Version bump wrt #254468 by Wizzleby.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 161 insertions, 1 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 5be01e0dcf59..81c145dc0349 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/snes9x
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.37 2010/01/08 21:55:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.38 2010/03/14 17:15:13 ssuominen Exp $
+
+*snes9x-1.52 (14 Mar 2010)
+
+  14 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +snes9x-1.52.ebuild,
+  +files/snes9x-1.52-build.patch:
+  Version bump wrt #254468 by Wizzleby.
 
   08 Jan 2010; Tupone Alfredo <tupone@gentoo.org>
   files/snes9x-1.51-config.patch:
diff --git a/games-emulation/snes9x/files/snes9x-1.52-build.patch b/games-emulation/snes9x/files/snes9x-1.52-build.patch
new file mode 100644
index 000000000000..8c3880f1af6b
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.52-build.patch
@@ -0,0 +1,44 @@
+--- unix/configure.ac
++++ unix/configure.ac
+@@ -56,20 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+ AC_ARG_ENABLE([debug],
+ 	[AS_HELP_STRING([--enable-debug],
+ 		[leave debug information in the final binary (default: no)])],
+@@ -79,9 +65,6 @@
+ 	AC_S9X_COMPILER_FLAG([-g],  [g])
+ 	AC_S9X_COMPILER_FLAG([-O0], [o0])
+ else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+ 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+ fi
+ 
+--- unix/Makefile.in
++++ unix/Makefile.in
+@@ -65,7 +65,7 @@
+ 	exit 1
+ 
+ snes9x: $(OBJECTS)
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
++	$(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
+ 
+ ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
+ 	$(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
index e2cb59ae5eec..a420386c0166 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -4,5 +4,6 @@
   <herd>games</herd>
   <use>
     <flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
+	<flag name="xrandr">Enable support for the X xrandr extension</flag>
   </use>
 </pkgmetadata>
diff --git a/games-emulation/snes9x/snes9x-1.52.ebuild b/games-emulation/snes9x/snes9x-1.52.ebuild
new file mode 100644
index 000000000000..2cc4c3d0ba20
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.52.ebuild
@@ -0,0 +1,109 @@
+# 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.52.ebuild,v 1.1 2010/03/14 17:15:13 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils flag-o-matic multilib games
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="http://code.google.com/p/snes9x-gtk/"
+SRC_URI="http://snes9x-gtk.googlecode.com/files/${P}-src.tar.bz2"
+
+LICENSE="as-is GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss pulseaudio portaudio +xv +xrandr zlib"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs )
+			gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100220-r2 ) )
+	gtk? ( >=x11-libs/gtk+-2.10:2
+		>=gnome-base/libglade-2.0
+		x11-misc/xdg-utils
+		portaudio? ( >=media-libs/portaudio-19_pre )
+		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
+		opengl? ( virtual/opengl )
+		xv? ( x11-libs/libXv )
+		xrandr? ( x11-libs/libXrandr )
+		alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio ) )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	x11-proto/xproto
+	gtk? ( dev-util/pkgconfig
+		xv? ( x11-proto/videoproto ) )
+	nls? ( dev-util/intltool )"
+
+S=${WORKDIR}/${P}-src/unix
+
+pkg_setup() {
+	use amd64 && use multilib && [[ -z ${NATIVE_AMD64_BUILD_PLZ} ]] && \
+			has_multilib_profile && ABI=x86
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+	if use gtk; then
+		cd ../gtk
+		sed -i -e '/PKG_CHECK_MODULES(\[LIBPNG/d' configure.ac || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+
+	egamesconf \
+		$(use_enable x86 zsnes-asm) \
+		$(use_enable joystick gamepad) \
+		$(use_enable debug debugger) \
+		$(use_enable netplay) \
+		$(use_enable zlib gzip) \
+		$(use_enable zlib zip) \
+		--disable-screenshot
+
+	if use gtk; then
+		cd ../gtk
+		egamesconf \
+			--datadir="${EPREFIX}/usr/share" \
+			$(use_enable nls) \
+			$(use_with opengl) \
+			$(use_with joystick) \
+			$(use_with xv) \
+			$(use_with xrandr) \
+			$(use_with netplay) \
+			$(use_with zlib) \
+			$(use_with x86 assembler) \
+			$(use_with alsa) \
+			$(use_with oss) \
+			$(use_with pulseaudio) \
+			$(use_with portaudio) \
+			--without-png
+	fi
+}
+
+src_compile() {
+	games_src_compile
+	if use gtk; then
+		emake -C ../gtk || die
+	fi
+}
+
+src_install() {
+	dogamesbin ${PN} || die
+
+	dohtml {.,..}/docs/*.html
+	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
+
+	if use gtk; then
+		cd ../gtk
+		emake DESTDIR="${D}" install || die
+		dodoc AUTHORS doc/README
+	fi
+
+	prepgamesdirs
+}