diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/vice/README | 4 | ||||
| -rw-r--r-- | system/vice/patches/vice-2.3.21-64bit.patch | 129 | ||||
| -rw-r--r-- | system/vice/patches/vice-2.3.21-docs-fixes.patch | 32 | ||||
| -rw-r--r-- | system/vice/patches/vice-2.4.18-64bit.patch | 84 | ||||
| -rw-r--r-- | system/vice/patches/vice-2.4.4-no-pdf.patch | 16 | ||||
| -rw-r--r-- | system/vice/patches/vice-fix-help.patch | 22 | ||||
| -rw-r--r-- | system/vice/slack-desc | 2 | ||||
| -rw-r--r-- | system/vice/vice.SlackBuild | 15 | ||||
| -rw-r--r-- | system/vice/vice.info | 8 |
9 files changed, 129 insertions, 183 deletions
diff --git a/system/vice/README b/system/vice/README index 2f731cb82e..d083b9685b 100644 --- a/system/vice/README +++ b/system/vice/README @@ -1,2 +1,6 @@ VICE is the one and only Versatile Commodore Emulator. It provides emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers. + +To enable recording of videos you have to build with this an internal +(static) version of ffmpeg: enable this passing to the script the parameter +FFMPEG=yes diff --git a/system/vice/patches/vice-2.3.21-64bit.patch b/system/vice/patches/vice-2.3.21-64bit.patch deleted file mode 100644 index b78ea51bc8..0000000000 --- a/system/vice/patches/vice-2.3.21-64bit.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Naur vice-2.3.21.orig/doc/vice.guide vice-2.3.21/doc/vice.guide ---- vice-2.3.21.orig/doc/vice.guide 2012-08-06 00:41:54.000000000 +0200 -+++ vice-2.3.21/doc/vice.guide 2012-08-06 09:44:36.288562655 +0200 -@@ -1292,7 +1292,7 @@ - `Directory' resource, which is a colon (`:')-separated search path - list, like the UNIX `PATH' environment variable. The default value is - -- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - - Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' - is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', -@@ -1306,12 +1306,12 @@ - - then the value will be - -- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - - And system files will be searched for under the following directories, - in the specified order: - -- 1. `/usr/local/lib/VICE/C64' -+ 1. `/usr/local/lib64/VICE/C64' - - 2. `$HOME/.vice/C64' - -@@ -4010,7 +4010,7 @@ - where: - - * `LIBDIR' is the VICE installation directory (usually -- `/usr/local/lib/vice', `/usr/lib/vice' or `/opt/vice/lib'); -+ `/usr/local/lib64/vice', `/usr/lib64/vice' or `/opt/vice/lib'); - - * `EMUID' is the emulation identification string (`C64', - `C128', `VIC20' or `PET'); -diff -Naur vice-2.3.21.orig/doc/vice.texi vice-2.3.21/doc/vice.texi ---- vice-2.3.21.orig/doc/vice.texi 2012-07-24 04:08:09.000000000 +0200 -+++ vice-2.3.21/doc/vice.texi 2012-08-06 09:44:36.291562619 +0200 -@@ -1364,7 +1364,7 @@ - default value is - - @example --PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - @end example - - Where @code{PREFIX} is the installation prefix (usually -@@ -1383,7 +1383,7 @@ - then the value will be - - @example --/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - @end example - - And system files will be searched for under the following directories, -@@ -1391,7 +1391,7 @@ - - @enumerate 1 - @item --@code{/usr/local/lib/VICE/C64} -+@code{/usr/local/lib64/VICE/C64} - @item - @code{$HOME/.vice/C64} - @item -diff -Naur vice-2.3.21.orig/doc/vice.txt vice-2.3.21/doc/vice.txt ---- vice-2.3.21.orig/doc/vice.txt 2012-08-06 02:23:21.000000000 +0200 -+++ vice-2.3.21/doc/vice.txt 2012-08-06 09:44:36.296562563 +0200 -@@ -1056,7 +1056,7 @@ - `Directory' resource, which is a colon (`:')-separated search path - list, like the UNIX `PATH' environment variable. The default value is - --PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - - Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' - is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', -@@ -1070,12 +1070,12 @@ - - then the value will be - --/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - - And system files will be searched for under the following directories, - in the specified order: - --1. `/usr/local/lib/VICE/C64' -+1. `/usr/local/lib64/VICE/C64' - - 2. `$HOME/.vice/C64' - -diff -Naur vice-2.3.21.orig/INSTALL vice-2.3.21/INSTALL ---- vice-2.3.21.orig/INSTALL 2011-01-29 14:17:50.000000000 +0100 -+++ vice-2.3.21/INSTALL 2012-08-06 09:44:36.299562529 +0200 -@@ -301,7 +301,7 @@ - - make install - -- The binaries and support files will all go under PREFIX/lib/vice. -+ The binaries and support files will all go under PREFIX/lib64/vice. - You must of course have write permissions for the directories where - VICE is to be installed. Normally only the system administrator - has write access to /usr/local, the default PREFIX. Either ask -diff -Naur vice-2.3.21.orig/src/arch/sdl/archdep_unix.h vice-2.3.21/src/arch/sdl/archdep_unix.h ---- vice-2.3.21.orig/src/arch/sdl/archdep_unix.h 2011-07-21 05:10:28.000000000 +0200 -+++ vice-2.3.21/src/arch/sdl/archdep_unix.h 2012-08-06 09:42:11.970323196 +0200 -@@ -88,7 +88,7 @@ - #ifdef __NetBSD__ - #define LIBDIR PREFIX "/share/vice" - #else --#define LIBDIR PREFIX "/lib/vice" -+#define LIBDIR PREFIX "/lib64/vice" - #endif - - #if defined(__FreeBSD__) || defined(__NetBSD__) -diff -Naur vice-2.3.21.orig/src/arch/unix/archdep.h vice-2.3.21/src/arch/unix/archdep.h ---- vice-2.3.21.orig/src/arch/unix/archdep.h 2010-10-06 18:17:43.000000000 +0200 -+++ vice-2.3.21/src/arch/unix/archdep.h 2012-08-06 09:42:46.474902531 +0200 -@@ -127,7 +127,7 @@ - #ifdef __NetBSD__ - #define LIBDIR PREFIX "/share/vice" - #else --#define LIBDIR PREFIX "/lib/vice" -+#define LIBDIR PREFIX "/lib64/vice" - #endif - - #if defined(__FreeBSD__) || defined(__NetBSD__) diff --git a/system/vice/patches/vice-2.3.21-docs-fixes.patch b/system/vice/patches/vice-2.3.21-docs-fixes.patch deleted file mode 100644 index 84ed74ca7f..0000000000 --- a/system/vice/patches/vice-2.3.21-docs-fixes.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur vice-2.3.21.orig/configure.in vice-2.3.21/configure.in ---- vice-2.3.21.orig/configure.in 2012-08-06 02:23:21.000000000 +0200 -+++ vice-2.3.21/configure.in 2012-08-06 11:35:40.509403194 +0200 -@@ -288,13 +288,7 @@ - - AC_CHECK_PROGS(MAKEINFO, makeinfo, no) - --AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) --AC_CHECK_PROGS(PDFTEX, pdftex, no) --if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then -- AM_CONDITIONAL(BUILD_PDF, false) --else -- AM_CONDITIONAL(BUILD_PDF, true) --fi -+AM_CONDITIONAL(BUILD_PDF, false) - - AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix) - -diff -Naur vice-2.3.21.orig/doc/html/Makefile.am vice-2.3.21/doc/html/Makefile.am ---- vice-2.3.21.orig/doc/html/Makefile.am 2012-06-30 05:31:11.000000000 +0200 -+++ vice-2.3.21/doc/html/Makefile.am 2012-08-06 11:32:11.953905072 +0200 -@@ -45,10 +45,6 @@ - vice_14.html \ - vice_15.html \ - vice_16.html \ -- vice_17.html \ -- vice_18.html \ -- vice_19.html \ -- vice_20.html \ - vice_toc.html - - EXTRA_DIST = $(doc_DATA) \ diff --git a/system/vice/patches/vice-2.4.18-64bit.patch b/system/vice/patches/vice-2.4.18-64bit.patch new file mode 100644 index 0000000000..ee07f3f2b9 --- /dev/null +++ b/system/vice/patches/vice-2.4.18-64bit.patch @@ -0,0 +1,84 @@ +diff -Naur vice-2.4.18.orig/doc/vice.guide vice-2.4.18/doc/vice.guide +--- vice-2.4.18.orig/doc/vice.guide 2015-02-23 19:11:07.000000000 +0100 ++++ vice-2.4.18/doc/vice.guide 2015-03-06 17:40:53.822159935 +0100 +@@ -1339,7 +1339,7 @@ + `Directory' resource, which is a colon (`:')-separated search path + list, like the UNIX `PATH' environment variable. The default value is + +- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + + Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' + is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', +@@ -1354,12 +1354,12 @@ + + then the value will be + +- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + + And system files will be searched for under the following directories, + in the specified order: + +- 1. `/usr/local/lib/VICE/C64' ++ 1. `/usr/local/lib64/VICE/C64' + + 2. `$HOME/.vice/C64' + +diff -Naur vice-2.4.18.orig/doc/vice.texi vice-2.4.18/doc/vice.texi +--- vice-2.4.18.orig/doc/vice.texi 2015-02-17 20:32:19.000000000 +0100 ++++ vice-2.4.18/doc/vice.texi 2015-03-06 17:40:53.829159935 +0100 +@@ -1502,7 +1502,7 @@ + default value is + + @example +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + @end example + + Where @code{PREFIX} is the installation prefix (usually +@@ -1521,7 +1521,7 @@ + then the value will be + + @example +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + @end example + + And system files will be searched for under the following directories, +@@ -1529,7 +1529,7 @@ + + @enumerate 1 + @item +-@code{/usr/local/lib/VICE/C64} ++@code{/usr/local/lib64/VICE/C64} + @item + @code{$HOME/.vice/C64} + @item +diff -Naur vice-2.4.18.orig/doc/vice.txt vice-2.4.18/doc/vice.txt +--- vice-2.4.18.orig/doc/vice.txt 2015-02-23 19:11:07.000000000 +0100 ++++ vice-2.4.18/doc/vice.txt 2015-03-06 17:40:53.834159935 +0100 +@@ -1094,7 +1094,7 @@ + `Directory' resource, which is a colon (`:')-separated search path + list, like the UNIX `PATH' environment variable. The default value is + +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + + Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' + is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', +@@ -1109,12 +1109,12 @@ + + then the value will be + +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + + And system files will be searched for under the following directories, + in the specified order: + +-1. `/usr/local/lib/VICE/C64' ++1. `/usr/local/lib64/VICE/C64' + + 2. `$HOME/.vice/C64' + diff --git a/system/vice/patches/vice-2.4.4-no-pdf.patch b/system/vice/patches/vice-2.4.4-no-pdf.patch new file mode 100644 index 0000000000..51e9fd015f --- /dev/null +++ b/system/vice/patches/vice-2.4.4-no-pdf.patch @@ -0,0 +1,16 @@ +diff -Naur vice-2.4.4.orig/configure.proto vice-2.4.4/configure.proto +--- vice-2.4.4.orig/configure.proto 2013-06-02 02:37:13.000000000 +0200 ++++ vice-2.4.4/configure.proto 2013-06-03 11:58:05.355979729 +0200 +@@ -349,11 +349,7 @@ + + AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) + AC_CHECK_PROGS(PDFTEX, pdftex, no) +-if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then +- AM_CONDITIONAL(BUILD_PDF, false) +-else +- AM_CONDITIONAL(BUILD_PDF, true) +-fi ++AM_CONDITIONAL(BUILD_PDF, false) + + AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix) + diff --git a/system/vice/patches/vice-fix-help.patch b/system/vice/patches/vice-fix-help.patch index 1312fe8399..e2bfe04f4f 100644 --- a/system/vice/patches/vice-fix-help.patch +++ b/system/vice/patches/vice-fix-help.patch @@ -1,21 +1,21 @@ -diff -urpN vice-1.22/man/vice.1 vice-1.22-fixdoc/man/vice.1 ---- vice-1.22/man/vice.1 2005-08-21 21:15:04.000000000 +0200 -+++ vice-1.22-fixdoc/man/vice.1 2008-02-16 19:40:11.000000000 +0100 -@@ -40,7 +40,7 @@ a Commodore BASIC de-tokenizer; +diff -Naur vice-2.4.1.orig/man/vice.1 vice-2.4.1/man/vice.1 +--- vice-2.4.1.orig/man/vice.1 2012-11-29 12:44:39.000000000 +0100 ++++ vice-2.4.1/man/vice.1 2013-01-23 19:48:47.065865099 +0100 +@@ -43,7 +43,7 @@ .PP The whole documentation for these programs is available in HTML format; the main file should be installed on your system as --/usr/local/lib/VICE/doc/vice_toc.html. -+/usr/doc/vice/html/vice_toc.html. +-/usr/local/lib/vice/doc/vice_toc.html. ++/usr/doc/vice-@VERSION@/html/vice_toc.html. .P For up to date news about VICE, have a look at the official home page at -diff -urpN vice-1.22/src/arch/unix/gui/uicommands.c vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c ---- vice-1.22/src/arch/unix/gui/uicommands.c 2007-04-01 17:02:44.000000000 +0200 -+++ vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c 2008-02-16 19:31:10.000000000 +0100 -@@ -160,7 +160,7 @@ static UI_CALLBACK(browse_manual) +diff -Naur vice-2.4.1.orig/src/arch/unix/gui/uicommands.c vice-2.4.1/src/arch/unix/gui/uicommands.c +--- vice-2.4.1.orig/src/arch/unix/gui/uicommands.c 2012-12-30 15:12:52.000000000 +0100 ++++ vice-2.4.1/src/arch/unix/gui/uicommands.c 2013-01-23 19:50:01.276832152 +0100 +@@ -162,7 +162,7 @@ char *manual_path; - manual_path = util_concat(boot_path,"/../doc/vice_toc.html",NULL); + manual_path = util_concat(boot_path, "/../doc/vice_toc.html", NULL); #else - static const char manual_path[] = DOCDIR "/vice_toc.html"; + static const char manual_path[] = DOCDIR "/html/vice_toc.html"; diff --git a/system/vice/slack-desc b/system/vice/slack-desc index 67c624c9b4..c1c323dda7 100644 --- a/system/vice/slack-desc +++ b/system/vice/slack-desc @@ -14,6 +14,6 @@ vice: programs intended for the old 8-bit computers. The current version vice: emulates the C64, the C128, the VIC20, almost all PET models, the vice: PLUS4 and the CBM-II (aka C610). vice: -vice: Homepage: http://www.viceteam.org/ +vice: Homepage: http://vice-emu.sourceforge.net vice: vice: diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 4affd7be5c..7003d78209 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vice -VERSION=${VERSION:-2.3.22} +VERSION=${VERSION:-2.4.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,6 +54,9 @@ else LIBDIRSUFFIX="" fi +# Only the internal ffmpeg libraries seems to work ATM +if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-static-ffmpeg"; else ffmpeg=""; fi + set -e rm -rf $PKG @@ -73,11 +76,11 @@ find -L . \ # folder (the folder set up by "make install" is quite broken). patch -p1 <$CWD/patches/vice-fix-help.patch -# Small fixes for html doc building, avoid pdf (broken) -patch -p1 < $CWD/patches/vice-2.3.21-docs-fixes.patch +# A small fix to avoid avoid building the pdf (broken, we use the one provided) +patch -p1 < $CWD/patches/vice-2.4.4-no-pdf.patch # Use /usr/lib64 on 64-bit Slackware -[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.3.21-64bit.patch +[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/vice-2.4.18-64bit.patch sh autogen.sh || true @@ -89,13 +92,13 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gnomeui \ --mandir=/usr/man \ --infodir=/usr/info \ - --disable-ffmpeg \ + $ffmpeg \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/system/vice/vice.info b/system/vice/vice.info index f3889031c4..dabfa9fe17 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="2.3.22" -HOMEPAGE="http://www.viceteam.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.3.22.tar.xz" -MD5SUM="44290700d30fca06f8655bab8c2ce86f" +VERSION="2.4.21" +HOMEPAGE="http://vice-emu.sourceforge.net" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.4.21.tar.xz" +MD5SUM="d5dd6d53dc8e8c3abb66c2ce487f146f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |