From 54b82152a062157dab9e48b7c0bd230a6b5c4af9 Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 19 Sep 2013 08:07:05 +0000 Subject: fixes build with GIFLIB-5.x. --- graphics/osg/distinfo | 3 ++- .../patch-src_osgPlugins_gif_ReaderWriterGIF.cpp | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 graphics/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp (limited to 'graphics/osg') diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo index d7a7748d73c..0bc827999ea 100644 --- a/graphics/osg/distinfo +++ b/graphics/osg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2012/05/20 19:28:19 marino Exp $ +$NetBSD: distinfo,v 1.7 2013/09/19 08:07:05 obache Exp $ SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33 RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71 @@ -12,4 +12,5 @@ SHA1 (patch-applications_present3D_Cluster.cpp) = 7b9dd81805322eeb1a4a26a21faa0a SHA1 (patch-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343 SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = 1552f78a0ed17fcdaed9d87fe3d1f8220712f403 +SHA1 (patch-src_osgPlugins_gif_ReaderWriterGIF.cpp) = 5bf99f6a688225e018b12e3708dae775158d03a3 SHA1 (patch-src_osgViewer_DarwinUtils.mm) = 4ab021cb797cb6959bee4ba33caf257b2a6cedf3 diff --git a/graphics/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp b/graphics/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp new file mode 100644 index 00000000000..ffb7a3ab12c --- /dev/null +++ b/graphics/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-src_osgPlugins_gif_ReaderWriterGIF.cpp,v 1.1 2013/09/19 08:07:05 obache Exp $ + +* GIFLIB 5.x API change + +--- src/osgPlugins/gif/ReaderWriterGIF.cpp.orig 2011-05-05 12:39:35.000000000 +0000 ++++ src/osgPlugins/gif/ReaderWriterGIF.cpp +@@ -370,7 +370,11 @@ GifImageStream** obj) + int interlacedoffset[] = { 0, 4, 2, 1 }; + int interlacedjumps[] = { 8, 8, 4, 2 }; + ++#if GIFLIB_MAJOR >= 5 ++ giffile = DGifOpen(&fin,gif_read_stream, NULL); ++#else + giffile = DGifOpen(&fin,gif_read_stream); ++#endif + if (!giffile) + { + giferror = ERR_OPEN; -- cgit v1.2.3