OpenSceneGraph-git: Rebuild against new giflib.

This commit is contained in:
Alexpux
2014-06-01 12:35:18 +04:00
parent 2bd836dbc6
commit dca9bdcfb3
2 changed files with 18 additions and 4 deletions

View File

@@ -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
}
}

View File

@@ -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;
}