openscenegraph: Update to 3.4.0rc8
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
_realname=OpenSceneGraph
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
|
||||
_pkgver=3.4.0-rc7
|
||||
_pkgver=3.4.0-rc8
|
||||
pkgver=${_pkgver//-/}
|
||||
pkgrel=1
|
||||
pkgdesc="Open source high performance 3D graphics toolkit (mingw-w64)"
|
||||
@@ -42,14 +42,12 @@ source=(http://www.openscenegraph.org/downloads/developer_releases/${_realname}-
|
||||
find-collada.patch
|
||||
find-freetype.patch
|
||||
additional-gl-header.patch
|
||||
fix-cast-error.patch
|
||||
fix-whar_t-redeclare.patch)
|
||||
md5sums=('834a73fd62fcc26b39554093490b06d7'
|
||||
fix-cast-error.patch)
|
||||
md5sums=('a9eb404b52bf62c3baf2b7c3c6282d6e'
|
||||
'18ce956c1889babc6515828b8200e864'
|
||||
'9ab69e1cd26826196fac5b3f01e6cb95'
|
||||
'e889e10100a1f3e07212c01603712594'
|
||||
'5599204490bf9f03cdd5871b938e3338'
|
||||
'c5800776305d26e9729ad1e1424371d5')
|
||||
'5599204490bf9f03cdd5871b938e3338')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_realname}-${_pkgver}"
|
||||
@@ -57,7 +55,6 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/find-freetype.patch
|
||||
patch -p1 -i ${srcdir}/additional-gl-header.patch
|
||||
patch -p1 -i ${srcdir}/fix-cast-error.patch
|
||||
patch -p1 -i ${srcdir}/fix-whar_t-redeclare.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- OpenSceneGraph-3.4.0-rc7/src/osg/GL.in.orig 2015-07-29 10:38:24.890785100 +0300
|
||||
+++ OpenSceneGraph-3.4.0-rc7/src/osg/GL.in 2015-07-29 10:38:31.384135700 +0300
|
||||
@@ -96,7 +96,7 @@
|
||||
#endif
|
||||
|
||||
// XXX This is from Win32's <ctype.h>
|
||||
- #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&((__GNUC__ == 3)||(__GNUC__ == 4)))
|
||||
+ #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&(__GNUC__ > 2))
|
||||
typedef unsigned short wchar_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif
|
||||
Reference in New Issue
Block a user