SDL[2]: Remove esound support

4 files changed, 8 insertions, 19 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 4d0eabaf874..25072ef78f9 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -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
 
diff --git a/devel/SDL/options.mk b/devel/SDL/options.mk
index dd0d6c86bc7..60c322468fd 100644
--- a/devel/SDL/options.mk
+++ b/devel/SDL/options.mk
@@ -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"
diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile
index e4a8b9312e2..02927c86947 100644
--- a/devel/SDL2/Makefile
+++ b/devel/SDL2/Makefile
@@ -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
diff --git a/devel/SDL2/options.mk b/devel/SDL2/options.mk
index 7b22883554d..46db2f5daf2 100644
--- a/devel/SDL2/options.mk
+++ b/devel/SDL2/options.mk
@@ -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