File OpenSceneGraph-1.2-giflib.patch of Package OpenSceneGraph1

Overview Repositories Revisions Requests Users Attributes Meta

File OpenSceneGraph-1.2-giflib.patch of Package OpenSceneGraph1

diff -ur OpenSceneGraph-1.2/OpenSceneGraph/Make/makedefs OpenSceneGraph-1.2_fix/OpenSceneGraph/Make/makedefs
--- OpenSceneGraph-1.2/OpenSceneGraph/Make/makedefs	2006-09-12 21:15:04.000000000 +0200
+++ OpenSceneGraph-1.2_fix/OpenSceneGraph/Make/makedefs	2013-12-10 17:30:17.709212516 +0100
@@ -398,7 +398,7 @@
   PNG_LIBS          = -lpng
   JPEG_LIBS         = -ljpeg
   TIFF_LIB          = -ltiff
-  GIF_LIBS          = -lungif
+  GIF_LIBS          = -lgif
   MAKEDIST          = $(TOPDIR)/Make/makerpms
 
   ifeq ("$(PROFILER)","gprof")
diff -ur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-1.2_fix/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp	2005-08-24 12:48:24.000000000 +0200
+++ OpenSceneGraph-1.2_fix/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp	2013-12-10 14:17:47.145611453 +0100
@@ -160,7 +160,7 @@
     int interlacedoffset[] = { 0, 4, 2, 1 };
     int interlacedjumps[] = { 8, 8, 4, 2 };
 
-    giffile = DGifOpen(&fin,gif_read_stream);
+    giffile = DGifOpen(&fin,gif_read_stream, &i);
     if (!giffile)
     {
         giferror = ERR_OPEN;
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-1.2-new/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp	2005-08-24 12:48:24.000000000 +0200
+++ OpenSceneGraph-1.2-new/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp	2015-11-23 04:18:04.108278857 +0100
@@ -316,7 +316,11 @@
     *width_ret = giffile->SWidth;
     *height_ret = giffile->SHeight;
     *numComponents_ret = 4;
+#if GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
+    DGifCloseFile(giffile, D_GIF_SUCCEEDED);
+#else
     DGifCloseFile(giffile);
+#endif
     return buffer;
 }

Places

File OpenSceneGraph-1.2-giflib.patch of Package OpenSceneGraph1

Places