summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2012-09-27 23:42:26 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-09-28 21:29:46 -0500
commiteb0951715ba090496050904dc6a66dce359a5912 (patch)
treeb38793f362ff7600b9c7bcf1e349b2269e9e376f
parent09cead537bfc4a101cdf54b210c540cc928a904a (diff)
downloadslackbuilds-eb0951715ba090496050904dc6a66dce359a5912.tar.gz
multimedia/gnash: Disable FFmpeg support (won't compile)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--multimedia/gnash/README2
-rw-r--r--multimedia/gnash/gnash.SlackBuild5
2 files changed, 5 insertions, 2 deletions
diff --git a/multimedia/gnash/README b/multimedia/gnash/README
index 4396b721c1..36b7c8478a 100644
--- a/multimedia/gnash/README
+++ b/multimedia/gnash/README
@@ -1,5 +1,5 @@
Gnash is the GNU SWF movie player, which can be run standalone on the
desktop or an embedded device, as well as as a plugin for several browsers.
-Optional but recommended dependencies are speex, ffmpeg, gst-ffmpeg,
+Optional but recommended dependencies are speex, gst-ffmpeg,
and gst-plugins-ugly
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index 11f1a0f0b9..9f1fb359c3 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=gnash
VERSION=${VERSION:-0.8.10}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -76,6 +76,8 @@ patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch
patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch
patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch
+# The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome.
+# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg.
autoreconf
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -88,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux \
+ --enable-media=gst \
--enable-write \
--without-gconf \
--with-plugins-install=system \