git: 7497c4a12ba9 - main - games/openjk: update to g20260711
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 26 Sep 2026 20:55:15 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7497c4a12ba9293021b5d3159881ad6e3d6ba720
commit 7497c4a12ba9293021b5d3159881ad6e3d6ba720
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2026-09-26 17:38:25 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2026-09-26 20:55:12 +0000
games/openjk: update to g20260711
Remove the bit-rotted PowerPC-only light grid path from the new rend2
renderer, which does not compile on powerpc64 and powerpc64le.
---
games/openjk/Makefile | 5 ++-
games/openjk/distinfo | 6 ++--
...ake => patch-cmake_Modules_InstallConfig.cmake} | 2 +-
.../files/patch-codemp_rd-rend2_tr__light.cpp | 40 ++++++++++++++++++++++
games/openjk/pkg-plist | 1 +
5 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/games/openjk/Makefile b/games/openjk/Makefile
index d3cb2197b9c5..732a6b2c113b 100644
--- a/games/openjk/Makefile
+++ b/games/openjk/Makefile
@@ -1,6 +1,5 @@
PORTNAME= openjk
-PORTVERSION= g20221013
-PORTREVISION= 1
+PORTVERSION= g20260711
CATEGORIES= games
MAINTAINER= pkubaj@FreeBSD.org
@@ -16,7 +15,7 @@ USE_GL= gl glu
USE_GITHUB= yes
GH_ACCOUNT= JACoders
GH_PROJECT= OpenJK
-GH_TAGNAME= c2095bb
+GH_TAGNAME= 1a6a643
USE_SDL= sdl2
USE_XORG= x11
diff --git a/games/openjk/distinfo b/games/openjk/distinfo
index 13b1e02c298f..e751f3122a1e 100644
--- a/games/openjk/distinfo
+++ b/games/openjk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667154560
-SHA256 (JACoders-OpenJK-g20221013-c2095bb_GH0.tar.gz) = b875b222debf209daf1aa1c3c1a76a864240695e5731cd715d643b20cc8e94f7
-SIZE (JACoders-OpenJK-g20221013-c2095bb_GH0.tar.gz) = 13513267
+TIMESTAMP = 1790419074
+SHA256 (JACoders-OpenJK-g20260711-1a6a643_GH0.tar.gz) = bdc5c0a0e80cc4ac2839198f458fa8906ffe303281c7ce4840e2e6b1e8c92417
+SIZE (JACoders-OpenJK-g20260711-1a6a643_GH0.tar.gz) = 15509836
diff --git a/games/openjk/files/patch-CMakeModules_InstallConfig.cmake b/games/openjk/files/patch-cmake_Modules_InstallConfig.cmake
similarity index 86%
rename from games/openjk/files/patch-CMakeModules_InstallConfig.cmake
rename to games/openjk/files/patch-cmake_Modules_InstallConfig.cmake
index ef297f36eac4..bfcceeb3068e 100644
--- a/games/openjk/files/patch-CMakeModules_InstallConfig.cmake
+++ b/games/openjk/files/patch-cmake_Modules_InstallConfig.cmake
@@ -1,4 +1,4 @@
---- cmake/Modules/InstallConfig.cmake.orig 2019-04-07 09:22:21 UTC
+--- cmake/Modules/InstallConfig.cmake.orig 2026-07-11 05:28:28 UTC
+++ cmake/Modules/InstallConfig.cmake
@@ -17,8 +17,8 @@
#============================================================================
diff --git a/games/openjk/files/patch-codemp_rd-rend2_tr__light.cpp b/games/openjk/files/patch-codemp_rd-rend2_tr__light.cpp
new file mode 100644
index 000000000000..85de75a88e40
--- /dev/null
+++ b/games/openjk/files/patch-codemp_rd-rend2_tr__light.cpp
@@ -0,0 +1,40 @@
+--- codemp/rd-rend2/tr_light.cpp.orig 2026-07-11 05:28:28 UTC
++++ codemp/rd-rend2/tr_light.cpp
+@@ -181,10 +181,6 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *
+ int lat, lng;
+ vec3_t normal;
+
+- #if idppc
+- float d0, d1, d2, d3, d4, d5;
+- #endif
+-
+ factor = 1.0;
+ gridPos = startGridPos;
+
+@@ -209,18 +205,6 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *
+ }
+
+ totalFactor += factor;
+- #if idppc
+- d0 = data[0]; d1 = data[1]; d2 = data[2];
+- d3 = data[3]; d4 = data[4]; d5 = data[5];
+-
+- ent->ambientLight[0] += factor * d0;
+- ent->ambientLight[1] += factor * d1;
+- ent->ambientLight[2] += factor * d2;
+-
+- ent->directedLight[0] += factor * d3;
+- ent->directedLight[1] += factor * d4;
+- ent->directedLight[2] += factor * d5;
+- #else
+ if (world->hdrLightGrid)
+ {
+ float *hdrData = world->hdrLightGrid + (gridPos * 6);
+@@ -254,7 +238,6 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *
+ }
+ }
+ }
+- #endif
+ lat = data->latLong[1];
+ lng = data->latLong[0];
+ lat *= (FUNCTABLE_SIZE/256);
diff --git a/games/openjk/pkg-plist b/games/openjk/pkg-plist
index 325d51ec93cf..f63418256861 100644
--- a/games/openjk/pkg-plist
+++ b/games/openjk/pkg-plist
@@ -10,5 +10,6 @@ share/JediAcademy/base/ui%%ARCH%%.so
share/JediAcademy/openjk.%%ARCH%%
share/JediAcademy/openjk_sp.%%ARCH%%
share/JediAcademy/openjkded.%%ARCH%%
+share/JediAcademy/rd-rend2_%%ARCH%%.so
share/JediAcademy/rd-vanilla_%%ARCH%%.so
share/JediAcademy/rdsp-vanilla_%%ARCH%%.so