Add Xonotic, the free arena shooter.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Add Xonotic, the free arena shooter.
From: Charlotte Koch <cfkoch%edgebsd.org@localhost>
Date: Mon, 30 Jan 2017 00:48:33 +0000
Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Sun Jan 29 16:48:33 2017 -0800
Changeset:	caeb8dddb6eb8a3925f7f1636d2ddb9e2b5717d6

Modified Files:
	Makefile
Added Files:
	xonotic/DESCR
	xonotic/Makefile
	xonotic/PLIST
	xonotic/TODO
	xonotic/distinfo
	xonotic/patches/patch-Makefile
	xonotic/patches/patch-source_darkplaces_hmac.c
	xonotic/patches/patch-source_darkplaces_hmac.h
	xonotic/patches/patch-source_darkplaces_makefile.inc
	xonotic/patches/patch-source_gmqcc_Makefile
	xonotic/patches/patch-source_gmqcc_gmqcc.h

Log Message:
Add Xonotic, the free arena shooter.

*ALMOST* works on NetBSD. There's some linker/rpath funkiness going on.

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

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

diffstat:
 Makefile                                           |  1 +
 xonotic/DESCR                                      |  4 +++
 xonotic/Makefile                                   | 23 ++++++++++++++
 xonotic/PLIST                                      |  0
 xonotic/TODO                                       |  2 ++
 xonotic/distinfo                                   | 12 +++++++
 xonotic/patches/patch-Makefile                     | 11 +++++++
 xonotic/patches/patch-source_darkplaces_hmac.c     | 11 +++++++
 xonotic/patches/patch-source_darkplaces_hmac.h     | 20 ++++++++++++
 .../patches/patch-source_darkplaces_makefile.inc   | 11 +++++++
 xonotic/patches/patch-source_gmqcc_Makefile        | 37 ++++++++++++++++++++++
 xonotic/patches/patch-source_gmqcc_gmqcc.h         | 11 +++++++
 12 files changed, 143 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index bc62c2e..edb4f0f 100644
--- a/Makefile
+++ b/Makefile
@@ -4427,6 +4427,7 @@ SUBDIR+=	xplore
 SUBDIR+=	xrdp
 SUBDIR+=	xspd
 SUBDIR+=	xspdapp
+SUBDIr+=	xonotic
 SUBDIR+=	xspread
 SUBDIR+=	xtags
 SUBDIR+=	xtraceroute
