summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-04-14 21:21:49 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-04-15 07:50:43 +0700
commitc12a3dcc11a93bd4a8852c4889c371a83cd1cb5d (patch)
treeb5c8b197ca02e857f87fce04d6ca7a34972626e6 /games
parentc4be6f532f9f32dba3af91ac2e9a44e494238868 (diff)
downloadslackbuilds-c12a3dcc11a93bd4a8852c4889c371a83cd1cb5d.tar.gz
games/yabause: Patched to fix build with ffmpeg 3.x.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r--games/yabause/ffmpeg3.patch20
-rw-r--r--games/yabause/yabause.SlackBuild11
2 files changed, 27 insertions, 4 deletions
diff --git a/games/yabause/ffmpeg3.patch b/games/yabause/ffmpeg3.patch
new file mode 100644
index 0000000000..c7144f3f94
--- /dev/null
+++ b/games/yabause/ffmpeg3.patch
@@ -0,0 +1,20 @@
+--- yabause-0.9.15/src/mpeg_card.c.orig 2017-04-14 21:15:44.908378882 +0700
++++ yabause-0.9.15/src/mpeg_card.c 2017-04-14 21:17:15.386497605 +0700
+@@ -535,7 +535,7 @@
+ yab_mpeg.audio.context->channels = 2;
+ yab_mpeg.audio.context->sample_rate = 44100;
+
+- ret = av_image_alloc(out_buf,out_linesize, 320, 240,PIX_FMT_RGB32, 1);
++ ret = av_image_alloc(out_buf,out_linesize, 320, 240,AV_PIX_FMT_RGB32, 1);
+
+ if(!ret)
+ assert(0);
+@@ -561,7 +561,7 @@
+ //dest width, height, format
+ out_width,
+ out_height,
+- PIX_FMT_RGB32,
++ AV_PIX_FMT_RGB32,
+ //flags
+ SWS_BILINEAR,
+ //source/dest filters
diff --git a/games/yabause/yabause.SlackBuild b/games/yabause/yabause.SlackBuild
index b3706d90fd..19089d158e 100644
--- a/games/yabause/yabause.SlackBuild
+++ b/games/yabause/yabause.SlackBuild
@@ -24,12 +24,12 @@
PRGNAM=yabause
VERSION=${VERSION:-0.9.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -82,6 +82,9 @@ for pic in $(find . -name "*\.png");do
mv ${pic}.new $pic
done
+# Patch against ffmpeg 3
+patch -p1 < $CWD/ffmpeg3.patch
+
mkdir build
cd build
cmake -G "Unix Makefiles" \