diff options
author | nia <nia@pkgsrc.org> | 2019-07-02 13:37:34 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-07-02 13:37:34 +0000 |
commit | 928e4e2900f4bbec41fba8fca4798505d5d1ac2c (patch) | |
tree | b07e6d86c48a0f0bee16658e1956b54039502ade | |
parent | 10334d64f40f4c099a3ce6c8bc5cb83e47ec48b1 (diff) | |
download | pkgsrc-928e4e2900f4bbec41fba8fca4798505d5d1ac2c.tar.gz |
quakeforge: The existing workaround is causing duplicate symbol errors at
link-time so just cheat by using "static inline".
Also, don't hardcode the libGL version number, take advantage of symlinks
instead to make libGL load on NetBSD-current with native X.
Bump PKGREVISION.
I still can't really get this to run for more than a few seconds (except
qw-client, which I can't test ingame), it may be borked.
-rw-r--r-- | games/quakeforge/Makefile | 4 | ||||
-rw-r--r-- | games/quakeforge/distinfo | 6 | ||||
-rw-r--r-- | games/quakeforge/patches/patch-ag | 11 | ||||
-rw-r--r-- | games/quakeforge/patches/patch-include_QF_mathlib.h | 49 |
4 files changed, 38 insertions, 32 deletions
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 5d5607c2218..77c33455cda 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2019/04/25 07:32:55 maya Exp $ +# $NetBSD: Makefile,v 1.37 2019/07/02 13:37:34 nia Exp $ DISTNAME= quakeforge-0.5.5 -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/} diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo index d5aeea55f8e..79565375566 100644 --- a/games/quakeforge/distinfo +++ b/games/quakeforge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2017/02/18 14:01:22 joerg Exp $ +$NetBSD: distinfo,v 1.14 2019/07/02 13:37:34 nia Exp $ SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402 RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11 @@ -10,7 +10,7 @@ SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43 SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926 -SHA1 (patch-ag) = a039a25dce8e9a625f461730c70b46c510d4aac3 +SHA1 (patch-ag) = 41b8acf4e012646d5a15e35540275b5584b2603d SHA1 (patch-ah) = b8da2ec1d52c89535d949445871e85872d9a135f SHA1 (patch-ai) = 67ef987cfa9dc50485a5a44341a7576e0e99d5c0 SHA1 (patch-aj) = 5b28f79846fd2dff62004ff52bfc0dad33a91a67 @@ -28,7 +28,7 @@ SHA1 (patch-au) = 5fbe311a03bc65e39e501b38f50a9c42b298a03a SHA1 (patch-av) = 8ba99fa13916ab9efd881a89760307fc5863e9d5 SHA1 (patch-aw) = d02d3a0cfbb47ad2f73e3ee523aed2964a8fcbae SHA1 (patch-include_QF_llist.h) = 34b69e99ca69d4564d7100b0e3bcd8d8a024ec94 -SHA1 (patch-include_QF_mathlib.h) = d867387c23ebfc2542711af655cb27cb3dab261d +SHA1 (patch-include_QF_mathlib.h) = 9f8ff732bbabdc64bba7354c581dc42b4f242330 SHA1 (patch-include_r__dynamic.h) = e37cd1d4e242db48793c29c2b78aa78eb14d138d SHA1 (patch-include_r__local.h) = 7bb3b46ea3835489a20609739bd7a8dc79b36c96 SHA1 (patch-libs_util_llist.c) = d41fdac88ac1c9dbccd1bffd512f7e34ae381860 diff --git a/games/quakeforge/patches/patch-ag b/games/quakeforge/patches/patch-ag index 8f258f847dd..17da1ecc962 100644 --- a/games/quakeforge/patches/patch-ag +++ b/games/quakeforge/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 2008/01/23 04:59:35 tnn Exp $ +$NetBSD: patch-ag,v 1.3 2019/07/02 13:37:34 nia Exp $ --- configure.orig 2004-05-02 20:53:17.000000000 +0000 +++ configure @@ -108,6 +108,15 @@ $NetBSD: patch-ag,v 1.2 2008/01/23 04:59:35 tnn Exp $ ; return 0; } +@@ -31107,7 +31107,7 @@ if test "x$gl_driver" = xauto -o "x$gl_d + if test "$SYSTYPE" = WIN32; then + gl_driver="OPENGL32.DLL" + else +- gl_driver="libGL.so.1" ++ gl_driver="libGL.so" + fi + fi + @@ -32305,6 +32305,7 @@ fi if test "x$BUILD_SW" = xyes; then diff --git a/games/quakeforge/patches/patch-include_QF_mathlib.h b/games/quakeforge/patches/patch-include_QF_mathlib.h index abdb191ae90..cad8a94a3cd 100644 --- a/games/quakeforge/patches/patch-include_QF_mathlib.h +++ b/games/quakeforge/patches/patch-include_QF_mathlib.h @@ -1,44 +1,41 @@ -$NetBSD: patch-include_QF_mathlib.h,v 1.3 2013/06/23 19:54:42 dholland Exp $ +$NetBSD: patch-include_QF_mathlib.h,v 1.4 2019/07/02 13:37:34 nia Exp $ ---- include/QF/mathlib.h.orig 2013-03-28 15:01:01.000000000 +0000 +--- include/QF/mathlib.h.orig 2004-04-07 18:01:45.000000000 +0000 +++ include/QF/mathlib.h -@@ -255,11 +255,12 @@ void QuatMult (const quat_t v1, const qu +@@ -255,12 +255,8 @@ void QuatMult (const quat_t v1, const qu (PlaneDist (point, plane) - (plane)->dist) extern mplane_t * const frustum; -extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs); -extern inline qboolean R_CullSphere (const vec3_t origin, const float radius); -extern inline float VectorNormalize (vec3_t v); // returns vector length - #ifndef IMPLEMENT_R_Cull -+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) -+inline -+#else - extern inline -+#endif - #endif +-#ifndef IMPLEMENT_R_Cull +-extern inline +-#endif ++ ++static inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs) -@@ -273,7 +274,11 @@ R_CullBox (const vec3_t mins, const vec3 + { +@@ -272,9 +268,7 @@ R_CullBox (const vec3_t mins, const vec3 + return false; } - #ifndef IMPLEMENT_R_Cull -+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) -+inline -+#else - extern inline -+#endif - #endif +-#ifndef IMPLEMENT_R_Cull +-extern inline +-#endif ++static inline qboolean R_CullSphere (const vec3_t origin, const float radius) -@@ -291,7 +296,11 @@ R_CullSphere (const vec3_t origin, const + { +@@ -290,9 +284,7 @@ R_CullSphere (const vec3_t origin, const + return false; } - #ifndef IMPLEMENT_VectorNormalize -+#if defined(__clang__) || !defined(__GNUC__) || defined(__GNC_STDC_INLINE__) -+inline -+#else - extern inline -+#endif - #endif +-#ifndef IMPLEMENT_VectorNormalize +-extern inline +-#endif ++static inline float VectorNormalize (vec3_t v) + { |