CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jan 20 21:13:16 UTC 2020

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

Log Message:
SDL[2]: Remove esound support


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/devel/SDL/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/SDL/options.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/SDL2/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.135 pkgsrc/devel/SDL/Makefile:1.136
--- pkgsrc/devel/SDL/Makefile:1.135     Wed Sep 18 14:17:07 2019
+++ pkgsrc/devel/SDL/Makefile   Mon Jan 20 21:13:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2019/09/18 14:17:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.136 2020/01/20 21:13:16 nia Exp $
 
 DISTNAME=      SDL-1.2.15
 PKGREVISION=   29
@@ -31,6 +31,7 @@ NASMFLAGS_a.out=      -f aoutb
 CONFIGURE_ARGS+=       --disable-nasm
 .endif
 
+CONFIGURE_ARGS+=       --disable-esd
 CONFIGURE_ARGS+=       --disable-video-ps2gs
 CONFIGURE_ARGS+=       --disable-video-ps3
 

Index: pkgsrc/devel/SDL/options.mk
diff -u pkgsrc/devel/SDL/options.mk:1.9 pkgsrc/devel/SDL/options.mk:1.10
--- pkgsrc/devel/SDL/options.mk:1.9     Sun Jul 21 11:25:52 2019
+++ pkgsrc/devel/SDL/options.mk Mon Jan 20 21:13:16 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2019/07/21 11:25:52 nia Exp $
+# $NetBSD: options.mk,v 1.10 2020/01/20 21:13:16 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.SDL
-PKG_SUPPORTED_OPTIONS=         aalib alsa esound nas pulseaudio
+PKG_SUPPORTED_OPTIONS=         aalib alsa nas pulseaudio
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .include "../../mk/bsd.options.mk"
@@ -18,13 +18,6 @@ CONFIGURE_ARGS+=     --enable-alsa
 CONFIGURE_ARGS+=       --disable-alsa
 .endif
 
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=       --enable-esd
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-esd
-.endif
-
 .if !empty(PKG_OPTIONS:Mnas)
 CONFIGURE_ARGS+=       --enable-nas
 .include "../../audio/nas/buildlink3.mk"

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.41 pkgsrc/devel/SDL2/Makefile:1.42
--- pkgsrc/devel/SDL2/Makefile:1.41     Sat Jan  4 01:52:23 2020
+++ pkgsrc/devel/SDL2/Makefile  Mon Jan 20 21:13:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/01/04 01:52:23 nia Exp $
+# $NetBSD: Makefile,v 1.42 2020/01/20 21:13:16 nia Exp $
 
 DISTNAME=      SDL2-2.0.10
 PKGREVISION=   2
@@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE+=  sdl2.pc.in
 CONFIGURE_ENV+=        SDL_RLD_FLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib \
                ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
 
+CONFIGURE_ARGS+=       --disable-esd
 CONFIGURE_ARGS+=       --disable-x11-shared
 
 CHECK_PORTABILITY_SKIP+=       build-scripts/androidbuildlibs.sh

Index: pkgsrc/devel/SDL2/options.mk
diff -u pkgsrc/devel/SDL2/options.mk:1.14 pkgsrc/devel/SDL2/options.mk:1.15
--- pkgsrc/devel/SDL2/options.mk:1.14   Sat Jan  4 01:52:23 2020
+++ pkgsrc/devel/SDL2/options.mk        Mon Jan 20 21:13:16 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.14 2020/01/04 01:52:23 nia Exp $
+# $NetBSD: options.mk,v 1.15 2020/01/20 21:13:16 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.SDL2
 PKG_OPTIONS_REQUIRED_GROUPS=   gl
-PKG_SUPPORTED_OPTIONS=         alsa dbus esound nas jack pulseaudio wayland x11
+PKG_SUPPORTED_OPTIONS=         alsa dbus nas jack pulseaudio wayland x11
 PKG_SUGGESTED_OPTIONS.Linux=   alsa
 PKG_OPTIONS_GROUP.gl=          opengl
 
@@ -39,12 +39,6 @@ CONFIGURE_ARGS+=     --disable-alsa
 CONFIGURE_ARGS+=       --disable-dbus
 .endif
 
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-esd
-.endif
-
 .if !empty(PKG_OPTIONS:Mjack)
 .include "../../audio/jack/buildlink3.mk"
 .else