Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9588129d2ace5098982b6ccdb7303eaf8e29e1b
commit e9588129d2ace5098982b6ccdb7303eaf8e29e1b Author: Marius Cirsta <[email protected]> Date: Sun Jun 7 02:03:18 2015 +0300 mupen64plus-2.5-1-x86_64 * version bump * rebuilt with new boost diff --git a/source/games-extra/mupen64plus/FrugalBuild b/source/games-extra/mupen64plus/FrugalBuild index 996635b..31fcbfe 100644 --- a/source/games-extra/mupen64plus/FrugalBuild +++ b/source/games-extra/mupen64plus/FrugalBuild @@ -3,19 +3,20 @@ # Contributor: Devil505 <[email protected]> pkgname=mupen64plus -pkgver=2.0 -pkgrel=2 +pkgver=2.5 +pkgrel=1 pkgdesc="Nintendo64 Emulator" -depends=('freetype2' 'sdl' 'mesa' 'libglu' 'gtk+2>=2.20.1' 'libxau' 'libxdmcp' 'libstdc++' 'libxml2>=2.7.8' 'sdl_ttf' 'libboost>=1.58.0') -_F_googlecode_ext=".tar.gz" -_F_googlecode_name="$pkgname-bundle-src" -_F_googlecode_dirname="$pkgname" -Finclude googlecode +depends=('freetype2' 'sdl2' 'mesa' 'libglu' 'gtk+2>=2.20.1' 'libxau' 'libxdmcp' 'libxml2>=2.7.8' 'libboost>=1.58.0') +makedepends=('ca-certificates' 'boost>=1.58.0') +_F_github_dirname="mupen64plus-core" +_F_github_tag=y +Finclude github _F_cd_path="$pkgname-bundle-src-$pkgver" options=('scriptlet') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('078a518e1b162bd88993e1815967fdafe61d9e28') +source=(https://github.com/mupen64plus/mupen64plus-core/releases/download/${pkgver}/${_F_cd_path}.tar.gz) +sha1sums=('f105a66b51d0d68df3da3cb73cfe03e2149160b4') build() { Fcd diff --git a/source/games-extra/mupen64plus/blight-input-linking.patch b/source/games-extra/mupen64plus/blight-input-linking.patch deleted file mode 100644 index b455338..0000000 --- a/source/games-extra/mupen64plus/blight-input-linking.patch +++ /dev/null @@ -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 --git a/source/games-extra/mupen64plus/const.patch b/source/games-extra/mupen64plus/const.patch deleted file mode 100644 index 8091355..0000000 --- a/source/games-extra/mupen64plus/const.patch +++ /dev/null @@ -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 --git a/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch b/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch deleted file mode 100644 index e76da17..0000000 --- a/source/games-extra/mupen64plus/ftbfs-gvariant-type-conflicts.patch +++ /dev/null @@ -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 <[email protected]> - ---- -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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
