OpenJK-git: import OpenJK-0.0nb20181224 as wip/OpenJK-git

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: OpenJK-git: import OpenJK-0.0nb20181224 as wip/OpenJK-git
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Mon, 24 Dec 2018 11:56:50 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Dec 24 13:56:50 2018 +0200
Changeset:	0289fd92484d7b183d08c79a342f73006a65b434

Modified Files:
	Makefile
Added Files:
	OpenJK-git/DESCR
	OpenJK-git/Makefile
	OpenJK-git/PLIST
	OpenJK-git/distinfo
	OpenJK-git/files/openjk.sh
	OpenJK-git/files/openjk_sp.sh
	OpenJK-git/files/openjkded.sh
	OpenJK-git/files/openjo_sp.sh
	OpenJK-git/patches/patch-code_rd-vanilla_qgl.h
	OpenJK-git/patches/patch-codemp_rd-dedicated_qgl.h
	OpenJK-git/patches/patch-codemp_rd-vanilla_qgl.h

Log Message:
OpenJK-git: import OpenJK-0.0nb20181224 as wip/OpenJK-git

Community effort to maintain and improve Jedi Academy + Jedi Outcast
released by Raven Software

This is the game engine - the data files are not included.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0289fd92484d7b183d08c79a342f73006a65b434

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 OpenJK-git/DESCR                                   |  4 ++
 OpenJK-git/Makefile                                | 48 ++++++++++++++++++++++
 OpenJK-git/PLIST                                   | 20 +++++++++
 OpenJK-git/distinfo                                |  9 ++++
 OpenJK-git/files/openjk.sh                         |  3 ++
 OpenJK-git/files/openjk_sp.sh                      |  3 ++
 OpenJK-git/files/openjkded.sh                      |  3 ++
 OpenJK-git/files/openjo_sp.sh                      |  3 ++
 OpenJK-git/patches/patch-code_rd-vanilla_qgl.h     | 15 +++++++
 OpenJK-git/patches/patch-codemp_rd-dedicated_qgl.h | 33 +++++++++++++++
 OpenJK-git/patches/patch-codemp_rd-vanilla_qgl.h   | 15 +++++++
 12 files changed, 157 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 6a3b6acb4f..3a2e719a7e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ SUBDIR+=	MesaLib-dfbsd
 SUBDIR+=	MoleInvasion
 SUBDIR+=	OpenGLUT
 SUBDIR+=	OpenIPMI
+SUBDIR+=	OpenJK-git
 SUBDIR+=	OpenTESArena
 SUBDIR+=	PHPUnit
 SUBDIR+=	PPower4
