From 07f6a5124452aa360395bc80c48af8a3543dd165 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Mon, 29 Dec 2008 23:26:21 +0000
Subject: [PATCH] - remove arts and esd output plugins and related patching -
 comment out audio(4) backend, as sndio backend is preferred

from Brad, thanks
---
 multimedia/xine-lib/Makefile                  | 32 ++++---------------
 .../patches/patch-src_audio_out_Makefile_in   | 13 ++------
 multimedia/xine-lib/pkg/DESCR-arts            |  1 -
 multimedia/xine-lib/pkg/DESCR-esd             |  1 -
 multimedia/xine-lib/pkg/PLIST-arts            |  2 --
 multimedia/xine-lib/pkg/PLIST-esd             |  2 --
 multimedia/xine-lib/pkg/PLIST-main            |  4 +--
 7 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 multimedia/xine-lib/pkg/DESCR-arts
 delete mode 100644 multimedia/xine-lib/pkg/DESCR-esd
 delete mode 100644 multimedia/xine-lib/pkg/PLIST-arts
 delete mode 100644 multimedia/xine-lib/pkg/PLIST-esd

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 0a37ff138be..84c7b055058 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,21 +1,18 @@
-# $OpenBSD: Makefile,v 1.44 2008/12/21 07:56:47 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.45 2008/12/29 23:26:21 jakemsr Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT-main=		multimedia decoding library
-COMMENT-esd=		esound audio output module for xine-lib
-COMMENT-arts=		artsd audio output module for xine-lib
 COMMENT-jack=		jackd audio output module for xine-lib
 
 V=			1.1.15
 DISTNAME=		xine-lib-${V}
-PKGNAME-main=		${DISTNAME}p6
-PKGNAME-esd=		xine-lib-esd-${V}
-PKGNAME-arts=		xine-lib-arts-${V}
+PKGNAME-main=		${DISTNAME}p7
 PKGNAME-jack=		xine-lib-jack-${V}
-
-EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		multimedia
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
+EXTRACT_SUFX=		.tar.bz2
+
 SHARED_LIBS=		xine	23.0
 
 HOMEPAGE=		http://xinehq.de/
