Page MenuHomeFreeBSD
Files F144623311

D19955.id56375.diff
No OneTemporary
Actions

D19955.id56375.diff
View Options

Index: games/Makefile
===================================================================
--- games/Makefile
+++ games/Makefile
@@ -679,6 +679,7 @@
SUBDIR += opengfx
SUBDIR += openglad
SUBDIR += openjazz
+ SUBDIR += openjk
SUBDIR += openlierox
SUBDIR += openmortal
SUBDIR += openmsx
Index: games/openjk/Makefile
===================================================================
--- /dev/null
+++ games/openjk/Makefile
@@ -0,0 +1,33 @@
+# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
+# $FreeBSD$
+
+PORTNAME= openjk
+PORTVERSION= g20190407
+CATEGORIES= games
+
+MAINTAINER= pkubaj@FreeBSD.org
+COMMENT= Community effort to maintain Jedi Academy + Jedi Outcast
+
+LICENSE= GPLv2
+
+LIB_DEPENDS= libpng.so:graphics/png
+
+USES= compiler:c++11-lang cmake gl jpeg localbase sdl
+USE_GL= gl glu
+USE_GITHUB= yes
+GH_ACCOUNT= JACoders
+GH_PROJECT= OpenJK
+GH_TAGNAME= 911c537
+USE_SDL= sdl2
+USE_XORG= x11
+
+SUB_FILES= jamp \
+ jasp
+SUB_LIST= ARCH="${ARCH}"
+PLIST_SUB= ARCH="${ARCH}"
+
+post-install:
+ ${INSTALL_SCRIPT} ${WRKDIR}/jamp ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKDIR}/jasp ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
Index: games/openjk/distinfo
===================================================================
--- /dev/null
+++ games/openjk/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1555590158
+SHA256 (JACoders-OpenJK-g20190407-911c537_GH0.tar.gz) = df142c5557b4ed31da9056d3cdba0ce376612e346024722530f84f05bfabd66b
+SIZE (JACoders-OpenJK-g20190407-911c537_GH0.tar.gz) = 11695891
Index: games/openjk/files/jamp.in
===================================================================
--- /dev/null
+++ games/openjk/files/jamp.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%PREFIX%%/share/JediAcademy && ./openjk.%%ARCH%%
Index: games/openjk/files/jasp.in
===================================================================
--- /dev/null
+++ games/openjk/files/jasp.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd %%PREFIX%%/share/JediAcademy && ./openjk_sp.%%ARCH%%
Index: games/openjk/files/patch-CMakeModules_InstallConfig.cmake
===================================================================
--- /dev/null
+++ games/openjk/files/patch-CMakeModules_InstallConfig.cmake
@@ -0,0 +1,13 @@
+--- CMakeModules/InstallConfig.cmake.orig 2019-04-07 09:22:21 UTC
++++ 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: games/openjk/files/patch-code_game_bg__pmove.cpp
===================================================================
--- /dev/null
+++ games/openjk/files/patch-code_game_bg__pmove.cpp
@@ -0,0 +1,12 @@
+--- code/game/bg_pmove.cpp.orig 2019-04-18 11:56:16 UTC
++++ code/game/bg_pmove.cpp
+@@ -10565,7 +10565,9 @@ qboolean PM_SaberLocked( void )
+ #endif
+ gi.G2API_GetBoneAnimIndex( &gent->ghoul2[gent->playerModel], gent->lowerLumbarBone,
+ (cg.time?cg.time:level.time), &currentFrame, &junk, &junk, &junk, &junk2, NULL );
++#ifdef _DEBUG
+ assert( ret ); // this would be pretty bad, the below code seems to assume the call succeeds. -gil
++#endif
+
+ strength = G_SaberLockStrength( gent );
+ if ( PM_InSaberLockOld( pm->ps->torsoAnim ) )
Index: games/openjk/files/patch-code_rd-vanilla_G2__API.cpp
===================================================================
--- /dev/null
+++ games/openjk/files/patch-code_rd-vanilla_G2__API.cpp
@@ -0,0 +1,22 @@
+--- code/rd-vanilla/G2_API.cpp.orig 2019-04-18 12:05:33 UTC
++++ code/rd-vanilla/G2_API.cpp
+@@ -731,7 +731,9 @@ void RestoreGhoul2InfoArray()
+ singleton->Deserialize ((const char *)data, size);
+ R_Free ((void *)data);
+
++#ifdef _DEBUG
+ assert (read == size);
++#endif
+ }
+ }
+
+@@ -744,7 +746,9 @@ void SaveGhoul2InfoArray()
+ #endif // _DEBUG
+ singleton->Serialize ((char *)data);
+
++#ifdef _DEBUG
+ assert (written == size);
++#endif
+
+ if ( !ri.PD_Store (PERSISTENT_G2DATA, data, size) )
+ {
Index: games/openjk/files/patch-codemp_rd-vanilla_G2__API.cpp
===================================================================
--- /dev/null
+++ games/openjk/files/patch-codemp_rd-vanilla_G2__API.cpp
@@ -0,0 +1,22 @@
+--- codemp/rd-vanilla/G2_API.cpp.orig 2019-04-18 12:02:42 UTC
++++ codemp/rd-vanilla/G2_API.cpp
+@@ -669,7 +669,9 @@ void RestoreGhoul2InfoArray()
+ singleton->Deserialize ((const char *)data, size);
+ Z_Free ((void *)data);
+
++#ifdef _DEBUG
+ assert (read == size);
++#endif
+ }
+ }
+
+@@ -682,7 +684,9 @@ void SaveGhoul2InfoArray()
+ #endif
+ singleton->Serialize ((char *)data);
+
++#ifdef _DEBUG
+ assert (written == size);
++#endif
+
+ if ( !ri.PD_Store (PERSISTENT_G2DATA, data, size) )
+ {
Index: games/openjk/pkg-descr
===================================================================
--- /dev/null
+++ games/openjk/pkg-descr
@@ -0,0 +1,6 @@
+OpenJK is an effort by the JACoders group to maintain and improve the game
+engines on which the Jedi Academy (JA) and Jedi Outcast (JO) games run on,
+while maintaining full backwards compatibility with the existing games.
+This project does not attempt to rebalance or otherwise modify core gameplay.
+
+WWW: https://openjk.org
Index: games/openjk/pkg-message
===================================================================
--- /dev/null
+++ games/openjk/pkg-message
@@ -0,0 +1,28 @@
+OpenJK requires the original game files from Star Wars: Jedi Knight:
+Jedi Academy to work properly. These can come from an original CD or
+from GOG.com.
+
+If using the GOG.com version, you must extract the files from
+setup_star_wars_jedi_knight_-_jedi_academy_1.01_(a)_(10331)_(g).exe
+using the innoextract package.
+
+The files will be in a directory named app. Inside the app directory,
+there is a GameData directory. Inside the GameData directory, there is
+a directory named base. This base directory must be moved to
+~/.local/share/openjk
+
+The easiest way to do this is to follow these steps:
+$ mkdir -p ~/.local/share/openjk
+$ innoextract setup_star_wars_jedi_knight_-_jedi_academy_1.01_(a)_(10331)_(g).exe
+$ cd app/GameData
+$ cp -R base ~/.local/share/openjk
+
+You can then delete everything else that is extracted from the exe,
+such as the tmp directory.
+
+The multiplayer game binary is jamp and the single player game binary
+is jasp.
+
+If you own a copy of Star Wars: Jedi Knight: Jedi Outcast, its game
+files may be used to play that game, though upstream makes no
+guarantees on your success in playing this game.
Index: games/openjk/pkg-plist
===================================================================
--- /dev/null
+++ games/openjk/pkg-plist
@@ -0,0 +1,14 @@
+bin/jamp
+bin/jasp
+share/JediAcademy/OpenJK/cgame%%ARCH%%.so
+share/JediAcademy/OpenJK/jagame%%ARCH%%.so
+share/JediAcademy/OpenJK/jampgame%%ARCH%%.so
+share/JediAcademy/OpenJK/ui%%ARCH%%.so
+share/JediAcademy/base/cgame%%ARCH%%.so
+share/JediAcademy/base/jampgame%%ARCH%%.so
+share/JediAcademy/base/ui%%ARCH%%.so
+share/JediAcademy/openjk.%%ARCH%%
+share/JediAcademy/openjk_sp.%%ARCH%%
+share/JediAcademy/openjkded.%%ARCH%%
+share/JediAcademy/rd-vanilla_%%ARCH%%.so
+share/JediAcademy/rdsp-vanilla_%%ARCH%%.so

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 11, 9:18 AM (18 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28644389
Default Alt Text
D19955.id56375.diff (7 KB)

Event Timeline