haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenMW: update osg version to 3.6.4

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-10-12 21:54:31 +10:00
parent ae9e4169a5
commit 099d54fff8
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
games-engines/openmw/openmw-0.45.0.recipe
View File

@@ -11,14 +11,14 @@ LICENSE="
MIT
Zlib
"
REVISION="2"
REVISION="3"
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"
osgVersion="3.6.4"
SOURCE_URI_2="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$osgVersion.tar.gz"
CHECKSUM_SHA256_2="cb32908b8e81b22c7c00a404e6eb1ded15b53bf79e848497643ff9c120999cff"
CHECKSUM_SHA256_2="81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33"
SOURCE_DIR_2="OpenSceneGraph-OpenSceneGraph-$osgVersion"
PATCHES="openmw-$portVersion.patchset"
PATCHES_2="osg-$osgVersion.patchset"
@@ -101,6 +101,7 @@ BUILD_PREREQUIRES="
cmd:git
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:zip
"

38
games-engines/openmw/patches/osg-3.6.4-rc3.patchset → games-engines/openmw/patches/osg-3.6.4.patchset
View File

@@ -1,22 +1,22 @@
From 13249cc8a5f8e27853046331269798e1ce8b1ed7 Mon Sep 17 00:00:00 2001
From 17893daf3d0cc0bc57d3806e70cbbaf6c9468e94 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 28 Oct 2018 18:28:33 +1000
Date: Fri, 11 Oct 2019 20:55:30 +1000
Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c34131b..b2bb18f 100644
index 81328ea..c686182 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)
@@ -888,7 +888,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
@@ -31,20 +31,20 @@ index c0c8cec..5bf23b5 100644
#define stat64 stat
#endif
--
2.19.1
2.23.0
From 51c9a21cc3e2def6169ac25dbabe3136878834dd Mon Sep 17 00:00:00 2001
From 9cfa48ea131559bb3bf114349d051714d6073169 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 29 Mar 2019 23:57:59 +1000
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 5977588..8e9ee44 100644
index ab6e184..b3a89da 100644
--- a/src/osgViewer/Renderer.cpp
+++ b/src/osgViewer/Renderer.cpp
@@ -745,7 +745,11 @@ void Renderer::draw()
@@ -768,7 +768,11 @@ void Renderer::draw()
state->getDynamicObjectRenderingCompletedCallback()->completed(state);
}
@@ -56,7 +56,7 @@ index 5977588..8e9ee44 100644
if (acquireGPUStats)
{
@@ -834,7 +838,12 @@ void Renderer::cull_draw()
@@ -857,7 +861,12 @@ void Renderer::cull_draw()
initialize(state);
}
@@ -70,5 +70,5 @@ index 5977588..8e9ee44 100644
if (acquireGPUStats)
{
--
2.19.1
2.23.0