First step at deorbitting esound:

remove esound options where it is possible to, category multimedia

6 files changed, 10 insertions, 36 deletions

diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index 4a84b346cbe5..10ec56a606f5 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -25,6 +25,7 @@ DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake \
 CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake
 CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
 CMAKE_ARGS+=	-DQT5:BOOL=OFF
+CMAKE_ARGS+=	-DESD:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 NOPRECIOUSMAKEVARS=	yes # ARCH
@@ -33,7 +34,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
-OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \
+OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS JACK \
 		PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \
 		FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU
 OPTIONS_DEFAULT=	FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
@@ -117,14 +118,6 @@ CMAKE_ARGS+=	-DOSS_SUPPORT:BOOL=ON
 CMAKE_ARGS+=	-DOSS_SUPPORT:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-PLIST_SUB+=	ESD=""
-.else
-CMAKE_ARGS+=	-DESD:BOOL=OFF
-PLIST_SUB+=	ESD="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:audio/jack
 PLIST_SUB+=	JACK=""
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 8fab8836c478..55ab22bb54b3 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -24,7 +24,8 @@ USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_func_inotify_init=no
 CONFIGURE_ARGS=	--disable-v4l --disable-v4l2 --disable-v4lconvert \
-		--without-doxygen --with-cpuflags=none --disable-musicbrainz
+		--without-doxygen --with-cpuflags=none --disable-musicbrainz \
+		--disable-esd
 USE_LDCONFIG=	yes
 LLD_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
@@ -36,7 +37,7 @@ LDFLAGS+=	-Wl,--add-needed
 
 INFO=		gmerlin
 
-OPTIONS_DEFINE=		ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \
+OPTIONS_DEFINE=		ALSA CDDB CDIO JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF DOCS
 OPTIONS_DEFAULT=	CDDB JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
@@ -49,8 +50,6 @@ CDDB_CONFIGURE_OFF=	--disable-cddb
 CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 			libcdio_cdda.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=	--disable-libcdio
-ESOUND_USE=		gnome=esound
-ESOUND_CONFIGURE_OFF=	--disable-esd
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 JPEG_USES=		jpeg
diff --git a/multimedia/gmerlin/pkg-plist b/multimedia/gmerlin/pkg-plist
index e1f68b6f6fa8..d86d98529a03 100644
--- a/multimedia/gmerlin/pkg-plist
+++ b/multimedia/gmerlin/pkg-plist
@@ -124,7 +124,6 @@ lib/gmerlin/plugins/fv_zoom.so
 %%ALSA%%lib/gmerlin/plugins/i_alsa.so
 %%CDIO%%lib/gmerlin/plugins/i_cdaudio.so
 lib/gmerlin/plugins/i_edl.so
-%%ESOUND%%lib/gmerlin/plugins/i_esd.so
 %%JACK%%lib/gmerlin/plugins/i_jack.so
 %%QUICKTIME%%lib/gmerlin/plugins/i_lqt.so
 lib/gmerlin/plugins/i_mikmod.so
@@ -146,7 +145,6 @@ lib/gmerlin/plugins/iw_pnm.so
 lib/gmerlin/plugins/iw_tga.so
 %%TIFF%%lib/gmerlin/plugins/iw_tiff.so
 %%ALSA%%lib/gmerlin/plugins/oa_alsa.so
-%%ESOUND%%lib/gmerlin/plugins/oa_esd.so
 %%JACK%%lib/gmerlin/plugins/oa_jack.so
 lib/gmerlin/plugins/oa_oss.so
 %%PULSEAUDIO%%lib/gmerlin/plugins/oa_pulse.so
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index c0124f9a8c85..58b39a1be0d0 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -54,6 +54,7 @@ CONFIGURE_ARGS=	--with-libflac \
 		--disable-real-codecs \
 		--disable-v4l \
 		--without-alsa \
+		--without-esound \
 		--disable-musepack
 
 MAKE_ENV=	V=1
@@ -69,7 +70,7 @@ DOCSDIR=	${PREFIX}/share/doc/xine-lib
 PLUGINSDIR=	lib/xine/plugins/2.7
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
-OPTIONS_DEFINE=		DOCS NLS CACA DVB DMX_IMAGE ESOUND IPV6 IMAGEMAGICK JACK \
+OPTIONS_DEFINE=		DOCS NLS CACA DVB DMX_IMAGE IPV6 IMAGEMAGICK JACK \
 			GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \
 			VAAPI LIBBLURAY
 OPTIONS_DEFAULT=	DVB PIXBUF VAAPI
@@ -86,8 +87,6 @@ AALIB_CONFIGURE_ENABLE=		aalib
 CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_WITH=		caca
 DVB_CONFIGURE_ENABLE=		dvb
-ESOUND_USE=			GNOME=esound
-ESOUND_CONFIGURE_WITH=		esound
 GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
 GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 63a5341ba100..f56856ea8d9f 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -54,7 +54,6 @@ lib/libxine.so.2.7.0
 %%PLUGINSDIR%%/post/xineplug_post_switch.so
 %%PLUGINSDIR%%/post/xineplug_post_tvtime.so
 %%PLUGINSDIR%%/post/xineplug_post_visualizations.so
-%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
 %%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
 %%PLUGINSDIR%%/xineplug_ao_out_oss.so
 %%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 909d926aa46b..dd67ee8aee87 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	43
+PORTREVISION=	44
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -37,7 +37,7 @@ CONFIGURE_ARGS=	--enable-ffmpeg=${LOCALBASE} \
 		--enable-mp4live \
 		--disable-static
 
-OPTIONS_DEFINE=		ESOUND IPV6 NAS OPTIMIZED_CFLAGS XVID DOCS
+OPTIONS_DEFINE=		IPV6 NAS OPTIMIZED_CFLAGS XVID DOCS
 OPTIONS_DEFAULT=	XVID
 
 DOC_FILES=	${PORTDOCS}
@@ -48,13 +48,6 @@ PORTDOCS=	MAINREADME.html MP4LIVE_INTERNALS.html MPEG4IP_Guide.pdf \
 
 .include <bsd.port.options.mk>
 
-###
-## Auto detect possible extensions
-###
-# esound
-.if exists(${LOCALBASE}/bin/esd-config) && empty(PORT_OPTIONS:MESOUND)
-PORT_OPTIONS+=	ESOUND
-.endif
 # nas
 .if exists(${LOCALBASE}/lib/libaudio.so) && empty(PORT_OPTIONS:MNAS)
 PORT_OPTIONS+=	NAS
@@ -64,13 +57,6 @@ PORT_OPTIONS+=	NAS
 PORT_OPTIONS+=	XVID
 .endif
 
-###
-## Enable extensions based on user choices
-###
-# esound
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-.endif
 # nas
 .if ${PORT_OPTIONS:MNAS}
 LIB_DEPENDS+=	libaudio.so:audio/nas