summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2015-10-19 21:42:58 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commitc005c2cf056a7cca6ce9c679daea86518c90372a (patch)
treec943dc1c855948ce2a40177eca93fbe07da5b12c /multimedia
parent8225c36eb240bf706b8cf9c5293ca1b88dae1655 (diff)
downloadslackbuilds-c005c2cf056a7cca6ce9c679daea86518c90372a.tar.gz
multimedia/gnash: Patched for giflib5 in -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gnash/gnash.SlackBuild5
-rw-r--r--multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch25
-rw-r--r--multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch31
3 files changed, 61 insertions, 0 deletions
diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild
index f8e3f42c8e..8f72007ba4 100644
--- a/multimedia/gnash/gnash.SlackBuild
+++ b/multimedia/gnash/gnash.SlackBuild
@@ -94,6 +94,11 @@ 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
+# Fix building with giflib-5.0
+# Also ripped from gentoo :-)
+patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
+patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.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
diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
new file mode 100644
index 0000000000..b3242ce0d3
--- /dev/null
+++ b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch
@@ -0,0 +1,25 @@
+From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001
+From: gustavo <gbuschle@hotmail.com>
+Date: Thu, 11 Sep 2014 14:12:17 +0000
+Subject: Add support for giflib 5.1
+
+---
+diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
+index 84b09ce..2ae5ddb 100644
+--- a/libbase/GnashImageGif.cpp
++++ b/libbase/GnashImageGif.cpp
+@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in)
+ GifInput::~GifInput()
+ {
+ // Clean up allocated data.
+- DGifCloseFile(_gif);
++#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1
++ DGifCloseFile(_gif, 0);
++#else
++ DGifCloseFile(_gif);
++#endif
+ }
+
+ size_t
+--
+cgit v0.9.0.2
diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
new file mode 100644
index 0000000000..6e90737d51
--- /dev/null
+++ b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch
@@ -0,0 +1,31 @@
+From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001
+From: OBATA Akio <obata@lins.jp>
+Date: Mon, 15 Jul 2013 07:16:39 +0000
+Subject: Add support fir GIFLIB-5.0 (bug #39482)
+
+Signed-off-by: Sandro Santilli <strk@keybit.net>
+---
+diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
+index eeba4b7..26865c1 100644
+--- a/libbase/GnashImageGif.cpp
++++ b/libbase/GnashImageGif.cpp
+@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record)
+ void
+ GifInput::read()
+ {
++#if GIFLIB_MAJOR >= 5
++ int errorCode;
++ _gif = DGifOpen(_inStream.get(), &readData, &errorCode);
++#else
+ _gif = DGifOpen(_inStream.get(), &readData);
++#endif
++
++ if ( ! _gif ) {
++ // TODO: decode errorCode if available
++ throw ParserException("Could not open input GIF stream");
++ }
+
+ GifRecordType record;
+
+--
+cgit v0.9.0.2