Friday, January 29, 2021

Fix/Update games/openjk -fno-common

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openjk/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 15 Dec 2019 18:03:30 -0000 1.11
+++ Makefile 30 Jan 2021 00:15:53 -0000
@@ -2,12 +2,12 @@

# Avoid future EPOCH bumps.
COMMENT = open source reimplementation of Jedi Academy game
-DISTNAME = openjk-0.0.0.20191129
+DISTNAME = openjk-0.0.0.20210115
CATEGORIES = games x11

GH_ACCOUNT = JACoders
GH_PROJECT = OpenJK
-GH_COMMIT = eed60925ad1b0d513d3747264f3bf98615fa4b2a
+GH_COMMIT = d2ed03a016f54917bc1dcf06bcc59d3f674fb533

HOMEPAGE = https://openjk.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openjk/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 15 Dec 2019 18:03:30 -0000 1.9
+++ distinfo 30 Jan 2021 00:15:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (openjk-0.0.0.20191129-eed60925.tar.gz) = Q++JpWF2e7uL7vc+aSPysiocOQBQKx4em4qaZbKQVds=
-SIZE (openjk-0.0.0.20191129-eed60925.tar.gz) = 13394932
+SHA256 (openjk-0.0.0.20210115-d2ed03a0.tar.gz) = zvRc3rZ83Pfrn9eadc0FfFpDmIMdDDfAuNwvHpRf9cw=
+SIZE (openjk-0.0.0.20210115-d2ed03a0.tar.gz) = 13522066
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/openjk/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 13 Feb 2018 07:13:37 -0000 1.2
+++ patches/patch-CMakeLists_txt 30 Jan 2021 00:15:53 -0000
@@ -5,7 +5,7 @@ Why would upstream add the arch name at
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -127,6 +127,9 @@ else()
+@@ -125,6 +125,9 @@ else()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86.64$")
set(X86 ON)
set(Architecture "x86_64")
@@ -15,10 +15,10 @@ Index: CMakeLists.txt
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc")
set(Architecture "ppc")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc64")
-@@ -150,19 +153,19 @@ message(STATUS "Git revision is ${GIT_SHA1}")
-
-
+@@ -145,19 +148,19 @@ endif()
# Binary names
+ #
+ #=============================================================================
-set(SPEngine "openjk_sp.${Architecture}")
-set(SPGame "jagame${Architecture}")
-set(SPRDVanillaRenderer "rdsp-vanilla_${Architecture}")
@@ -48,3 +48,10 @@ Index: CMakeLists.txt
# Library names
set(MPBotLib "botlib")
set(SharedLib "shared")
+@@ -386,4 +389,4 @@ endif()
+ if(BuildTests)
+ enable_testing()
+ add_subdirectory("tests")
+-endif()
+\ No newline at end of file
++endif()
Index: patches/patch-CMakeModules_InstallConfig_cmake
===================================================================
RCS file: patches/patch-CMakeModules_InstallConfig_cmake
diff -N patches/patch-CMakeModules_InstallConfig_cmake
--- patches/patch-CMakeModules_InstallConfig_cmake 6 Mar 2019 02:20:40 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-CMakeModules_InstallConfig_cmake,v 1.2 2019/03/06 02:20:40 bcallah Exp $
-
-Index: CMakeModules/InstallConfig.cmake
---- CMakeModules/InstallConfig.cmake.orig
-+++ CMakeModules/InstallConfig.cmake
-@@ -17,8 +17,8 @@
- #============================================================================
-
- # Subdirectories to package JK2 and JKA into
--set(JKAInstallDir "JediAcademy")
--set(JK2InstallDir "JediOutcast")
-+set(JKAInstallDir "share/JediAcademy")
-+set(JK2InstallDir "share/JediOutcast")
-
- # Install components
- set(JKAMPCoreComponent "JKAMPCore")
Index: patches/patch-cmake_Modules_InstallConfig_cmake
===================================================================
RCS file: patches/patch-cmake_Modules_InstallConfig_cmake
diff -N patches/patch-cmake_Modules_InstallConfig_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_Modules_InstallConfig_cmake 30 Jan 2021 00:15:53 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: cmake/Modules/InstallConfig.cmake
+--- cmake/Modules/InstallConfig.cmake.orig
++++ cmake/Modules/InstallConfig.cmake
+@@ -17,8 +17,8 @@
+ #============================================================================
+
+ # Subdirectories to package JK2 and JKA into
+-set(JKAInstallDir "JediAcademy")
+-set(JK2InstallDir "JediOutcast")
++set(JKAInstallDir "share/JediAcademy")
++set(JK2InstallDir "share/JediOutcast")
+
+ # Install components
+ set(JKAMPCoreComponent "JKAMPCore")
Hello ports --

OpenJK was identified as a port that fails with -fno-common.
It doesn't make much sense to cherry pick. Upstream makes no releases,
and it has been over a year since the last update. So let's just update
and that'll take care of -fno-common for us.

I know there are several OpenJK players, so testing welcome.

OK?

~Brian

No comments:

Post a Comment