- update to 0.5DrLector

Submitted by:	swell.k@gmail.com

4 files changed, 84 insertions, 28 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 5668b689b841..a4901b550fb7 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME?=	xmms2
-PORTVERSION=	0.4.d.0
-DISTVERSION=	0.4DrKosmos
-PORTREVISION=	2
+DISTVERSION=	0.5.d.0
+DISTVERSION=	0.5DrLecter
 CATEGORIES?=	audio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${DISTVERSION}
@@ -37,17 +36,20 @@ MANCOMPRESSED=	yes
 
 OPTIONS=	FAAD "Support to playback AAC files" on \
 		FLAC "Support to playback FLAC files" on \
+		SPEEX "Support to playback SPEEX files" off \
+		CDDA "Support to playback AudioCD" off \
 		MODPLUG "Support to playback MOD files" off \
 		MUSEPACK "Support to playback MPC files" off \
 		SID "Support to playback SID files" off \
-		AVCODEC "Support to playback files with avcodec/avformat" off \
+		AVCODEC "Support to playback files with avcodec" off \
 		APE "Support to playback Monkey's Audio files" off \
 		CURL "Support to playback files via HTTP" on \
 		LASTFM "Support to playback audio via Last.fm radio" on \
-		GNOMEVFS "Support to playback files via GnomeVFS" off \
+		GVFS "Support to playback files via GVFS" off \
 		MMS "Support to playback streams via MMS" off \
 		SAMBA "Support to playback files via SMB" off \
 		DAAP "Support to playback files via DAAP" on \
+		GME "Support to playback files via GME (SPC/NSF/GBS)" on \
 		OFA "Support to collect MusicDNS fingerprints" off \
 		XML "Support for XML based playlists (XSPF, RSS)" off \
 		FAM "Support to update Media Library on file change" off \
@@ -55,7 +57,9 @@ OPTIONS=	FAAD "Support to playback AAC files" on \
 		MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \
 		ICES "Support to playback files to an icecast server" off \
 		JACK "Support to output via the Jack output server" off \
+		PULSE "Support to output via the PulseAudio" off \
 		AO "Support to output via libao" off \
+		KARAOKE "Karaoke plugin for voice removal from tracks" on \
 		VOCODER "Phase Vocoder effect plugin" off #\
 #		SDL "Support for visualization" on
 .endif
@@ -85,7 +89,6 @@ EXCLUDE+=	--without-optionals="python" --without-optionals="ruby" --without-opti
 
 .if !defined(XMMS2_SLAVE)
 
-EXCLUDE+=	--without-plugins="cdda"
 .if !defined(WITHOUT_CURL)
 LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
@@ -120,6 +123,23 @@ EXCLUDE+=	--without-plugins="flac"
 PLIST_SUB+=	FLAC="@comment "
 .endif
 
+.if defined(WITH_SPEEX)
+LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+PLIST_SUB+=	SPEEX=""
+.else
+EXCLUDE+=	--without-plugins="speex"
+PLIST_SUB+=	SPEEX="@comment "
+.endif
+
+.if defined(WITH_CDDA)
+LIB_DEPENDS+=	cdio.8:${PORTSDIR}/sysutils/libcdio \
+		discid.2:${PORTSDIR}/audio/libdiscid
+PLIST_SUB+=	CDDA=""
+.else
+EXCLUDE+=	--without-plugins="cdda"
+PLIST_SUB+=	CDDA="@comment "
+.endif
+
 .if !defined(WITHOUT_FAAD)
 LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
@@ -132,7 +152,7 @@ PLIST_SUB+=	FAAD="@comment "
 LIB_DEPENDS+=	avutil.1:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	AVCODEC=""
 .else
-EXCLUDE+=	--without-plugins="avcodec" --without-plugins="avformat"
+EXCLUDE+=	--without-plugins="avcodec"
 PLIST_SUB+=	AVCODEC="@comment "
 .endif
 
@@ -169,6 +189,14 @@ EXCLUDE+=	--without-plugins="jack"
 PLIST_SUB+=	JACK="@comment "
 .endif
 
+.if defined(WITH_PULSE)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+PLIST_SUB+=	PULSE=""
+.else
+EXCLUDE+=	--without-plugins="pulse"
+PLIST_SUB+=	PULSE="@comment "
+.endif
+
 .if defined(WITH_MODPLUG)
 LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
 PLIST_SUB+=	MODPLUG=""
@@ -208,12 +236,19 @@ EXCLUDE+=	--without-plugins="daap"
 PLIST_SUB+=	DAAP="@comment "
 .endif
 
-.if defined(WITH_GNOMEVFS)
-USE_GNOME+=	gnomevfs2
-PLIST_SUB+=	GNOMEVFS=""
+.if !defined(WITHOUT_GME)
+PLIST_SUB+=	GME=""
 .else
-EXCLUDE+=	--without-plugins="gnomevfs"
-PLIST_SUB+=	GNOMEVFS="@comment "
+EXCLUDE+=	--without-plugins="gme"
+PLIST_SUB+=	GME="@comment "
+.endif
+
+.if defined(WITH_GVFS)
+USE_GNOME+=	gvfs
+PLIST_SUB+=	GVFS=""
+.else
+EXCLUDE+=	--without-plugins="gvfs"
+PLIST_SUB+=	GVFS="@comment "
 .endif
 
 .if defined(WITH_MMS)
