summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2010-07-05 16:20:55 -0500
committerErik Hanson <erik@slackbuilds.org>2010-07-05 16:20:55 -0500
commit87799655d49aca2a1a086d9ad4140254165f2f2e (patch)
treeb1adda8eedaad66156bfd7cd23ea9ce29f0b3fd7 /multimedia
parent17ae204e257d1e82c7551db7a6220a50a01749b0 (diff)
downloadslackbuilds-87799655d49aca2a1a086d9ad4140254165f2f2e.tar.gz
multimedia/xbmc: Fix to work with newer ffmpeg.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xbmc/README2
-rw-r--r--multimedia/xbmc/xbmc.SlackBuild8
2 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/xbmc/README b/multimedia/xbmc/README
index 91e8644d08..cfa3ed8e08 100644
--- a/multimedia/xbmc/README
+++ b/multimedia/xbmc/README
@@ -12,7 +12,7 @@ lightblue, libvdpau and avahi. Starting with version 9.11 XBMC can
be built with additional system libraries which are ffmpeg, libmpeg2,
libdca (aka libdts), a52dec (aka liba52) libass and python (all available
at slackbuilds.org or included in Slackware). Look inside the slackbuild
-for addtional information to turn these options on.
+for additional information to turn these options on.
Optional: pulseaudio (not available at slackbuilds.org)
diff --git a/multimedia/xbmc/xbmc.SlackBuild b/multimedia/xbmc/xbmc.SlackBuild
index a397d8a93d..08a1a7cff2 100644
--- a/multimedia/xbmc/xbmc.SlackBuild
+++ b/multimedia/xbmc/xbmc.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=xbmc
VERSION=9.11
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -113,13 +113,15 @@ EXTRA_INCLUDES="\
ENABLE_OPTS="\
--enable-external-libogg \
--enable-external-libwavpack"
-[ "${EXT_FFMPEG:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-ffmpeg"
+[ "${EXT_FFMPEG:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-ffmpeg" \
+ SLKCFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" # Workaround for ffmpeg 0.6+
[ "${EXT_A52DEC:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-liba52"
[ "${EXT_DTS:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-libdts"
[ "${EXT_MPEG2:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-libmpeg2"
[ "${EXT_ASS:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-libass"
[ "${EXT_PYTHON:-no}" == "yes" ] && ENABLE_OPTS="$ENABLE_OPTS --enable-external-python"
-[ "${EXT_ALL:-no}" == "yes" ] && ENABLE_OPTS="--enable-external-libraries"
+[ "${EXT_ALL:-no}" == "yes" ] && ENABLE_OPTS="--enable-external-libraries" \
+ SLKCFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" # Workaround for ffmpeg 0.6+
CFLAGS="$SLKCFLAGS $EXTRA_INCLUDES" \
CXXFLAGS="$SLKCFLAGS $EXTRA_INCLUDES" \