CVS commit: pkgsrc/devel/SDL

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jul 15 13:42:34 UTC 2019

Modified Files:
        pkgsrc/devel/SDL: Makefile options.mk

Log Message:
SDL: sync options with SDL2

as discussed at pkgsrccon, this was pretty much the only thing still using
or supporting esound. the esound website doesn't even exist any more. NAS
might still be useful, but maybe only if you're using IRIX or something

i'm especially worried about libaudiofile and spidermonkey52 being pulled
in by esound and pulseaudio respectively - the maintainance status of these
libraries is very unclear and their security record is quite problematic.

also:
- Linux gets ALSA.
- explicitly disable support for PlayStation video outputs
  if you get pkgsrc to work on the PlayStation OS please submit a talk
- add pkg-config to USE_TOOLS, it seems to be used in some circumstances.


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/devel/SDL/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/SDL/options.mk

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

Modified files:

Index: pkgsrc/devel/SDL/Makefile
diff -u pkgsrc/devel/SDL/Makefile:1.130 pkgsrc/devel/SDL/Makefile:1.131
--- pkgsrc/devel/SDL/Makefile:1.130     Fri Jul  6 15:06:45 2018
+++ pkgsrc/devel/SDL/Makefile   Mon Jul 15 13:42:34 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2018/07/06 15:06:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.131 2019/07/15 13:42:34 nia Exp $
 
 DISTNAME=      SDL-1.2.15
-PKGREVISION=   25
+PKGREVISION=   26
 CATEGORIES=    devel games
 MASTER_SITES=  http://www.libsdl.org/release/
 
@@ -12,7 +12,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 PTHREAD_OPTS+=         require
 
@@ -31,6 +31,9 @@ NASMFLAGS_a.out=      -f aoutb
 CONFIGURE_ARGS+=       --disable-nasm
 .endif
 
+CONFIGURE_ARGS+=       --disable-video-ps2gs
+CONFIGURE_ARGS+=       --disable-video-ps3
+
 CONFIGURE_ENV+=                NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 MAKE_ENV+=             NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
 

Index: pkgsrc/devel/SDL/options.mk
diff -u pkgsrc/devel/SDL/options.mk:1.7 pkgsrc/devel/SDL/options.mk:1.8
--- pkgsrc/devel/SDL/options.mk:1.7     Wed Sep 27 13:49:38 2017
+++ pkgsrc/devel/SDL/options.mk Mon Jul 15 13:42:34 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2017/09/27 13:49:38 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2019/07/15 13:42:34 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.SDL
-PKG_SUPPORTED_OPTIONS= aalib esound nas pulseaudio
-PKG_SUGGESTED_OPTIONS= esound nas pulseaudio
+PKG_SUPPORTED_OPTIONS= aalib alsa esound nas pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,6 +11,13 @@ CONFIGURE_ARGS+=     --enable-video-aalib
 .include "../../graphics/aalib/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=       --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-alsa
+.endif
+
 .if !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=       --enable-esd
 .include "../../audio/esound/buildlink3.mk"