@@ -241,6 +276,14 @@ EXCLUDE+=	--without-plugins="ices"
 PLIST_SUB+=	ICES="@comment "
 .endif
 
+# FIXME: requires pkg-config data of openssl
+.if defined(WITH_AIRPLAY)
+PLIST_SUB+=	AIRPLAY=""
+.else
+EXCLUDE+=	--without-plugins="airplay"
+PLIST_SUB+=	AIRPLAY="@comment "
+.endif
+
 .if defined(WITH_AO)
 LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
 PLIST_SUB+=	AO=""
@@ -274,6 +317,13 @@ EXCLUDE+=	--without-optionals="dns_sd"
 PLIST_SUB+=	MDNS_APPLE="@comment "
 .endif
 
+.if !defined(WITHOUT_KARAOKE)
+PLIST_SUB+=	KARAOKE=""
+.else
+EXCLUDE+=	--without-plugins="karaoke"
+PLIST_SUB+=	KARAOKE="@comment "
+.endif
+
 .if defined(WITH_VOCODER)
 LIB_DEPENDS+=	fftw3f.4:${PORTSDIR}/math/fftw3-float
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
index 21c77e755a51..5258d083aece 100644
--- a/audio/xmms2/distinfo
+++ b/audio/xmms2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms2-0.4DrKosmos.tar.bz2) = f363857a77606a2d7d14603ab375f454
-SHA256 (xmms2-0.4DrKosmos.tar.bz2) = 0fb76d56a424f1d4bb36bffdf32ed750173a288f406e76dcec2b1f43d6f9783d
-SIZE (xmms2-0.4DrKosmos.tar.bz2) = 1354241
+MD5 (xmms2-0.5DrLecter.tar.bz2) = 9033ef15be9069ef43aeb4b6360a4d36
+SHA256 (xmms2-0.5DrLecter.tar.bz2) = 95e4dc003599c88ec7caa16c95f472df2a8e4fc024843b610a27e405ffc5c659
+SIZE (xmms2-0.5DrLecter.tar.bz2) = 1543415
diff --git a/audio/xmms2/files/patch-src_include_xmms_wscript b/audio/xmms2/files/patch-src_include_xmms_wscript
index 3588ba5ca8ae..53003b398690 100644
--- a/audio/xmms2/files/patch-src_include_xmms_wscript
+++ b/audio/xmms2/files/patch-src_include_xmms_wscript
@@ -1,11 +1,11 @@
---- src/include/xmms/wscript.orig	Fri May 25 16:49:48 2007
-+++ src/include/xmms/wscript	Fri May 25 16:50:17 2007
-@@ -45,7 +45,7 @@
+--- wscript.orig	Fri May 25 16:49:48 2007
++++ wscript	Fri May 25 16:50:17 2007
+@@ -284,7 +284,7 @@
+         conf.env['PKGCONFIGDIR'] = Params.g_options.pkgconfigdir
+         print conf.env['PKGCONFIGDIR']
+     else:
+-        conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
++        conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
  
-     conf.env['XMMS_DEFS'] = defs
-     conf.env['PLUGINDIR'] = defs['PKGLIBDIR']
--    conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
-+    conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
- 
-     for i in defs:
-         conf.add_define(i, defs[i])
+     if Params.g_options.config_prefix:
+         for dir in Params.g_options.config_prefix:
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index 43491bf6103d..3a1f149a791d 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -63,8 +63,8 @@ lib/libxmmsclient-glib.so
 lib/libxmmsclient-glib.so.1
 lib/libxmmsclient-glib.so.1.0.0
 lib/libxmmsclient.so
-lib/libxmmsclient.so.3
-lib/libxmmsclient.so.3.0.0
+lib/libxmmsclient.so.4
+lib/libxmmsclient.so.4.0.0
 %%AO%%lib/xmms2/libxmms_ao.so
 lib/xmms2/libxmms_asf.so
 lib/xmms2/libxmms_asx.so
@@ -78,13 +78,19 @@ lib/xmms2/libxmms_equalizer.so
 %%FAAD%%lib/xmms2/libxmms_faad.so
 lib/xmms2/libxmms_file.so
 %%FLAC%%lib/xmms2/libxmms_flac.so
-%%GNOMEVFS%%lib/xmms2/libxmms_gnomevfs.so
+%%SPEEX%%lib/xmms2/libxmms_speex.so
+%%CDDA%%lib/xmms2/libxmms_cdda.so
+%%GVFS%%lib/xmms2/libxmms_gvfs.so
 %%ICES%%lib/xmms2/libxmms_ices.so
+%%AIRPLAY%%lib/xmms2/libxmms_airplay.so
 %%CURL%%lib/xmms2/libxmms_icymetaint.so
 lib/xmms2/libxmms_id3v2.so
 %%JACK%%lib/xmms2/libxmms_jack.so
+%%PULSE%%lib/xmms2/libxmms_pulse.so
 %%LASTFM%%lib/xmms2/libxmms_lastfm.so
 %%LASTFM%%lib/xmms2/libxmms_lastfmeta.so
+%%KARAOKE%%lib/xmms2/libxmms_karaoke.so
+%%GME%%lib/xmms2/libxmms_gme.so
 lib/xmms2/libxmms_m3u.so
 %%MAC%%lib/xmms2/libxmms_mac.so
 lib/xmms2/libxmms_mad.so