@@ -26,16 +23,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
-
-MULTI_PACKAGES=		-main -esd -arts -jack
+MULTI_PACKAGES=		-main -jack
 
 WANTLIB=		expat fontconfig freetype m z
 WANTLIB-main=		${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
 			Xrender Xv c jpeg lcms pthread sndio usbhid
-WANTLIB-esd=		${WANTLIB}
-WANTLIB-arts=		${WANTLIB} pcre stdc++ glib-2.0 \
-			gmodule-2.0 gthread-2.0
 WANTLIB-jack=		${WANTLIB}
 
 .if ${MACHINE_ARCH} == "i386"
@@ -59,15 +51,6 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			speex.>=3::audio/speex \
 			theora.>=1::multimedia/libtheora
 
-LIB_DEPENDS-esd=	${LIB_DEPENDS} \
-			esd.>=2::audio/esound \
-			audiofile.>=0::devel/libaudiofile \
-			xine::${BUILD_PKGPATH}
-RUN_DEPENDS-esd=	${RUN_DEPENDS}
-LIB_DEPENDS-arts=	${LIB_DEPENDS} \
-			artsc.>=1::x11/kde/arts3 \
-			xine::${BUILD_PKGPATH}
-RUN_DEPENDS-arts=	${RUN_DEPENDS}
 LIB_DEPENDS-jack=	${LIB_DEPENDS} \
 			jack::audio/jack \
 			xine::${BUILD_PKGPATH}
@@ -104,8 +87,7 @@ CONFIGURE_ARGS+=	--disable-optimizations \
 			--without-pulseaudio \
 			--disable-oss \
 			--without-alsa \
-			--with-esound \
-			--with-arts \
+			--without-esound \
 			--with-jack \
 			--without-imagemagick \
 			--disable-samba \
diff --git a/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in b/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
index 922edb8d222..969abce8657 100644
--- a/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_audio_out_Makefile_in,v 1.11 2008/12/14 23:57:34 brad Exp $
+$OpenBSD: patch-src_audio_out_Makefile_in,v 1.12 2008/12/29 23:26:21 jakemsr Exp $
 --- src/audio_out/Makefile.in.orig	Thu Aug 14 17:18:39 2008
-+++ src/audio_out/Makefile.in	Thu Dec 11 00:23:10 2008
++++ src/audio_out/Makefile.in	Sat Dec 27 20:50:00 2008
 @@ -170,6 +170,18 @@ xineplug_ao_out_jack_la_LINK = $(LIBTOOL) --tag=CC $(A
  	$(xineplug_ao_out_jack_la_LDFLAGS) $(LDFLAGS) -o $@
  @HAVE_JACK_TRUE@am_xineplug_ao_out_jack_la_rpath = -rpath \
@@ -63,15 +63,6 @@ $OpenBSD: patch-src_audio_out_Makefile_in,v 1.11 2008/12/14 23:57:34 brad Exp $
  
  xineplug_ao_out_none_la_SOURCES = audio_none_out.c
  xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
-@@ -632,7 +650,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
- #xineplug_ao_out_irixal_la_CFLAGS = $(VISIBILITY_FLAG) $(IRIXAL_CFLAGS)
- #xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
- xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c
--xineplug_ao_out_arts_la_LIBADD = $(XINE_LIB) $(ARTS_LIBS)
-+xineplug_ao_out_arts_la_LIBADD = $(XINE_LIB) $(ARTS_LIBS) -lstdc++
- xineplug_ao_out_arts_la_CFLAGS = $(VISIBILITY_FLAG) $(ARTS_CFLAGS)
- xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
- xineplug_ao_out_directx_la_SOURCES = audio_directx_out.c
 @@ -667,6 +685,10 @@ xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
  xineplug_ao_out_jack_la_LIBADD = $(XINE_LIB) $(JACK_LIBS) $(LTLIBINTL)
  xineplug_ao_out_jack_la_CFLAGS = $(VISIBILITY_FLAG) $(JACK_CFLAGS)
diff --git a/multimedia/xine-lib/pkg/DESCR-arts b/multimedia/xine-lib/pkg/DESCR-arts
deleted file mode 100644
index 1ec44f59e1d..00000000000
--- a/multimedia/xine-lib/pkg/DESCR-arts
+++ /dev/null
@@ -1 +0,0 @@
-artsd audio output plugin for xine-lib.
diff --git a/multimedia/xine-lib/pkg/DESCR-esd b/multimedia/xine-lib/pkg/DESCR-esd
deleted file mode 100644
index e6dc77c2bad..00000000000
--- a/multimedia/xine-lib/pkg/DESCR-esd
+++ /dev/null
@@ -1 +0,0 @@
-esound audio output plugin for xine-lib.
diff --git a/multimedia/xine-lib/pkg/PLIST-arts b/multimedia/xine-lib/pkg/PLIST-arts
deleted file mode 100644
index 5a6237b15b8..00000000000
--- a/multimedia/xine-lib/pkg/PLIST-arts
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-arts,v 1.2 2008/03/24 03:26:34 jakemsr Exp $
-lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_arts.so
diff --git a/multimedia/xine-lib/pkg/PLIST-esd b/multimedia/xine-lib/pkg/PLIST-esd
deleted file mode 100644
index f6525fcf344..00000000000
--- a/multimedia/xine-lib/pkg/PLIST-esd
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-esd,v 1.2 2008/03/24 03:26:34 jakemsr Exp $
-lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_esd.so
diff --git a/multimedia/xine-lib/pkg/PLIST-main b/multimedia/xine-lib/pkg/PLIST-main
index ccbfe55e073..474839c86bd 100644
--- a/multimedia/xine-lib/pkg/PLIST-main
+++ b/multimedia/xine-lib/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2008/12/14 23:57:34 brad Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2008/12/29 23:26:21 jakemsr Exp $
 @pkgpath multimedia/xine-lib
 %%i386%%
 bin/xine-config
@@ -60,7 +60,7 @@ lib/xine/plugins/${XINEAPI_REV}/post/xineplug_post_visualizations.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_file.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_none.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_sndio.so
-lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_sun.so
+@comment lib/xine/plugins/${XINEAPI_REV}/xineplug_ao_out_sun.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_a52.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_bitplane.so
 lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_dts.so