OpenMW: bump git revision

* use openmw's fork of osg library
2026-04-22 11:40:06 +02:00 · 2018-10-28 21:24:19 +10:00
parent cc82b2e059
commit c51ea06282
3 changed files with 90 additions and 22 deletions
--- a/games-engines/openmw/openmw-0.44.0~git.recipe
+++ b/games-engines/openmw/openmw-0.44.0~git.recipe
@@ -11,13 +11,19 @@ LICENSE="
 	MIT
 	Zlib
 	"
-REVISION="2"
-srcGitRev="503352e8405d0a3930a9416ab00a972a1f41b8a9"
+REVISION="3"
+srcGitRev="9f4892ce92239edc87bf4a1cd837ec19afda241f"
 SOURCE_URI="https://github.com/OpenMW/openmw/archive/$srcGitRev.tar.gz"
 SOURCE_FILENAME="openmw-$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8c9c9a5184210bbab338bbdd91de0acbb4397db8f4ce5fab85b988f3cd88f88e"
+CHECKSUM_SHA256="1619ea49a582899e81877f2b1a3f34dd9562858ddf1761a1b14090c378ace2da"
 SOURCE_DIR="openmw-$srcGitRev"
+osgVersion="3.6.2-rc1"
+SOURCE_URI_2="https://github.com/OpenMW/osg/archive/OpenSceneGraph-$osgVersion.tar.gz"
+CHECKSUM_SHA256_2="bc34465770aebb7f159e013d57c565210b6fec7c3b2f4accb25cfb2a3e535b2b"
+SOURCE_DIR_2="osg-OpenSceneGraph-$osgVersion"
 PATCHES="openmw-$portVersion.patchset"
+PATCHES_2="osg-$osgVersion.patchset"
+
 ADDITIONAL_FILES="
 	openmw.rdef.in
 	haikuicons.zip
@@ -44,24 +50,23 @@ REQUIRES="
 	lib:libboost_system$secondaryArchSuffix
 	lib:libboost_program_options$secondaryArchSuffix
 	lib:libBulletCollision$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
 	lib:libLinearMath$secondaryArchSuffix
 	lib:libMyGUIEngine$secondaryArchSuffix
 	lib:libopenal$secondaryArchSuffix
-	lib:libosg$secondaryArchSuffix
-	lib:libosgDB$secondaryArchSuffix
-	lib:libosgFX$secondaryArchSuffix
-	lib:libosgGA$secondaryArchSuffix
-	lib:libosgParticle$secondaryArchSuffix
-	lib:libosgText$secondaryArchSuffix
-	lib:libosgUtil$secondaryArchSuffix
-	lib:libosgViewer$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libSDL2_image_2.0$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
 	lib:libunshield$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
@@ -73,17 +78,23 @@ BUILD_REQUIRES="
 	devel:libboost_system$secondaryArchSuffix
 	devel:libboost_program_options$secondaryArchSuffix
 	devel:libBulletCollision$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
 	devel:libLinearMath$secondaryArchSuffix
 	devel:libMyGUIEngine$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
-	devel:libosg$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libSDL2_image_2.0$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
 	devel:libunshield$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -100,8 +111,28 @@ PATCH()

 BUILD()
 {
-	mkdir -p build
-	cd 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_WINDOWING_SYSTEM=None
+	make $jobArgs
+	make install
+	export OSG_DIR=$appsDir/OpenMW
+
+	mkdir -p $sourceDir/build
+	cd $sourceDir/build
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=$appsDir/OpenMW \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -120,11 +151,13 @@ BUILD()

 INSTALL()
 {
-	cd build
+	cd $sourceDir2/build
+	make install
+	cd $sourceDir/build
 	make install

 	mv -f $appsDir/OpenMW/games/openmw/* $appsDir/OpenMW
-	rm -rf $appsDir/OpenMW/{games,applications,licenses,metainfo,pixmaps}
+	rm -rf $appsDir/OpenMW/{applications,data,games,include,licenses,lib/pkgconfig,metainfo,pixmaps}

 	# capitalize application names
 	mv $appsDir/OpenMW/openmw $appsDir/OpenMW/OpenMW
--- a/games-engines/openmw/patches/openmw-0.44.0~git.patchset
+++ b/games-engines/openmw/patches/openmw-0.44.0~git.patchset
@@ -1,4 +1,4 @@
-From e0b3395787c4ccaef239856f5768d8e8728fa977 Mon Sep 17 00:00:00 2001
+From cb32f03f326ac562d3fdc1fb94daf2d7000eba44 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 6 Oct 2018 20:54:27 +1000
 Subject: Fix build for Haiku
@@ -219,7 +219,7 @@ index 176adfa..2c69d45 100644
     Files::ConfigurationManager cfgMgr;
     std::unique_ptr<OMW::Engine> engine;
 diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
-index 64824b6..11caea9 100644
+index 2e2ddd1..e9400cf 100644
 --- a/components/crashcatcher/crashcatcher.cpp
 +++ b/components/crashcatcher/crashcatcher.cpp
@@ -12,7 +12,9 @@
@@ -246,7 +246,7 @@ index fd8f0d1..5b1bc71 100644
 #else
     #define USE_CRASH_CATCHER 0
 diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
-index a4c59c2..17d3e29 100644
+index e89a659..04441dd 100644
 --- a/components/debug/debugging.cpp
 +++ b/components/debug/debugging.cpp
@@ -52,6 +52,9 @@ namespace Debug
@@ -279,7 +279,7 @@ index 2e72b81..97c43f0 100644
     #include <components/files/linuxpath.hpp>
     namespace Files { typedef LinuxPath TargetPathType; }
 diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp
-index 1f6a3d9..d8cc728 100644
+index 3743eef..13c9451 100644
 --- a/components/files/linuxpath.cpp
 +++ b/components/files/linuxpath.cpp
@@ -1,6 +1,6 @@
@@ -340,14 +340,14 @@ index 7950157..32ff3d8 100644
 2.19.1


-From c7b68b8fbf130e80548a5ff348113dfd86277810 Mon Sep 17 00:00:00 2001
+From e7155ea818a5f48ef927752e8d6f5d1db2e42652 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 7 Oct 2018 16:49:50 +1000
 Subject: Remove SDL_WINDOW_RESIZABLE flag for haiku


 diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
-index 057113b..f517a24 100644
+index f5b4171..897b3e1 100644
 --- a/apps/openmw/engine.cpp
 +++ b/apps/openmw/engine.cpp
@@ -336,7 +336,11 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
--- a/games-engines/openmw/patches/osg-3.6.2-rc1.patchset
+++ b/games-engines/openmw/patches/osg-3.6.2-rc1.patchset
@@ -0,0 +1,35 @@
+From 6f55cd4c912f3bdc6c450b2c77b82b6f0cebed04 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 28 Oct 2018 18:28:33 +1000
+Subject: Fix build for Haiku
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb9dbc4..71fce1b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -891,7 +891,7 @@ IF(CYGWIN)
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
+ 
+-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 f76ec4f..3b7da52 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.19.1
+