diff options
| author |   M.Dinslage | 2011-01-10 10:53:23 +0100 |
|---|---|---|
| committer |   Robby Workman | 2011-01-10 22:04:25 +0100 |
| commit | fb6a932c500c83edb25deae93f8b0b2620f3f84e (patch) | |
| tree | 7d0efa31591b84beb2cb31d3bc60c4eb8a43aa31 /games | |
| parent | daa75b6a3557290e7e321998647717a3b851a70d (diff) | |
| download | slackbuilds-fb6a932c500c83edb25deae93f8b0b2620f3f84e.tar.gz | |
games/mupen64plus: Fixed to build with new gtk/glib.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'games')
| -rw-r--r-- | games/mupen64plus/ftbfs-gvariant-type-conflicts.patch | 20 | ||||
| -rw-r--r-- | games/mupen64plus/mupen64plus.SlackBuild | 5 | ||||
| -rw-r--r-- | games/mupen64plus/mupen64plus.info | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch b/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch new file mode 100644 index 0000000000..2a409d79f9 --- /dev/null +++ b/games/mupen64plus/ftbfs-gvariant-type-conflicts.patch @@ -0,0 +1,20 @@ +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; diff --git a/games/mupen64plus/mupen64plus.SlackBuild b/games/mupen64plus/mupen64plus.SlackBuild index f2c7cf6866..21e92bf920 100644 --- a/games/mupen64plus/mupen64plus.SlackBuild +++ b/games/mupen64plus/mupen64plus.SlackBuild @@ -26,15 +26,13 @@ PRGNAM=mupen64plus VERSION=${VERSION:-1.5} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -71,6 +69,7 @@ rm -rf Mupen64Plus-1-5-src tar xvf $CWD/Mupen64Plus-1-5-src.tar.gz || exit 1 cd Mupen64Plus-1-5-src || exit 1 patch -p1 < $CWD/gcc4.4-build.patch +patch -p1 < $CWD/ftbfs-gvariant-type-conflicts.patch chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/games/mupen64plus/mupen64plus.info b/games/mupen64plus/mupen64plus.info index 3b922f89d5..a2efe87e29 100644 --- a/games/mupen64plus/mupen64plus.info +++ b/games/mupen64plus/mupen64plus.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="M.Dinslage" EMAIL="daedra1980{at}gmail{dot}com" -APPROVED="dsomero" +APPROVED="Niels Horn" |