summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/vice/config/vice.png (renamed from system/vice/vice.png)bin4040 -> 4040 bytes
-rw-r--r--system/vice/config/x128.desktop (renamed from system/vice/x128.desktop)0
-rw-r--r--system/vice/config/x64.desktop (renamed from system/vice/x64.desktop)0
-rw-r--r--system/vice/config/x64dtv.desktop (renamed from system/vice/x64dtv.desktop)0
-rw-r--r--system/vice/config/xcbm2.desktop (renamed from system/vice/xcbm2.desktop)0
-rw-r--r--system/vice/config/xpet.desktop (renamed from system/vice/xpet.desktop)0
-rw-r--r--system/vice/config/xplus4.desktop (renamed from system/vice/xplus4.desktop)0
-rw-r--r--system/vice/config/xvic.desktop (renamed from system/vice/xvic.desktop)0
-rw-r--r--system/vice/doinst.sh13
-rw-r--r--system/vice/patches/vice-2.1-64bit.patch105
-rw-r--r--system/vice/patches/vice-fix-help.patch (renamed from system/vice/vice-fix-help.patch)0
-rw-r--r--system/vice/vice.SlackBuild42
-rw-r--r--system/vice/vice.info4
13 files changed, 146 insertions, 18 deletions
diff --git a/system/vice/vice.png b/system/vice/config/vice.png
index e001fc8620..e001fc8620 100644
--- a/system/vice/vice.png
+++ b/system/vice/config/vice.png
Binary files differ
diff --git a/system/vice/x128.desktop b/system/vice/config/x128.desktop
index c72fd07a2a..c72fd07a2a 100644
--- a/system/vice/x128.desktop
+++ b/system/vice/config/x128.desktop
diff --git a/system/vice/x64.desktop b/system/vice/config/x64.desktop
index 99f4c4941b..99f4c4941b 100644
--- a/system/vice/x64.desktop
+++ b/system/vice/config/x64.desktop
diff --git a/system/vice/x64dtv.desktop b/system/vice/config/x64dtv.desktop
index 3a64e94124..3a64e94124 100644
--- a/system/vice/x64dtv.desktop
+++ b/system/vice/config/x64dtv.desktop
diff --git a/system/vice/xcbm2.desktop b/system/vice/config/xcbm2.desktop
index c0ec685c3b..c0ec685c3b 100644
--- a/system/vice/xcbm2.desktop
+++ b/system/vice/config/xcbm2.desktop
diff --git a/system/vice/xpet.desktop b/system/vice/config/xpet.desktop
index c36301e023..c36301e023 100644
--- a/system/vice/xpet.desktop
+++ b/system/vice/config/xpet.desktop
diff --git a/system/vice/xplus4.desktop b/system/vice/config/xplus4.desktop
index 5eba55e710..5eba55e710 100644
--- a/system/vice/xplus4.desktop
+++ b/system/vice/config/xplus4.desktop
diff --git a/system/vice/xvic.desktop b/system/vice/config/xvic.desktop
index 7e96c4c5e5..7e96c4c5e5 100644
--- a/system/vice/xvic.desktop
+++ b/system/vice/config/xvic.desktop
diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh
index 5fb28930db..8095c47d9b 100644
--- a/system/vice/doinst.sh
+++ b/system/vice/doinst.sh
@@ -1,3 +1,16 @@
+# Update desktop icons
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+ ( cd /usr/share/fonts/TTF
+ mkfontscale .
+ mkfontdir .
+ )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+fi
+
diff --git a/system/vice/patches/vice-2.1-64bit.patch b/system/vice/patches/vice-2.1-64bit.patch
new file mode 100644
index 0000000000..eadf9b64e5
--- /dev/null
+++ b/system/vice/patches/vice-2.1-64bit.patch
@@ -0,0 +1,105 @@
+diff -urpN vice-2.1/configure vice-2.1-64/configure
+--- vice-2.1/configure 2008-12-15 21:18:47.000000000 +0100
++++ vice-2.1-64/configure 2009-10-11 00:02:00.763205494 +0200
+@@ -960,7 +960,7 @@ htmldir='${docdir}'
+ dvidir='${docdir}'
+ pdfdir='${docdir}'
+ psdir='${docdir}'
+-libdir='${exec_prefix}/lib'
++libdir='${exec_prefix}/lib64'
+ localedir='${datarootdir}/locale'
+ mandir='${datarootdir}/man'
+
+@@ -1445,7 +1445,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'.
+
+@@ -1458,7 +1458,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]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+@@ -5583,7 +5583,7 @@ if test -z "$CPP"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CPP needs to be expanded
+- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp"
+ do
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -6369,7 +6369,7 @@ if test -z "$CPP"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CPP needs to be expanded
+- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp"
+ do
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -8652,7 +8652,7 @@ if test -z "$CXXCPP"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # Double quotes because CXXCPP needs to be expanded
+- for CXXCPP in "$CXX -E" "/lib/cpp"
++ for CXXCPP in "$CXX -E" "/lib64/cpp"
+ do
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -8911,7 +8911,7 @@ _ACEOF
+ else
+ no_recursion=yes
+
+- LDFLAGS="$LDFLAGS -L$with_resid/lib"
++ LDFLAGS="$LDFLAGS -L$with_resid/lib64"
+ CPPFLAGS="$CPPFLAGS -I$with_resid/include"
+
+
+@@ -9131,7 +9131,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+
+ RESID_DIR=
+- RESID_LIBS="$with_resid/lib/libresid.a"
++ RESID_LIBS="$with_resid/lib64/libresid.a"
+ RESID_INCLUDES="-I$with_resid/include"
+ fi
+
+@@ -23284,7 +23284,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 | /lib64) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+ esac
+ fi
+@@ -28704,7 +28704,7 @@ fi
+
+ ;;
+ *)
+- VICEDIR="$PREFIX/lib/vice";
++ VICEDIR="$PREFIX/lib64/vice";
+
+
+ if false; then
+diff -urpN vice-2.1/src/arch/unix/archdep.h vice-2.1-64/src/arch/unix/archdep.h
+--- vice-2.1/src/arch/unix/archdep.h 2008-10-10 21:08:31.000000000 +0200
++++ vice-2.1-64/src/arch/unix/archdep.h 2009-10-11 00:03:04.366722924 +0200
+@@ -116,7 +116,7 @@ extern const char *archdep_pref_path;
+ #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/vice-fix-help.patch b/system/vice/patches/vice-fix-help.patch
index 1312fe8399..1312fe8399 100644
--- a/system/vice/vice-fix-help.patch
+++ b/system/vice/patches/vice-fix-help.patch
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 871ea9600a..66d51ae8b7 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX=64
fi
set -e # Exit on most errors
@@ -58,7 +61,10 @@ find . \
# 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
+patch -p1 <$CWD/patches/vice-fix-help.patch
+
+# Use /usr/lib64 on 64-bit Slackware
+[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.1-64bit.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -68,7 +74,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-gnomeui \
--mandir=/usr/man \
--infodir=/usr/info \
- --build=$ARCH
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
@@ -83,14 +89,27 @@ make install DESTDIR=$PKG
)
rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+gzip -9 $PKG/usr/info/*
+
+# Create link to documentation folder in the place VICE expects to find it.
+( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
+
+# Copy the CBM.ttf font to the fonts directory
+# ('make install' spits an error on this, I haven't investigated why)
+mkdir -p $PKG/usr/share/fonts/TTF
+cp data/fonts/CBM.ttf $PKG/usr/share/fonts/TTF
+
+# Install icon and menu entries
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp $CWD/config/*.desktop $PKG/usr/share/applications
+cp $CWD/config/vice.png $PKG/usr/share/pixmaps
# Remove the documentation folder installed by "make install", which
# is a broken mess of almost unrelated files in the wrong place
-rm -rf $PKG/usr/lib$LIBSUFFIX/$PRGNAM/doc
+rm -rf $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc
# Copy the original documentation folder to the usual place
mkdir -p $PKG/usr/doc
-cp -R doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 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
@@ -98,20 +117,9 @@ 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.
-( cd $PKG/usr/lib/$PRGNAM
- ln -s /usr/doc/$PRGNAM-$VERSION doc
-)
-
-# Install icon and menu entries
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cp $CWD/*.desktop $PKG/usr/share/applications
-cp $CWD/vice.png $PKG/usr/share/pixmaps
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vice/vice.info b/system/vice/vice.info
index 1a05c15618..8cc210ab46 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -3,6 +3,8 @@ VERSION="2.1"
HOMEPAGE="http://www.viceteam.org/"
DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz"
MD5SUM="a4cca1aad12e12ac7f37d6c85310ade8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Mauro Giachero"
EMAIL="mauro dot giachero at gmail dot com"
-APPROVED="dsomero"
+APPROVED="rworkman"
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-11 14:22:31 +0000