fixed mupen64 with split out plugins in own packages

8 files changed, 70 insertions, 132 deletions

diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index 109174b1c44a..438261efc1af 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/mupen64
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.6 2005/01/01 06:59:18 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.7 2005/01/07 00:15:37 morfic Exp $
+
+  05 Jan 2005; Daniel Goller <morfic@gentoo.org> files/mupen64,
+  files/mupen64-confdir.patch, files/mupen64-makefiles.patch,
+  +files/mupen64-noasm.patch, mupen64-0.4.ebuild:
+  Fixed mupen64 , cleaned it up, split out plugins into own ebuilds
 
 *mupen64-0.4 (01 Jan 2005)
 
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index 0e401ac07297..43b631f9fe41 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a782913e7973cc008cda557599b5d204 ChangeLog 1690
+MD5 1dfc35aec1e0f49db80dcca1b4ce8a40 ChangeLog 1935
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 6575b824fd5cbfb4833874d8261e8dfb mupen64-0.3.ebuild 2448
-MD5 a0f5822196b0b4c8742be71f8b3a97cd mupen64-0.4.ebuild 3674
+MD5 5e06fe06777a0a2f74b495665652e6f8 mupen64-0.4.ebuild 2623
 MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662
 MD5 a0d71f9477dc18606c7cf5dd61fa63da files/digest-mupen64-0.3 396
-MD5 184d6cdb2587cc6607c49a42f39335b1 files/mupen64 511
-MD5 8cb72fa87f95c2a79540ea5e4a15c0b9 files/mupen64-gtk2-makefile.patch 3144
-MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
-MD5 691d458af594d569060b8722ace617a3 files/mupen64-confdir.patch 1710
-MD5 4705caa6824153f1297173bdf43854b0 files/mupen64-makefiles.patch 2888
+MD5 4fd55475c3cb8bec06cddcac05c0e735 files/mupen64 574
+MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353
+MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171
+MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662
 MD5 04a919e368e803ceda85d809cc767b0a files/mupen64-gentoo-avi.patch 255
 MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558
-MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662
-MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353
-MD5 73956aa6279bf5b57a7d27619f4191d4 files/digest-mupen64-0.4 466
+MD5 8cb72fa87f95c2a79540ea5e4a15c0b9 files/mupen64-gtk2-makefile.patch 3144
+MD5 948cf998de2319579074b530861362aa files/mupen64-makefiles.patch 2040
+MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208
+MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229
+MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB1kqEUpKYMelfdYERAtQ4AJ9/hpKf2zeSncrkTYqvYrhY9XbeFwCfYmhe
-TjsPO7UY+teprAnW2ttNal4=
-=nbvC
+iD8DBQFB3dUVUpKYMelfdYERAi0OAJ9Gtb6VIVgA3Ive+S61JsoJl6cX0gCfU3eI
+FwgUS3JNKfsZyp8iYCEQqxw=
+=Plb4
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4 b/games-emulation/mupen64/files/digest-mupen64-0.4
index c5cdcf8bf1f9..235e4ebb6a71 100644
--- a/games-emulation/mupen64/files/digest-mupen64-0.4
+++ b/games-emulation/mupen64/files/digest-mupen64-0.4
@@ -2,6 +2,3 @@ MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148
 MD5 14fc6075a19bb567afebedd5ab2ea6c1 mupen64_input.tar.bz2 4438
 MD5 88dfa0045794db7f1fc100b4c7b23125 mupen64_sound.tar.bz2 5932
 MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268
-MD5 f6f42d31cee3fce0ea92176f42ef73ba riceplugin.tar.bz2 287672
-MD5 31661c6fca2dc455d7cbe7e87d316021 blight_input-0.0.8-b.tar.gz 733624
-MD5 7bb104cf6ca94c0e761027eb9895fcbe jttl_sound-1.2.tar.bz2 10015
diff --git a/games-emulation/mupen64/files/mupen64 b/games-emulation/mupen64/files/mupen64
index 91f25bf47a02..09189fd8d05e 100644
--- a/games-emulation/mupen64/files/mupen64
+++ b/games-emulation/mupen64/files/mupen64
@@ -2,14 +2,20 @@
 
 if [ ! -d ~/.mupen64/save ] ; then
 	mkdir -p ~/.mupen64/save
+	mkdir -p ~/.mupen64/plugins
 	cd ~/.mupen64
