summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/mame/gcc471.patch11
-rw-r--r--games/mame/mame.SlackBuild12
-rw-r--r--games/mame/mame.info6
3 files changed, 25 insertions, 4 deletions
diff --git a/games/mame/gcc471.patch b/games/mame/gcc471.patch
new file mode 100644
index 0000000000..476336fffa
--- /dev/null
+++ b/games/mame/gcc471.patch
@@ -0,0 +1,11 @@
+--- mame-0.149/src/osd/osdcomm.h 2013-01-11 09:32:48.000000000 -0200
++++ mame-0.149_patched/src/osd/osdcomm.h 2013-06-13 23:42:19.963506085 -0300
+@@ -66,7 +66,7 @@
+ #define ATTR_MALLOC __attribute__((malloc))
+ #define ATTR_PURE __attribute__((pure))
+ #define ATTR_CONST __attribute__((const))
+-#define ATTR_FORCE_INLINE __attribute__((always_inline))
++#define ATTR_FORCE_INLINE
+ #define ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
+ /* not supported in GCC prior to 4.4.x */
+ #if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)
diff --git a/games/mame/mame.SlackBuild b/games/mame/mame.SlackBuild
index b3f7302341..511fecc609 100644
--- a/games/mame/mame.SlackBuild
+++ b/games/mame/mame.SlackBuild
@@ -25,7 +25,7 @@
# Adapted from sdlmame.SlackBuild, Written by B. Watson (yalhcru@gmail.com)
PRGNAM=mame
-VERSION=${VERSION:-0.148}
+VERSION=${VERSION:-0.149}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,6 +73,16 @@ chmod -R a-s,u+w,go+r-w .
# $HOME/.mame, then /etc.
cat $CWD/ini_path.diff | patch -p0
+# Workaround for bug in gcc-4.7.1 (seems to be fixed in 4.7.3 & 4.8.1)
+patch -p1 < $CWD/gcc471.patch
+
+# Fix line-endings (dos2unix is much faster)
+if hash dos2unix 2>/dev/null ; then
+ find -type f -exec dos2unix -q {} \;
+else
+ find -type f -exec file {} \; | grep CRLF | awk 'BEGIN{FS=":"}{print $1}' | xargs perl -pi -e 's/\r\n?/\n/g'
+fi
+
# This is purely cosmetic.
sed -i 's/DISTRO = generic/DISTRO = slackware/' src/osd/sdl/sdl.mak
diff --git a/games/mame/mame.info b/games/mame/mame.info
index 20b6627128..3577e0a97c 100644
--- a/games/mame/mame.info
+++ b/games/mame/mame.info
@@ -1,8 +1,8 @@
PRGNAM="mame"
-VERSION="0.148"
+VERSION="0.149"
HOMEPAGE="http://mamedev.org/"
-DOWNLOAD="http://mame.mirrors.zippykid.com/releases/mame0148s.zip"
-MD5SUM="38f7727c2961cd31e2ab6aa1814a23ba"
+DOWNLOAD="http://mame.mirrors.zippykid.com/releases/mame0149s.zip"
+MD5SUM="0be44260fd75f5cbe40c4bf8d26867fb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""