# HG changeset patch # User Aleksej Bobylev # Date 1447197954 -7200 # Node ID 36c2b631aefd801367a4567430766e8c282048ae # Parent c12891d554bab713e971798178edca54c1889a0e Up mupen64plus(2.5) diff -r c12891d554ba -r 36c2b631aefd mupen64plus/description.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mupen64plus/description.txt Wed Nov 11 01:25:54 2015 +0200 @@ -0,0 +1,10 @@ +Mupen64Plus is a cross-platform plugin-based N64 emulator which is capable of +accurately playing many games. Included are four MIPS R4300 CPU emulators, with +dynamic recompilers for 32-bit x86 and 64-bit amd64 systems, and necessary +plugins for audio, graphical rendering (RDP), signal co-processor (RSP), and +input. There is 1 included OpenGL video plugin, called RiceVideo. There are +3 other excellent video plugins being maintained by wahrhaft, called Arachnoid, +Glide64, and Z64. + +More documentation can be found on the Mupen64Plus Documentation Section: +http://www.mupen64plus.org/docs/ diff -r c12891d554ba -r 36c2b631aefd mupen64plus/receipt --- a/mupen64plus/receipt Tue Nov 10 22:42:55 2015 +0100 +++ b/mupen64plus/receipt Wed Nov 11 01:25:54 2015 +0200 @@ -1,43 +1,33 @@ # SliTaz package receipt. PACKAGE="mupen64plus" -VERSION="1.5" +VERSION="2.5" CATEGORY="games" SHORT_DESC="Nintendo64 Emulator" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" -SOURCE="Mupen64Plus" -TARBALL="$SOURCE-${VERSION//./-}-src.tar.gz" -WEB_SITE="http://code.google.com/p/mupen64plus/" -WGET_URL="http://mupen64plus.googlecode.com/files/$TARBALL" +TARBALL="$PACKAGE-bundle-src-$VERSION.tar.gz" +WEB_SITE="http://www.mupen64plus.org/" +WGET_URL="https://github.com/mupen64plus/mupen64plus-core/releases/download/$VERSION/$TARBALL" TAGS="emulator nintendo64" -DEPENDS="gtk+ mesa libglu-mesa libsamplerate libsdl-ttf" -BUILD_DEPENDS="gtk+-dev mesa-dev libglu-mesa libglu-mesa-dev libsamplerate-dev \ -libsdl-dev libsdl-ttf-dev yasm pkg-config zlib-dev" +DEPENDS="bzlib freetype libboost-filesystem libglu-mesa libsamplerate libsdl \ +speex" +BUILD_DEPENDS="gtk+-dev libboost-filesystem-dev libglu-mesa libglu-mesa-dev \ +libsamplerate-dev libsdl-dev libsdl-ttf-dev mesa-dev speex-dev yasm zlib-dev" # Rules to configure and make the package. compile_rules() { - cd $src - - # patching (provided by Yggdrasil) Thanks! Will remove when new version of mupen64plus comes out. - patch -Np1 -i $stuff/const.patch - patch -Np1 -i $stuff/blight-input-linking.patch - # thanks to debian for having a patch :) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329 - patch -Np1 -i $stuff/ftbfs-gvariant-type-conflicts.patch - - make PREFIX=/usr all - mkdir -p $DESTDIR/usr/bin - make PREFIX=$DESTDIR/usr install + export PREFIX=/usr DESTDIR=$install + ./m64p_build.sh && + ./m64p_install.sh } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share/mupen64plus $fs/usr/share - cp -a $install/usr/share/applications $fs/usr/share + cp -a $install/* $fs + rm -r $fs/usr/include + find $fs -name '*.so*' -exec chmod a+x \{\} \; } - diff -r c12891d554ba -r 36c2b631aefd mupen64plus/stuff/blight-input-linking.patch --- a/mupen64plus/stuff/blight-input-linking.patch Tue Nov 10 22:42:55 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -aur Mupen64Plus-1-5-src/blight_input/Makefile Mupen64Plus-1-5-src_patched/blight_input/Makefile ---- Mupen64Plus-1-5-src/blight_input/Makefile 2009-01-04 19:47:08.000000000 +0100 -+++ Mupen64Plus-1-5-src_patched/blight_input/Makefile 2010-02-09 14:19:27.000000000 +0100 -@@ -48,7 +48,7 @@ - $(CC) -o $@ $(CFLAGS) $(SDL_FLAGS) $(FREETYPE_FLAGS) -c $< - - blight_input.$(SO_EXTENSION): $(OBJ_BLIGHT) -- $(CC) -o $@ -shared $(LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS) $^ -+ $(CC) -o $@ -shared $(LDFLAGS//-Wl,--as-needed/) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS) $^ - ifneq ($(OS), WINDOWS) - $(STRIP) $@ - endif diff -r c12891d554ba -r 36c2b631aefd mupen64plus/stuff/const.patch --- a/mupen64plus/stuff/const.patch Tue Nov 10 22:42:55 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -diff -aur Mupen64Plus-1-5-src/glide64/Combine.cpp Mupen64Plus-1-5-src_patched/glide64/Combine.cpp ---- Mupen64Plus-1-5-src/glide64/Combine.cpp 2009-01-04 19:47:08.000000000 +0100 -+++ Mupen64Plus-1-5-src_patched/glide64/Combine.cpp 2010-02-09 13:18:34.000000000 +0100 -@@ -11873,7 +11873,7 @@ - LOG ("InitCombine() "); - memset(&cmb, 0, sizeof(cmb)); - const char *extensions = grGetString (GR_EXTENSION); -- if (char * extstr = strstr(extensions, "COMBINE")) { -+ if (const char * extstr = strstr(extensions, "COMBINE")) { - if (!strncmp(extstr, "COMBINE", 7)) { - LOG ("extensions "); - cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt"); -diff -aur Mupen64Plus-1-5-src/glide64/Main.cpp Mupen64Plus-1-5-src_patched/glide64/Main.cpp ---- Mupen64Plus-1-5-src/glide64/Main.cpp 2009-01-04 19:47:08.000000000 +0100 -+++ Mupen64Plus-1-5-src_patched/glide64/Main.cpp 2010-02-09 13:17:39.000000000 +0100 -@@ -784,7 +784,7 @@ - printf("bebefore2\n"); - if (settings.fb_hires) - { -- if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) -+ if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) - { - if (!strncmp(extstr, "TEXTUREBUFFER", 13)) - { diff -r c12891d554ba -r 36c2b631aefd mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch --- a/mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch Tue Nov 10 22:42:55 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -Description: Fix FTBFS due to glib gvariant type definitions -Forwarded: not-needed -Bug-Debian: http://bugs.debian.org/577329 -Author: Sven Eckelmann - ---- -diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h -index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644 ---- a/rice_video/typedefs.h -+++ b/rice_video/typedefs.h -@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #ifndef _TYPEDEFS_H_ - #define _TYPEDEFS_H_ - --#define uchar unsigned char --#define uint16 unsigned short --#define uint32 unsigned int --#define uint64 unsigned long long -+#include -+ -+typedef uint8_t uchar; -+typedef uint16_t uint16; -+typedef uint32_t uint32; -+typedef uint64_t uint64; - - typedef unsigned char uint8; -