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

OpenJK-Outcast: bump git revision

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-03-10 21:23:06 +10:00
parent dfa5515e46
commit 995a9ad1ec
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
games-fps/openjk_outcast/openjk_outcast-2019.11.30.recipe → games-fps/openjk_outcast/openjk_outcast-2020.03.09.recipe
View File

@@ -19,9 +19,9 @@ HOMEPAGE="https://github.com/JACoders/OpenJK"
COPYRIGHT="2003 Activision"
LICENSE="GNU GPL v2"
REVISION="1"
srcGitRev="eed60925ad1b0d513d3747264f3bf98615fa4b2a"
srcGitRev="52030235f052772008d99e6ccb16de48e7ddb688"
SOURCE_URI="https://github.com/JACoders/OpenJK/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="43ef89a561767bbb8beef73e6923f2b22a1c3900502b1e1e9b8a9a65b29055db"
CHECKSUM_SHA256="2b6fadf16cca2fdf4cce32f977e0d0aa34e2a19d1c596b996f9857b6a97c7d32"
SOURCE_DIR="OpenJK-$srcGitRev"
srcGitRev2="68b5907feff0dda72fe5435e1108ccd2ad7e8ed5"
SOURCE_URI_2="https://github.com/EXL/BeGameLauncher/archive/$srcGitRev2.tar.gz"
@@ -41,20 +41,14 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libgl$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libsdl2_2.0$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgl$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libsdl2_2.0$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -72,7 +66,9 @@ BUILD()
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir/JediOutcast \
-DSDL2_INCLUDE_DIR=/system/$relativeIncludeDir/SDL2 \
-DUseInternalZlib=ON \
-DUseInternalPNG=ON \
-DUseInternalJPEG=ON \
-DBuildJK2SPEngine=ON \
-DBuildJK2SPGame=ON \
-DBuildJK2SPRdVanilla=ON \

29
games-fps/openjk_outcast/patches/openjk_outcast-2019.11.30.patchset → games-fps/openjk_outcast/patches/openjk_outcast-2020.03.09.patchset
View File

@@ -1,4 +1,4 @@
From fd56d9c29cb9d90e6718cffca7a8e19314e968d7 Mon Sep 17 00:00:00 2001
From 8d17431ae65e9932076e4132e5734af03995d5da Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 30 Oct 2019 00:18:24 +1000
Subject: Add Haiku support
@@ -22,7 +22,7 @@ index c35d0e0..c4f6149 100644
#ifdef MACOS_X
fs_apppath = Cvar_Get ("fs_apppath", Sys_DefaultAppPath(), CVAR_INIT|CVAR_PROTECTED );
diff --git a/code/rd-vanilla/qgl.h b/code/rd-vanilla/qgl.h
index f9fc10f..3e3d384 100644
index c9215db..9b3fa66 100644
--- a/code/rd-vanilla/qgl.h
+++ b/code/rd-vanilla/qgl.h
@@ -39,6 +39,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -175,5 +175,28 @@ index 96f5b7a..c90f068 100644
char *Sys_DefaultHomePath(void)
{
--
2.23.0
2.24.1
From 5b854b10e02d79ee232d3249b9d02709b24d6d1f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 10 Mar 2020 20:22:50 +1000
Subject: use internal zlib
diff --git a/lib/libpng/CMakeLists.txt b/lib/libpng/CMakeLists.txt
index 4ef4c7e..a25a99a 100644
--- a/lib/libpng/CMakeLists.txt
+++ b/lib/libpng/CMakeLists.txt
@@ -23,7 +23,7 @@
# This only has effect in this directory (lib/png).
include_directories(include/)
-if(WIN32)
+if(WIN32 OR HAIKU)
include_directories(../zlib/include/)
endif()
--
2.24.1