From f01fa50fe20f634dcd4165ac3b4023d34c3be3d1 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Wed, 12 May 2010 17:39:38 +0200 Subject: games/tuxnes: Updated for version 0.75 --- games/tuxnes/Makefile.patch | 11 ------- games/tuxnes/README.slack64 | 4 +++ games/tuxnes/configure.in.patch | 56 -------------------------------- games/tuxnes/emu.c.patch | 38 ---------------------- games/tuxnes/gtuxnes.desktop | 7 ++++ games/tuxnes/gtuxnes.png | Bin 0 -> 10558 bytes games/tuxnes/patches/Makefile.patch | 11 +++++++ games/tuxnes/patches/configure.in.patch | 56 ++++++++++++++++++++++++++++++++ games/tuxnes/patches/emu.c.patch | 38 ++++++++++++++++++++++ games/tuxnes/tuxnes.SlackBuild | 53 ++++++++++++++++++------------ 10 files changed, 148 insertions(+), 126 deletions(-) delete mode 100644 games/tuxnes/Makefile.patch create mode 100644 games/tuxnes/README.slack64 delete mode 100644 games/tuxnes/configure.in.patch delete mode 100644 games/tuxnes/emu.c.patch create mode 100644 games/tuxnes/gtuxnes.desktop create mode 100644 games/tuxnes/gtuxnes.png create mode 100644 games/tuxnes/patches/Makefile.patch create mode 100644 games/tuxnes/patches/configure.in.patch create mode 100644 games/tuxnes/patches/emu.c.patch (limited to 'games/tuxnes') diff --git a/games/tuxnes/Makefile.patch b/games/tuxnes/Makefile.patch deleted file mode 100644 index 041bb27927..0000000000 --- a/games/tuxnes/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile~ 2007-06-30 09:16:58.000000000 -0500 -+++ Makefile 2007-06-30 09:18:26.000000000 -0500 -@@ -3,7 +3,7 @@ - panels.o debug.o config.o `gtk-config --cflags --libs` - - %.o: %.c gtuxnes.h -- gcc `gtk-config --cflags` -c $*.c -o $@ -+ gcc $(CFLAGS) `gtk-config --cflags` -c $*.c -o $@ - - clean: - rm -f *.o diff --git a/games/tuxnes/README.slack64 b/games/tuxnes/README.slack64 new file mode 100644 index 0000000000..69546f0ad8 --- /dev/null +++ b/games/tuxnes/README.slack64 @@ -0,0 +1,4 @@ +Note to Slackware64 users: although tuxnes.SlackBuild won't work on an +x86_64 processor, you should be able to build tuxnes on a 32-bit Slackware +system and install the package on a Slackware64 system, provided you also +install 32-bit compatibility libraries. diff --git a/games/tuxnes/configure.in.patch b/games/tuxnes/configure.in.patch deleted file mode 100644 index 38a91de2cb..0000000000 --- a/games/tuxnes/configure.in.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- configure.in~ 2007-06-30 08:03:35.000000000 -0500 -+++ configure.in 2007-06-30 08:21:46.000000000 -0500 -@@ -8,15 +8,16 @@ - ## - - dnl -------------------------------------------------------------------- --dnl Made the prerequisite autoconf 2.13, lower it to each version we -+dnl Made the prerequisite autoconf 2.60, lower it to each version we - dnl find to work correctly with this script - dnl -------------------------------------------------------------------- --AC_PREREQ(2.13) -+AC_PREREQ(2.60) - - dnl -------------------------------------------------------------------- - dnl Process this file with autoconf to produce a configure script - dnl -------------------------------------------------------------------- --AC_INIT(consts.h) -+AC_INIT -+AC_CONFIG_SRCDIR([consts.h]) - AM_INIT_AUTOMAKE(tuxnes,0.75) - #AM_INIT_AUTOMAKE(tuxnes,devel) - -@@ -28,16 +29,10 @@ - AC_CANONICAL_HOST - - dnl -------------------------------------------------------------------- --dnl Don't assume we want high level optimisations, it is known to --dnl produce broken code on certain architectures using certain compilers --dnl -------------------------------------------------------------------- --CFLAGS="-O" --AC_SUBST(CFLAGS) -- --dnl -------------------------------------------------------------------- - dnl Check for programs which we might need - dnl -------------------------------------------------------------------- - AC_PROG_CC -+AM_PROG_AS - AC_PROG_INSTALL - - dnl -------------------------------------------------------------------- -@@ -175,7 +170,7 @@ - *-freebsd*) - OLDFLAGS="$LDFLAGS" - LDFLAGS="-L/usr/local/lib" -- AC_CHECK_LIB(gnugetopt, getopt, [AC_DEFINE(HAVE_LIBGNUGETOPT) GNUGETOPT_LIB="-lgnugetopt"]) -+ AC_CHECK_LIB(gnugetopt, getopt, [AC_DEFINE([HAVE_LIBGNUGETOPT], 1, [Define to 1 if you have the `gnugetopt' library (-lgnugetopt).]) GNUGETOPT_LIB="-lgnugetopt"]) - if test -n "$GNUGETOPT_LIB"; then - LDFLAGS="$OLDFLAGS -L/usr/local/lib -lgnugetopt" - AC_SUBST(LDFLAGS) -@@ -209,4 +204,5 @@ - AC_TYPE_SIGNAL - AC_CHECK_FUNCS(gettimeofday strtod strtoul) - --AC_OUTPUT(Makefile) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT diff --git a/games/tuxnes/emu.c.patch b/games/tuxnes/emu.c.patch deleted file mode 100644 index 0b33a7190c..0000000000 --- a/games/tuxnes/emu.c.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- emu.c~ 2007-06-30 02:02:34.000000000 -0500 -+++ emu.c 2007-06-30 02:04:48.000000000 -0500 -@@ -890,7 +890,7 @@ - len = strlen(palfile) + 1; - if (! (buffer = malloc(len))) - { -- perror (__FUNCTION__ ": malloc"); -+ perror ("loadpal: malloc"); - return; - } - memcpy (buffer, palfile, len); -@@ -912,7 +912,7 @@ - len = strlen(filename) + 1; - if (! (buffer = malloc(len))) - { -- perror (__FUNCTION__ ": malloc"); -+ perror ("loadpal: malloc"); - return; - } - memcpy (buffer, filename, len); -@@ -924,7 +924,7 @@ - return; - if (!(palfile = malloc ((len = strlen (filename)) + 11))) - { -- perror (__FUNCTION__ ": malloc"); -+ perror ("loadpal: malloc"); - return; - } - strcpy (palfile, filename); -@@ -1602,7 +1602,7 @@ - - if (! (basefilename = malloc(baseend - basestart + 1))) - { -- perror (__FUNCTION__ ": malloc"); -+ perror ("main: malloc"); - exit (1); - } - diff --git a/games/tuxnes/gtuxnes.desktop b/games/tuxnes/gtuxnes.desktop new file mode 100644 index 0000000000..812f55430c --- /dev/null +++ b/games/tuxnes/gtuxnes.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=GTuxNES +Exec=gtuxnes +Type=Application +Icon=gtuxnes +GenericName=Emulator Launcher +Categories=Game;Emulator; diff --git a/games/tuxnes/gtuxnes.png b/games/tuxnes/gtuxnes.png new file mode 100644 index 0000000000..8a0be2e828 Binary files /dev/null and b/games/tuxnes/gtuxnes.png differ diff --git a/games/tuxnes/patches/Makefile.patch b/games/tuxnes/patches/Makefile.patch new file mode 100644 index 0000000000..041bb27927 --- /dev/null +++ b/games/tuxnes/patches/Makefile.patch @@ -0,0 +1,11 @@ +--- Makefile~ 2007-06-30 09:16:58.000000000 -0500 ++++ Makefile 2007-06-30 09:18:26.000000000 -0500 +@@ -3,7 +3,7 @@ + panels.o debug.o config.o `gtk-config --cflags --libs` + + %.o: %.c gtuxnes.h +- gcc `gtk-config --cflags` -c $*.c -o $@ ++ gcc $(CFLAGS) `gtk-config --cflags` -c $*.c -o $@ + + clean: + rm -f *.o diff --git a/games/tuxnes/patches/configure.in.patch b/games/tuxnes/patches/configure.in.patch new file mode 100644 index 0000000000..38a91de2cb --- /dev/null +++ b/games/tuxnes/patches/configure.in.patch @@ -0,0 +1,56 @@ +--- configure.in~ 2007-06-30 08:03:35.000000000 -0500 ++++ configure.in 2007-06-30 08:21:46.000000000 -0500 +@@ -8,15 +8,16 @@ + ## + + dnl -------------------------------------------------------------------- +-dnl Made the prerequisite autoconf 2.13, lower it to each version we ++dnl Made the prerequisite autoconf 2.60, lower it to each version we + dnl find to work correctly with this script + dnl -------------------------------------------------------------------- +-AC_PREREQ(2.13) ++AC_PREREQ(2.60) + + dnl -------------------------------------------------------------------- + dnl Process this file with autoconf to produce a configure script + dnl -------------------------------------------------------------------- +-AC_INIT(consts.h) ++AC_INIT ++AC_CONFIG_SRCDIR([consts.h]) + AM_INIT_AUTOMAKE(tuxnes,0.75) + #AM_INIT_AUTOMAKE(tuxnes,devel) + +@@ -28,16 +29,10 @@ + AC_CANONICAL_HOST + + dnl -------------------------------------------------------------------- +-dnl Don't assume we want high level optimisations, it is known to +-dnl produce broken code on certain architectures using certain compilers +-dnl -------------------------------------------------------------------- +-CFLAGS="-O" +-AC_SUBST(CFLAGS) +- +-dnl -------------------------------------------------------------------- + dnl Check for programs which we might need + dnl -------------------------------------------------------------------- + AC_PROG_CC ++AM_PROG_AS + AC_PROG_INSTALL + + dnl -------------------------------------------------------------------- +@@ -175,7 +170,7 @@ + *-freebsd*) + OLDFLAGS="$LDFLAGS" + LDFLAGS="-L/usr/local/lib" +- AC_CHECK_LIB(gnugetopt, getopt, [AC_DEFINE(HAVE_LIBGNUGETOPT) GNUGETOPT_LIB="-lgnugetopt"]) ++ AC_CHECK_LIB(gnugetopt, getopt, [AC_DEFINE([HAVE_LIBGNUGETOPT], 1, [Define to 1 if you have the `gnugetopt' library (-lgnugetopt).]) GNUGETOPT_LIB="-lgnugetopt"]) + if test -n "$GNUGETOPT_LIB"; then + LDFLAGS="$OLDFLAGS -L/usr/local/lib -lgnugetopt" + AC_SUBST(LDFLAGS) +@@ -209,4 +204,5 @@ + AC_TYPE_SIGNAL + AC_CHECK_FUNCS(gettimeofday strtod strtoul) + +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT diff --git a/games/tuxnes/patches/emu.c.patch b/games/tuxnes/patches/emu.c.patch new file mode 100644 index 0000000000..0b33a7190c --- /dev/null +++ b/games/tuxnes/patches/emu.c.patch @@ -0,0 +1,38 @@ +--- emu.c~ 2007-06-30 02:02:34.000000000 -0500 ++++ emu.c 2007-06-30 02:04:48.000000000 -0500 +@@ -890,7 +890,7 @@ + len = strlen(palfile) + 1; + if (! (buffer = malloc(len))) + { +- perror (__FUNCTION__ ": malloc"); ++ perror ("loadpal: malloc"); + return; + } + memcpy (buffer, palfile, len); +@@ -912,7 +912,7 @@ + len = strlen(filename) + 1; + if (! (buffer = malloc(len))) + { +- perror (__FUNCTION__ ": malloc"); ++ perror ("loadpal: malloc"); + return; + } + memcpy (buffer, filename, len); +@@ -924,7 +924,7 @@ + return; + if (!(palfile = malloc ((len = strlen (filename)) + 11))) + { +- perror (__FUNCTION__ ": malloc"); ++ perror ("loadpal: malloc"); + return; + } + strcpy (palfile, filename); +@@ -1602,7 +1602,7 @@ + + if (! (basefilename = malloc(baseend - basestart + 1))) + { +- perror (__FUNCTION__ ": malloc"); ++ perror ("main: malloc"); + exit (1); + } + diff --git a/games/tuxnes/tuxnes.SlackBuild b/games/tuxnes/tuxnes.SlackBuild index 15c8270c44..a57e343e01 100644 --- a/games/tuxnes/tuxnes.SlackBuild +++ b/games/tuxnes/tuxnes.SlackBuild @@ -2,15 +2,14 @@ # Slackware build script for tuxnes # Written by Kyle Guinn -# Modified by the SlackBuilds.org project - -set -e +# Updated slightly by B. Watson , with permission PRGNAM=tuxnes VERSION=0.75 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -20,23 +19,33 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +else + cat < $PKG/usr/share/pixmaps/$PRGNAM.png + + mkdir -p $PKG/usr/share/applications + cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - cp -a AUTHORS CHANGES COPYING INSTALL README TODO \ + cp -a AUTHORS CHANGES COPYING README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION fi -) - -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +) || exit 1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS BUGS CHANGES COPYING ChangeLog INSTALL* NEWS README THANKS \ +cp -a AUTHORS BUGS CHANGES COPYING ChangeLog NEWS README THANKS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -- cgit v1.2.3-80-g2a13