old
authorSamuli Suominen <ssuominen@gentoo.org>
Mon, 19 Jul 2010 19:35:09 +0000 (19:35 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Mon, 19 Jul 2010 19:35:09 +0000 (19:35 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

games-emulation/snes9x/Manifest
games-emulation/snes9x/files/nojoy.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-build.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-config.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-gcc412.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-gcc440.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch [deleted file]
games-emulation/snes9x/files/snes9x-1.43-porting.patch [deleted file]
games-emulation/snes9x/snes9x-1.43-r2.ebuild [deleted file]

index 474fd569cd8ce03342275856b3b1cefb99ff927f..7bf11a2e3a79201e16f1aa62aa6887a3f46283c3 100644 (file)
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX nojoy.patch 507 RMD160 cc341aa07cc1ea707e66c864dd8fd5ee0234cb0c SHA1 19c467c0f8ce6b4442cef09bb2ec752bce10c784 SHA256 20f9c04757643cf6db4a9fcd7041bf23c27dc46385913f20999f4d1687b54e61
-AUX snes9x-1.43-build.patch 1104 RMD160 9a5502223a1f052d6c30f61293f6bb5cd36a0dd3 SHA1 5676d726da0a6b1d69b020c288029a140c5f44ca SHA256 40912ece42780e53259f60aa53f6cf69e49c9d6b6d17839ef06608bcac32868a
-AUX snes9x-1.43-config.patch 371 RMD160 9d16c5ca51901b6c5abbdf1b025dfced4a9e96a7 SHA1 0768d9068b2a7c3dc9599227014895615fde320d SHA256 0a99f13b0c58a78feca200c301a24dd09ebfb3aee99e74229870bd8728f93952
-AUX snes9x-1.43-gcc412.patch 627 RMD160 9dc49ebfb8f212633f672acf803f905e0fd9b475 SHA1 97ba7a8474c6d6b55ffe15892358c523378090e4 SHA256 e41de369da57997b1163d79af87d1e27b62aad389184887721b39554969c37e9
-AUX snes9x-1.43-gcc440.patch 431 RMD160 14bffbacbbf1e5b0580247a1c976d3412216ce43 SHA1 3384c3b995d32eed4956911aefd2085eff1c8a6b SHA256 44c1dbaa922521fbf4923f5388f3c7247838d97becbf726c4cc027cc99f6af13
-AUX snes9x-1.43-key-bindings-fix.patch 2526 RMD160 d1dd054cf8f7f637c759ed7cd82dfb7511a0629d SHA1 e9992f6550d9420d9e6da74be78828f366025ed8 SHA256 22a6df46d15438aaaeddc5f86564474988f810037d2810da4773ff365f907b77
-AUX snes9x-1.43-porting.patch 1903 RMD160 b95939f656e669dcca1df0fb5bd584e40ba6eba2 SHA1 a057eb6493ee81d4720ee343b11e3aa17dfb76dd SHA256 a38fedbd355487ac0ff28a79a39e108bd0063446befc4d5081a707f944bed286
 AUX snes9x-1.52-build.patch 1219 RMD160 ac9af15b62c2ac454d1efcd4533314e4df55ec85 SHA1 c272379b4923d6448fa92fce1f218fc17343e72e SHA256 b61041e1b86d07922ecc2be6a4cb21b01e18024accc957b9d6d692948e0704bb
-DIST snes9x-1.43-src.tar.gz 1016251 RMD160 d2003f7afb208109405b41f4eec586b93518f9b2 SHA1 c6883c451aeb442030862ec19a8dca25ee02d82c SHA256 cb60baaeabc28b68f7dfc8fd54453f6268b66aae33ea64eb1788c19df09be6f1
 DIST snes9x-1.52-src.tar.bz2 1720137 RMD160 ec7f85058e4571d89a65a89d3f09e2e40db0cbcc SHA1 fb3957b68fcede882518516094a73ec5bbed76cf SHA256 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
-EBUILD snes9x-1.43-r2.ebuild 2799 RMD160 6a71765c9231fad5b33783123ca0f8a3114b01df SHA1 d4bac3689c57e418005ccf6c450b585fb40f5d97 SHA256 40c7efe310d15f2e2e32fb8b1052e15e2b6f32ff172eb6fd3d8508b9efe5c500
 EBUILD snes9x-1.52-r1.ebuild 3098 RMD160 e8231bdd8777e140e5b3f697d11e15c542b83c7d SHA1 b0533076c7bf7d90034e59390e9d2252c699db1c SHA256 4ec04dbd04ae5cd0613ccde8c97ecadae8c501269c28f968af0e69cc7971b771
 MISC ChangeLog 8018 RMD160 efa51ccf5fc125265f706a465ddcd02f2a478784 SHA1 e138ff0b2e08cd3a702887ce9f339193fc7f5631 SHA256 8cc86c8313f9251a0b7597fa077a4c48c3083215b3ac64a2bee3271b6b4cfaef
 MISC metadata.xml 334 RMD160 4f4edcdcdd6a29a1c343e4bf8f54216f07ddfecc SHA1 d6e7ef8be60e7d6c2feecd2f2ea857e955e44b0b SHA256 de4cddcdc2f3619338049af9fa693339c5079664665fdb48b97fd6f51715dad4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxEpDIACgkQcsIHjyDViGTbVACeNw+n0xMQRCk8WzsR+mVSVEIe
-29EAnj45p3C1qLznr9HK/2Vjxzykl7+m
-=Habz
------END PGP SIGNATURE-----
diff --git a/games-emulation/snes9x/files/nojoy.patch b/games-emulation/snes9x/files/nojoy.patch
deleted file mode 100644 (file)
index 3298144..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
---- unix/unix.cpp.orig 2004-04-13 03:40:13.000000000 -0700
-+++ unix/unix.cpp      2004-04-13 04:00:08.000000000 -0700
-@@ -233,10 +233,12 @@
- 
- void S9xParseArg (char **argv, int &i, int argc)
- {
--#ifdef JOYSTICK_SUPPORT
-     if (strcmp (argv [i], "-j") == 0 ||
--           strcasecmp (argv [i], "-nojoy") == 0)
-+           strcasecmp (argv [i], "-nojoy") == 0) {
-       Settings.JoystickEnabled = FALSE;
-+      return;
-+    }
-+#ifdef JOYSTICK_SUPPORT
-     else if (strcasecmp (argv [i], "-joydev1") == 0)
-     {
-       if (i + 1 < argc)
diff --git a/games-emulation/snes9x/files/snes9x-1.43-build.patch b/games-emulation/snes9x/files/snes9x-1.43-build.patch
deleted file mode 100644 (file)
index efc9d31..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Make sure the build process respects our LDFLAGS (so we can slip in -m32)
-and that the stupid custom OPTIMIZE flags arent used in favor of our own
-CFLAGS (so we can slip in -m32).
-
---- snes9x/Makefile.in
-+++ snes9x/Makefile.in
-@@ -16,6 +16,7 @@
- @DREAMCAST@
- CHEATS=1
- 2XSAI=1
-+EXTRALIBS=@LDFLAGS@
- 
- #Fairly good and special-char-safe descriptor of the os being built on.
- OS=`uname -s -r -m|sed \"s/ /-/g\"|tr \"[A-Z]\" \"[a-z]\"|tr \"/()\" \"___\"`
-@@ -186,7 +188,7 @@
- OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks -fno-exceptions
- CPUFLAGS=-ml  -m4-single-only
- else
--OPTIMISE = @OPTIMIZE@
-+OPTIMISE = @CFLAGS@
- endif
- 
- DEFS += \
-@@ -257,8 +259,8 @@
-       @test -d unzip || mkdir unzip
-       @test -d jma || mkdir jma
- 
--offsets: offsets.o
--      $(CCC) $(INCLUDES) -o $@ offsets.o
-+offsets: offsets.cpp
-+      $(CCC) $(EXTRALIBS) $(INCLUDES) -o $@ offsets.cpp
-       ./offsets >$(srcdir)/$(CPU)/offsets.h #FIXME: Move to builddir
- 
- snes9x: $(OBJECTS) unix/x11.o $(AIDOOBJS)
diff --git a/games-emulation/snes9x/files/snes9x-1.43-config.patch b/games-emulation/snes9x/files/snes9x-1.43-config.patch
deleted file mode 100644 (file)
index 4415d0f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.old   2006-02-06 22:39:31.000000000 +0100
-+++ configure.in       2006-02-06 22:39:52.000000000 +0100
-@@ -462,9 +462,9 @@
-   fi
- ])
- 
-+AC_CHECK_HEADERS(zlib.h)
- if test x$with_zlib = xyes ; then
-   SNES9X_FEATURE_NODEP(Gz)
--  AC_CHECK_HEADERS(zlib.h)
-   if test $ac_cv_header_zlib_h = yes ; then
-     AC_MSG_CHECKING([if zlib.h is new enough])
-     AC_TRY_LINK([
diff --git a/games-emulation/snes9x/files/snes9x-1.43-gcc412.patch b/games-emulation/snes9x/files/snes9x-1.43-gcc412.patch
deleted file mode 100644 (file)
index 1879ac8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
---- snes9x/globals.cpp.old     2007-07-28 23:55:09.000000000 +0200
-+++ snes9x/globals.cpp 2007-07-28 23:56:34.000000000 +0200
-@@ -123,19 +123,12 @@
- 
- struct SSettings Settings;
- 
--struct SDSP1 DSP1;
--
- struct SSA1Registers SA1Registers;
- 
- struct SSA1 SA1;
- 
- SSoundData SoundData;
- 
--SnesModel M1SNES={1,3,2};
--SnesModel M2SNES={2,4,3};
--SnesModel* Model=&M1SNES;
--
--
- uint8 *SRAM = NULL;
- uint8 *ROM = NULL;
- uint8 *RegRAM = NULL;
-@@ -162,6 +155,13 @@
- 
- END_EXTERN_C
- 
-+struct SDSP1 DSP1;
-+
-+SnesModel M1SNES={1,3,2};
-+SnesModel M2SNES={2,4,3};
-+SnesModel* Model=&M1SNES;
-+
-+
- #ifndef ZSNES_FX
- struct FxInit_s SuperFX;
- #else
diff --git a/games-emulation/snes9x/files/snes9x-1.43-gcc440.patch b/games-emulation/snes9x/files/snes9x-1.43-gcc440.patch
deleted file mode 100644 (file)
index b0905c3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
---- unix/unix.cpp.old  2009-06-05 08:52:45.000000000 +0200
-+++ unix/unix.cpp      2009-06-05 08:54:31.000000000 +0200
-@@ -1131,11 +1131,11 @@
- {
-     *drive = 0;
- 
--    char *slash = strrchr (path, '/');
-+    const char *slash = strrchr (path, '/');
-     if (!slash)
-       slash = strrchr (path, '\\');
- 
--    char *dot = strrchr (path, '.');
-+    const char *dot = strrchr (path, '.');
- 
-     if (dot && slash && dot < slash)
-       dot = NULL;
diff --git a/games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch b/games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch
deleted file mode 100644 (file)
index 99ea776..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- snes9x-1.43-src/snes9x/unix/x11.cpp.old    2005-02-14 13:18:59.000000000 +0100
-+++ snes9x-1.43-src/snes9x/unix/x11.cpp        2005-02-14 13:20:10.000000000 +0100
-@@ -1213,26 +1213,26 @@
-         // re-enable all sound channels
-         Define(TOGGLE_SOUND, 8,         Alt(XK_F12), Ctrl(XK_F12));
-         // numbered quicksaves
--        Define(WRITE_SAVE_NUM, 0,       XK_F1);
--        Define(WRITE_SAVE_NUM, 1,       XK_F2);
--        Define(WRITE_SAVE_NUM, 2,       XK_F3);
--        Define(WRITE_SAVE_NUM, 3,       XK_F4);
--        Define(WRITE_SAVE_NUM, 4,       XK_F5);
--        Define(WRITE_SAVE_NUM, 5,       XK_F6);
--        Define(WRITE_SAVE_NUM, 6,       XK_F7);
--        Define(WRITE_SAVE_NUM, 7,       XK_F8);
--        Define(WRITE_SAVE_NUM, 8,       XK_F9);
--        Define(WRITE_SAVE_NUM, 9,       XK_F10);
--        Define(LOAD_SAVE_NUM, 0,       Shift(XK_F1));
--        Define(LOAD_SAVE_NUM, 1,       Shift(XK_F2));
--        Define(LOAD_SAVE_NUM, 2,       Shift(XK_F3));
--        Define(LOAD_SAVE_NUM, 3,       Shift(XK_F4));
--        Define(LOAD_SAVE_NUM, 4,       Shift(XK_F5));
--        Define(LOAD_SAVE_NUM, 5,       Shift(XK_F6));
--        Define(LOAD_SAVE_NUM, 6,       Shift(XK_F7));
--        Define(LOAD_SAVE_NUM, 7,       Shift(XK_F8));
--        Define(LOAD_SAVE_NUM, 8,       Shift(XK_F9));
--        Define(LOAD_SAVE_NUM, 9,       Shift(XK_F10));
-+        Define(LOAD_SAVE_NUM, 0,       XK_F1);
-+        Define(LOAD_SAVE_NUM, 1,       XK_F2);
-+        Define(LOAD_SAVE_NUM, 2,       XK_F3);
-+        Define(LOAD_SAVE_NUM, 3,       XK_F4);
-+        Define(LOAD_SAVE_NUM, 4,       XK_F5);
-+        Define(LOAD_SAVE_NUM, 5,       XK_F6);
-+        Define(LOAD_SAVE_NUM, 6,       XK_F7);
-+        Define(LOAD_SAVE_NUM, 7,       XK_F8);
-+        Define(LOAD_SAVE_NUM, 8,       XK_F9);
-+        Define(LOAD_SAVE_NUM, 9,       XK_F10);
-+        Define(WRITE_SAVE_NUM, 0,       Shift(XK_F1));
-+        Define(WRITE_SAVE_NUM, 1,       Shift(XK_F2));
-+        Define(WRITE_SAVE_NUM, 2,       Shift(XK_F3));
-+        Define(WRITE_SAVE_NUM, 3,       Shift(XK_F4));
-+        Define(WRITE_SAVE_NUM, 4,       Shift(XK_F5));
-+        Define(WRITE_SAVE_NUM, 5,       Shift(XK_F6));
-+        Define(WRITE_SAVE_NUM, 6,       Shift(XK_F7));
-+        Define(WRITE_SAVE_NUM, 7,       Shift(XK_F8));
-+        Define(WRITE_SAVE_NUM, 8,       Shift(XK_F9));
-+        Define(WRITE_SAVE_NUM, 9,       Shift(XK_F10));
-         // layer toggles
-         Define(TOGGLE_LAYER,  0,       XK_1);
-         Define(TOGGLE_LAYER,  1,       XK_2);
diff --git a/games-emulation/snes9x/files/snes9x-1.43-porting.patch b/games-emulation/snes9x/files/snes9x-1.43-porting.patch
deleted file mode 100644 (file)
index 33d03bb..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-http://www.snes9x.com/phpbb2/viewtopic.php?p=12712
-http://bugs.gentoo.org/104049
-
---- snes9x/configure.in
-+++ snes9x/configure.in
-@@ -585,6 +585,19 @@
-   SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_IOCTL_H'
- ])
- 
-+AC_CHECK_HEADER(endian.h, [
-+  SYSDEFINES="$SYSDEFINES"' -DHAVE_ENDIAN_H'
-+])
-+AC_CHECK_HEADER(sys/endian.h, [
-+  SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_ENDIAN_H'
-+])
-+AC_CHECK_HEADER(machine/endian.h, [
-+  SYSDEFINES="$SYSDEFINES"' -DHAVE_MACHINE_ENDIAN_H'
-+])
-+AC_CHECK_HEADER(sys/isa_defs.h, [
-+  SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_ISA_DEFS_H'
-+])
-+
- AC_CHECK_HEADERS(unistd.h sys/socket.h winsock.h winsock2.h WS2tcpip.h)
- 
- 
---- snes9x/port.h.orig 2005-08-28 16:57:03.000000000 -0400
-+++ snes9x/port.h      2005-08-28 17:11:59.000000000 -0400
-@@ -110,6 +110,19 @@
- 
- #include <sys/types.h>
- 
-+#if defined(HAVE_ENDIAN_H)
-+# include <endian.h>
-+#endif
-+#if defined(HAVE_SYS_ENDIAN_H)
-+# include <sys/endian.h>
-+#endif
-+#if defined(HAVE_MACHINE_ENDIAN_H)
-+# include <machine/endian.h>
-+#endif
-+#if defined(HAVE_SYS_ISA_DEFS_H)
-+# include <sys/isa_defs.h>
-+#endif
-+
- /* #define PIXEL_FORMAT RGB565 */
- #define GFX_MULTI_FORMAT
- 
-@@ -265,12 +278,27 @@
- #define SIG_PF void(*)(int)
- #endif
- 
--#if defined(__i386__) || defined(__i486__) || defined(__i586__) || \
--    defined(__WIN32__) || defined(__alpha__)
--#define LSB_FIRST
--#define FAST_LSB_WORD_ACCESS
--#else
--#define MSB_FIRST
-+#if defined(BYTE_ORDER)
-+# if BYTE_ORDER == LITTLE_ENDIAN
-+#  define LSB_FIRST
-+# else
-+#  define MSB_FIRST
-+# endif
-+#elif defined(WORDS_LITTLENDIAN)
-+# define LSB_FIRST
-+#elif defined(WORDS_BIGENDIAN)
-+# define MSB_FIRST
-+#else
-+# if defined(__i386__) || defined(__i486__) || defined(__i586__) || \
-+    defined(__WIN32__) || defined(__alpha__) || defined(__x86_64__)
-+#  define LSB_FIRST
-+# else
-+#  define MSB_FIRST
-+# endif
-+#endif
-+
-+#if defined(LSB_FIRST)
-+# define FAST_LSB_WORD_ACCESS
- #endif
- 
- #ifdef __sun
diff --git a/games-emulation/snes9x/snes9x-1.43-r2.ebuild b/games-emulation/snes9x/snes9x-1.43-r2.ebuild
deleted file mode 100644 (file)
index 80f0f38..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r2.ebuild,v 1.6 2010/07/19 07:46:02 ssuominen Exp $
-
-# 3dfx support (glide) is disabled because it requires
-# glide-v2 while we only provide glide-v3 in portage
-# http://bugs.gentoo.org/show_bug.cgi?id=93097
-
-inherit autotools eutils flag-o-matic multilib games
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="http://www.snes9x.com/"
-SRC_URI="http://www.lysator.liu.se/snes9x/${PV}/snes9x-${PV}-src.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="debug dga joystick opengl zlib"
-
-RDEPEND="x11-libs/libXext
-       dga? ( x11-libs/libXxf86dga
-          x11-libs/libXxf86vm )
-       media-libs/libpng
-       amd64? ( app-emulation/emul-linux-x86-xlibs )
-       opengl? ( virtual/opengl
-               virtual/glu )"
-DEPEND="${RDEPEND}
-       x86? ( dev-lang/nasm )
-       x11-proto/xextproto
-       x11-proto/xproto
-       dga? ( x11-proto/xf86dgaproto
-               x11-proto/xf86vidmodeproto )"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"/snes9x
-       rm offsets # stupid prebuilt file
-       sed -i \
-               -e 's:-lXext -lX11::' Makefile.in \
-               || die "sed failed"
-       epatch \
-               "${FILESDIR}"/nojoy.patch \
-               "${FILESDIR}"/${P}-porting.patch \
-               "${FILESDIR}"/${P}-key-bindings-fix.patch \
-               "${FILESDIR}"/${P}-build.patch \
-               "${FILESDIR}"/${P}-gcc412.patch \
-               "${FILESDIR}"/${P}-gcc440.patch \
-               "${FILESDIR}"/${P}-config.patch
-
-       sed -i \
-               -e 's:png_jmpbuf:png_write_info:g' \
-               -e '/X_LDFLAGS=/d' \
-               configure.in || die "sed failed"
-
-       eautoconf
-}
-
-src_compile() {
-       [[ -z ${NATIVE_AMD64_BUILD_PLZ} ]] && use amd64 && multilib_toolchain_setup x86
-
-       local vidconf=
-       local target=
-       local vid=
-
-       append-ldflags -Wl,-z,noexecstack
-
-       mkdir mybins
-       for vid in opengl fallback ; do
-               if [[ ${vid} != "fallback" ]] ; then
-                       use ${vid} || continue
-               fi
-               cd "${S}"/snes9x
-               case ${vid} in
-#                      3dfx)
-#                              vidconf="--with-glide --without-opengl --without-x"
-#                              target=gsnes9x;;
-                       opengl)
-                               vidconf="--with-opengl --without-glide --without-x"
-                               target=osnes9x;;
-                       fallback)
-                               vidconf="--with-x --without-glide --without-opengl"
-                               target=snes9x;;
-               esac
-               # this stuff is ugly but hey the build process sucks ;)
-               egamesconf \
-                       ${vidconf} \
-                       $(use_with x86 assembler) \
-                       $(use_with joystick) \
-                       $(use_with debug debugger) \
-                       $(use_with zlib) \
-                       $(use_with dga extensions) \
-                       || die
-               # Makefile doesnt quite support parallel builds
-               emake -j1 offsets || die "making offsets"
-               emake ${target} || die "making ${target}"
-               mv ${target} "${S}"/mybins/
-               cd "${WORKDIR}"
-               rm -r "${S}"/snes9x
-               src_unpack
-       done
-}
-
-src_install() {
-       dogamesbin mybins/* || die "dogamesbin failed"
-       dodoc faqs.txt readme.txt readme.unix snes9x/*.txt
-       prepgamesdirs
-}