-	ln -s GENTOO_DIR/plugins plugins
 	ln -s GENTOO_DIR/mupen64 mupen64
 	ln -s GENTOO_DIR/mupen64_nogui mupen64_nogui
 	cp GENTOO_DIR/mupen64.ini .
 fi
 
 cd ~/.mupen64
+
+cd plugins
+cleanlinks
+ln -s GENTOO_DIR/plugins/*.{so,ini} .
+cd ..
+
 # We must execute ./blah not /foo/bar/blah because mupen64 tries to
 # write to files in the directory from which the application is run.
 # It segfaults if it can't write to the directory.  Upstream has been
diff --git a/games-emulation/mupen64/files/mupen64-confdir.patch b/games-emulation/mupen64/files/mupen64-confdir.patch
index b71bf05e8516..d0705336faa8 100644
--- a/games-emulation/mupen64/files/mupen64-confdir.patch
+++ b/games-emulation/mupen64/files/mupen64-confdir.patch
@@ -1,46 +1,3 @@
---- blight_input-0.0.8-b/src/plugin.c.orig	2003-10-15 00:44:17.000000000 +0000
-+++ blight_input-0.0.8-b/src/plugin.c		2004-07-16 12:15:22.757428472 +0000
-@@ -33,6 +33,7 @@
- #include "SDL.h"
- #include <errno.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- static unsigned short button_bits[] = {
-@@ -158,7 +159,8 @@
- 	FILE *f;
- 	int cont, plugged, mempak, mouse, i, b, dev;
- 	char line[200], device[200], key_a[200], key_b[200], button_a[200], button_b[200],
--             axis[200], button[200], hat[200], hat_pos_a[200], hat_pos_b[200], mbutton[200];
-+             axis[200], button[200], hat[200], hat_pos_a[200], hat_pos_b[200], mbutton[200],
-+	     conffilename[200];
- 	const char *p;
- //	const char *p1, *p2;
- 
-@@ -188,8 +190,8 @@
- 			controller[i].axis[b].hat_pos_b = -1;
- 		}
- 	}
--
--	f = fopen( "blight_input.conf", "r" );
-+	snprintf (conffilename, 200, "%s/.mupen64/plugins/blight_input.conf", getenv("HOME"));
-+	f = fopen(conffilename, "r" );
- 	if( f == NULL )
- 	{
- 		fprintf( stderr, "["PLUGIN_NAME"]: Couldn't open blight_input.conf for reading: %s\n", strerror( errno ) );
-@@ -339,8 +341,10 @@
- 	char cButton_a[100], cButton_b[100], cAxis[100];
- 	char cHat[100];
- 	char cMouse[100];
-+	char conffilename[200];
- 
--	f = fopen( "blight_input.conf", "w" );
-+	snprintf (conffilename, 200, "%s/.mupen64/plugins/blight_input.conf", getenv("HOME"));
-+	f = fopen(conffilename, "w" );
- 	if( f == NULL )
- 	{
- 		fprintf( stderr, "["PLUGIN_NAME"]: Couldn't open blight_input.conf for writing: %s\n", strerror( errno ) );
 --- emu64/path.cfg.orig	2004-07-05 20:37:13.000000000 +0000
 +++ emu64/path.cfg	2004-07-16 22:40:43.000000000 +0000
 @@ -1 +1 @@
diff --git a/games-emulation/mupen64/files/mupen64-makefiles.patch b/games-emulation/mupen64/files/mupen64-makefiles.patch
index 86a7791507f9..a2a4e7f8f8f7 100644
--- a/games-emulation/mupen64/files/mupen64-makefiles.patch
+++ b/games-emulation/mupen64/files/mupen64-makefiles.patch
@@ -1,17 +1,3 @@
---- riceplugin/Makefile.orig	2004-07-15 21:38:45.195293640 +0000
-+++ riceplugin/Makefile	2004-07-15 21:40:31.719099560 +0000
-@@ -1,8 +1,8 @@
- CC = gcc
--#CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -g -mmmx -msse
--CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -O3 -mcpu=athlon -ffast-math -funroll-loops -fomit-frame-pointer -msse -mmmx
-+CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -g $(GCFLAGS)
-+#CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -O3 -mcpu=athlon -ffast-math -funroll-loops -fomit-frame-pointer -msse -mmmx
- CXX = g++
--CPPFLAGS = $(CFLAGS)
-+CPPFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -g  $(GCXXFLAGS)
- LD = g++
- LDFLAGS = -lGL -lGLU -L/usr/X11R6/lib -lSDL
- 
 --- emu64/Makefile.orig	2004-07-15 21:50:36.577147160 +0000
 +++ emu64/Makefile	2004-07-15 21:53:11.189642488 +0000
 @@ -3,14 +3,9 @@
@@ -26,9 +12,9 @@
 -#CFLAGS		=-DX86 -Wall -pipe -g
 -
 -CXXFLAGS	=$(CFLAGS)
-+COMFLAGS	=-DX86 -g
-+CFLAGS		=$(COMFLAGS) $(GCFLAGS)
-+CXXFLAGS	=$(COMFLAGS) $(GCXXFLAGS)
++COMFLAGS	=-DX86
++CFLAGS		=$(COMFLAGS)
++CXXFLAGS	=$(COMFLAGS)
  
  GL_PATH		=-I/usr/X11R6/include
  
@@ -41,7 +27,7 @@
 -#CC		=gcc -O3 -I/usr/X11R6/include -fPIC -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=pentium -pipe
 -#CC		=gcc -O3 -mpentium -Wall -g -pg
 -CC 		=gcc -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -DUSE_GTK `gtk-config --cflags` -I/usr/X11R6/include -pipe
-+CC		=gcc -g $(GCFLAGS)
++CC		=gcc
  
  OBJ		=main.o
  
@@ -52,10 +38,10 @@
 -CFLAGS = -DUSE_GTK `gtk-config --cflags` -O3 -mcpu=athlon \
 -         -ffast-math -funroll-loops -fomit-frame-pointer
 -#CFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC
-+CFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC $(GCFLAGS)
++CFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
  CXX = g++
 -CXXFLAGS = $(CFLAGS)
-+CXXFLAGS = -DUSE_GTK `gtk-config --cflags` -g -fPIC $(GCXXFLAGS)
++CXXFLAGS = -DUSE_GTK `gtk-config --cflags` -fPIC
  LD = g++
  LDFLAGS =
  
@@ -64,7 +50,7 @@
 @@ -1,5 +1,5 @@
  CC = gcc
 -CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall
-+CFLAGS = `gtk-config --cflags` -DUSE_GTK  $(GCFLAGS)
++CFLAGS = `gtk-config --cflags` -DUSE_GTK
  LD = gcc
  LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread
    
diff --git a/games-emulation/mupen64/files/mupen64-noasm.patch b/games-emulation/mupen64/files/mupen64-noasm.patch
new file mode 100644
index 000000000000..7b740acb85f6
--- /dev/null
+++ b/games-emulation/mupen64/files/mupen64-noasm.patch
@@ -0,0 +1,11 @@
+--- emu64/Makefile.old	2005-01-02 12:57:37.444075589 -0800
++++ emu64/Makefile	2005-01-02 12:57:44.673605061 -0800
+@@ -3,7 +3,7 @@
+ CC		=gcc
+ CXX		=g++
+ 
+-COMFLAGS	=-DX86
++COMFLAGS	=
+ CFLAGS		=$(COMFLAGS)
+ CXXFLAGS	=$(COMFLAGS)
+ 
diff --git a/games-emulation/mupen64/mupen64-0.4.ebuild b/games-emulation/mupen64/mupen64-0.4.ebuild
index f25d2a179ee3..e15dd9283a98 100644
--- a/games-emulation/mupen64/mupen64-0.4.ebuild
+++ b/games-emulation/mupen64/mupen64-0.4.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4.ebuild,v 1.1 2005/01/01 06:59:18 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4.ebuild,v 1.2 2005/01/07 00:15:37 morfic Exp $
 
 inherit games gcc eutils libtool
 
-IUSE="avi gtk2 sdl"
+IUSE="avi gtk2 asm"
 
 DESCRIPTION="A Nintendo 64 (N64) emulator"
 SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2
 	http://mupen64.emulation64.com/files/${PV}/mupen64_input.tar.bz2
 	http://mupen64.emulation64.com/files/${PV}/mupen64_sound.tar.bz2
-	http://mupen64.emulation64.com/files/${PV}/hack_azi_rsp_hle.tar.bz2
-	http://mupen64.emulation64.com/files/${PV}/riceplugin.tar.bz2
-	http://mupen64.emulation64.com/files/${PV}/blight_input-0.0.8-b.tar.gz
-	sdl? ( http://mupen64.emulation64.com/files/${PV}/jttl_sound-1.2.tar.bz2 )"
+	http://mupen64.emulation64.com/files/${PV}/hack_azi_rsp_hle.tar.bz2"
+
 HOMEPAGE="http://mupen64.emulation64.com/"
 
 RESTRICT="nomirror"
@@ -22,15 +20,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-RDEPEND="sys-libs/zlib
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )
+DEPEND="sys-libs/zlib
 	media-libs/libsdl
-	sdl? ( media-libs/sdl-sound )
-	avi? ( media-video/avifile )
 	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}
+	virtual/opengl
+	avi? ( media-video/avifile )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( =x11-libs/gtk+-2* )"
+
+RDEPEND="${RDEPEND}
+	games-emulation/mupen64-glN64
 	>=sys-apps/sed-4"
 
 S="${WORKDIR}"
@@ -41,45 +40,34 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-makefiles.patch
 	epatch ${FILESDIR}/${PN}-confdir.patch
-	epatch ${FILESDIR}/${PN}-rice-confdir.patch
-	epatch ${FILESDIR}/${PN}-SDL_ttf.patch
 	# gtk2 breaks some configuration dialogs (bug 56195 #35)
 	use gtk2 && epatch ${FILESDIR}/${PN}-gtk2-makefile.patch
 	use avi && epatch ${FILESDIR}/${PN}-gentoo-avi.patch
-	use sdl && epatch ${FILESDIR}/${PN}-gentoo-sdl.patch
 
-	# the riceplugin seems to want gcc 3.3 to compile
-	if [ "`gcc-major-version`" -lt 3 -o "`gcc-version`" = "3.2" ] ; then
-		rm -rf riceplugin
-	else
-		epatch ${FILESDIR}/${PN}-gcc3.patch
+	if use x86; then
+		if use asm; then
+			einfo "using x86 asm where aviable"
+		else
+			epatch ${FILESDIR}/${PN}-noasm.patch
+		fi
 	fi
-
-	# the riceplugin requires sse support
-	echo "#include <xmmintrin.h>" > ${T}/test.c
-	$(gcc-getCC) ${CFLAGS} -o ${T}/test.s -S ${T}/test.c >&/dev/null || rm -rf riceplugin
-
 	# polish locales
 	cp ${FILESDIR}/polish.lng ${S}/emu64/lang
 }
 
 src_compile() {
-	cd ${S}/blight_input-0.0.8-b
-	econf || die "configure of blight_input failed"
-
-	export GCFLAGS="${CFLAGS}"
-	export GCXXFLAGS="${CXXFLAGS}"
 
-	cd ${S}
 	for i in *; do
 		einfo ""
 		einfo "Entering $i and make"
-		cd ${S}/${i} && emake || die "emake failed on $i"
+		cd ${S}/${i}
+		sed -i -e "s:CFLAGS.*=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
+				-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \
+				Makefile ||  die "couldn't apply cflags"
+		emake || die "emake failed on $i"
 		einfo "and done."
 	done
 
-	unset GCFLAGS
-	unset GCXXFLAGS
 }
 
 src_install() {
@@ -89,20 +77,14 @@ src_install() {
 	cd ${S}
 
 	exeinto ${dir}/plugins
-	doexe */*.so blight_input-0.0.8-b/src/.libs/*.so
+	doexe */*.so
 	insinto ${dir}/plugins
 	doins */*.ini
 	rm ${D}/${dir}/plugins/mupen64*.ini
-	echo -e "\n" > ${D}/usr/games/lib/mupen64/plugins/RiceDaedalus.cfg
-	echo -e "\n" > ${D}/usr/games/lib/mupen64/plugins/blight_input.conf
 
 	cd ${S}/emu64
 	cp -r mupen64* lang plugins save roms path.cfg ${D}/${dir}/
 	rm ${D}/${dir}/mupen64_test.ini
-	if use sdl; then
-		cd ${S}/jttl_sound-1.2
-		cp jttl_audio.conf ${D}/${dir}/plugins
-	fi
 
 	dogamesbin ${FILESDIR}/mupen64
 	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/mupen64
@@ -111,15 +93,8 @@ src_install() {
 
 	# plugins docs are in subdirs of the doc main directory
 	cd ${S}/emu64
-	insinto /usr/share/doc/${PF}
 	dodoc *.txt
-	doins doc/readme.pdf
-	cd ${S}/blight_input-0.0.8-b
-	docinto blight_input
-	dodoc AUTHORS ChangeLog NEWS README ToDo
-	cd ${S}/jttl_sound-1.2
-	docinto jttl_sound-1.2
-	dodoc README
+	dodoc doc/readme.pdf
 
 	prepgamesdirs
 }