[pkgsrc/trunk]: pkgsrc/games/etlegacy etlegacy: rm workaround for SDL_netbsda...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ae02a31b924
branches:  trunk
changeset: 397455:6ae02a31b924
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 23 13:28:04 2019 +0000

description:
etlegacy: rm workaround for SDL_netbsdaudio, since it ain't broken now.

Also, improve comments.

diffstat:

 games/etlegacy/MESSAGE                              |   5 ++++-
 games/etlegacy/Makefile                             |  14 +++++++++-----
 games/etlegacy/distinfo                             |   3 +--
 games/etlegacy/patches/patch-src_client_snd__main.c |  15 ---------------
 4 files changed, 14 insertions(+), 23 deletions(-)

diffs (101 lines):

diff -r 74ccf3d45aad -r 6ae02a31b924 games/etlegacy/MESSAGE
--- a/games/etlegacy/MESSAGE    Sun Jun 23 11:41:25 2019 +0000
+++ b/games/etlegacy/MESSAGE    Sun Jun 23 13:28:04 2019 +0000
@@ -1,5 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2019/04/11 20:56:34 nia Exp $
+$NetBSD: MESSAGE,v 1.2 2019/06/23 13:28:04 nia Exp $
+
+Enemy Territory is available as a free download, but the data files are not
+redistributable.
 
 pak0.pk3, pak1.pk3 and pak2.pk3 must be copied from the official game
 files to ${PREFIX}/share/etlegacy/etmain to play Enemy Territory.
diff -r 74ccf3d45aad -r 6ae02a31b924 games/etlegacy/Makefile
--- a/games/etlegacy/Makefile   Sun Jun 23 11:41:25 2019 +0000
+++ b/games/etlegacy/Makefile   Sun Jun 23 13:28:04 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/06/23 11:20:23 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/06/23 13:28:04 nia Exp $
 
 PKGNAME=       etlegacy-2.76
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games
 
 DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
@@ -25,12 +25,14 @@
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-CMAKE_ARGS+=   -DRENDERER_DYNAMIC=OFF # doesn't work with builtin MesaLib
+CMAKE_ARGS+=   -DRENDERER_DYNAMIC=OFF
 CMAKE_ARGS+=   -DFEATURE_RENDERER2=OFF # experimental, buggy
 
+# use libraries from pkgsrc
 CMAKE_ARGS+=   -DBUNDLED_CURL=OFF
 CMAKE_ARGS+=   -DBUNDLED_FREETYPE=OFF
 CMAKE_ARGS+=   -DBUNDLED_GLEW=OFF
+CMAKE_ARGS+=   -DBUNDLED_JANSSON=OFF
 CMAKE_ARGS+=   -DBUNDLED_JPEG=OFF
 CMAKE_ARGS+=   -DBUNDLED_LUA=OFF
 CMAKE_ARGS+=   -DBUNDLED_OGG_VORBIS=OFF
@@ -41,20 +43,22 @@
 CMAKE_ARGS+=   -DBUNDLED_THEORA=OFF
 CMAKE_ARGS+=   -DBUNDLED_ZLIB=OFF
 
+# don't try to build i386 binaries on amd64
 CMAKE_ARGS+=   -DCROSS_COMPILE32=OFF
 
 CMAKE_ARGS+=   -DFEATURE_AUTOUPDATE=OFF
 
+# tries to install binaries
+# but maybe this can be built from source separately
 CMAKE_ARGS+=   -DFEATURE_OMNIBOT=OFF
 CMAKE_ARGS+=   -DINSTALL_OMNIBOT=OFF
 
-CMAKE_ARGS+=   -DFEATURE_OPENAL=ON
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_BINDIR="bin"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_MODDIR="share/etlegacy"
 
+# don't use fopen64 etc
 CFLAGS+=       -DIOAPI_NO_64
 
 CHECK_PORTABILITY_SKIP+=       libs/sdl2/build-scripts/*
diff -r 74ccf3d45aad -r 6ae02a31b924 games/etlegacy/distinfo
--- a/games/etlegacy/distinfo   Sun Jun 23 11:41:25 2019 +0000
+++ b/games/etlegacy/distinfo   Sun Jun 23 13:28:04 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/06/23 11:20:23 maya Exp $
+$NetBSD: distinfo,v 1.3 2019/06/23 13:28:04 nia Exp $
 
 SHA1 (etlegacy-2.76/etlegacy-libs.tar.gz) = 27da78b9c118be2bb931543ee217f95246e26658
 RMD160 (etlegacy-2.76/etlegacy-libs.tar.gz) = 3052bd1c8f3164016d5402452e76f4ed66e3571f
@@ -10,5 +10,4 @@
 Size (etlegacy-2.76/etlegacy.tar.gz) = 10381173 bytes
 SHA1 (patch-cmake_ETLInstall.cmake) = f89a99b5c280227f520fbd6f2eec06139cec503f
 SHA1 (patch-cmake_ETLPlatform.cmake) = d73dd745cf2d70f0f0fe6385364d54ac2cdbe0e8
-SHA1 (patch-src_client_snd__main.c) = 82d4fef339044d6677eadad526b8f2b57099514f
 SHA1 (patch-src_qcommon_q__platform.h) = b377ad5033c4f47a2c6659837e2a0b72082dd570
diff -r 74ccf3d45aad -r 6ae02a31b924 games/etlegacy/patches/patch-src_client_snd__main.c
--- a/games/etlegacy/patches/patch-src_client_snd__main.c       Sun Jun 23 11:41:25 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_client_snd__main.c,v 1.1 2019/04/11 20:56:34 nia Exp $
-
-Default to OpenAL over SDL2 - eliminates stuttering on NetBSD.
-
---- src/client/snd_main.c.orig 2019-01-05 19:54:35.000000000 +0000
-+++ src/client/snd_main.c
-@@ -809,7 +809,7 @@ void S_StopMusic_f(void)
-  */
- void S_Init(void)
- {
--      cvar_t *cv = Cvar_Get("s_initsound", "1", CVAR_ARCHIVE | CVAR_LATCH | CVAR_UNSAFE);  // 0 = disabled, 1 = SDL2, 2 = OpenAL
-+      cvar_t *cv = Cvar_Get("s_initsound", "2", CVAR_ARCHIVE | CVAR_LATCH | CVAR_UNSAFE);  // 0 = disabled, 1 = SDL2, 2 = OpenAL
- 
-       Com_Printf("------ Initializing Sound (%i)------\n", cv->integer);
-