From f47ff3b92e52ea1aa599e422ba1f0d7cc2e94060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 24 Dec 2014 15:20:04 +0000 Subject: [PATCH] OpenSceneGraph 3.2.1 - More fixes --- .../openscenegraph-3.2.1.recipe | 41 ++++------ .../openscenegraph/openscenegraph-git.recipe | 49 +++++------- .../patches/openscenegraph-3.2.1.patchset | 36 +++++++++ .../patches/openscenegraph_x86-3.2.1.patchset | 77 ------------------- 4 files changed, 70 insertions(+), 133 deletions(-) create mode 100644 games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset delete mode 100644 games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 79af87fb7..e6a8785e8 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -1,11 +1,11 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" @@ -77,14 +77,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -103,23 +103,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 61b17c0a4..474d351ec 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -1,23 +1,23 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" -SRC_URI="git://github.com/openscenegraph/osg.git" +SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" REVISION="1" LICENSE="OSGPL" COPYRIGHT="2002-2014 Robert Osfield and others" -ARCHITECTURES="?x86 ?x86_64" +ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES ?x86_gcc2" + ARCHITECTURES="$ARCHITECTURES x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi @@ -76,14 +76,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" -SOURCE_DIR="OpenSceneGraph" +SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -102,23 +102,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset new file mode 100644 index 000000000..28ee177e3 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset @@ -0,0 +1,36 @@ +From 3e731d32a286903a4b75d445ec6fdf0b8359b5d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 24 Dec 2014 14:55:21 +0000 +Subject: Add __HAIKU__ when needed + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..dcbb532 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -76,7 +76,7 @@ typedef char TCHAR; + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset deleted file mode 100644 index 593a5cef1..000000000 --- a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset +++ /dev/null @@ -1,77 +0,0 @@ -From c4669d4e62e056fc2b29cc1372e41fcba9d286da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:08:44 +0000 -Subject: Haiku specific cases - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index affd682..47436d5 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,12 +71,13 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther since they are not defined, -+ // for older OS's like Jaguar, Panther -+ since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat - #endif --#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ -+#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ - (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) - #define stat64 stat - #endif -@@ -100,7 +101,7 @@ typedef char TCHAR; - #include - - #include --#include -+#include - #include - - #include -diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h -index 3720ea6..6f4c6bc 100644 ---- a/src/osgPlugins/osc/osc/OscHostEndianness.h -+++ b/src/osgPlugins/osc/osc/OscHostEndianness.h -@@ -51,7 +51,7 @@ - - #else - -- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) -+ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) - #include - #if (__BYTE_ORDER == __LITTLE_ENDIAN) - #define __LITTLE_ENDIAN__ --- -1.8.3.4 - - -From 7fa67738f702dc39b16f2caa05b9301e09209a5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:56:17 +0000 -Subject: Stupid type-bug - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index 47436d5..060eb29 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,8 +71,7 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther -- since they are not defined, -+ // for older OS's like Jaguar, Panther since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat --- -1.8.3.4 -