On Wed, 28 Oct 2015 16:02:40 +0100 Matthias Klose wrote: > For the latter two options, please see a patch at > http://launchpadlibrarian.net/222944251/openscenegraph_3.2.1-7ubuntu2_3.2.1-7ubuntu3.diff.gz
Upstream has fixed the giflib5 support a bit differently [0][1]. The attached debdiff uses the upstream changes for giflib 5.x instead of those applied in Ubuntu. Please include these changes in openscenegraph (3.2.1-9) to prevent testing autoremoval of openscenegraph and all its reverse dependencies because of this RC bug. [0] https://github.com/openscenegraph/osg/commit/afb442fccd182cfe8608f43394af016f6723f97a [1] https://github.com/openscenegraph/osg/commit/18213bfb67d464715af618fd8c73549f749625b9 Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff --git a/debian/changelog b/debian/changelog index 1cef1f3..1e021e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openscenegraph (3.2.1-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add patch for giflib 5 support. + (closes: #803300) + + -- Bas Couwenberg <sebas...@debian.org> Sun, 13 Dec 2015 16:24:35 +0100 + openscenegraph (3.2.1-8) unstable; urgency=medium * Adding upstream patch for GDAL 2.0 support, needed by upcoming diff --git a/debian/patches/giflib5.patch b/debian/patches/giflib5.patch new file mode 100644 index 0000000..166c724 --- /dev/null +++ b/debian/patches/giflib5.patch @@ -0,0 +1,20 @@ +Description: Add support for giflib 5. +Origin: https://github.com/openscenegraph/osg/commit/afb442fccd182cfe8608f43394af016f6723f97a + https://github.com/openscenegraph/osg/commit/18213bfb67d464715af618fd8c73549f749625b9 +Bug-Debian: https://bugs.debian.org/803300 +Forwarded: not-needed + +--- a/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp ++++ b/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/debian/patches/series b/debian/patches/series index f0c725b..27f5e1d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ bug763818_fix_preprocessor_double_substitution bug765855_removecallback_use_after_free gdal-2.0.patch no-xine-malloc-aligned.diff +giflib5.patch