pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SDL SDL: sync options with SDL2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f90d269ebca
branches:  trunk
changeset: 398276:5f90d269ebca
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jul 15 13:42:34 2019 +0000

description:
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.

diffstat:

 devel/SDL/Makefile   |   9 ++++++---
 devel/SDL/options.mk |  13 ++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 3e0d92e0db09 -r 5f90d269ebca devel/SDL/Makefile
--- a/devel/SDL/Makefile        Mon Jul 15 12:58:04 2019 +0000
+++ b/devel/SDL/Makefile        Mon Jul 15 13:42:34 2019 +0000
@@ -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 @@
 
 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 @@
 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}}"
 
diff -r 3e0d92e0db09 -r 5f90d269ebca devel/SDL/options.mk
--- a/devel/SDL/options.mk      Mon Jul 15 12:58:04 2019 +0000
+++ b/devel/SDL/options.mk      Mon Jul 15 13:42:34 2019 +0000
@@ -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 @@
 .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"



Home | Main Index | Thread Index | Old Index