------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-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.51-build.patch 497 RMD160 6db003d87d71392e45aaf8388b89068f545af3f7 SHA1 a448d6ae07ce9455b069f5d269c07a4ef15f7853 SHA256 2e1c87802b9022c901f6ee7c940e767ddbcbdb300e532e75e77a6a02a6dfd6c8
-AUX snes9x-1.51-config.patch 528 RMD160 2bb2f78a60444bafa86c690748c69ca8403ae084 SHA1 c9d4da14c3d04fc9080da885022e82284fc8f489 SHA256 ada6d3674ff40d650e2278974dee7bd57b1434592198e266798a7aa0d153ac8a
-AUX snes9x-1.51-glibc2.10.patch 295 RMD160 489c655d5677ddcc6c6827c6a07c3a7effa308bd SHA1 e506de81a5b12879959e7a549ac90e752b475f43 SHA256 c2c3956dab03385c377c6ebb20aabc0efdc0bad65f635ef6b1f5099d600a2b69
-AUX snes9x-1.51-opengl.patch 3265 RMD160 372edbbdcad3091c7f3dbdc43bfa661da11df9ec SHA1 8ba87226b5e271768fd9e1f5d6106d7eef1df838 SHA256 3006fe29f027b8be2a8f0a9c8cd41392bfd1ae6999333edb0e4d1b5b9ada2a64
-AUX snes9x-1.51-x11.patch 4297 RMD160 40998bbd623779dd6160ebd98a542f7e1d3c97cb SHA1 464066c638d80168fb904544256150f66b6ec1df SHA256 edc568083e20ba99698f500f60bcb6f0ffe4c84dd772d6ec9aa0c47918ed8787
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.51-src.tar.bz2 1707256 RMD160 5813405b05f181224614f95e8ba3c309f79e1b36 SHA1 a0de23fb376463d27f4e8fc7f11424bd3c598585 SHA256 70c8f41fc7f1e000605127e0f4261e3eb52c72019b3cbf9bc8061b0b8ccdf687
DIST snes9x-1.52-src.tar.bz2 1720137 RMD160 ec7f85058e4571d89a65a89d3f09e2e40db0cbcc SHA1 fb3957b68fcede882518516094a73ec5bbed76cf SHA256 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
EBUILD snes9x-1.43-r2.ebuild 2806 RMD160 52295918ca64f3132bb69a1a2bc84200a782d0e7 SHA1 b85911bc9b522c30f2f8f3df349f11a5dc409def SHA256 35600aef9bc85fc6597a47971abb1feb423f486de646712419888f0feddbfe88
-EBUILD snes9x-1.51.ebuild 2874 RMD160 a3e91080488f68ba69015b6e81b52c14fa4d2ea0 SHA1 4c04e0e51b21d650b3de9e1c6ae8e613adbe07ef SHA256 d17bbd231c6c671b54ba92ea569783a43693df7f06b567ed495d9550d3362ee1
EBUILD snes9x-1.52-r1.ebuild 3105 RMD160 5f83e6cccfb0d5e5e8ee12af466fe42dc405e29f SHA1 7dde1747d5c1f1c00f8bc2cd84389e0cf83bfb89 SHA256 20ce3cc4697210f1e580465109625bacdbe24fa139250cb66e92ba040dbf5e3f
EBUILD snes9x-1.52.ebuild 3001 RMD160 53d89cb51e77455be1d7db43d5dd93ad78bcccf3 SHA1 49ca61459f0b8c4af8a25712df46c581e8217ded SHA256 a18b67833326a6c7ee26387bf9f9318e83dd4ced6f97a3c40a4e3b014e088bf5
MISC ChangeLog 7600 RMD160 6573f8d9a3f9de5c6d1e1baf71ab0e3290888db6 SHA1 7cb83126d27de9eb608ca13802f9739dfa36ea8c SHA256 93bb433f2feb7576f6e8f0de9637791c213d4c0b7eec810a81d94b7da5bdbbe8
MISC metadata.xml 334 RMD160 4f4edcdcdd6a29a1c343e4bf8f54216f07ddfecc SHA1 d6e7ef8be60e7d6c2feecd2f2ea857e955e44b0b SHA256 de4cddcdc2f3619338049af9fa693339c5079664665fdb48b97fd6f51715dad4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwjxpQACgkQCaWpQKGI+9TtiwCeN2QRAvalnlmj1hotuKbPjoi4
-W+8AnRJM41RKkAaWNmCGNGAvmmxHCLgI
-=zJXx
------END PGP SIGNATURE-----
+++ /dev/null
-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-1.51-src/Makefile.in
-+++ snes9x-1.51-src/Makefile.in
-@@ -17,4 +17,5 @@
- CHEATS=1
- 2XSAI=1
-+EXTRALIBS=@LDFLAGS@
-
- #Fairly good and special-char-safe descriptor of the os being built on.
-@@ -183,5 +184,5 @@
- CPUFLAGS=-ml -m4-single-only
- else
--OPTIMISE = @OPTIMIZE@
-+OPTIMISE = @OPTIMIZE@ @CFLAGS@
- endif
+++ /dev/null
---- configure.in.old
-+++ configure.in
-@@ -20,9 +20,9 @@
-
- SYSDEFINES=''
-
--AC_DEFUN([AC_S9X_DEFINE],
-+AC_DEFUN([AC_S9X_DEFINE],[
- AC_DEFINE($1, $2, $3)
-- SYSDEFINES="$SYSDEFINES"' -D$1')
-+ SYSDEFINES="$SYSDEFINES"' -D$1'])
-
- AC_DEFUN([AC_SYS_COMPILER_FLAG],
- [
-@@ -506,9 +506,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([
+++ /dev/null
---- unix/unix.cpp
-+++ unix/unix.cpp
-@@ -1162,8 +1162,8 @@
- {
- *drive = 0;
-
-- char *slash = strrchr(path, SLASH_CHAR);
-- char *dot = strrchr(path, '.');
-+ char *slash = strrchr((char *)path, SLASH_CHAR);
-+ char *dot = strrchr((char *)path, '.');
-
- if (dot && slash && dot < slash)
- {
+++ /dev/null
---- snes9x-1.51-src/gfx.h
-+++ snes9x-1.51-src/gfx.h
-@@ -331,7 +331,7 @@
-
- inline uint16 COLOR_SUB(uint16 C1, uint16 C2)
- {
-- uint16 mC1, mC2, v = 0;
-+ uint16 mC1, mC2, v = ALPHA_BITS_MASK;
-
- mC1 = C1 & FIRST_COLOR_MASK;
- mC2 = C2 & FIRST_COLOR_MASK;
---- snes9x-1.51-src/unix/opengl.cpp
-+++ snes9x-1.51-src/unix/opengl.cpp
-@@ -233,14 +233,14 @@
-
- // Strip dots from the version string
- char *ptr;
-- while (ptr = strchr (ver, '.'))
-+ while ( (ptr = strchr (ver, '.')) != 0)
- memmove (ptr, ptr + 1, strlen (ptr + 1) + 1);
-
-- // Pad the string with zeros to 4 digits
-- while (strlen (ver) < 4)
-- strcat (ver, "0");
--
- OpenGL.version = atoi (ver);
-+
-+ // Pad the number with zeros to 4 digits
-+ while (OpenGL.version < 1000)
-+ OpenGL.version *= 10;
- }
- else
- OpenGL.version = 1100;
-@@ -400,7 +400,7 @@
- int i = 0;
- for (uint32 y = 0; y < pheight; y++)
- {
-- uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch) + startx;
-+ uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch/2) + startx;
- for (uint32 x = 0; x < pwidth; x++)
- {
- int color = *ptr++;
-@@ -418,7 +418,7 @@
- for (uint32 y = 0; y < pheight; y++)
- {
- memmove (basetexbuffer + sizeof (uint16) * texture_size * y,
-- (GFX.Screen + (y + startl) * GFX.Pitch) + startx,
-+ (GFX.Screen + (y + startl) * GFX.Pitch/2) + startx,
- sizeof (uint16) * texture_size);
- }
- data = basetexbuffer;
---- snes9x-1.51-src/unix/x11.cpp
-+++ snes9x-1.51-src/unix/x11.cpp
-@@ -572,15 +572,29 @@
- }
- delete[] color_diff;
-
-+ GUI.cmap = XCreateColormap (GUI.display, RootWindowOfScreen (GUI.screen),
-+ GUI.visual, GUI.pseudo ? AllocAll : AllocNone);
-+ if (GUI.pseudo)
-+ {
-+ for (i = 0; i < 256; i++)
-+ {
-+ GUI.colors[i].red = GUI.colors[i].green = GUI.colors[i].blue = 0;
-+ GUI.colors[i].pixel = i;
-+ GUI.colors[i].flags = DoRed | DoGreen | DoBlue;
-+ }
-+ XStoreColors (GUI.display, GUI.cmap, GUI.colors, 256);
-+ }
-+
- XSetWindowAttributes attrib;
-
- attrib.background_pixel = BlackPixelOfScreen (GUI.screen);
-+ attrib.colormap = GUI.cmap;
- GUI.window = XCreateWindow (GUI.display, RootWindowOfScreen (GUI.screen),
- (WidthOfScreen(GUI.screen) - GUI.window_width) / 2,
- (HeightOfScreen(GUI.screen) - GUI.window_height) / 2,
- GUI.window_width, GUI.window_height, 0,
- GUI.depth, InputOutput, GUI.visual,
-- CWBackPixel, &attrib);
-+ CWBackPixel | CWColormap, &attrib);
-
- #ifdef USE_DGA_EXTENSION
- CreateFullScreenWindow ();
-@@ -625,18 +639,6 @@
- ButtonPressMask | ButtonReleaseMask);
- #endif
-
-- if (GUI.pseudo)
-- {
-- GUI.cmap = XCreateColormap (GUI.display, GUI.window, GUI.visual, True);
-- XSetWindowColormap (GUI.display, GUI.window, GUI.cmap);
-- for (i = 0; i < 256; i++)
-- {
-- GUI.colors[i].red = GUI.colors[i].green = GUI.colors[i].blue = 0;
-- GUI.colors[i].pixel = i;
-- GUI.colors[i].flags = DoRed | DoGreen | DoBlue;
-- }
-- XStoreColors (GUI.display, GUI.cmap, GUI.colors, 256);
-- }
- XMapRaised (GUI.display, GUI.window);
- XClearWindow (GUI.display, GUI.window);
- SetupImage ();
+++ /dev/null
-diff -Naur snes9x-1.51-src/unix/unix.cpp snes9x-1.51-src/unix/unix.cpp
---- snes9x-1.51-src/unix/unix.cpp 2007-05-11 01:51:58.000000000 -0700
-+++ snes9x-1.51-src/unix/unix.cpp 2007-05-11 01:52:09.000000000 -0700
-@@ -574,8 +574,6 @@
- S9xInitInputDevices ();
-
- S9xInitDisplay (argc, argv);
-- if (!S9xGraphicsInit ())
-- OutOfMemory ();
- S9xSetupDefaultKeymap();
-
- S9xTextMode ();
-@@ -748,6 +746,7 @@
- (*CleanUp7110)();
-
- S9xSetSoundMute (TRUE);
-+ S9xUnmapAllControls ();
- S9xDeinitDisplay ();
- Memory.SaveSRAM (S9xGetFilename (".srm", SRAM_DIR));
- S9xSaveCheatFile (S9xGetFilename (".cht", PATCH_DIR));
-diff -Naur snes9x-1.51-src/unix/x11.cpp snes9x-1.51-src/unix/x11.cpp
---- snes9x-1.51-src/unix/x11.cpp 2007-05-11 02:10:22.000000000 -0700
-+++ snes9x-1.51-src/unix/x11.cpp 2007-05-11 02:10:31.000000000 -0700
-@@ -275,6 +275,7 @@
- void Convert16To24 (int width, int height);
- void Convert16To24Packed (int width, int height);
- void SetupImage ();
-+void TakedownImage ();
- int ErrorHandler (Display *, XErrorEvent *);
- void TVMode (int width, int height);
-
-@@ -314,36 +315,7 @@
- #endif
-
- S9xTextMode ();
-- uint32 i;
--
-- for (i = 0; i < sizeof (GUI.to_free) / sizeof (GUI.to_free [0]); i++)
-- if (GUI.to_free [i])
-- {
-- free (GUI.to_free [i]);
-- GUI.to_free [i] = NULL;
-- }
--
-- if (GUI.image)
-- {
--#ifdef MITSHM
-- if (GUI.use_shared_memory)
-- {
-- XShmDetach (GUI.display, &GUI.sm_info);
-- GUI.image->data = NULL;
-- XDestroyImage (GUI.image);
-- if (GUI.sm_info.shmaddr)
-- shmdt (GUI.sm_info.shmaddr);
-- if (GUI.sm_info.shmid >= 0)
-- shmctl (GUI.sm_info.shmid, IPC_RMID, 0);
-- GUI.image = NULL;
-- }
-- else
--#endif
-- {
-- XDestroyImage (GUI.image);
-- GUI.image = NULL;
-- }
-- }
-+ TakedownImage ();
- XSync (GUI.display, False);
- XCloseDisplay (GUI.display);
- }
-@@ -715,36 +687,7 @@
- ;
- }
-
-- uint32 i;
--
-- for (i = 0; i < sizeof (GUI.to_free) / sizeof (GUI.to_free [0]); i++)
-- if (GUI.to_free [i])
-- {
-- free (GUI.to_free [i]);
-- GUI.to_free [i] = NULL;
-- }
--
-- if (GUI.image)
-- {
--#ifdef MITSHM
-- if (GUI.use_shared_memory)
-- {
-- XShmDetach (GUI.display, &GUI.sm_info);
-- GUI.image->data = NULL;
-- XDestroyImage (GUI.image);
-- if (GUI.sm_info.shmaddr)
-- shmdt (GUI.sm_info.shmaddr);
-- if (GUI.sm_info.shmid >= 0)
-- shmctl (GUI.sm_info.shmid, IPC_RMID, 0);
-- GUI.image = NULL;
-- }
-- else
--#endif
-- {
-- XDestroyImage (GUI.image);
-- GUI.image = NULL;
-- }
-- }
-+ TakedownImage ();
-
- #ifdef MITSHM
- GUI.use_shared_memory = 1;
-@@ -884,8 +827,47 @@
- }
- GUI.image_date = (uint8 *) GUI.image->data;
- GUI.bytes_per_line = GUI.image->bytes_per_line;
-+
-+ S9xGraphicsInit ();
-+}
-+
-+void TakedownImage ()
-+{
-+ uint32 i;
-+
-+ for (i = 0; i < sizeof (GUI.to_free) / sizeof (GUI.to_free [0]); i++)
-+ if (GUI.to_free [i])
-+ {
-+ free (GUI.to_free [i]);
-+ GUI.to_free [i] = NULL;
-+ }
-+
-+ if (GUI.image)
-+ {
-+#ifdef MITSHM
-+ if (GUI.use_shared_memory)
-+ {
-+ XShmDetach (GUI.display, &GUI.sm_info);
-+ GUI.image->data = NULL;
-+ XDestroyImage (GUI.image);
-+ if (GUI.sm_info.shmaddr)
-+ shmdt (GUI.sm_info.shmaddr);
-+ if (GUI.sm_info.shmid >= 0)
-+ shmctl (GUI.sm_info.shmid, IPC_RMID, 0);
-+ GUI.image = NULL;
-+ }
-+ else
-+#endif
-+ {
-+ XDestroyImage (GUI.image);
-+ GUI.image = NULL;
-+ }
-+ }
-+
-+ S9xGraphicsDeinit ();
- }
-
-+
- int ErrorHandler (Display *, XErrorEvent *)
- {
- #ifdef MITSHM
-@@ -1002,6 +984,8 @@
- IPPU.RenderThisFrame = TRUE;
- IPPU.FrameSkip = Settings.SkipFrames;
- SetupImage ();
-+ extern void S9xReRefresh();
-+ S9xReRefresh ();
- }
- #ifdef USE_DGA_EXTENSION
- if (XF86.start_full_screen)
-diff -Naur snes9x-1.51-src/unix/xf86.cpp snes9x-1.51-src/unix/xf86.cpp
---- snes9x-1.51-src/unix/xf86.cpp 2007-05-11 01:51:58.000000000 -0700
-+++ snes9x-1.51-src/unix/xf86.cpp 2007-05-11 01:52:09.000000000 -0700
-@@ -404,6 +404,8 @@
- break;
- }
- ourvideo.scrnBegin = ourvideo.vidMemBegin + (320 - IMAGE_WIDTH) * ourvideo.screendepth / 2 + ourvideo.width * ourvideo.screendepth * 8;
-+
-+ S9xGraphicsInit ();
- }
-
- void S9xGraphicsMode ()
+++ /dev/null
-# 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.51.ebuild,v 1.6 2010/01/03 11:52:08 fauli 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://files.ipherswipsite.com/snes9x/${P}-src.tar.bz2
- http://vincent.grigorieff.free.fr/snes9x/${P}-src.tar.bz2"
-
-LICENSE="as-is GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug dga joystick netplay 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
-
-pkg_setup() {
- use amd64 && [[ -z ${NATIVE_AMD64_BUILD_PLZ} ]] && has_multilib_profile && ABI=x86
- games_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i \
- -e 's:-lXext -lX11::' Makefile.in \
- || die "sed failed"
- epatch \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-opengl.patch \
- "${FILESDIR}"/${P}-x11.patch \
- "${FILESDIR}"/${P}-glibc2.10.patch
-
- eautoreconf
-}
-
-src_compile() {
- local vidconf
- local target
- local vid
- local nooffset
-
- append-ldflags -Wl,-z,noexecstack
-
- mkdir "${WORKDIR}"/mybins
- for vid in opengl fallback ; do
- if [[ ${vid} != "fallback" ]] ; then
- use ${vid} || continue
- fi
- cd "${S}"
- case ${vid} in
-# 3dfx)
-# vidconf="--with-glide --without-opengl"
-# target=gsnes9x;;
- opengl)
- vidconf="--with-opengl --without-glide"
- target=osnes9x;;
- fallback)
- vidconf="--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) \
- $(use_with netplay) \
- || die
- # Makefile doesn't quite support parallel builds
- emake ${target} || die "making ${target}"
- mv ${target} "${WORKDIR}"/mybins/
- cd "${WORKDIR}"
- rm -r "${S}"
- src_unpack # FIXME
- done
-}
-
-src_install() {
- dogamesbin "${WORKDIR}"/mybins/* || die "dogamesbin failed"
- dodoc doc/* unix/docs/*
- prepgamesdirs
- elog "Starting with version 1.50, snes9x's behavior is determined by a"
- elog "configuration file. See readme_unix.txt and snes9x.conf.default"
- elog "in /usr/share/doc/${PF} for details."
-}
projects / gentoo.git / commitdiff