Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=3a8ff8ecb49d5f0260b8c6be40bacf0c09a8bbcb
commit 3a8ff8ecb49d5f0260b8c6be40bacf0c09a8bbcb
Author: Devil505 <devil505li...@gmail.com>
Date: Sun May 23 11:43:11 2010 +0200
mupen64plus-1_5-2-i686
* rebuilt with new libs
* added patches to build properly
diff --git a/source/games-extra/mupen64plus/FrugalBuild
b/source/games-extra/mupen64plus/FrugalBuild
index 8e612fa..c7cc288 100644
--- a/source/games-extra/mupen64plus/FrugalBuild
+++ b/source/games-extra/mupen64plus/FrugalBuild
@@ -3,9 +3,9 @@
pkgname=mupen64plus
pkgver=1_5
-pkgrel=1
+pkgrel=2
pkgdesc="Nintendo64 Emulator"
-depends=('freetype2' 'sdl' 'mesa' 'gtk+2' 'libxau' 'libxdmcp' 'libstdc++'
'libxml2' 'sdl_ttf')
+depends=('freetype2' 'sdl' 'mesa' 'gtk+2>=2.20.1' 'libxau' 'libxdmcp'
'libstdc++' 'libxml2' 'sdl_ttf')
_F_googlecode_ext="-src.tar.gz"
_F_googlecode_dirname="$pkgname"
_F_googlecode_name="Mupen64Plus"
@@ -13,10 +13,16 @@ Finclude googlecode
options=('scriptlet')
groups=('games-extra')
archs=('i686' 'x86_64')
-sha1sums=('ef200d6ea2eb3faa969ba9c82d2a771236c3145d')
+source=($source ftbfs-gvariant-type-conflicts.patch \
+ blight-input-linking.patch const.patch)
+sha1sums=('ef200d6ea2eb3faa969ba9c82d2a771236c3145d' \
+ 'f43a04f16b555fe81935fc1ba1ced2d71cba72bf' \
+ '324452729417c1a24358131cf0e81d9af3f40b44' \
+ 'b072dfc11fdd174a19324c86a349dc3e2d9f35cc')
build() {
Fcd "Mupen64Plus-${pkgver//_/-}-src"
+ Fpatchall
make PREFIX=/usr all || Fdie
make PREFIX=$Fdestdir/usr install || Fdie
}
diff --git a/source/games-extra/mupen64plus/blight-input-linking.patch
b/source/games-extra/mupen64plus/blight-input-linking.patch
new file mode 100644
index 0000000..b455338
--- /dev/null
+++ b/source/games-extra/mupen64plus/blight-input-linking.patch
@@ -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 --git a/source/games-extra/mupen64plus/const.patch
b/source/games-extra/mupen64plus/const.patch
new file mode 100644
index 0000000..8091355
--- /dev/null
+++ b/source/games-extra/mupen64plus/const.patch
@@ -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 --git a/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch
b/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch
new file mode 100644
index 0000000..e76da17
--- /dev/null
+++ b/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch
@@ -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 <sven.eckelm...@gmx.de>
+
+---
+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 <stdint.h>
++
++typedef uint8_t uchar;
++typedef uint16_t uint16;
++typedef uint32_t uint32;
++typedef uint64_t uint64;
+
+ typedef unsigned char uint8;
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
