diff options
| author | obache <obache@pkgsrc.org> | 2014-05-16 11:56:58 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-05-16 11:56:58 +0000 |
| commit | 3a61d50babc46b55fa240716f8608c0c834c2219 (patch) | |
| tree | cf1a96b61b294092f11926c187083cd87aa09cd6 /multimedia/gnash | |
| parent | 3f47779aadc2d4c0025cae829f07613e269fd967 (diff) | |
| download | pkgsrc-3a61d50babc46b55fa240716f8608c0c834c2219.tar.gz | |
fixes build with giflib>=5.1
Diffstat (limited to 'multimedia/gnash')
| -rw-r--r-- | multimedia/gnash/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/gnash/patches/patch-libbase_GnashImageGif.cpp | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo index 8326be91fb7..80dd3be2d21 100644 --- a/multimedia/gnash/distinfo +++ b/multimedia/gnash/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.23 2013/12/15 19:42:04 joerg Exp $ +$NetBSD: distinfo,v 1.24 2014/05/16 11:56:58 obache Exp $ SHA1 (gnash-0.8.10.tar.bz2) = be3b12a5edcd3b05f2ae73d02f0991aa786e7300 RMD160 (gnash-0.8.10.tar.bz2) = 0093174ec0a912309772c033b5f1c1ad46ab41dc Size (gnash-0.8.10.tar.bz2) = 4238106 bytes SHA1 (patch-aa) = 5e3cfa0c21f6bd9ad01ce4c9f68f245316d063a3 SHA1 (patch-ae) = ca44e2559a1ce0a24baf6d5479636f967e011202 -SHA1 (patch-libbase_GnashImageGif.cpp) = e08a9657269ac7f37ad892a003ac9025deda6c9f +SHA1 (patch-libbase_GnashImageGif.cpp) = 91da96fa6c5a92ab8035b29d0fbacb3516b9ec52 SHA1 (patch-libbase_GnashSleep.h) = f713b29feb0153efa24c10df20e0ac8342b88265 SHA1 (patch-libbase_IOChannel.h) = 6b2b66291598e574f13a6a5ee905d6d5f1a459e8 SHA1 (patch-libbase_Makefile.in) = c5b6533f5ac2b2ee26d0547c3054375e72512ccf diff --git a/multimedia/gnash/patches/patch-libbase_GnashImageGif.cpp b/multimedia/gnash/patches/patch-libbase_GnashImageGif.cpp index 279b58724e6..b496ba23b98 100644 --- a/multimedia/gnash/patches/patch-libbase_GnashImageGif.cpp +++ b/multimedia/gnash/patches/patch-libbase_GnashImageGif.cpp @@ -1,15 +1,30 @@ -$NetBSD: patch-libbase_GnashImageGif.cpp,v 1.1 2013/07/14 02:32:34 obache Exp $ +$NetBSD: patch-libbase_GnashImageGif.cpp,v 1.2 2014/05/16 11:56:58 obache Exp $ * for giflib-5.0 API changes https://savannah.gnu.org/bugs/index.php?39482 --- libbase/GnashImageGif.cpp.orig 2012-01-19 19:17:48.000000000 +0000 +++ libbase/GnashImageGif.cpp -@@ -269,7 +269,11 @@ GifInput::processRecord(GifRecordType re +@@ -121,7 +121,13 @@ GifInput::GifInput(boost::shared_ptr<IOC + GifInput::~GifInput() + { + // Clean up allocated data. +- DGifCloseFile(_gif); ++#if (GIFLIB_MAJOR + 0) == 5 && (GIFLIB_MINOR + 0) >= 1 || (GIFLIB_MAJOR + 0) > 5 ++ DGifCloseFile(_gif, NULL); ++#else ++ if (DGifCloseFile(_gif) != GIF_OK) { ++ free(_gif); ++ } ++#endif + } + + size_t +@@ -269,7 +275,11 @@ GifInput::processRecord(GifRecordType re void GifInput::read() { -+#if GIFLIB_MAJOR >= 5 ++#if (GIFLIB_MAJOR + 0) >= 5 + _gif = DGifOpen(_inStream.get(), &readData, NULL); +#else _gif = DGifOpen(_inStream.get(), &readData); |