From f7eb8ffc0b53fa45009474fc59be245e2af05d4d Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Wed, 14 Feb 2007 14:27:57 +0000 Subject: Use external sdl-ttf, bug #166531 (Portage version: 2.1.2-r9) --- games-emulation/mupen64/ChangeLog | 11 +- .../mupen64/files/digest-mupen64-0.4-r2 | 12 -- .../mupen64/files/digest-mupen64-0.5-r1 | 3 - .../mupen64/files/digest-mupen64-0.5-r2 | 3 + games-emulation/mupen64/files/mupen64 | 32 ------ .../mupen64/files/mupen64-0.5-paths.patch | 112 ++++++++++++++++++ .../mupen64/files/mupen64-0.5-sdl-ttf.patch | 28 +++++ .../mupen64/files/mupen64-confdir.patch | 5 - games-emulation/mupen64/files/mupen64-gentoo.patch | 125 -------------------- .../mupen64/files/mupen64-gtk2-makefile.patch | 127 --------------------- .../mupen64/files/mupen64-makefiles.patch | 56 --------- games-emulation/mupen64/files/mupen64-noasm.patch | 11 -- games-emulation/mupen64/mupen64-0.4-r2.ebuild | 94 --------------- games-emulation/mupen64/mupen64-0.5-r1.ebuild | 88 -------------- games-emulation/mupen64/mupen64-0.5-r2.ebuild | 92 +++++++++++++++ 15 files changed, 244 insertions(+), 555 deletions(-) delete mode 100644 games-emulation/mupen64/files/digest-mupen64-0.4-r2 delete mode 100644 games-emulation/mupen64/files/digest-mupen64-0.5-r1 create mode 100644 games-emulation/mupen64/files/digest-mupen64-0.5-r2 delete mode 100644 games-emulation/mupen64/files/mupen64 create mode 100644 games-emulation/mupen64/files/mupen64-0.5-paths.patch create mode 100644 games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch delete mode 100644 games-emulation/mupen64/files/mupen64-confdir.patch delete mode 100644 games-emulation/mupen64/files/mupen64-gentoo.patch delete mode 100644 games-emulation/mupen64/files/mupen64-gtk2-makefile.patch delete mode 100644 games-emulation/mupen64/files/mupen64-makefiles.patch delete mode 100644 games-emulation/mupen64/files/mupen64-noasm.patch delete mode 100644 games-emulation/mupen64/mupen64-0.4-r2.ebuild delete mode 100644 games-emulation/mupen64/mupen64-0.5-r1.ebuild create mode 100644 games-emulation/mupen64/mupen64-0.5-r2.ebuild (limited to 'games-emulation/mupen64') diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog index d9d68566f604..c8e9aacd8221 100644 --- a/games-emulation/mupen64/ChangeLog +++ b/games-emulation/mupen64/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-emulation/mupen64 -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.21 2006/09/17 18:15:57 joker Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.22 2007/02/14 14:27:57 nyhm Exp $ + +*mupen64-0.5-r2 (14 Feb 2007) + + 14 Feb 2007; Tristan Heaven + +files/mupen64-0.5-paths.patch, +files/mupen64-0.5-sdl-ttf.patch, + +mupen64-0.5-r2.ebuild: + Use external sdl-ttf, bug #166531 *mupen64-0.5-r1 (17 Sep 2006) diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 b/games-emulation/mupen64/files/digest-mupen64-0.4-r2 deleted file mode 100644 index 4007c6a32525..000000000000 --- a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268 -RMD160 284cb9ffe4157d580d1c9924cbf40ea34bfee752 hack_azi_rsp_hle.tar.bz2 38268 -SHA256 cf9a2c0340f5eb3c06580e44af645fa3a06bc4c7e64c33e51b7a146c703d4aae hack_azi_rsp_hle.tar.bz2 38268 -MD5 14fc6075a19bb567afebedd5ab2ea6c1 mupen64_input.tar.bz2 4438 -RMD160 8e2d9b278ff8988c5fc171b25bd1a279fb44b994 mupen64_input.tar.bz2 4438 -SHA256 d4eac5e204e094f32c46230aacb206468a0f8d3a62b2b654d17b00e86d20500d mupen64_input.tar.bz2 4438 -MD5 88dfa0045794db7f1fc100b4c7b23125 mupen64_sound.tar.bz2 5932 -RMD160 618773689a1cd5a70082bd619584f5df03f05575 mupen64_sound.tar.bz2 5932 -SHA256 df53df36a416dad22db87325dae8dc14174f5b7ef6a7e8680b2ff855eb31581a mupen64_sound.tar.bz2 5932 -MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148 -RMD160 dbae6b939129c4867ade445ddd8676fb645608f4 mupen64_src-0.4.tar.bz2 1871148 -SHA256 12958fa185c8a851f31ea007a1bb4df2bb6eeed582bc6af234ae5b9d57a8f3ae mupen64_src-0.4.tar.bz2 1871148 diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r1 b/games-emulation/mupen64/files/digest-mupen64-0.5-r1 deleted file mode 100644 index f5e4ac023a01..000000000000 --- a/games-emulation/mupen64/files/digest-mupen64-0.5-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046 -RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046 -SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046 diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5-r2 b/games-emulation/mupen64/files/digest-mupen64-0.5-r2 new file mode 100644 index 000000000000..f5e4ac023a01 --- /dev/null +++ b/games-emulation/mupen64/files/digest-mupen64-0.5-r2 @@ -0,0 +1,3 @@ +MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046 +RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046 +SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046 diff --git a/games-emulation/mupen64/files/mupen64 b/games-emulation/mupen64/files/mupen64 deleted file mode 100644 index e6ae559f0d95..000000000000 --- a/games-emulation/mupen64/files/mupen64 +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -if [ ! -d ~/.mupen64/save ] ; then - mkdir -p ~/.mupen64/save - if [ -h ~/.mupen64/plugins ]; then - rm ~/.mupen64/plugins - fi - mkdir -p ~/.mupen64/plugins - cd ~/.mupen64 - ln -s GENTOO_DIR/mupen64 mupen64 - ln -s GENTOO_DIR/mupen64_nogui mupen64_nogui - cp GENTOO_DIR/mupen64.ini . -fi - -cd ~/.mupen64/plugins - -cleanlinks -ln -sf GENTOO_DIR/plugins/*.so . -for i in GENTOO_DIR/plugins/*.{ini,conf}; do - lfile=`basename $i` - if [ -h $lfile ]; then - rm $lfile - cp $i . - fi -done -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 -# notified of the problem. -exec ./$(basename $0) "$@" diff --git a/games-emulation/mupen64/files/mupen64-0.5-paths.patch b/games-emulation/mupen64/files/mupen64-0.5-paths.patch new file mode 100644 index 000000000000..f6bd21fcdaa4 --- /dev/null +++ b/games-emulation/mupen64/files/mupen64-0.5-paths.patch @@ -0,0 +1,112 @@ +--- main/gui_gtk/main_gtk.c ++++ main/gui_gtk/main_gtk.c +@@ -1881,7 +1881,7 @@ + unsigned char byte; + dest = fopen(temp, "wb"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/mupen64.ini"); ++ strcat(orig, "lib/mupen64/mupen64.ini"); + src = fopen(orig, "rb"); + while(fread(&byte, 1, 1, src)) + fwrite(&byte, 1, 1, dest); +@@ -1893,7 +1893,7 @@ + strcpy(temp, g_WorkingDir); + strcat(temp, "lang"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/lang"); ++ strcat(orig, "lib/mupen64/lang"); + symlink(orig, temp); + + /*strcpy(temp, g_WorkingDir); +@@ -1906,14 +1906,14 @@ + strcat(temp, "plugins"); + mkdir(temp, 0700); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins"); ++ strcat(orig, "lib/mupen64/plugins"); + dir = opendir(orig); + while((entry = readdir(dir)) != NULL) + { + if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so")) + { + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "lib/mupen64/plugins/"); + strcat(orig, entry->d_name); + src = fopen(orig, "rb"); + if(src == NULL) continue; +@@ -1939,7 +1939,7 @@ + strcat(temp, "plugins/"); + strcat(temp, entry->d_name); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "lib/mupen64/plugins/"); + strcat(orig, entry->d_name); + symlink(orig, temp); + } +--- main/main.c ++++ main/main.c +@@ -37,6 +37,8 @@ + + #include + #include ++#include ++#include + + #include "main.h" + #include "guifuncs.h" +@@ -263,7 +265,7 @@ + unsigned char byte; + dest = fopen(temp, "wb"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/mupen64.ini"); ++ strcat(orig, "lib/mupen64/mupen64.ini"); + src = fopen(orig, "rb"); + while(fread(&byte, 1, 1, src)) + fwrite(&byte, 1, 1, dest); +@@ -275,7 +277,7 @@ + strcpy(temp, g_WorkingDir); + strcat(temp, "lang"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/lang"); ++ strcat(orig, "lib/mupen64/lang"); + symlink(orig, temp); + + /*strcpy(temp, g_WorkingDir); +@@ -288,14 +290,14 @@ + strcat(temp, "plugins"); + mkdir(temp, 0700); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins"); ++ strcat(orig, "lib/mupen64/plugins"); + dir = opendir(orig); + while((entry = readdir(dir)) != NULL) + { + if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so")) + { + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "lib/mupen64/plugins/"); + strcat(orig, entry->d_name); + src = fopen(orig, "rb"); + if(src == NULL) continue; +@@ -321,7 +323,7 @@ + strcat(temp, "plugins/"); + strcat(temp, entry->d_name); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "lib/mupen64/plugins/"); + strcat(orig, entry->d_name); + symlink(orig, temp); + } +--- Makefile ++++ Makefile +@@ -166,7 +166,7 @@ + endif + + PREFIX =$(shell grep WITH_HOME config.h | cut -d '"' -f 2) +-SHARE ="$(PREFIX)share/mupen64/" ++SHARE ="$(PREFIX)lib/mupen64/" + + PLUGINS =plugins/mupen64_input.so plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so + diff --git a/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch new file mode 100644 index 000000000000..a8d599d385c7 --- /dev/null +++ b/games-emulation/mupen64/files/mupen64-0.5-sdl-ttf.patch @@ -0,0 +1,28 @@ +--- Makefile ++++ Makefile +@@ -80,7 +80,6 @@ + OBJ_INPUT =mupen64_input/main.o + + OBJ_BLIGHT =blight_input/plugin.o \ +- blight_input/SDL_ttf.o \ + blight_input/arial.ttf.o \ + blight_input/configdialog_sdl.o \ + blight_input/pad.o +@@ -223,8 +222,6 @@ + blight_input/plugin.o: blight_input/plugin.c + $(CC) $(CFLAGS) "-DPACKAGE=\"$(shell grep PACKAGE blight_input/package | cut -d "=" -f 2)\"" "-DVERSION=\"$(shell grep VERSION blight_input/package | cut -d "=" -f 2)\"" `sdl-config --cflags` -DGUI_SDL -c -o $@ $< + +-blight_input/SDL_ttf.o: blight_input/SDL_ttf.c +- $(CC) $(CFLAGS) `freetype-config --cflags` `sdl-config --cflags` -c -o $@ $< + + blight_input/arial.ttf.o: blight_input/arial.ttf.c + +@@ -367,7 +364,7 @@ + strip --strip-all $@ + + plugins/blight_input.so: $(OBJ_BLIGHT) +- $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` `freetype-config --libs` -o $@ ++ $(CC) $^ -Wl,-Bsymbolic -shared `sdl-config --libs` -lSDL_ttf -o $@ + strip --strip-all $@ + + plugins/mupen64_hle_rsp_azimer.so: $(OBJ_RSPHLE) diff --git a/games-emulation/mupen64/files/mupen64-confdir.patch b/games-emulation/mupen64/files/mupen64-confdir.patch deleted file mode 100644 index d0705336faa8..000000000000 --- a/games-emulation/mupen64/files/mupen64-confdir.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- 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 @@ --/bidon/roms/ -+/usr/games/lib/mupen64/roms/ diff --git a/games-emulation/mupen64/files/mupen64-gentoo.patch b/games-emulation/mupen64/files/mupen64-gentoo.patch deleted file mode 100644 index 54e3efdb7dc1..000000000000 --- a/games-emulation/mupen64/files/mupen64-gentoo.patch +++ /dev/null @@ -1,125 +0,0 @@ -File mupen64_src-0.5/compare_pipe is a fifo while file mupen64_src-0.5.fixed/compare_pipe is a fifo -diff -u -r mupen64_src-0.5/main/gui_gtk/main_gtk.c mupen64_src-0.5.fixed/main/gui_gtk/main_gtk.c ---- mupen64_src-0.5/main/gui_gtk/main_gtk.c 2005-08-26 15:08:13.000000000 -0500 -+++ mupen64_src-0.5.fixed/main/gui_gtk/main_gtk.c 2005-09-09 23:00:17.000000000 -0500 -@@ -1881,7 +1881,7 @@ - unsigned char byte; - dest = fopen(temp, "wb"); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/mupen64.ini"); -+ strcat(orig, "lib/mupen64/mupen64.ini"); - src = fopen(orig, "rb"); - while(fread(&byte, 1, 1, src)) - fwrite(&byte, 1, 1, dest); -@@ -1893,7 +1893,7 @@ - strcpy(temp, g_WorkingDir); - strcat(temp, "lang"); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/lang"); -+ strcat(orig, "lib/mupen64/lang"); - symlink(orig, temp); - - /*strcpy(temp, g_WorkingDir); -@@ -1906,14 +1906,14 @@ - strcat(temp, "plugins"); - mkdir(temp, 0700); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins"); -+ strcat(orig, "lib/mupen64/plugins"); - dir = opendir(orig); - while((entry = readdir(dir)) != NULL) - { - if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so")) - { - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins/"); -+ strcat(orig, "lib/mupen64/plugins/"); - strcat(orig, entry->d_name); - src = fopen(orig, "rb"); - if(src == NULL) continue; -@@ -1939,7 +1939,7 @@ - strcat(temp, "plugins/"); - strcat(temp, entry->d_name); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins/"); -+ strcat(orig, "lib/mupen64/plugins/"); - strcat(orig, entry->d_name); - symlink(orig, temp); - } -diff -u -r mupen64_src-0.5/main/main.c mupen64_src-0.5.fixed/main/main.c ---- mupen64_src-0.5/main/main.c 2005-08-26 14:52:11.000000000 -0500 -+++ mupen64_src-0.5.fixed/main/main.c 2005-09-09 22:06:12.000000000 -0500 -@@ -37,6 +37,8 @@ - - #include - #include -+#include -+#include - - #include "main.h" - #include "guifuncs.h" -@@ -263,7 +265,7 @@ - unsigned char byte; - dest = fopen(temp, "wb"); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/mupen64.ini"); -+ strcat(orig, "lib/mupen64/mupen64.ini"); - src = fopen(orig, "rb"); - while(fread(&byte, 1, 1, src)) - fwrite(&byte, 1, 1, dest); -@@ -275,7 +277,7 @@ - strcpy(temp, g_WorkingDir); - strcat(temp, "lang"); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/lang"); -+ strcat(orig, "lib/mupen64/lang"); - symlink(orig, temp); - - /*strcpy(temp, g_WorkingDir); -@@ -288,14 +290,14 @@ - strcat(temp, "plugins"); - mkdir(temp, 0700); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins"); -+ strcat(orig, "lib/mupen64/plugins"); - dir = opendir(orig); - while((entry = readdir(dir)) != NULL) - { - if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so")) - { - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins/"); -+ strcat(orig, "lib/mupen64/plugins/"); - strcat(orig, entry->d_name); - src = fopen(orig, "rb"); - if(src == NULL) continue; -@@ -321,7 +323,7 @@ - strcat(temp, "plugins/"); - strcat(temp, entry->d_name); - strcpy(orig, WITH_HOME); -- strcat(orig, "share/mupen64/plugins/"); -+ strcat(orig, "lib/mupen64/plugins/"); - strcat(orig, entry->d_name); - symlink(orig, temp); - } -diff -u -r mupen64_src-0.5/Makefile mupen64_src-0.5.fixed/Makefile ---- mupen64_src-0.5/Makefile 2005-08-26 14:52:13.000000000 -0500 -+++ mupen64_src-0.5.fixed/Makefile 2005-09-09 22:45:40.000000000 -0500 -@@ -166,7 +166,7 @@ - endif - - PREFIX =$(shell grep WITH_HOME config.h | cut -d '"' -f 2) --SHARE ="$(PREFIX)share/mupen64/" -+SHARE ="$(PREFIX)lib/mupen64/" - - PLUGINS =plugins/mupen64_input.so plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so - -@@ -405,7 +405,7 @@ - - clean: - find . -name '*.o' -print0 | xargs -0r rm -f -- rm mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so -+ rm -f mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so - - clean_o: - find . -name '*.o' -print0 | xargs -0r rm -f diff --git a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch b/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch deleted file mode 100644 index f79c4c01ef39..000000000000 --- a/games-emulation/mupen64/files/mupen64-gtk2-makefile.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- emu64/Makefile 2005-03-21 19:24:41.000000000 +0100 -+++ emu64/Makefile 2005-03-21 19:21:52.000000000 +0100 -@@ -87,46 +87,49 @@ - PREFIX =$(shell grep WITH_HOME config.h | cut -d '"' -f 2) - SHARE ="$(PREFIX)share/mupen64/" - -+GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` -D_GTK2 -+GTK_LIBS = `pkg-config --libs gtk+-2.0` -+ - all: mupen64 - - main/main.o: main/main.c - $(CC) $(CFLAGS) -c -o $@ $< - - main/main_gtk.o: main/main_gtk.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/main_gtk.o: main/gui_gtk/main_gtk.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/translate.o: main/gui_gtk/translate.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/messagebox.o: main/gui_gtk/messagebox.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/aboutdialog.o: main/gui_gtk/aboutdialog.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/configdialog.o: main/gui_gtk/configdialog.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/support.o: main/gui_gtk/support.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/rombrowser.o: main/gui_gtk/rombrowser.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/romproperties.o: main/gui_gtk/romproperties.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/config.o: main/gui_gtk/config.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/dirbrowser.o: main/gui_gtk/dirbrowser.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/gui_gtk/vcrcomp_dialog.o: main/gui_gtk/vcrcomp_dialog.c -- $(CC) $(CFLAGS) -c -o $@ $< `gtk-config --cflags` -+ $(CC) $(CFLAGS) -c -o $@ $< $(GTK_CFLAGS) - - main/vcr_compress.o: main/vcr_compress.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< `avifile-config --cflags` -@@ -138,13 +141,13 @@ - ifneq ("$(shell grep VCR config.h)","\#define VCR_SUPPORT 1") - - mupen64: $(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI) -- $(CC) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic `gtk-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@ -+ $(CC) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@ - strip --strip-all $@ - - else - - mupen64: $(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI) $(OBJ_VCR) -- $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic `gtk-config --libs` `avifile-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@ -+ $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` -L/usr/X11R6/lib -lSDL -lGL -lpthread -ldl -o $@ - strip --strip-all $@ - endif - -diff -ru work/hack_azi_rsp_hle/Makefile work.new/hack_azi_rsp_hle/Makefile ---- hack_azi_rsp_hle/Makefile 2005-03-21 19:25:04.000000000 +0100 -+++ hack_azi_rsp_hle/Makefile 2005-03-21 19:28:01.000000000 +0100 -@@ -1,7 +1,7 @@ - CC = gcc --CFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags` -+CFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags` - CXX = g++ --CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags` -+CXXFLAGS = -fPIC -DUSE_GTK `pkg-config gtk+-2.0 --cflags` - LD = g++ - LDFLAGS = - -@@ -11,7 +11,7 @@ - all: $(TARGET) instruction - - $(TARGET): $(OBJECTS) -- $(LD) -shared -Wl,-Bsymbolic `gtk-config --libs` $(LDFLAGS) -o $@ $(OBJECTS) -+ $(LD) -shared -Wl,-Bsymbolic `pkg-config gtk+-2.0 --libs` $(LDFLAGS) -o $@ $(OBJECTS) - strip --strip-all $@ - - instruction: -diff -ru work/mupen64_input/Makefile work.new/mupen64_input/Makefile ---- mupen64_input/Makefile 2005-03-21 19:24:41.000000000 +0100 -+++ mupen64_input/Makefile 2005-03-21 19:28:25.000000000 +0100 -@@ -8,7 +8,7 @@ - - - mupen64_input.so: $(OBJ) -- $(CC) $(OBJ) -Wl,-Bsymbolic -shared -lSDL `gtk-config --cflags --libs` -o $@ -+ $(CC) $(OBJ) -Wl,-Bsymbolic -shared -lSDL `pkg-config gtk+-2.0 --cflags --libs` -o $@ - strip --strip-all $@ - - instruction: -diff -ru work/mupen64_sound/Makefile work.new/mupen64_sound/Makefile ---- mupen64_sound/Makefile 2005-03-21 19:25:04.000000000 +0100 -+++ mupen64_sound/Makefile 2005-03-21 19:28:58.000000000 +0100 -@@ -1,7 +1,7 @@ - CC = gcc --CFLAGS = -fPIC `gtk-config --cflags` -DUSE_GTK -+CFLAGS = -fPIC `pkg-config gtk+-2.0 --cflags` -DUSE_GTK - LD = gcc --LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread -+LDFLAGS = -shared -Wl,-Bsymbolic `pkg-config gtk+-2.0 --libs` -lpthread - - OBJECTS = main.o - diff --git a/games-emulation/mupen64/files/mupen64-makefiles.patch b/games-emulation/mupen64/files/mupen64-makefiles.patch deleted file mode 100644 index 5da004d2e85e..000000000000 --- a/games-emulation/mupen64/files/mupen64-makefiles.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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 @@ - CC =gcc - CXX =g++ - --#CFLAGS =-DX86 -O3 -mpentium -Wall -DEMU64_DEBUG --CFLAGS =-DX86 -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon -Wall -pipe --#CFLAGS =-DX86 -O3 -mcpu=pentium -Wall -g -pg --#CFLAGS =-DX86 -Wall -pipe -g3 -DEMU64_DEBUG --#CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE --#CFLAGS =-DX86 -Wall -pipe -g -- --CXXFLAGS =$(CFLAGS) -+COMFLAGS =-DX86 -+CFLAGS =$(COMFLAGS) -+CXXFLAGS =$(COMFLAGS) - - GL_PATH =-I/usr/X11R6/include - - #endif /* CONFIG_H */ ---- mupen64_input/Makefile.orig 2004-07-15 21:53:51.944446816 +0000 -+++ mupen64_input/Makefile 2004-07-15 21:54:34.593963104 +0000 -@@ -1,8 +1,5 @@ - #Makefile GRAPHIC --#CXX =g++ -O3 -mpentium -Wall -DEMU64_DEBUG --#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 -fPIC - - OBJ =main.o - ---- hack_azi_rsp_hle/Makefile.orig 2004-07-15 21:56:27.429809448 +0000 -+++ hack_azi_rsp_hle/Makefile 2004-07-15 21:57:15.940434712 +0000 -@@ -1,9 +1,7 @@ - CC = gcc --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 = -fPIC -DUSE_GTK `gtk-config --cflags` - CXX = g++ --CXXFLAGS = $(CFLAGS) -+CXXFLAGS = -fPIC -DUSE_GTK `gtk-config --cflags` - LD = g++ - LDFLAGS = - ---- mupen64_sound/Makefile.orig 2004-07-04 04:43:39.000000000 -0500 -+++ mupen64_sound/Makefile 2004-12-31 23:53:55.329185760 -0600 -@@ -1,5 +1,5 @@ - CC = gcc --CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall -+CFLAGS = -fPIC `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 deleted file mode 100644 index 7b740acb85f6..000000000000 --- a/games-emulation/mupen64/files/mupen64-noasm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild deleted file mode 100644 index 06ea34e2ee94..000000000000 --- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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-r2.ebuild,v 1.7 2005/11/08 01:33:05 morfic Exp $ - -inherit eutils games - -DESCRIPTION="A Nintendo 64 (N64) emulator" -HOMEPAGE="http://mupen64.emulation64.com/" -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-amd64 x86" -IUSE="asm" - -RDEPEND="sys-libs/zlib - media-libs/libsdl - virtual/glu - virtual/opengl - =x11-libs/gtk+-2*" -DEPEND="${RDEPEND} - dev-util/pkgconfig" -RDEPEND="${RDEPEND} - >=games-emulation/mupen64-glN64-0.4.1_rc2-r1" - -S=${WORKDIR} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${PN}-makefiles.patch" \ - "${FILESDIR}/${PN}-confdir.patch" \ - "${FILESDIR}/${PN}-gtk2-makefile.patch" - - if ! use asm ; then - epatch "${FILESDIR}/${PN}-noasm.patch" - fi - sed -i \ - -e "s:CFLAGS.*=\(.*\):CFLAGS=\1 -fPIC ${CFLAGS}:" \ - -e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \ - */Makefile \ - || die "sed failed" -} - -src_compile() { - local d - - for d in *; do - emake -C $d || die "emake failed on $d" - done -} - -src_install() { - local dir=${GAMES_LIBDIR}/${PN} - - exeinto "${dir}/plugins" - doexe */*.so || die "doexe failed" - insinto "${dir}/plugins" - doins */*.ini || die "doins failed" - rm "${D}/${dir}"/plugins/mupen64*.ini - - cd emu64 - cp -r mupen64* lang plugins save roms path.cfg "${D}/${dir}/" \ - || die "cp failed" - rm "${D}/${dir}/mupen64_test.ini" - - dogamesbin "${FILESDIR}/mupen64" || die "dogamesbin failed" - newgamesbin "${FILESDIR}/mupen64" mupen64_nogui || die "newgamesbin failed" - sed -i \ - -e "s:GENTOO_DIR:${dir}:" \ - "${D}${GAMES_BINDIR}/mupen64" \ - "${D}${GAMES_BINDIR}/mupen64_nogui" \ - || die "sed failed" - - # plugins docs are in subdirs of the doc main directory - dodoc *.txt - cp doc/readme.pdf "${D}/usr/share/doc/${PF}" - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "If you are upgrading from previous version of mupen64" - ewarn "you have to do rm -rf on your .mupen64 directory." - ewarn "Copy your saved games and after launching new mupen" - ewarn "copy it to the original place." - echo -} diff --git a/games-emulation/mupen64/mupen64-0.5-r1.ebuild b/games-emulation/mupen64/mupen64-0.5-r1.ebuild deleted file mode 100644 index ab758cf5e12f..000000000000 --- a/games-emulation/mupen64/mupen64-0.5-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r1.ebuild,v 1.3 2007/02/03 06:54:35 nyhm Exp $ - -inherit eutils flag-o-matic multilib games - -MY_P=${PN}_src-${PV} -DESCRIPTION="A Nintendo 64 (N64) emulator" -HOMEPAGE="http://mupen64.emulation64.com/" -SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="opengl" - -RDEPEND="opengl? ( virtual/opengl ) - >=x11-libs/gtk+-2 - amd64? ( app-emulation/emul-linux-x86-gtklibs - app-emulation/emul-linux-x86-sdl ) - media-libs/libsdl - media-libs/sdl-sound" -# Block the now included external plugins. -DEPEND="${RDEPEND} - dev-util/pkgconfig - !games-emulation/mupen64-blight-input - !games-emulation/mupen64-glN64 - !games-emulation/mupen64-jttl_sound" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${PN}-gentoo.patch - - cd "${S}" - rm -f plugins/empty - - sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \ - config.h \ - || die "sed failed" - - sed -i \ - -e '/strip/d' \ - -e "s:CFLAGS[[:space:]]*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \ - -e "s:CXXFLAGS[[:space:]]*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \ - Makefile \ - || die "sed failed" -} - -src_compile() { - use amd64 && multilib_toolchain_setup x86 - - emake mupen64 || die "emake failed" - emake mupen64_nogui || die "emake failed" - emake plugins/mupen64_input.so || die "emake failed" - emake plugins/mupen64_hle_rsp_azimer.so || die "emake failed" - emake plugins/dummyaudio.so || die "emake failed" - emake plugins/mupen64_audio.so || die "emake failed" - emake plugins/mupen64_soft_gfx.so || die "emake failed" - - emake plugins/blight_input.so || die "emake failed" - emake plugins/jttl_audio.so || die "emake failed" - - if use opengl; then - emake plugins/glN64.so || die "emake failed" - fi -} - -src_install() { - dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed" - - insinto "${GAMES_LIBDIR}"/${PN} - doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed" - - dodoc *.txt doc/readme.pdf - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "If you are upgrading from a previous version of mupen64," - ewarn "backup your saved games then run rm -rf on your" - ewarn ".mupen64 directory. After launching the new version, copy" - ewarn "your saved games to their original place." - echo -} diff --git a/games-emulation/mupen64/mupen64-0.5-r2.ebuild b/games-emulation/mupen64/mupen64-0.5-r2.ebuild new file mode 100644 index 000000000000..0b2b9d4b7bc3 --- /dev/null +++ b/games-emulation/mupen64/mupen64-0.5-r2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r2.ebuild,v 1.1 2007/02/14 14:27:57 nyhm Exp $ + +inherit eutils multilib games + +MY_P=${PN}_src-${PV} +DESCRIPTION="A Nintendo 64 (N64) emulator" +HOMEPAGE="http://mupen64.emulation64.com/" +SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 x86" +IUSE="" + +RDEPEND="virtual/opengl + >=x11-libs/gtk+-2 + media-libs/libsdl + media-libs/sdl-ttf + amd64? ( + app-emulation/emul-linux-x86-gtklibs + app-emulation/emul-linux-x86-sdl + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + !games-emulation/mupen64-blight-input + !games-emulation/mupen64-glN64 + !games-emulation/mupen64-jttl_sound" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + rm -f plugins/empty blight_input/SDL_ttf* + + epatch \ + "${FILESDIR}"/${P}-paths.patch \ + "${FILESDIR}"/${P}-sdl-ttf.patch + + sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \ + config.h \ + || die "sed failed" + + sed -i \ + -e '/strip/d' \ + -e "s:CFLAGS[[:space:]]*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \ + -e "s:CXXFLAGS[[:space:]]*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \ + Makefile \ + || die "sed failed" +} + +src_compile() { + use amd64 && multilib_toolchain_setup x86 + + local t + for t in \ + mupen64 \ + mupen64_nogui \ + plugins/mupen64_input.so \ + plugins/blight_input.so \ + plugins/mupen64_hle_rsp_azimer.so \ + plugins/dummyaudio.so \ + plugins/mupen64_audio.so \ + plugins/jttl_audio.so \ + plugins/mupen64_soft_gfx.so \ + plugins/glN64.so + do + emake ${t} || die "emake ${t} failed" + done +} + +src_install() { + dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed" + + insinto "${GAMES_LIBDIR}"/${PN} + doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed" + + dodoc *.txt doc/readme.pdf + prepgamesdirs +} + +pkg_postinst() { + games_pkg_postinst + echo + ewarn "If you are upgrading from a previous version of mupen64," + ewarn "backup your saved games then run rm -rf on your" + ewarn ".mupen64 directory. After launching the new version, copy" + ewarn "your saved games to their original place." + echo +} -- cgit v1.2.3-65-gdbad