From 0a0b86bf001898ecb6e4b5d28f30c660a1e994f0 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 8 Jan 2025 20:25:21 +0100 Subject: [PATCH] openmw, revbump for tiff4, use system OSG (#11620) --- games-engines/openmw/openmw-0.47.0.recipe | 49 ++++-------- .../openmw/patches/osg-3.6.5.patchset | 74 ------------------- 2 files changed, 16 insertions(+), 107 deletions(-) delete mode 100644 games-engines/openmw/patches/osg-3.6.5.patchset diff --git a/games-engines/openmw/openmw-0.47.0.recipe b/games-engines/openmw/openmw-0.47.0.recipe index ae328ad31..d113d1f3f 100644 --- a/games-engines/openmw/openmw-0.47.0.recipe +++ b/games-engines/openmw/openmw-0.47.0.recipe @@ -9,18 +9,12 @@ COPYRIGHT="2008-2021 OpenMW" LICENSE="GNU GPL v3 MIT Zlib" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/OpenMW/openmw/archive/refs/tags/openmw-$portVersion.tar.gz" SOURCE_FILENAME="openmw-$portVersion.tar.gz" CHECKSUM_SHA256="bd7f77e1527c2180e9b0dfcbe401d6fb48f24dbb37701dac7747697873d6edb4" SOURCE_DIR="openmw-openmw-$portVersion" -osgVersion="3.6.5" -SOURCE_URI_2="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$osgVersion.tar.gz" -CHECKSUM_SHA256_2="aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12" -SOURCE_DIR_2="OpenSceneGraph-OpenSceneGraph-$osgVersion" PATCHES="openmw-$portVersion.patchset" -PATCHES_2="osg-$osgVersion.patchset" - ADDITIONAL_FILES=" openmw.rdef.in haikuicons.zip @@ -56,6 +50,17 @@ REQUIRES=" lib:liblz4$secondaryArchSuffix lib:libMyGUIEngine$secondaryArchSuffix lib:libopenal$secondaryArchSuffix + lib:libOpenThreads$secondaryArchSuffix + lib:libosg$secondaryArchSuffix + lib:libosgAnimation$secondaryArchSuffix + lib:libosgDB$secondaryArchSuffix + lib:libosgFX$secondaryArchSuffix + lib:libosgGA$secondaryArchSuffix + lib:libosgParticle$secondaryArchSuffix + lib:libosgShadow$secondaryArchSuffix + lib:libosgText$secondaryArchSuffix + lib:libosgUtil$secondaryArchSuffix + lib:libosgViewer$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix @@ -72,9 +77,9 @@ BUILD_REQUIRES=" devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix - devel:libboost_filesystem$secondaryArchSuffix >= 1.69.0 - devel:libboost_system$secondaryArchSuffix >= 1.69.0 - devel:libboost_program_options$secondaryArchSuffix >= 1.69.0 + devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libboost_program_options$secondaryArchSuffix >= 1.83.0 devel:libBulletCollision$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libGL$secondaryArchSuffix @@ -86,6 +91,7 @@ BUILD_REQUIRES=" devel:libMyGUIEngine$secondaryArchSuffix devel:libopenal$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libosg$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libSDL2_2.0$secondaryArchSuffix @@ -112,27 +118,6 @@ PATCH() BUILD() { - mkdir -p $sourceDir2/build - cd $sourceDir2/build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=$appsDir/OpenMW \ - -DCMAKE_BUILD_TYPE=Release \ - -DSDL2_INCLUDE_DIR=/system/$relativeIncludeDir/SDL2 \ - -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF \ - -DBUILD_OSG_PLUGIN_OSG=ON \ - -DBUILD_OSG_PLUGIN_DDS=ON \ - -DBUILD_OSG_PLUGIN_TGA=ON \ - -DBUILD_OSG_PLUGIN_BMP=ON \ - -DBUILD_OSG_PLUGIN_JPEG=ON \ - -DBUILD_OSG_PLUGIN_PNG=ON \ - -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF \ - -DBUILD_OSG_APPLICATIONS=OFF \ - -DOSG_GL3_AVAILABLE=OFF \ - -DOSG_WINDOWING_SYSTEM=None - make $jobArgs - make install - export OSG_DIR=$appsDir/OpenMW - mkdir -p $sourceDir/build cd $sourceDir/build cmake .. \ @@ -153,8 +138,6 @@ BUILD() INSTALL() { - cd $sourceDir2/build - make install cd $sourceDir/build make install diff --git a/games-engines/openmw/patches/osg-3.6.5.patchset b/games-engines/openmw/patches/osg-3.6.5.patchset deleted file mode 100644 index 45f923141..000000000 --- a/games-engines/openmw/patches/osg-3.6.5.patchset +++ /dev/null @@ -1,74 +0,0 @@ -From f1e94b259b4bd4fec195e9ab125a3bed14b1519d Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 11 Oct 2019 20:55:30 +1000 -Subject: Fix build for Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ef2edd..5536b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -889,7 +889,7 @@ IF(DEFINED LIB_POSTFIX) - SET(OSG_INSTALL_LIBDIR lib${LIB_POSTFIX}) - ELSE() - IF(CMAKE_VERSION VERSION_LESS "2.8.5") -- IF(UNIX AND NOT WIN32 AND NOT APPLE) -+ IF(UNIX AND NOT WIN32 AND NOT APPLE AND NOT HAIKU) - IF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") - MARK_AS_ADVANCED(LIB_POSTFIX) -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index c0c8cec..5bf23b5 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -80,7 +80,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(__FreeBSD__) || defined(__HAIKU__) || defined(__DragonFly__) || \ - (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) - #define stat64 stat - #endif --- -2.30.2 - - -From 10aaa2c8fc959808770cbfbbd54995a9a4c545f4 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 11 Oct 2019 20:55:47 +1000 -Subject: Disable gpu stats - - -diff --git a/src/osgViewer/Renderer.cpp b/src/osgViewer/Renderer.cpp -index ab6e184..b3a89da 100644 ---- a/src/osgViewer/Renderer.cpp -+++ b/src/osgViewer/Renderer.cpp -@@ -768,7 +768,11 @@ void Renderer::draw() - state->getDynamicObjectRenderingCompletedCallback()->completed(state); - } - -+#ifndef __HAIKU__ - bool acquireGPUStats = stats && _querySupport && stats->collectStats("gpu"); -+#else -+ bool acquireGPUStats = false; -+#endif - - if (acquireGPUStats) - { -@@ -857,7 +861,12 @@ void Renderer::cull_draw() - initialize(state); - } - -+#ifndef __HAIKU__ - bool acquireGPUStats = stats && _querySupport && stats->collectStats("gpu"); -+#else -+ bool acquireGPUStats = false; -+#endif -+ - - if (acquireGPUStats) - { --- -2.30.2 -