summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-09-06 09:37:56 +0200
committer Robby Workman <rworkman@slackbuilds.org>2012-09-07 09:20:53 -0500
commit9cb99b50d72f2a1918b3ba3a9631c67abbf025a8 (patch)
tree45ec79d790a4d1aa6ee9dae91eadaf1a2933dcc4
parent6bba9d3bbf68ce1f23f20b7c85c60c7d06258715 (diff)
downloadslackbuilds-9cb99b50d72f2a1918b3ba3a9631c67abbf025a8.tar.gz
slackbuilds-9cb99b50d72f2a1918b3ba3a9631c67abbf025a8.tar.xz
audio/xmms2: Fixed build with ffmpeg and noted it as an opt. dep.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--audio/xmms2/README2
-rw-r--r--audio/xmms2/xmms2.SlackBuild3
2 files changed, 5 insertions, 0 deletions
diff --git a/audio/xmms2/README b/audio/xmms2/README
index ae35ce57a1..a5006f5fd5 100644
--- a/audio/xmms2/README
+++ b/audio/xmms2/README
@@ -4,3 +4,5 @@ flexible design. The goal is to make the system easy for developers to
maintain and integrate with. In terms of the listening experience, XMMS2
makes it possible for anyone to easily manage their music collection and to
interact with it in a flexible manner.
+
+ffmpeg is an optional dependency.
diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild
index f68d7261ab..2dbe56fadf 100644
--- a/audio/xmms2/xmms2.SlackBuild
+++ b/audio/xmms2/xmms2.SlackBuild
@@ -52,6 +52,9 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# This fixes building over the newer ffmpeg
+sed -i "s|^\ \ \ \ flags\.enable_c_error.*||" wscript
+
export CCFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"