diff --git a/xonotic/DESCR b/xonotic/DESCR
new file mode 100644
index 0000000..1134d7a
--- /dev/null
+++ b/xonotic/DESCR
@@ -0,0 +1,4 @@
+Xonotic is an addictive, arena-style first person shooter with crisp
+movement and a wide array of weapons. It combines intuitive mechanics with
+in-your-face action to elevate your heart rate. Xonotic is and will always
+be free-to-play. It is available under the copyleft-style GPLv2 license.
diff --git a/xonotic/Makefile b/xonotic/Makefile
new file mode 100644
index 0000000..9d83384
--- /dev/null
+++ b/xonotic/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD$
+
+DISTNAME=	xonotic-0.8.1
+CATEGORIES=	games
+MASTER_SITES=	http://nl.dl.xonotic.org/
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	cfkoch%edgebsd.org@localhost
+COMMENT=	The free and fast arena shooter
+HOMEPAGE=	http://xonotic.org/
+LICENSE=	gnu-gpl-v2
+
+USE_TOOLS+=	gmake
+USE_LANGUAGES+=	c c++
+
+WRKSRC=		${WRKDIR}/Xonotic
+BUILD_TARGET=	all-zip-source
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xonotic/PLIST b/xonotic/PLIST
new file mode 100644
index 0000000..e69de29
diff --git a/xonotic/TODO b/xonotic/TODO
new file mode 100644
index 0000000..5d6553f
--- /dev/null
+++ b/xonotic/TODO
@@ -0,0 +1,2 @@
+- I only have been testing with NetBSD so far
+- darkplaces-sdl builds and links OK except for some rpath strangeness
diff --git a/xonotic/distinfo b/xonotic/distinfo
new file mode 100644
index 0000000..1d62415
--- /dev/null
+++ b/xonotic/distinfo
@@ -0,0 +1,12 @@
+$NetBSD$
+
+SHA1 (xonotic-0.8.1.zip) = 2f6d46caa35a6778845c0c927d889af57677f8d2
+RMD160 (xonotic-0.8.1.zip) = cf5d5c7535aca52877770e9abea8cdb79e6463dd
+SHA512 (xonotic-0.8.1.zip) = adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4
+Size (xonotic-0.8.1.zip) = 984854761 bytes
+SHA1 (patch-Makefile) = 5062b2e3366d3ce3aa060228c6121c30c63d7285
+SHA1 (patch-source_darkplaces_hmac.c) = 2fae84c009f8808c814e4b68ba8c5640a001f699
+SHA1 (patch-source_darkplaces_hmac.h) = 62e3c7a657b8bef5a0dbb7fb0367379bcaae6347
+SHA1 (patch-source_darkplaces_makefile.inc) = e6b145ac7bd945a4cb957a3cc6a8a0eefc35b980
+SHA1 (patch-source_gmqcc_Makefile) = 40716c8fd9b46307bf7996300151822a704e6c48
+SHA1 (patch-source_gmqcc_gmqcc.h) = 1703136b3022637885bfa51a3e08ec8a86d20b05
diff --git a/xonotic/patches/patch-Makefile b/xonotic/patches/patch-Makefile
new file mode 100644
index 0000000..6bd6323
--- /dev/null
+++ b/xonotic/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.old	2017-01-29 15:33:05.816238729 -0800
++++ Makefile	2017-01-29 15:33:11.893156479 -0800
+@@ -30,7 +30,7 @@
+ 	( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
+ 	$(MAKE) -C source/d0_blind_id
+ 	$(MAKE) -C source/gmqcc
+-	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/gmqcc/gmqcc
++	$(MAKE) -C source/qcsrc QCC=$(CURDIR)/source/gmqcc/gmqcc
+ 	$(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
+ 	$(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
+ 	$(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
diff --git a/xonotic/patches/patch-source_darkplaces_hmac.c b/xonotic/patches/patch-source_darkplaces_hmac.c
new file mode 100644
index 0000000..d62b456
--- /dev/null
+++ b/xonotic/patches/patch-source_darkplaces_hmac.c
@@ -0,0 +1,11 @@
+--- ./source/darkplaces/hmac.c.old	2015-08-25 15:10:24.000000000 -0700
++++ ./source/darkplaces/hmac.c	2017-01-29 15:40:52.751046841 -0800
+@@ -1,7 +1,7 @@
+ #include "quakedef.h"
+ #include "hmac.h"
+ 
+-qboolean hmac(
++qboolean darkplaces_hmac(
+ 	hashfunc_t hfunc, int hlen, int hblock,
+ 	unsigned char *out,
+ 	const unsigned char *in, int n,
diff --git a/xonotic/patches/patch-source_darkplaces_hmac.h b/xonotic/patches/patch-source_darkplaces_hmac.h
new file mode 100644
index 0000000..1301c69
--- /dev/null
+++ b/xonotic/patches/patch-source_darkplaces_hmac.h
@@ -0,0 +1,20 @@
+--- ./source/darkplaces/hmac.h.old	2015-08-25 15:10:24.000000000 -0700
++++ ./source/darkplaces/hmac.h	2017-01-29 15:40:52.751077907 -0800
+@@ -2,14 +2,14 @@
+ #define HMAC_H
+ 
+ typedef void (*hashfunc_t) (unsigned char *out, const unsigned char *in, int n);
+-qboolean hmac(
++qboolean darkplaces_hmac(
+ 	hashfunc_t hfunc, int hlen, int hblock,
+ 	unsigned char *out,
+ 	const unsigned char *in, int n,
+ 	const unsigned char *key, int k
+ );
+ 
+-#define HMAC_MDFOUR_16BYTES(out, in, n, key, k) hmac(mdfour, 16, 64, out, in, n, key, k)
+-#define HMAC_SHA256_32BYTES(out, in, n, key, k) hmac(sha256, 32, 64, out, in, n, key, k)
++#define HMAC_MDFOUR_16BYTES(out, in, n, key, k) darkplaces_hmac(mdfour, 16, 64, out, in, n, key, k)
++#define HMAC_SHA256_32BYTES(out, in, n, key, k) darkplaces_hmac(sha256, 32, 64, out, in, n, key, k)
+ 
+ #endif
diff --git a/xonotic/patches/patch-source_darkplaces_makefile.inc b/xonotic/patches/patch-source_darkplaces_makefile.inc
new file mode 100644
index 0000000..73f51c8
--- /dev/null
+++ b/xonotic/patches/patch-source_darkplaces_makefile.inc
@@ -0,0 +1,11 @@
+--- ./source/darkplaces/makefile.inc.old	2017-01-29 16:01:20.020748344 -0800
++++ ./source/darkplaces/makefile.inc	2017-01-29 16:01:52.502349209 -0800
+@@ -205,7 +205,7 @@
+ 
+ OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
+ 
+-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
++LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -L${PREFIX}/lib
+ LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND)
+ LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl
+ LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
diff --git a/xonotic/patches/patch-source_gmqcc_Makefile b/xonotic/patches/patch-source_gmqcc_Makefile
new file mode 100644
index 0000000..12890ac
--- /dev/null
+++ b/xonotic/patches/patch-source_gmqcc_Makefile
@@ -0,0 +1,37 @@
+--- ./source/gmqcc/Makefile.old	2017-01-29 00:58:59.253045990 -0800
++++ ./source/gmqcc/Makefile	2017-01-29 00:59:06.869507333 -0800
+@@ -4,34 +4,6 @@
+ CYGWIN  = $(findstring CYGWIN, $(UNAME))
+ MINGW   = $(findstring MINGW,  $(UNAME))
+ 
+-# turn on tons of warnings if clang is present
+-# but also turn off the STUPID ONES
+-ifeq ($(CC), clang)
+-	CFLAGS +=                              \
+-	    -Weverything                       \
+-	    -Wno-padded                        \
+-	    -Wno-format-nonliteral             \
+-	    -Wno-disabled-macro-expansion      \
+-	    -Wno-conversion                    \
+-	    -Wno-float-equal                   \
+-	    -Wno-unknown-warning-option        \
+-	    -Wno-cast-align                    \
+-	    -Wno-assign-enum                   \
+-	    -Wno-empty-body                    \
+-	    -Wno-date-time                     \
+-	    -pedantic-errors
+-else
+-	ifneq ($(CC), g++)
+-		CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
+-	endif
+-
+-	ifneq ($(CC), tcc)
+-		CFLAGS += -pedantic-errors
+-	else
+-		CFLAGS += -Wno-pointer-sign -fno-common
+-	endif
+-endif
+-
+ ifneq ($(shell git describe --always 2>/dev/null),)
+ 	CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+ endif
diff --git a/xonotic/patches/patch-source_gmqcc_gmqcc.h b/xonotic/patches/patch-source_gmqcc_gmqcc.h
new file mode 100644
index 0000000..d73b6a9
--- /dev/null
+++ b/xonotic/patches/patch-source_gmqcc_gmqcc.h
@@ -0,0 +1,11 @@
+--- ./source/gmqcc/gmqcc.h.old	2017-01-29 00:50:17.690470085 -0800
++++ ./source/gmqcc/gmqcc.h	2017-01-29 00:50:41.735428133 -0800
+@@ -104,7 +104,7 @@
+ #define GMQCC_BYTE_ORDER_BIG    4321
+ 
+ #if defined (__GNUC__) || defined (__GNU_LIBRARY__)
+-#   if defined (__FreeBSD__) || defined (__OpenBSD__)
++#   if defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__)
+ #       include <sys/endian.h>
+ #   elif defined (BSD) && (BSD >= 199103) || defined (__DJGPP__) || defined (__CYGWIN32__)
+ #       include <machine/endian.h>
Prev by Date: lldb-netbsd: Update TODO: New patch sent upstream
Next by Date: Typo
Previous by Thread: lldb-netbsd: Update TODO: New patch sent upstream
Next by Thread: Typo
Indexes:
Home | Main Index | Thread Index | Old Index