OpenMW: bump version

games-engines/openmw/openmw-0.45.0.recipe

@@ -5,22 +5,21 @@ DESCRIPTION="OpenMW is a new and modern engine based on the one that runs the \
 and OpenMW are written from scratch and aren’t made to support any third party \
 programs the original Morrowind engine uses to improve its functionality."
 HOMEPAGE="https://openmw.org/"
-COPYRIGHT="2008-2018 OpenMW"
+COPYRIGHT="2008-2019 OpenMW"
 LICENSE="
 	GNU GPL v3
 	MIT
 	Zlib
 	"
-REVISION="3"
-srcGitRev="9f4892ce92239edc87bf4a1cd837ec19afda241f"
-SOURCE_URI="https://github.com/OpenMW/openmw/archive/$srcGitRev.tar.gz"
-SOURCE_FILENAME="openmw-$srcGitRev.tar.gz"
-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"
+REVISION="1"
+SOURCE_URI="https://github.com/OpenMW/openmw/archive/openmw-$portVersion.tar.gz"
+SOURCE_FILENAME="openmw-$portVersion.tar.gz"
+CHECKSUM_SHA256="b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64"
+SOURCE_DIR="openmw-openmw-$portVersion"
+osgVersion="3.6.4-rc3"
+SOURCE_URI_2="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$osgVersion.tar.gz"
+CHECKSUM_SHA256_2="cb32908b8e81b22c7c00a404e6eb1ded15b53bf79e848497643ff9c120999cff"
+SOURCE_DIR_2="OpenSceneGraph-OpenSceneGraph-$osgVersion"
 PATCHES="openmw-$portVersion.patchset"
 PATCHES_2="osg-$osgVersion.patchset"
 
@@ -100,6 +99,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:zip
 	"
@@ -126,6 +126,7 @@ BUILD()
 		-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

games-engines/openmw/patches/osg-3.6.2-rc1.patchset

@@ -1,35 +0,0 @@
-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
-

games-engines/openmw/patches/osg-3.6.4-rc3.patchset

@@ -0,0 +1,74 @@
+From 13249cc8a5f8e27853046331269798e1ce8b1ed7 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 c34131b..b2bb18f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -870,7 +870,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 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.19.1
+
+
+From 51c9a21cc3e2def6169ac25dbabe3136878834dd Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 29 Mar 2019 23:57:59 +1000
+Subject: Disable gpu stats
+
+
+diff --git a/src/osgViewer/Renderer.cpp b/src/osgViewer/Renderer.cpp
+index 5977588..8e9ee44 100644
+--- a/src/osgViewer/Renderer.cpp
++++ b/src/osgViewer/Renderer.cpp
+@@ -745,7 +745,11 @@ void Renderer::draw()
+             state->getDynamicObjectRenderingCompletedCallback()->completed(state);
+         }
+ 
++#ifndef __HAIKU__
+         bool acquireGPUStats = stats && _querySupport && stats->collectStats("gpu");
++#else
++        bool acquireGPUStats = false;
++#endif
+ 
+         if (acquireGPUStats)
+         {
+@@ -834,7 +838,12 @@ void Renderer::cull_draw()
+         initialize(state);
+     }
+ 
++#ifndef __HAIKU__
+     bool acquireGPUStats = stats && _querySupport && stats->collectStats("gpu");
++#else
++    bool acquireGPUStats = false;
++#endif
++
+ 
+     if (acquireGPUStats)
+     {
+-- 
+2.19.1
+