From 149d1e19e7c19e66f72db92ac296eb2d3f983fc5 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Thu, 1 Nov 2007 04:01:36 +0000
Subject: [PATCH] build esound abd artsd audio output module subpackages

helps integrate amarok & kaffeine into KDE (and other) desktop(s)

ok brad@
---
 multimedia/xine-lib/Makefile                  | 36 ++++++++++++++-----
 .../patches/patch-src_audio_out_Makefile_in   | 12 +++++++
 multimedia/xine-lib/pkg/DESCR-arts            |  1 +
 multimedia/xine-lib/pkg/DESCR-esd             |  1 +
 multimedia/xine-lib/pkg/{DESCR => DESCR-main} |  0
 multimedia/xine-lib/pkg/PLIST-arts            |  2 ++
 multimedia/xine-lib/pkg/PLIST-esd             |  2 ++
 multimedia/xine-lib/pkg/{PLIST => PLIST-main} |  2 +-
 8 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
 create mode 100644 multimedia/xine-lib/pkg/DESCR-arts
 create mode 100644 multimedia/xine-lib/pkg/DESCR-esd
 rename multimedia/xine-lib/pkg/{DESCR => DESCR-main} (100%)
 create mode 100644 multimedia/xine-lib/pkg/PLIST-arts
 create mode 100644 multimedia/xine-lib/pkg/PLIST-esd
 rename multimedia/xine-lib/pkg/{PLIST => PLIST-main} (99%)

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index a0a0c863c17..8e1da173dc4 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,14 @@
-# $OpenBSD: Makefile,v 1.20 2007/10/31 10:55:37 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.21 2007/11/01 04:01:36 jakemsr Exp $
 
-COMMENT=		multimedia decoding library
+COMMENT-main=		multimedia decoding library
+COMMENT-esd=		esound audio output module for xine-lib
+COMMENT-arts=		artsd audio output muodule for xine-lib
 
 V=			1.1.8
 DISTNAME=		xine-lib-${V}
+PKGNAME-main=		xine-lib-${V}p0
+PKGNAME-esd=		xine-lib-esd-${V}
+PKGNAME-arts=		xine-lib-arts-${V}
 CATEGORIES=		multimedia
 SHARED_LIBS=		xine	19.0
 
@@ -17,9 +22,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
-WANTLIB=		X11 Xau Xdmcp Xext Xinerama Xrandr Xrender \
-			Xv expat faac freetype fontconfig jpeg lcms m \
-			mp3lame usbhid x264 z
+MULTI_PACKAGES=		-main -esd -arts
+
+WANTLIB=		expat fontconfig freetype m z
+WANTLIB-main=		${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
+			Xrender Xv faac jpeg lcms mp3lame usbhid x264
+WANTLIB-esd=		${WANTLIB}
+WANTLIB-arts=		${WANTLIB} stdc++ glib-2.0 gmodule-2.0 gthread-2.0
 
 .if ${MACHINE_ARCH} == "i386"
 PKG_ARGS+=		-Di386=1
@@ -28,7 +37,8 @@ PKG_ARGS+=		-Di386=0
 .endif
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		FLAC.>=5::audio/flac \
+LIB_DEPENDS-main=	${LIB_DEPENDS} \
+			FLAC.>=5::audio/flac \
 			SDL.>=3::devel/sdl \
 			a52::audio/liba52 \
 			avcodec.>=7,avutil.>=2,postproc.>=7::graphics/ffmpeg \
@@ -41,6 +51,16 @@ LIB_DEPENDS=		FLAC.>=5::audio/flac \
 			speex.>=3::audio/speex \
 			theora.>=1::multimedia/libtheora
 
+LIB_DEPENDS-esd=	${LIB_DEPENDS} \
+			esd.>=2::audio/esound \
+			audiofile.>=0::devel/libaudiofile \
+			::${BUILD_PKGPATH}
+RUN_DEPENDS-esd=	${RUN_DEPENDS}
+LIB_DEPENDS-arts=	${LIB_DEPENDS} \
+			artsc.>=1::x11/kde/arts3 \
+			::${BUILD_PKGPATH}
+RUN_DEPENDS-arts=	${RUN_DEPENDS}
+
 SHARED_ONLY=		Yes
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
@@ -66,8 +86,8 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--without-pulseaudio \
 			--disable-oss \
 			--without-alsa \
-			--without-arts \
-			--without-esound \
+			--with-esound \
+			--with-arts \
 			--without-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
new file mode 100644
index 00000000000..4d4d254e3a6
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_audio_out_Makefile_in,v 1.3 2007/11/01 04:01:36 jakemsr Exp $
+--- src/audio_out/Makefile.in.orig	Wed Jun  6 06:40:33 2007
++++ src/audio_out/Makefile.in	Wed Oct  3 14:27:00 2007
+@@ -716,7 +716,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 = $(ARTS_LIBS) $(XINE_LIB)
++xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) $(XINE_LIB) -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
diff --git a/multimedia/xine-lib/pkg/DESCR-arts b/multimedia/xine-lib/pkg/DESCR-arts
new file mode 100644
index 00000000000..1ec44f59e1d
--- /dev/null
+++ b/multimedia/xine-lib/pkg/DESCR-arts
@@ -0,0 +1 @@
+artsd audio output plugin for xine-lib.
diff --git a/multimedia/xine-lib/pkg/DESCR-esd b/multimedia/xine-lib/pkg/DESCR-esd
new file mode 100644
index 00000000000..e6dc77c2bad
--- /dev/null
+++ b/multimedia/xine-lib/pkg/DESCR-esd
@@ -0,0 +1 @@
+esound audio output plugin for xine-lib.
diff --git a/multimedia/xine-lib/pkg/DESCR b/multimedia/xine-lib/pkg/DESCR-main
similarity index 100%
rename from multimedia/xine-lib/pkg/DESCR
rename to multimedia/xine-lib/pkg/DESCR-main
diff --git a/multimedia/xine-lib/pkg/PLIST-arts b/multimedia/xine-lib/pkg/PLIST-arts
new file mode 100644
index 00000000000..348cd188072
--- /dev/null
+++ b/multimedia/xine-lib/pkg/PLIST-arts
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-arts,v 1.1 2007/11/01 04:01:36 jakemsr Exp $
+lib/xine/plugins/${V}/xineplug_ao_out_arts.so
diff --git a/multimedia/xine-lib/pkg/PLIST-esd b/multimedia/xine-lib/pkg/PLIST-esd
new file mode 100644
index 00000000000..c81ad0cd91a
--- /dev/null
+++ b/multimedia/xine-lib/pkg/PLIST-esd
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-esd,v 1.1 2007/11/01 04:01:36 jakemsr Exp $
+lib/xine/plugins/${V}/xineplug_ao_out_esd.so
diff --git a/multimedia/xine-lib/pkg/PLIST b/multimedia/xine-lib/pkg/PLIST-main
similarity index 99%
rename from multimedia/xine-lib/pkg/PLIST
rename to multimedia/xine-lib/pkg/PLIST-main
index c831bf74f11..a769e1bb8a5 100644
--- a/multimedia/xine-lib/pkg/PLIST
+++ b/multimedia/xine-lib/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/06/13 10:58:29 jakemsr Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2007/11/01 04:01:36 jakemsr Exp $
 %%i386%%
 bin/xine-config
 include/xine/