# HG changeset patch # User Christopher Rogers # Date 1287461619 0 # Node ID 1ac39c4ea23afbbb72f08903400188130055db40 # Parent 4f6dafa1cfd3fc2113a480d646c34d21a3e61ce6 Added mupen64plus. A N64 emulator. diff -r 4f6dafa1cfd3 -r 1ac39c4ea23a mupen64plus/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mupen64plus/receipt Tue Oct 19 04:13:39 2010 +0000 @@ -0,0 +1,41 @@ +# SliTaz package receipt. + +PACKAGE="mupen64plus" +VERSION="1.5" +CATEGORY="games" +SHORT_DESC="Nintendo64 Emulator" +MAINTAINER="slaxemulator@gmail.com" +DEPENDS="gtk+ mesa libglu-mesa libsamplerate libsdl-ttf" +BUILD_DEPENDS="gtk+-dev mesa-dev libglu-mesa libsamplerate-dev libsdl-dev libsdl-ttf-dev yasm pkg-config zlib-dev" +SOURCE="Mupen64Plus" +TARBALL="$SOURCE-${VERSION//./-}-src.tar.gz" +WEB_SITE="http://code.google.com/p/mupen64plus/" +WGET_URL="http://mupen64plus.googlecode.com/files/$TARBALL" + +# Rules to configure and make the package. +compile_rules() +{ + src=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src + 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 $PWD/_pkg/usr/bin + make PREFIX=$PWD/_pkg/usr install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + _pkg=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src/_pkg + mkdir -p $fs/usr/share + cp -a $_pkg/usr/bin $fs/usr + cp -a $_pkg/usr/share/mupen64plus $fs/usr/share + cp -a $_pkg/usr/share/applications $fs/usr/share +} + diff -r 4f6dafa1cfd3 -r 1ac39c4ea23a mupen64plus/stuff/blight-input-linking.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mupen64plus/stuff/blight-input-linking.patch Tue Oct 19 04:13:39 2010 +0000 @@ -0,0 +1,12 @@ +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 4f6dafa1cfd3 -r 1ac39c4ea23a mupen64plus/stuff/const.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mupen64plus/stuff/const.patch Tue Oct 19 04:13:39 2010 +0000 @@ -0,0 +1,24 @@ +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 4f6dafa1cfd3 -r 1ac39c4ea23a mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch Tue Oct 19 04:13:39 2010 +0000 @@ -0,0 +1,27 @@ +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; +