[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/files/, dev-games/openscenegraph/

["Maciej Mrozowski" <reavertm@gentoo.org>]

commit:     c775cf1990878ca40eea47c14feabf8bc683c3fc
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 01:18:05 2016 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 01:18:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c775cf19

dev-games/openscenegraph: add patch to support giflib5, bug 571656

Package-Manager: portage-2.2.26

 .../files/openscenegraph-3.2.1-giflib5.patch       | 24 ++++++++++++++++++++++
 .../openscenegraph/openscenegraph-3.2.1-r2.ebuild  |  1 +
 2 files changed, 25 insertions(+)

diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
new file mode 100644
index 0000000..bd604c3
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
@@ -0,0 +1,24 @@
+From: Alberto Luaces <aluaces@udc.es>
+Date: Sat, 19 Dec 2015 04:52:52 +0100
+Subject: Compatibility with giflib5.
+
+---
+ OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
+===================================================================
+--- git2.orig/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
++++ git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
+@@ -561,7 +561,11 @@ GifImageStream** obj)
+     *width_ret = giffile->SWidth;
+     *height_ret = giffile->SHeight;
+     *numComponents_ret = 4;
++#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
++    DGifCloseFile(giffile, &Error);
++#else
+     DGifCloseFile(giffile);
++#endif
+     return buffer;
+ }
+ 

diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
index 37499a8..9ec683a 100644
--- a/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r2.ebuild
@@ -91,6 +91,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
 	"${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch
+	"${FILESDIR}"/${PN}-3.2.1-giflib5.patch
 )
 
 src_configure() {