cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the latest upstream code for OpenJK. Among other things, fixes

Browse Source 
-fno-common issues.
This commit is contained in:
bcallah 2021-02-07 18:59:12 +00:00
parent 10ba0f810b
commit 2014bd54b8
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/openjk/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.11 2019/12/15 18:03:30 bcallah Exp $
# $OpenBSD: Makefile,v 1.12 2021/02/07 18:59:12 bcallah Exp $
# 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>

4
games/openjk/distinfo
View File

@ -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

17
games/openjk/patches/patch-CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/02/13 07:13:37 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2021/02/07 18:59:13 bcallah Exp $
Why would upstream add the arch name at the end of all binaries?
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()

8
games/openjk/patches/patch-CMakeModules_InstallConfig_cmake → games/openjk/patches/patch-cmake_Modules_InstallConfig_cmake
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-CMakeModules_InstallConfig_cmake,v 1.2 2019/03/06 02:20:40 bcallah Exp $
$OpenBSD: patch-cmake_Modules_InstallConfig_cmake,v 1.1 2021/02/07 18:59:13 bcallah Exp $
Index: CMakeModules/InstallConfig.cmake
--- CMakeModules/InstallConfig.cmake.orig
+++ CMakeModules/InstallConfig.cmake
Index: cmake/Modules/InstallConfig.cmake
--- cmake/Modules/InstallConfig.cmake.orig
+++ cmake/Modules/InstallConfig.cmake
@@ -17,8 +17,8 @@
#============================================================================