system/vice: Updated for version 2.0

This commit is contained in:
Mauro Giachero 2010-05-11 22:27:10 +02:00 committed by David Somero
parent f2f5525d6e
commit a011349462
6 changed files with 18 additions and 126 deletions

View File

@ -1,9 +1,2 @@
VICE is the one and only Versatile Commodore Emulator. It provides emulation
of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers.
If you are building this on Slamd64, execute the build script as follows:
ARCH=x86_64 ./vice.SlackBuild
If you build on a multicore system, add JOBS={core #} to enable parallel
compilation, as in: JOBS=4 ./vice.SlackBuild
which starts up to 4 build jobs simultaneously.

Binary file not shown.

View File

@ -22,15 +22,3 @@ diff -urpN vice-1.22/src/arch/unix/gui/uicommands.c vice-1.22-fixdoc/src/arch/un
#endif
char *res_ptr;
diff -urpN vice-1.22/src/arch/unix/x11/ui-resources.c vice-1.22-fixdoc/src/arch/unix/x11/ui-resources.c
--- vice-1.22/src/arch/unix/x11/ui-resources.c 2007-03-03 10:07:37.000000000 +0100
+++ vice-1.22-fixdoc/src/arch/unix/x11/ui-resources.c 2008-02-16 19:33:32.000000000 +0100
@@ -112,7 +112,7 @@ static const resource_string_t resources
#ifdef MACOSX_SUPPORT
"/usr/bin/open %s",
#else
- "netscape %s",
+ "htmlview %s",
#endif
RES_EVENT_NO, NULL,
&ui_resources.html_browser_command,

View File

@ -1,87 +0,0 @@
diff -urpN vice-1.22/configure vice-1.22-64bit/configure
--- vice-1.22/configure 2007-08-05 21:53:33.000000000 +0200
+++ vice-1.22-64bit/configure 2008-02-16 14:22:15.000000000 +0100
@@ -345,7 +345,7 @@ datadir='${prefix}/share'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
+libdir='${exec_prefix}/lib64'
includedir='${prefix}/include'
oldincludedir='/usr/include'
infodir='${prefix}/info'
@@ -821,7 +821,7 @@ Installation directories:
[PREFIX]
By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib64' etc. You can specify
an installation prefix other than \`$ac_default_prefix' using \`--prefix',
for instance \`--prefix=\$HOME'.
@@ -835,7 +835,7 @@ Fine tuning of the installation director
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
+ --libdir=DIR object code libraries [EPREFIX/lib64]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--infodir=DIR info documentation [PREFIX/info]
@@ -7988,7 +7988,7 @@ subdirs="$subdirs src/resid"
else
no_recursion=yes
- LDFLAGS="$LDFLAGS -L$with_resid/lib"
+ LDFLAGS="$LDFLAGS -L$with_resid/lib64"
CPPFLAGS="$CPPFLAGS -I$with_resid/include"
@@ -22745,7 +22745,7 @@ _ACEOF
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /lib) ;;
+ /usr/lib64 | /lib) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
@@ -22886,7 +22886,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib64/g`
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -27845,7 +27845,7 @@ fi
;;
freebsd*)
- VICEDIR="$PREFIX/lib/vice";
+ VICEDIR="$PREFIX/lib64/vice";
if true; then
@@ -27858,7 +27858,7 @@ fi
;;
*)
- VICEDIR="$PREFIX/lib/vice";
+ VICEDIR="$PREFIX/lib64/vice";
if false; then
diff -urpN vice-1.22/src/arch/unix/archdep.h vice-1.22-64bit/src/arch/unix/archdep.h
--- vice-1.22/src/arch/unix/archdep.h 2007-04-29 20:50:17.000000000 +0200
+++ vice-1.22-64bit/src/arch/unix/archdep.h 2008-02-16 14:16:32.000000000 +0100
@@ -109,7 +109,7 @@ extern const char *archdep_home_path(voi
#ifdef __NetBSD__
#define LIBDIR PREFIX "/share/vice"
#else
-#define LIBDIR PREFIX "/lib/vice"
+#define LIBDIR PREFIX "/lib64/vice"
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__)

View File

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vice
VERSION=1.22
VERSION=2.0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -33,16 +33,12 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
# Parallel compilation support
JOBS=${JOBS:-1}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -march=x86-64"
LIBSUFFIX="64"
SLKCFLAGS="-O2 -fPIC"
fi
set -e # Exit on most errors
@ -60,14 +56,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Replace the hardcoded "netscape" HTML viewer with "htmlview" and set
# the help path correctly with respect to the actually installed doc folder
# (the folder set up by "make install" is quite broken)
patch -p1 <$CWD/vice-fix-help.patch
# Fix PAL emulation.
# This is an official patch to release 2.0 and has been applied upstream.
zcat $CWD/gnome-palemu.diff.gz |patch -p0
# This patch fixes the libdir path for 64 bit builds
# (configure doesn't honor --libdir)
[ "$LIBSUFFIX" = "64" ] && patch -p1 <$CWD/vice-lib64.patch
# Set the help path correctly with respect to the actually installed doc
# folder (the folder set up by "make install" is quite broken).
# This also changes the HTML help viewer from "firefox" to "htmlview".
patch -p1 <$CWD/vice-fix-help.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@ -75,9 +71,11 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--enable-fullscreen \
--enable-gnomeui \
--mandir=/usr/man \
--infodir=/usr/info \
--build=$ARCH
make -j$JOBS
make
make install DESTDIR=$PKG
( cd $PKG
@ -100,13 +98,13 @@ cp -R doc $PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
find $PKG/usr/doc/$PRGNAM-$VERSION -name "tex*" -exec rm -f {} \;
# Copy additional program documentation
cp -a AUTHORS FEEDBACK INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# Create link to documentation folder in the place VICE expects
# to find it (looks like the VICE team does something strange with
# the build scripts, as it resulted very difficult to actually set
# a different doc folder)
( cd $PKG/usr/lib$LIBSUFFIX/$PRGNAM
( cd $PKG/usr/lib/$PRGNAM
ln -s /usr/doc/$PRGNAM-$VERSION doc
)

View File

@ -1,8 +1,8 @@
PRGNAM="vice"
VERSION="1.22"
VERSION="2.0"
HOMEPAGE="http://www.viceteam.org/"
DOWNLOAD="http://www.viceteam.org/online/vice-1.22.tar.gz"
MD5SUM="33204acbb74bafb12594d39b55888626"
DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz"
MD5SUM="e4af3962469cb2279429718946528f1d"
MAINTAINER="Mauro Giachero"
EMAIL="mauro dot giachero at gmail dot com"
APPROVED="David Somero"
APPROVED="dsomero"