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

openscenegraph, revbump, switch poppler version, silense some build warnings (#9442)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-09-17 15:54:40 +00:00
committed by GitHub
parent 7aee7d50f4
commit be16ca2683
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
games-engines/openscenegraph/openscenegraph-3.6.5.recipe
View File

@@ -10,7 +10,7 @@ virtual reality industries."
HOMEPAGE="http://www.openscenegraph.org/"
COPYRIGHT="2002-2018 Robert Osfield and others"
LICENSE="OSGPL"
REVISION="1"
REVISION="3"
SOURCE_URI="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$portVersion.tar.gz"
CHECKSUM_SHA256="aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12"
SOURCE_DIR="OpenSceneGraph-OpenSceneGraph-$portVersion"
@@ -127,7 +127,7 @@ BUILD_REQUIRES="
devel:libjpeg$secondaryArchSuffix
# devel:libOpenCOLLADABaseUtils$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpoppler${secondaryArchSuffix}_glib >= 8.12
devel:libpoppler${secondaryArchSuffix}_glib >= 8.22
devel:libSDL2_2.0$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 5
# devel:libTKGeomBase$secondaryArchSuffix #opencascade

36
games-engines/openscenegraph/patches/openscenegraph-3.6.5.patchset
View File

@@ -1,4 +1,4 @@
From 0e2014a809e482f344e2f00922c7aff3bbde7de3 Mon Sep 17 00:00:00 2001
From 55acd2dacccdd52c12f671a9d1a4775aa2acc828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
<adrian.arroyocalle@gmail.com>
Date: Wed, 24 Dec 2014 14:55:21 +0000
@@ -37,7 +37,7 @@ index fe135f4..680fcfe 100644
2.37.3
From 2d8ce5d50ab91532875d0c8986f5e7506fddac75 Mon Sep 17 00:00:00 2001
From b353013758aa33e2ab2e4a1eedbc74d434cb4da3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Oct 2018 00:19:11 +1000
Subject: Find plugins in system lib and addons directory
@@ -78,7 +78,7 @@ index f723123..fd87ddb 100644
2.37.3
From ad08ae83c314bd2cabf245adf97a29afa24ca679 Mon Sep 17 00:00:00 2001
From cd0bd99618436c0f1f5c2525cabf479f0593532c Mon Sep 17 00:00:00 2001
From: beaglejoe <BeagleJoe13@gmail.com>
Date: Mon, 4 Oct 2021 19:09:51 +0000
Subject: Fix FindSDL2
@@ -101,7 +101,7 @@ index 91724d6..84ec1bf 100644
2.37.3
From 1f7536ae6d3ff416272e678cccd16defa2114c2b Mon Sep 17 00:00:00 2001
From 5292c93dd3e543c35fc7b4729848727e524ca1e4 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 17 Aug 2023 14:36:48 +0200
Subject: Add Haiku support
@@ -135,7 +135,7 @@ index 86785b1..2fb3555 100644
2.37.3
From 16254650c4064a28b4070d23c11eb09d3443a3f8 Mon Sep 17 00:00:00 2001
From e88954c3d7b5b3f291344fc236e3088e0372439e Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 17 Aug 2023 14:37:21 +0200
Subject: Link against libnetwork
@@ -159,7 +159,7 @@ index 0ef2edd..16ce450 100644
2.37.3
From 9f50fabfd7e2524870d7d5d144131a1e447fcf45 Mon Sep 17 00:00:00 2001
From d64e7768a6e800273e7acb99082ec75bde22e21c Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 17 Aug 2023 15:26:49 +0200
Subject: Fix building examples
@@ -208,3 +208,27 @@ index 6ab5e79..91a5fb6 100644
--
2.37.3
From 5301f1bbd949c6d323fec08591de007f6ceea6a5 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 17 Sep 2023 17:46:55 +0200
Subject: Silense some warnings that are clobering the Terminal while building
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16ce450..4106e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,6 +316,9 @@ INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR})
#ADD_DEFINITIONS(-D)
# Platform specific definitions
+IF(HAIKU)
+ADD_DEFINITIONS(-Wno-deprecated-copy -Wno-deprecated-declarations -Wno-overloaded-virtual) # TODO too much spam for now
+ENDIF()
IF(WIN32 AND NOT ANDROID)
OPTION(OSG_DETERMINE_WIN_VERSION "Wheter to automatically determine current Windows version" ON)
--
2.37.3