wok-next rev 18573

Up mupen64plus(2.5)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Nov 11 01:25:54 2015 +0200 (2015-11-11)
parents c12891d554ba
children 5b6bd102aa87
files mupen64plus/description.txt mupen64plus/receipt mupen64plus/stuff/blight-input-linking.patch mupen64plus/stuff/const.patch mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/mupen64plus/description.txt	Wed Nov 11 01:25:54 2015 +0200
     1.3 @@ -0,0 +1,10 @@
     1.4 +Mupen64Plus is a cross-platform plugin-based N64 emulator which is capable of
     1.5 +accurately playing many games. Included are four MIPS R4300 CPU emulators, with
     1.6 +dynamic recompilers for 32-bit x86 and 64-bit amd64 systems, and necessary
     1.7 +plugins for audio, graphical rendering (RDP), signal co-processor (RSP), and
     1.8 +input. There is 1 included OpenGL video plugin, called RiceVideo. There are
     1.9 +3 other excellent video plugins being maintained by wahrhaft, called Arachnoid,
    1.10 +Glide64, and Z64.
    1.11 +
    1.12 +More documentation can be found on the Mupen64Plus Documentation Section:
    1.13 +http://www.mupen64plus.org/docs/
     2.1 --- a/mupen64plus/receipt	Tue Nov 10 22:42:55 2015 +0100
     2.2 +++ b/mupen64plus/receipt	Wed Nov 11 01:25:54 2015 +0200
     2.3 @@ -1,43 +1,33 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="mupen64plus"
     2.7 -VERSION="1.5"
     2.8 +VERSION="2.5"
     2.9  CATEGORY="games"
    2.10  SHORT_DESC="Nintendo64 Emulator"
    2.11  MAINTAINER="slaxemulator@gmail.com"
    2.12  LICENSE="GPL2"
    2.13 -SOURCE="Mupen64Plus"
    2.14 -TARBALL="$SOURCE-${VERSION//./-}-src.tar.gz"
    2.15 -WEB_SITE="http://code.google.com/p/mupen64plus/"
    2.16 -WGET_URL="http://mupen64plus.googlecode.com/files/$TARBALL"
    2.17 +TARBALL="$PACKAGE-bundle-src-$VERSION.tar.gz"
    2.18 +WEB_SITE="http://www.mupen64plus.org/"
    2.19 +WGET_URL="https://github.com/mupen64plus/mupen64plus-core/releases/download/$VERSION/$TARBALL"
    2.20  TAGS="emulator nintendo64"
    2.21  
    2.22 -DEPENDS="gtk+ mesa libglu-mesa libsamplerate libsdl-ttf"
    2.23 -BUILD_DEPENDS="gtk+-dev mesa-dev libglu-mesa libglu-mesa-dev libsamplerate-dev \
    2.24 -libsdl-dev libsdl-ttf-dev yasm pkg-config zlib-dev"
    2.25 +DEPENDS="bzlib freetype libboost-filesystem libglu-mesa libsamplerate libsdl \
    2.26 +speex"
    2.27 +BUILD_DEPENDS="gtk+-dev libboost-filesystem-dev libglu-mesa libglu-mesa-dev \
    2.28 +libsamplerate-dev libsdl-dev libsdl-ttf-dev mesa-dev speex-dev yasm zlib-dev"
    2.29  
    2.30  # Rules to configure and make the package.
    2.31  compile_rules()
    2.32  {
    2.33 -	cd $src
    2.34 -
    2.35 -	# patching (provided by Yggdrasil) Thanks! Will remove when new version of mupen64plus comes out.
    2.36 -	patch -Np1 -i $stuff/const.patch
    2.37 -	patch -Np1 -i $stuff/blight-input-linking.patch
    2.38 -	# thanks to debian for having a patch :) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329
    2.39 -	patch -Np1 -i $stuff/ftbfs-gvariant-type-conflicts.patch
    2.40 -
    2.41 -	make PREFIX=/usr all
    2.42 -	mkdir -p $DESTDIR/usr/bin
    2.43 -	make PREFIX=$DESTDIR/usr install
    2.44 +	export PREFIX=/usr DESTDIR=$install
    2.45 +	./m64p_build.sh &&
    2.46 +	./m64p_install.sh
    2.47  }
    2.48  
    2.49  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.50  genpkg_rules()
    2.51  {
    2.52 -	mkdir -p $fs/usr/share
    2.53 -	cp -a $install/usr/bin $fs/usr
    2.54 -	cp -a $install/usr/share/mupen64plus $fs/usr/share
    2.55 -	cp -a $install/usr/share/applications $fs/usr/share
    2.56 +	cp -a $install/* $fs
    2.57 +	rm -r $fs/usr/include
    2.58 +	find $fs -name '*.so*' -exec chmod a+x \{\} \;
    2.59  }
    2.60 -
     3.1 --- a/mupen64plus/stuff/blight-input-linking.patch	Tue Nov 10 22:42:55 2015 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,12 +0,0 @@
     3.4 -diff -aur Mupen64Plus-1-5-src/blight_input/Makefile Mupen64Plus-1-5-src_patched/blight_input/Makefile
     3.5 ---- Mupen64Plus-1-5-src/blight_input/Makefile	2009-01-04 19:47:08.000000000 +0100
     3.6 -+++ Mupen64Plus-1-5-src_patched/blight_input/Makefile	2010-02-09 14:19:27.000000000 +0100
     3.7 -@@ -48,7 +48,7 @@
     3.8 - 	$(CC) -o $@ $(CFLAGS) $(SDL_FLAGS) $(FREETYPE_FLAGS) -c $<
     3.9 - 
    3.10 - blight_input.$(SO_EXTENSION): $(OBJ_BLIGHT)
    3.11 --	$(CC) -o $@ -shared $(LDFLAGS) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS) $^
    3.12 -+	$(CC) -o $@ -shared $(LDFLAGS//-Wl,--as-needed/) $(PLUGIN_LDFLAGS) $(SDL_LIBS) $(SDLTTF_LIBS) $(FREETYPE_LIBS) $^
    3.13 - ifneq ($(OS), WINDOWS)
    3.14 - 	$(STRIP) $@
    3.15 - endif
     4.1 --- a/mupen64plus/stuff/const.patch	Tue Nov 10 22:42:55 2015 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,24 +0,0 @@
     4.4 -diff -aur Mupen64Plus-1-5-src/glide64/Combine.cpp Mupen64Plus-1-5-src_patched/glide64/Combine.cpp
     4.5 ---- Mupen64Plus-1-5-src/glide64/Combine.cpp	2009-01-04 19:47:08.000000000 +0100
     4.6 -+++ Mupen64Plus-1-5-src_patched/glide64/Combine.cpp	2010-02-09 13:18:34.000000000 +0100
     4.7 -@@ -11873,7 +11873,7 @@
     4.8 -   LOG ("InitCombine() ");
     4.9 -   memset(&cmb, 0, sizeof(cmb));
    4.10 -   const char *extensions = grGetString (GR_EXTENSION);
    4.11 --  if (char * extstr = strstr(extensions, "COMBINE")) {
    4.12 -+  if (const char * extstr = strstr(extensions, "COMBINE")) {
    4.13 -     if (!strncmp(extstr, "COMBINE", 7)) {
    4.14 -       LOG ("extensions ");
    4.15 -       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
    4.16 -diff -aur Mupen64Plus-1-5-src/glide64/Main.cpp Mupen64Plus-1-5-src_patched/glide64/Main.cpp
    4.17 ---- Mupen64Plus-1-5-src/glide64/Main.cpp	2009-01-04 19:47:08.000000000 +0100
    4.18 -+++ Mupen64Plus-1-5-src_patched/glide64/Main.cpp	2010-02-09 13:17:39.000000000 +0100
    4.19 -@@ -784,7 +784,7 @@
    4.20 -   printf("bebefore2\n");
    4.21 -   if (settings.fb_hires)
    4.22 -   {
    4.23 --    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
    4.24 -+    if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
    4.25 -     {
    4.26 -       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
    4.27 -       {
     5.1 --- a/mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch	Tue Nov 10 22:42:55 2015 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,27 +0,0 @@
     5.4 -Description: Fix FTBFS due to glib gvariant type definitions
     5.5 -Forwarded: not-needed
     5.6 -Bug-Debian: http://bugs.debian.org/577329
     5.7 -Author: Sven Eckelmann <sven.eckelmann@gmx.de>
     5.8 -
     5.9 ----
    5.10 -diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
    5.11 -index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
    5.12 ---- a/rice_video/typedefs.h
    5.13 -+++ b/rice_video/typedefs.h
    5.14 -@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    5.15 - #ifndef _TYPEDEFS_H_
    5.16 - #define _TYPEDEFS_H_
    5.17 - 
    5.18 --#define uchar  unsigned char
    5.19 --#define uint16 unsigned short
    5.20 --#define uint32 unsigned int
    5.21 --#define uint64 unsigned long long
    5.22 -+#include <stdint.h>
    5.23 -+
    5.24 -+typedef uint8_t uchar;
    5.25 -+typedef uint16_t uint16;
    5.26 -+typedef uint32_t uint32;
    5.27 -+typedef uint64_t uint64;
    5.28 - 
    5.29 - typedef unsigned char               uint8;
    5.30 -