diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-05-29 11:00:31 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | fd7b56a69c4e0bebca868362186a08356556941f (patch) | |
| tree | 5706b60f9e38cdf5ed15edb31aa1b11827c49a3c /libraries | |
| parent | 205a9a194666779ef17b105898d76cdf24c51d41 (diff) | |
libraries/OpenSceneGraph: Patched to fix build on -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 5 | ||||
| -rw-r--r-- | libraries/OpenSceneGraph/giflib.patch | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 4720604debd75..bd24ea73e2cd1 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -54,7 +54,10 @@ find -L . \ sed -i 's|#include <curl/types.h>||' src/osgPlugins/curl/ReaderWriterCURL.cpp -# Our ffmpeg is incompatible ATM +# Fix building with giflib-5.1.1 -- thanks to Arch Linux +# https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib.patch?h=packages/openscenegraph +patch -p1 < $CWD/giflib.patch + cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ diff --git a/libraries/OpenSceneGraph/giflib.patch b/libraries/OpenSceneGraph/giflib.patch new file mode 100644 index 0000000000000..8bb72a8d3b606 --- /dev/null +++ b/libraries/OpenSceneGraph/giflib.patch @@ -0,0 +1,12 @@ +diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp +--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400 ++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400 +@@ -561,7 +561,7 @@ + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; +- DGifCloseFile(giffile); ++ DGifCloseFile(giffile, NULL); + return buffer; + } + |