CVS commit: pkgsrc/games/quakespasm

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 22 23:05:43 UTC 2024

Modified Files:
        pkgsrc/games/quakespasm: Makefile distinfo
Added Files:
        pkgsrc/games/quakespasm/patches: patch-main__sdl.c

Log Message:
quakespasm: Fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/quakespasm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/quakespasm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/quakespasm/patches/patch-main__sdl.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/quakespasm/Makefile
diff -u pkgsrc/games/quakespasm/Makefile:1.22 pkgsrc/games/quakespasm/Makefile:1.23
--- pkgsrc/games/quakespasm/Makefile:1.22       Tue Jan 30 14:22:03 2024
+++ pkgsrc/games/quakespasm/Makefile    Fri Mar 22 23:05:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/01/30 14:22:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2024/03/22 23:05:42 nia Exp $
 
 DISTNAME=      quakespasm-0.96.1
 PKGREVISION=   1
@@ -18,6 +18,15 @@ MAKE_FLAGS+= MP3LIB=mpg123
 WRKSRC=                ${WRKDIR}/${DISTNAME}/Quake
 BUILD_TARGET=  quakespasm
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+MAKE_FLAGS+=   COMMON_LIBS="-framework OpenGL -lm"
+LDFLAGS+=      -framework CoreFoundation
+LDFLAGS+=      -framework IOKit
+LDFLAGS+=      -lSDL2main
+.endif
+
 INSTALLATION_DIRS=     bin
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 

Index: pkgsrc/games/quakespasm/distinfo
diff -u pkgsrc/games/quakespasm/distinfo:1.13 pkgsrc/games/quakespasm/distinfo:1.14
--- pkgsrc/games/quakespasm/distinfo:1.13       Thu Oct 26 16:13:58 2023
+++ pkgsrc/games/quakespasm/distinfo    Fri Mar 22 23:05:42 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2023/10/26 16:13:58 snj Exp $
+$NetBSD: distinfo,v 1.14 2024/03/22 23:05:42 nia Exp $
 
 BLAKE2s (quakespasm-0.96.1.tar.gz) = 6910026dcab003855d41b04631c786e31999355dc2a1a5073a708595274f6c50
 SHA512 (quakespasm-0.96.1.tar.gz) = 4bf442b866e90ecb0deaebd97f21847d38b0931b297547a598f9c98c4882de33ac422dfdc376c1d5f03b18e0d480932632052747afa3741b35613637371a69d0
 Size (quakespasm-0.96.1.tar.gz) = 11515757 bytes
+SHA1 (patch-main__sdl.c) = 7b67b1da9e2f5e35ff3f089069f76928d322e390

Added files:

Index: pkgsrc/games/quakespasm/patches/patch-main__sdl.c
diff -u /dev/null pkgsrc/games/quakespasm/patches/patch-main__sdl.c:1.1
--- /dev/null   Fri Mar 22 23:05:43 2024
+++ pkgsrc/games/quakespasm/patches/patch-main__sdl.c   Fri Mar 22 23:05:42 2024
@@ -0,0 +1,27 @@
+$NetBSD: patch-main__sdl.c,v 1.1 2024/03/22 23:05:42 nia Exp $
+
+Include the proper header for the SDL_main alias.
+
+--- main_sdl.c.orig    2024-03-22 22:32:47.000000000 +0000
++++ main_sdl.c
+@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #else
+ #include "SDL.h"
+ #endif
++#include <SDL_main.h>
+ #include <stdio.h>
+ 
+ static void Sys_AtExit (void)
+@@ -60,12 +61,6 @@ static void Sys_InitSDL (void)
+ 
+ static quakeparms_t   parms;
+ 
+-// On OS X we call SDL_main from the launcher, but SDL2 doesn't redefine main
+-// as SDL_main on OS X anymore, so we do it ourselves.
+-#if defined(USE_SDL2) && defined(__APPLE__)
+-#define main SDL_main
+-#endif
+-
+ int main(int argc, char *argv[])
+ {
+       int             t;