Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

openscenegraph: upgrade to 3.5.3

Browse Source
This commit is contained in:
Philippe Renon
2016-06-25 17:04:38 +02:00
parent c51a27e8cd
commit aec81ef180
2 changed files with 35 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
mingw-w64-openscenegraph/PKGBUILD
View File

@@ -3,42 +3,42 @@
_realname=OpenSceneGraph
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
_pkgver=3.5.1
_pkgver=3.5.3
pkgver=${_pkgver//-/}
pkgrel=2
pkgrel=1
arch=('any')
url="http://www.openscenegraph.org/"
license=("LGPL")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-collada-dom-svn"
"${MINGW_PACKAGE_PREFIX}-curl"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-fltk"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-gdal"
"${MINGW_PACKAGE_PREFIX}-giflib"
"${MINGW_PACKAGE_PREFIX}-gstreamer"
"${MINGW_PACKAGE_PREFIX}-gtk2"
"${MINGW_PACKAGE_PREFIX}-gtkglext"
"${MINGW_PACKAGE_PREFIX}-jasper"
"${MINGW_PACKAGE_PREFIX}-libjpeg"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-lua"
"${MINGW_PACKAGE_PREFIX}-SDL"
"${MINGW_PACKAGE_PREFIX}-SDL2"
"${MINGW_PACKAGE_PREFIX}-poppler"
"${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-qt5"
"${MINGW_PACKAGE_PREFIX}-wxWidgets"
"${MINGW_PACKAGE_PREFIX}-zlib")
"${MINGW_PACKAGE_PREFIX}-cmake")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-collada-dom-svn"
"${MINGW_PACKAGE_PREFIX}-curl"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-fltk"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-gdal"
"${MINGW_PACKAGE_PREFIX}-giflib"
"${MINGW_PACKAGE_PREFIX}-gstreamer"
"${MINGW_PACKAGE_PREFIX}-gtk2"
"${MINGW_PACKAGE_PREFIX}-gtkglext"
"${MINGW_PACKAGE_PREFIX}-jasper"
"${MINGW_PACKAGE_PREFIX}-libjpeg"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-lua"
"${MINGW_PACKAGE_PREFIX}-SDL"
"${MINGW_PACKAGE_PREFIX}-SDL2"
"${MINGW_PACKAGE_PREFIX}-poppler"
"${MINGW_PACKAGE_PREFIX}-python3"
"${MINGW_PACKAGE_PREFIX}-qt5"
"${MINGW_PACKAGE_PREFIX}-wxWidgets"
"${MINGW_PACKAGE_PREFIX}-zlib")
options=('staticlibs' 'strip')
source=(http://trac.openscenegraph.org/downloads/developer_releases/${_realname}-${_pkgver}.zip
source=(https://github.com/openscenegraph/OpenSceneGraph/archive/${_realname}-${_pkgver}.tar.gz
find-collada.patch
find-ffmpeg.patch
find-freetype.patch
@@ -46,24 +46,24 @@ source=(http://trac.openscenegraph.org/downloads/developer_releases/${_realname}
fix-cast-error.patch
add-gstreamer-cflags.patch
replace-ffmpeg-deprecated-api.patch)
sha256sums=('c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0'
sha256sums=('200540d0567b6763be6ddc89f7cb9f1fb08805ef758dee0071443239561d580b'
'24f64f975e776fc018f9c65a1bcae043dded1d4174342d863f9f205b013acc13'
'19e8ad935f2a1bb7ded4da12da048333e5e2278f8000cb064fe5a540ef7b689f'
'f872320611a96d424350326e63d1d43f07b691eb4d9f3cfeb8a2ee0fe0c9bbbe'
'3c7469cf0741905f2c46e4632159220213532d8f194b711b0600b50ad94ab4f8'
'76eafa53bfc4bb9e0260bf1835622e46210b61cf244a0440beceed9969eeaca7'
'7b54b25e6280095f82045179cb4cef3664415e734995d7ed0f90ff45ab8bb001'
'56b1c31a5d673807a0bdfdf481bc32d9dc8fa22afa900c494d1f6d155ccc3a6e'
'5d1452d7d661031111d5a5bbd60b627f7eefb6f84988c5572a4a530fc03df459')
prepare() {
cd "${srcdir}/${_realname}-${_pkgver}"
cd "${srcdir}/${_realname}-${_realname}-${_pkgver}"
patch -p1 -i ${srcdir}/find-collada.patch
patch -p1 -i ${srcdir}/find-ffmpeg.patch
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-cast-error.patch
patch -p1 -i ${srcdir}/add-gstreamer-cflags.patch
patch -p1 -i ${srcdir}/replace-ffmpeg-deprecated-api.patch
#patch -p1 -i ${srcdir}/replace-ffmpeg-deprecated-api.patch
}
build() {
@@ -88,7 +88,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_BUILD_TYPE=${builddir%-${MINGW_CHOST}} \
${_opts} \
../${_realname}-${_pkgver}
../${_realname}-${_realname}-${_pkgver}
make
popd

31
mingw-w64-openscenegraph/find-freetype.patch
View File

@@ -1,34 +1,3 @@
--- OpenSceneGraph-3.2.1-rc1/CMakeModules/FindFreeType.cmake.orig 2013-12-25 00:58:33.941400000 +0400
+++ OpenSceneGraph-3.2.1-rc1/CMakeModules/FindFreeType.cmake 2013-12-25 01:03:21.365800000 +0400
@@ -28,12 +28,12 @@
PATHS
$ENV{FREETYPE_DIR}
NO_DEFAULT_PATH
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/freetype2
)
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
NO_DEFAULT_PATH
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/freetype2
)
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
PATHS
@@ -51,11 +51,11 @@
PATH_SUFFIXES include
)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
$ENV{FREETYPE_DIR}/include/freetype2
NO_DEFAULT_PATH
)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
NO_DEFAULT_PATH
PATH_SUFFIXES include/freetype2
--- OpenSceneGraph-3.2.1-rc1/src/osgPlugins/freetype/FreeTypeLibrary.cpp.orig 2013-12-25 07:02:01.426200000 +0400
+++ OpenSceneGraph-3.2.1-rc1/src/osgPlugins/freetype/FreeTypeLibrary.cpp 2013-12-25 07:02:17.993400000 +0400
@@ -17,7 +17,7 @@