[gentoo-commits] proj/gamerlay:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-core/files/

[gentoo-commits] proj/gamerlay:master commit in: games-emulation/mupen64plus-core/, games-emulation/mupen64plus-core/files/

[Marcel Unbehaun]

commit:     edd865fee1ca123c2a63d526e024b1c018cdbb43
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sat Oct  8 18:51:54 2011 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sat Oct  8 18:51:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=edd865fe

[games-emulation/mupen64plus-core]	fixed upstream - files/mupen64plus-core-minizip.patch
[games-emulation/mupen64plus-core]	updated mupen64plus-core-9999.ebuild

---
 .../files/mupen64plus-core-minizip.patch           |   36 --------------------
 .../mupen64plus-core/mupen64plus-core-9999.ebuild  |    4 --
 2 files changed, 0 insertions(+), 40 deletions(-)

diff --git a/games-emulation/mupen64plus-core/files/mupen64plus-core-minizip.patch b/games-emulation/mupen64plus-core/files/mupen64plus-core-minizip.patch
deleted file mode 100644
index de724ac..0000000
--- a/games-emulation/mupen64plus-core/files/mupen64plus-core-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur mupen64plus-core/projects/unix/Makefile mupen64plus-core-p/projects/unix/Makefile
---- mupen64plus-core/projects/unix/Makefile	2011-10-05 17:49:30.000000000 +0200
-+++ mupen64plus-core-p/projects/unix/Makefile	2011-10-05 18:08:00.828940972 +0200
-@@ -92,7 +92,7 @@
- OPTFLAGS ?= -O3
- CFLAGS += $(OPTFLAGS) -Wall -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
- CXXFLAGS += -fvisibility-inlines-hidden
--LDLIBS +=  -lm
-+LDLIBS +=  -lm -lminizip
- 
- # Since we are building a shared library, we must compile with -fPIC on some architectures
- # On 32-bit x86 systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
-@@ -285,9 +285,6 @@
- 	$(SRCDIR)/main/ini_reader.c \
- 	$(SRCDIR)/main/savestates.c \
- 	$(SRCDIR)/main/adler32.c \
--	$(SRCDIR)/main/zip/ioapi.c \
--	$(SRCDIR)/main/zip/zip.c \
--	$(SRCDIR)/main/zip/unzip.c \
- 	$(SRCDIR)/memory/dma.c \
- 	$(SRCDIR)/memory/flashram.c \
- 	$(SRCDIR)/memory/memory.c \
-diff -Naur mupen64plus-core/src/main/savestates.c mupen64plus-core-p/src/main/savestates.c
---- mupen64plus-core/src/main/savestates.c	2011-10-05 17:49:30.000000000 +0200
-+++ mupen64plus-core-p/src/main/savestates.c	2011-10-05 18:07:35.117941286 +0200
-@@ -43,8 +43,8 @@
- #include "osal/preproc.h"
- #include "osd/osd.h"
- 
--#include "main/zip/unzip.h"
--#include "main/zip/zip.h"
-+#include "minizip/unzip.h"
-+#include "minizip/zip.h"
- 
- static const char* savestate_magic = "M64+SAVE";
- static const int savestate_version = 0x00010000;  /* 1.0 */

diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-9999.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-9999.ebuild
index 5729fcd..7645d58 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-9999.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-9999.ebuild
@@ -29,10 +29,6 @@ DEPEND="${RDEPEND}
 
 OPTS="V=1 PREFIX=${GAMES_PREFIX} LIBDIR=$(games_get_libdir) BINDIR=${GAMES_BINDIR} APIDIR=/usr/include/mupen64plus/ INCDIR=/usr/include/mupen64plus/ SHAREDIR=${GAMES_DATADIR} DESTDIR=${D} COREDIR=$(games_get_libdir)/ PLUGINDIR=$(games_get_libdir)/mupen64plus/ MANDIR=/usr/share/man V=1 OPTFLAGS= INSTALL_STRIP_FLAG="
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-minizip.patch #383845
-}
-
 src_compile() {
 	use debug && OPTS+=" DEBUG=1 DEBUGGER=1 PLUGINDBG=1"
 	use lirc && OPTS+=" LIRC=1"