modular X patch + fixups from Tupone Alfredo (bug #121160)

(Portage version: 2.0.54)

3 files changed, 42 insertions, 13 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index f446130b8b3a..e5193887ccb7 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/snes9x
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.21 2005/12/26 19:27:54 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.22 2006/02/07 00:30:14 mr_bones_ Exp $
+
+  07 Feb 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/snes9x-1.43-config.patch, snes9x-1.43-r1.ebuild:
+  modular X patch + fixups from Tupone Alfredo (bug #121160)
 
   26 Dec 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -files/snes9x-139-r1-BE-sound-fix.diff, -files/1.41.1-system-zlib.patch,
diff --git a/games-emulation/snes9x/files/snes9x-1.43-config.patch b/games-emulation/snes9x/files/snes9x-1.43-config.patch
new file mode 100644
index 000000000000..4415d0febec2
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.43-config.patch
@@ -0,0 +1,13 @@
+--- 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/snes9x-1.43-r1.ebuild b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
index 09a3aff80d9a..6326a4e97246 100644
--- a/games-emulation/snes9x/snes9x-1.43-r1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r1.ebuild,v 1.5 2005/12/26 20:22:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r1.ebuild,v 1.6 2006/02/07 00:30:14 mr_bones_ Exp $
 
 # 3dfx support (glide) is disabled because it requires
 # glide-v2 while we only provide glide-v3 in portage
@@ -15,15 +15,24 @@ SRC_URI="http://www.lysator.liu.se/snes9x/${PV}/snes9x-${PV}-src.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="opengl X joystick zlib dga debug"
+IUSE="opengl joystick zlib dga debug"
 
-RDEPEND="zlib? ( sys-libs/zlib )
-	virtual/x11
+RDEPEND="|| ( ( x11-libs/libXext
+				dga? ( x11-libs/libXxf86dga
+					   x11-libs/libXxf86vm ) )
+			  virtual/x11 )
 	media-libs/libpng
 	amd64? ( emul-linux-x86-xlibs )
-	opengl? ( virtual/opengl virtual/glu )"
+	opengl? (
+		virtual/opengl
+		virtual/glu )"
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+	|| ( ( x11-proto/xextproto
+		   x11-proto/xproto
+		   dga? ( x11-proto/xf86dgaproto
+		   		  x11-proto/xf86vidmodeproto ) )
+		 virtual/x11 )"
 
 S=${WORKDIR}/${P}-src
 
@@ -43,12 +52,13 @@ src_unpack() {
 		"${FILESDIR}"/nojoy.patch \
 		"${FILESDIR}"/${P}-porting.patch \
 		"${FILESDIR}"/${P}-key-bindings-fix.patch \
-		"${FILESDIR}"/${P}-build.patch
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-config.patch
 
 	sed -i \
 		-e 's:png_jmpbuf:png_write_info:g' \
 		-e '/X_LDFLAGS=/d' \
-		configure || die "sed failed"
+		configure.in || die "sed failed"
 
 	autoconf || die
 }
@@ -58,8 +68,10 @@ src_compile() {
 	local target=
 	local vid=
 
+	append-ldflags -Wl,-z,noexecstack
+
 	mkdir mybins
-	for vid in opengl X fallback ; do
+	for vid in opengl fallback ; do
 		if [[ ${vid} != "fallback" ]] ; then
 			use ${vid} || continue
 		fi
@@ -71,7 +83,7 @@ src_compile() {
 			opengl)
 				vidconf="--with-opengl --without-glide --without-x"
 				target=osnes9x;;
-			fallback|X)
+			fallback)
 				vidconf="--with-x --without-glide --without-opengl"
 				target=snes9x;;
 		esac