diff --git a/OpenJK-git/DESCR b/OpenJK-git/DESCR
new file mode 100644
index 0000000000..8fd7bb1ca3
--- /dev/null
+++ b/OpenJK-git/DESCR
@@ -0,0 +1,4 @@
+Community effort to maintain and improve Jedi Academy + Jedi Outcast
+released by Raven Software
+
+This is the game engine - the data files are not included.
diff --git a/OpenJK-git/Makefile b/OpenJK-git/Makefile
new file mode 100644
index 0000000000..6e6e5abe94
--- /dev/null
+++ b/OpenJK-git/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD$
+
+DISTNAME=	OpenJK-0.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=JACoders/}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/JACoders/OpenJK/
+COMMENT=	Game engine for Jedi Academy and Jedi Outcast
+LICENSE=	gnu-gpl-v2
+
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+
+CMAKE_ARGS+=		-DBuildJK2SPEngine:BOOL=YES
+CMAKE_ARGS+=		-DBuildJK2SPGame:BOOL=YES
+CMAKE_ARGS+=		-DBuildJK2SPRdVanilla:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPCGame:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPDed:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPEngine:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPGame:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPRdVanilla:BOOL=YES
+CMAKE_ARGS+=		-DBuildMPUI:BOOL=YES
+CMAKE_INSTALL_PREFIX=	${PREFIX}/share
+GIT_REPOSITORIES=	OpenJK
+GIT_REPO.OpenJK=	git://github.com/JACoders/OpenJK.git
+INSTALLATION_DIRS+=	bin
+PLIST_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
+WRKSRC=			${WRKDIR}/OpenJK
+
+post-build:
+	${SED} -e s,@PREFIX@,${PREFIX}, -e s/@MACHINE_ARCH@/${MACHINE_ARCH}/ ${FILESDIR}/openjk.sh > ${WRKSRC}/openjk
+	${SED} -e s,@PREFIX@,${PREFIX}, -e s/@MACHINE_ARCH@/${MACHINE_ARCH}/ ${FILESDIR}/openjk_sp.sh > ${WRKSRC}/openjk_sp
+	${SED} -e s,@PREFIX@,${PREFIX}, -e s/@MACHINE_ARCH@/${MACHINE_ARCH}/ ${FILESDIR}/openjkded.sh > ${WRKSRC}/openjkded
+	${SED} -e s,@PREFIX@,${PREFIX}, -e s/@MACHINE_ARCH@/${MACHINE_ARCH}/ ${FILESDIR}/openjo_sp.sh > ${WRKSRC}/openjo_sp
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/openjk ${DESTDIR}${PREFIX}/bin/openjk
+	${INSTALL_SCRIPT} ${WRKSRC}/openjk_sp ${DESTDIR}${PREFIX}/bin/openjk_sp
+	${INSTALL_SCRIPT} ${WRKSRC}/openjkded ${DESTDIR}${PREFIX}/bin/openjkded
+	${INSTALL_SCRIPT} ${WRKSRC}/openjo_sp ${DESTDIR}${PREFIX}/bin/openjo_sp
+
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/OpenJK-git/PLIST b/OpenJK-git/PLIST
new file mode 100644
index 0000000000..8c7b108590
--- /dev/null
+++ b/OpenJK-git/PLIST
@@ -0,0 +1,20 @@
+@comment $NetBSD$
+bin/openjk
+bin/openjk_sp
+bin/openjkded
+bin/openjo_sp
+share/JediAcademy/OpenJK/cgame${MACHINE_ARCH}.so
+share/JediAcademy/OpenJK/jagame${MACHINE_ARCH}.so
+share/JediAcademy/OpenJK/jampgame${MACHINE_ARCH}.so
+share/JediAcademy/OpenJK/ui${MACHINE_ARCH}.so
+share/JediAcademy/base/cgame${MACHINE_ARCH}.so
+share/JediAcademy/base/jampgame${MACHINE_ARCH}.so
+share/JediAcademy/base/ui${MACHINE_ARCH}.so
+share/JediAcademy/openjk.${MACHINE_ARCH}
+share/JediAcademy/openjk_sp.${MACHINE_ARCH}
+share/JediAcademy/openjkded.${MACHINE_ARCH}
+share/JediAcademy/rd-vanilla_${MACHINE_ARCH}.so
+share/JediAcademy/rdsp-vanilla_${MACHINE_ARCH}.so
+share/JediOutcast/OpenJK/jospgame${MACHINE_ARCH}.so
+share/JediOutcast/openjo_sp.${MACHINE_ARCH}
+share/JediOutcast/rdjosp-vanilla_${MACHINE_ARCH}.so
diff --git a/OpenJK-git/distinfo b/OpenJK-git/distinfo
new file mode 100644
index 0000000000..cbb4619c0e
--- /dev/null
+++ b/OpenJK-git/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = f7fb0556241f037bb38fa966e1b4fd321a2d03e5
+RMD160 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = b1df484fca341e5728f9fa8684c83ebe899f9a20
+SHA512 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = d16cca9836545eba86ac39e608ac002d3f768ab4160bee87a9687841b5f3d6941135be641a689eca67a01610563a1169c0b49b4aadfba2916d2e36b315fe2d1a
+Size (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = 11708269 bytes
+SHA1 (patch-code_rd-vanilla_qgl.h) = d8be7ae133e65bb184f2bb6f4eefac6077cde2e2
+SHA1 (patch-codemp_rd-dedicated_qgl.h) = bb18c945dea4c03f2aedfb4dfb609919ccfa72ec
+SHA1 (patch-codemp_rd-vanilla_qgl.h) = 1c090620009d81f988a89afe1ba36cdc8ba02b5d
diff --git a/OpenJK-git/files/openjk.sh b/OpenJK-git/files/openjk.sh
new file mode 100644
index 0000000000..97220408f5
--- /dev/null
+++ b/OpenJK-git/files/openjk.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd @PREFIX@/share/JediAcademy && exec ./openjk.@MACHINE_ARCH@
diff --git a/OpenJK-git/files/openjk_sp.sh b/OpenJK-git/files/openjk_sp.sh
new file mode 100644
index 0000000000..3791ffe68a
--- /dev/null
+++ b/OpenJK-git/files/openjk_sp.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd @PREFIX@/share/JediAcademy && exec ./openjk_sp.@MACHINE_ARCH@
diff --git a/OpenJK-git/files/openjkded.sh b/OpenJK-git/files/openjkded.sh
new file mode 100644
index 0000000000..4dc03e539d
--- /dev/null
+++ b/OpenJK-git/files/openjkded.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd @PREFIX@/share/JediAcademy && exec ./openjkded.@MACHINE_ARCH@
diff --git a/OpenJK-git/files/openjo_sp.sh b/OpenJK-git/files/openjo_sp.sh
new file mode 100644
index 0000000000..9ca7aec3ae
--- /dev/null
+++ b/OpenJK-git/files/openjo_sp.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd @PREFIX@/share/JediOutcast && exec ./openjo_sp.@MACHINE_ARCH@
diff --git a/OpenJK-git/patches/patch-code_rd-vanilla_qgl.h b/OpenJK-git/patches/patch-code_rd-vanilla_qgl.h
new file mode 100644
index 0000000000..2319762cf5
--- /dev/null
+++ b/OpenJK-git/patches/patch-code_rd-vanilla_qgl.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Also support other BSDs.
+
+--- code/rd-vanilla/qgl.h.orig	2018-12-23 21:02:06.000000000 +0000
++++ code/rd-vanilla/qgl.h
+@@ -39,7 +39,7 @@ along with this program; if not, see <ht
+ #	if defined(__FX__)
+ #		include <GL/fxmesa.h>
+ #	endif
+-#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) // rb010123
++#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined( __OpenBSD__ ) // rb010123
+ #	include <GL/gl.h>
+ #	include <GL/glx.h>
+ #	if defined(__FX__)
diff --git a/OpenJK-git/patches/patch-codemp_rd-dedicated_qgl.h b/OpenJK-git/patches/patch-codemp_rd-dedicated_qgl.h
new file mode 100644
index 0000000000..285dfd140a
--- /dev/null
+++ b/OpenJK-git/patches/patch-codemp_rd-dedicated_qgl.h
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Also support other BSDs.
+
+--- codemp/rd-dedicated/qgl.h.orig	2018-12-23 21:02:06.000000000 +0000
++++ codemp/rd-dedicated/qgl.h
+@@ -32,7 +32,7 @@
+ #include <GL/fxmesa.h>
+ #endif
+ 
+-#elif defined( __FreeBSD__ ) // rb010123
++#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined( __OpenBSD__ ) // rb010123
+ 
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+@@ -346,7 +346,7 @@ extern	void ( APIENTRY * qglUnlockArrays
+ //===========================================================================
+ 
+ // non-windows systems will just redefine qgl* to gl*
+-#if !defined( _WIN32 ) && !defined(MACOS_X) && !defined( __linux__ ) && !defined( __FreeBSD__ ) // rb010123
++#if !defined( _WIN32 ) && !defined(MACOS_X) && !defined( __linux__ ) && !defined( __FreeBSD__ ) && !defined( __NetBSD__ ) && !defined( __OpenBSD__ ) // rb010123
+ 
+ #include "qgl_linked.h"
+ 
+@@ -724,7 +724,7 @@ extern BOOL ( WINAPI * qwglSwapIntervalE
+ 
+ #endif	// _WIN32
+ 
+-#if ( (defined __linux__ )  || (defined __FreeBSD__ ) ) // rb010123
++#if ( (defined __linux__ )  || (defined __FreeBSD__ ) || (defined __NetBSD__ ) || (defined __OpenBSD__ ) ) // rb010123
+ 
+ //FX Mesa Functions
+ // bk001129 - from cvs1.17 (mkv)
diff --git a/OpenJK-git/patches/patch-codemp_rd-vanilla_qgl.h b/OpenJK-git/patches/patch-codemp_rd-vanilla_qgl.h
new file mode 100644
index 0000000000..954f91445a
--- /dev/null
+++ b/OpenJK-git/patches/patch-codemp_rd-vanilla_qgl.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Also support other BSDs.
+
+--- codemp/rd-vanilla/qgl.h.orig	2018-12-23 21:02:06.000000000 +0000
++++ codemp/rd-vanilla/qgl.h
+@@ -39,7 +39,7 @@ along with this program; if not, see <ht
+ #	if defined(__FX__)
+ #		include <GL/fxmesa.h>
+ #	endif
+-#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) // rb010123
++#elif defined( __FreeBSD__ ) || defined ( __NetBSD__ ) || defined( __OpenBSD__ ) // rb010123
+ #	include <GL/gl.h>
+ #	include <GL/glx.h>
+ #	if defined(__FX__)
Prev by Date: commandergenius: update to Commander-Genius-2.2.8
Next by Date: Import backports.csv; Backport of Python 3 csv module
Previous by Thread: commandergenius: update to Commander-Genius-2.2.8
Next by Thread: Import backports.csv; Backport of Python 3 csv module
Indexes:
Home | Main Index | Thread Index | Old Index