CVS commit: pkgsrc/games

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 17 09:48:21 UTC 2024

Modified Files:
        pkgsrc/games/etlegacy: Makefile.common PLIST distinfo
        pkgsrc/games/etlegacy-server: Makefile
Added Files:
        pkgsrc/games/etlegacy/patches: patch-src_sdl_sdl__glimp.c

Log Message:
etlegacy[-server]: Update to 2.83.1

Release notes:
https://www.etlegacy.com/blog/et-legacy-2830-mom-its-working


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/etlegacy/Makefile.common \
    pkgsrc/games/etlegacy/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/etlegacy/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/games/etlegacy-server/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/etlegacy/patches/patch-src_sdl_sdl__glimp.c

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

Modified files:

Index: pkgsrc/games/etlegacy/Makefile.common
diff -u pkgsrc/games/etlegacy/Makefile.common:1.11 pkgsrc/games/etlegacy/Makefile.common:1.12
--- pkgsrc/games/etlegacy/Makefile.common:1.11  Sun Aug 25 06:18:43 2024
+++ pkgsrc/games/etlegacy/Makefile.common       Sun Nov 17 09:48:20 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2024/08/25 06:18:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2024/11/17 09:48:20 nia Exp $
 # used by games/etlegacy/Makefile
 # used by games/etlegacy-server/Makefile
 
-ETL_VERSION=   2.82.1
+ETL_VERSION=   2.83.1
 CATEGORIES=    games
 
 DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
@@ -30,8 +30,12 @@ PLIST_SRC+=  ${.CURDIR}/../../games/etleg
 
 WRKSRC=                ${WRKDIR}/etlegacy-${ETL_VERSION}
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
+USE_TOOLS+=    gmake # file names contain spaces
+
+.if exists(/usr/lib/libexecinfo.so)
+LDFLAGS+=      -lexecinfo
+.endif
 
 # use libraries from pkgsrc
 CMAKE_CONFIGURE_ARGS+= -DBUNDLED_CJSON=OFF
@@ -82,7 +86,7 @@ CHECK_PORTABILITY_SKIP+=      libs/jpegturbo/
 PLIST_SUBST+=  ARCH_STRING="x86_64"
 .elif ${MACHINE_ARCH} == "i386"
 PLIST_SUBST+=  ARCH_STRING="i386"
-.elif !empty(MACHINE_ARCH:M*arm*)
+.elif ${MACHINE_ARCH:M*arm*}
 PLIST_SUBST+=  ARCH_STRING="arm"
 .else
 # maybe architecture-neutral shared objects could be generated
@@ -94,6 +98,7 @@ post-extract:
        ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \
            ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs
 
+.include "../../devel/cmake/build.mk"
 .include "../../archivers/minizip/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/cJSON/buildlink3.mk"
Index: pkgsrc/games/etlegacy/PLIST
diff -u pkgsrc/games/etlegacy/PLIST:1.11 pkgsrc/games/etlegacy/PLIST:1.12
--- pkgsrc/games/etlegacy/PLIST:1.11    Sat Aug 10 11:12:16 2024
+++ pkgsrc/games/etlegacy/PLIST Sun Nov 17 09:48:20 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/08/10 11:12:16 nia Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/11/17 09:48:20 nia Exp $
 ${PLIST.client}bin/etl.${ARCH_STRING}
 bin/etlded.${ARCH_STRING}
 man/man6/etl.6
@@ -14,7 +14,7 @@ share/etlegacy/etmain/mapvotecycle.cfg
 share/etlegacy/etmain/mapvoteplayerscount.cfg
 share/etlegacy/etmain/objectivecycle.cfg
 share/etlegacy/legacy/description.txt
-share/etlegacy/legacy/legacy_2.82-dirty.pk3
+share/etlegacy/legacy/legacy_2.83-dirty.pk3
 share/icons/hicolor/scalable/apps/etl.svg
 share/licenses/etlegacy/COPYING.txt
 share/metainfo/com.etlegacy.ETLegacy.metainfo.xml

Index: pkgsrc/games/etlegacy/distinfo
diff -u pkgsrc/games/etlegacy/distinfo:1.12 pkgsrc/games/etlegacy/distinfo:1.13
--- pkgsrc/games/etlegacy/distinfo:1.12 Sat Aug 10 11:12:16 2024
+++ pkgsrc/games/etlegacy/distinfo      Sun Nov 17 09:48:20 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2024/08/10 11:12:16 nia Exp $
+$NetBSD: distinfo,v 1.13 2024/11/17 09:48:20 nia Exp $
 
