On Wed, Oct 03, 2007 at 09:20:49PM +0000, Jacob Meuser wrote: > > this lets ports that use xine-lib for audio output use artsd. > > this would let xine, kaffeine and amarok (and possible others?) > use artsd. > > comments?
full diff this time -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile 3 Oct 2007 06:36:43 -0000 1.19 +++ Makefile 3 Oct 2007 21:38:35 -0000 @@ -4,7 +4,7 @@ V= 1.1.7 DISTNAME= xine-lib-${V} -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 EXTRACT_SUFX= .tar.bz2 CATEGORIES= multimedia SHARED_LIBS= xine 18.1 @@ -19,8 +19,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} -WANTLIB= X11 Xau Xdmcp Xext Xinerama Xv expat \ - freetype fontconfig jpeg lcms m usbhid z +WANTLIB= X11 Xau Xdmcp Xext Xinerama Xrandr Xrender Xv \ + expat freetype fontconfig glib-2.0 gmodule-2.0 \ + gthread-2.0 jpeg lcms m pthread usbhid z .if ${MACHINE_ARCH} == "i386" PKG_ARGS+= -Di386=1 @@ -32,6 +33,7 @@ LIB_DEPENDS= FLAC.>=5::audio/flac \ SDL.>=3::devel/sdl \ a52::audio/liba52 \ + artsc.>=1::x11/kde/arts3 \ avcodec.>=7,postproc.>=7::graphics/ffmpeg \ dvdnav.>=5::multimedia/libdvdnav \ faad.>=1::audio/faad \ @@ -67,8 +69,8 @@ --without-pulseaudio \ --disable-oss \ --without-alsa \ - --without-arts \ --without-esound \ + --with-arts \ --without-jack \ --without-imagemagick \ --disable-samba \ Index: patches/patch-src_audio_out_Makefile_in =================================================================== RCS file: patches/patch-src_audio_out_Makefile_in diff -N patches/patch-src_audio_out_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_audio_out_Makefile_in 3 Oct 2007 21:38:35 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- 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 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/multimedia/xine-lib/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 13 Jun 2007 10:58:29 -0000 1.3 +++ pkg/PLIST 3 Oct 2007 21:38:35 -0000 @@ -56,6 +56,7 @@ lib/xine/plugins/${V}/post/xineplug_post_tvtime.so lib/xine/plugins/${V}/post/xineplug_post_visualizations.so @comment lib/xine/plugins/${V}/vidix/ +lib/xine/plugins/${V}/xineplug_ao_out_arts.so lib/xine/plugins/${V}/xineplug_ao_out_file.so lib/xine/plugins/${V}/xineplug_ao_out_none.so lib/xine/plugins/${V}/xineplug_ao_out_sun.so