From dca9bdcfb363ee73aaf720eaa3b184f88660a1cd Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sun, 1 Jun 2014 12:35:18 +0400 Subject: [PATCH] OpenSceneGraph-git: Rebuild against new giflib. --- mingw-w64-openscenegraph-git/PKGBUILD | 11 +++++++---- mingw-w64-openscenegraph-git/giflib.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-openscenegraph-git/giflib.patch diff --git a/mingw-w64-openscenegraph-git/PKGBUILD b/mingw-w64-openscenegraph-git/PKGBUILD index bdef338fd0..8aed2a1318 100644 --- a/mingw-w64-openscenegraph-git/PKGBUILD +++ b/mingw-w64-openscenegraph-git/PKGBUILD @@ -3,7 +3,7 @@ _realname=OpenSceneGraph _mingw_suff=mingw-w64-${CARCH} pkgname=("${_mingw_suff}-${_realname}-git" "${_mingw_suff}-${_realname}-debug-git") -pkgver=r12735.19820f4 +pkgver=r12746.2fedb53 pkgrel=1 pkgdesc="Open source high performance 3D graphics toolkit (mingw-w64)" arch=('any') @@ -34,11 +34,13 @@ options=('staticlibs' '!strip') source=("${_realname}"::"git+https://github.com/openscenegraph/osg.git" osg-collada-dae-fixes.patch find-collada.patch - find-freetype.patch) + find-freetype.patch + giflib.patch) md5sums=('SKIP' '45d0668f56c5e4ca58002f38fd3eb4a0' '668def9c99f044db9a8215fa927d6ac2' - '9ab69e1cd26826196fac5b3f01e6cb95') + '9ab69e1cd26826196fac5b3f01e6cb95' + '849f641c915f17db85a49b355bf63a17') pkgver() { cd "$srcdir/$_realname" @@ -50,6 +52,7 @@ prepare() { patch -p1 -i ${srcdir}/osg-collada-dae-fixes.patch patch -p1 -i ${srcdir}/find-collada.patch patch -p1 -i ${srcdir}/find-freetype.patch + patch -p1 -i ${srcdir}/giflib.patch } build() { @@ -122,4 +125,4 @@ package_mingw-w64-x86_64-OpenSceneGraph-git() { package_mingw-w64-x86_64-OpenSceneGraph-debug-git() { package_debug -} \ No newline at end of file +} diff --git a/mingw-w64-openscenegraph-git/giflib.patch b/mingw-w64-openscenegraph-git/giflib.patch new file mode 100644 index 0000000000..0091cf5d60 --- /dev/null +++ b/mingw-w64-openscenegraph-git/giflib.patch @@ -0,0 +1,11 @@ +--- OpenSceneGraph-3.2.1-rc3/src/osgPlugins/gif/ReaderWriterGIF.cpp.orig 2013-06-03 18:04:02.000000000 +0400 ++++ OpenSceneGraph-3.2.1-rc3/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-30 07:29:09.498200000 +0400 +@@ -561,7 +561,7 @@ + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; +- DGifCloseFile(giffile); ++ DGifCloseFile(giffile, NULL); + return buffer; + } +