-BLAKE2s (etlegacy-2.82.1/etlegacy-libs.tar.gz) = 03920fdf9fdfebb424c2875985aad427b5eeb6855a9ed630f0344f3ab25bb00c
-SHA512 (etlegacy-2.82.1/etlegacy-libs.tar.gz) = b6144e8d550884d23f8e8a49a2b221ca18e25761f1d3ac4ce07b19e36545deb8b97c9bfcab2ec81137af808548e7440db64fbc2db9e1988e8d878c187f47cbbb
-Size (etlegacy-2.82.1/etlegacy-libs.tar.gz) = 18024222 bytes
-BLAKE2s (etlegacy-2.82.1/etlegacy.tar.gz) = c3e578bbc3fdc762665b71825848f96d489064cfb21c95c60ad98fc2a8f0e3c4
-SHA512 (etlegacy-2.82.1/etlegacy.tar.gz) = fcae1bae4c5c5e5153fc61ddfcd49e68abc4442191cb64c525eb3cdd640ac7dc5deefd36dbc810853a70e4e3de7c461e4b17435ba4ffea6b47f5f033f1baa4b7
-Size (etlegacy-2.82.1/etlegacy.tar.gz) = 15174508 bytes
+BLAKE2s (etlegacy-2.83.1/etlegacy-libs.tar.gz) = 03920fdf9fdfebb424c2875985aad427b5eeb6855a9ed630f0344f3ab25bb00c
+SHA512 (etlegacy-2.83.1/etlegacy-libs.tar.gz) = b6144e8d550884d23f8e8a49a2b221ca18e25761f1d3ac4ce07b19e36545deb8b97c9bfcab2ec81137af808548e7440db64fbc2db9e1988e8d878c187f47cbbb
+Size (etlegacy-2.83.1/etlegacy-libs.tar.gz) = 18024222 bytes
+BLAKE2s (etlegacy-2.83.1/etlegacy.tar.gz) = a74d83b49267b62b302b7e50b6b137cd790e4a3707e19aea5bf65166796808df
+SHA512 (etlegacy-2.83.1/etlegacy.tar.gz) = 177249dd500347c6484221086e5b21be73ac26931f2a7b87bbda26936ca624e0105b067d48ec3aa1ad4979144ac818d2d7b65b32bcb20fde3aa36da480249367
+Size (etlegacy-2.83.1/etlegacy.tar.gz) = 15611296 bytes
 SHA1 (patch-cmake_ETLInstall.cmake) = a5b2a80b6cef0f28e5d1042fb84ea617d62fec74
 SHA1 (patch-cmake_FindLua.cmake) = b25e7deef2f03f40dfbe577e94717b1bfc0aca59
 SHA1 (patch-src_sdl_sdl__glimp.c) = 6f229c946cba675b8d0b3602500078fb9337367f

Index: pkgsrc/games/etlegacy-server/Makefile
diff -u pkgsrc/games/etlegacy-server/Makefile:1.33 pkgsrc/games/etlegacy-server/Makefile:1.34
--- pkgsrc/games/etlegacy-server/Makefile:1.33  Thu Nov 14 22:19:49 2024
+++ pkgsrc/games/etlegacy-server/Makefile       Sun Nov 17 09:48:21 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.33 2024/11/14 22:19:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/11/17 09:48:21 nia Exp $
 
-PKGREVISION= 3
 .include "../../games/etlegacy/Makefile.common"
 
 PKGNAME=       etlegacy-server-${ETL_VERSION}

Added files:

Index: pkgsrc/games/etlegacy/patches/patch-src_sdl_sdl__glimp.c
diff -u /dev/null pkgsrc/games/etlegacy/patches/patch-src_sdl_sdl__glimp.c:1.1
--- /dev/null   Sun Nov 17 09:48:21 2024
+++ pkgsrc/games/etlegacy/patches/patch-src_sdl_sdl__glimp.c    Sun Nov 17 09:48:21 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_sdl_sdl__glimp.c,v 1.1 2024/11/17 09:48:21 nia Exp $
+
+Default fullscreen to off - a bit safer.
+
+--- src/sdl/sdl_glimp.c.orig   2024-08-10 11:04:40.918867331 +0000
++++ src/sdl/sdl_glimp.c
+@@ -359,7 +359,7 @@ static void GLimp_InitCvars(void)
+       r_allowResize     = Cvar_Get("r_allowResize", "0", CVAR_ARCHIVE);
+ 
+       // Window cvars
+-      r_fullscreen     = Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
++      r_fullscreen     = Cvar_Get("r_fullscreen", "0", CVAR_ARCHIVE | CVAR_LATCH);
+       r_noBorder       = Cvar_Get("r_noborder", "0", CVAR_ARCHIVE_ND | CVAR_LATCH);
+       r_centerWindow   = Cvar_Get("r_centerWindow", "0", CVAR_ARCHIVE | CVAR_LATCH);
+       r_customwidth    = Cvar_Get("r_customwidth", "1280", CVAR_ARCHIVE | CVAR_LATCH);