update audacious to 3.6.2

9 files changed, 49 insertions, 97 deletions

diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index 39e191a..a889d6b 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -17,6 +17,7 @@ RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
 		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
 
+BROKEN=		Does not compile with audacious 3.6.x.
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 30d6f6e..6f15f32 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -14,21 +14,18 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake pkgconfig tar:bzip2 compiler:c++11-lib
 USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--disable-mpris2
 USE_GNOME=	glib20
 WANT_SDL=	yes
 
-PORTDOCS=	AUTHORS
-
 OPTIONS_DEFINE=	DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \
 		ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \
 		CDAUDIO SCROBBLER MMS NLS RESAMPLE AMIDI GLSPECTRUM \
 		NOTIFY BS2B FFAUDIO PULSE NEON SPEEDPITCH LIRC MP3FILEWRITER \
-		SID
+		SID MPRIS
 OPTIONS_DEFAULT=DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \
 		SCROBBLER NEON NLS OSS4 FFAUDIO
 
@@ -51,6 +48,7 @@ NEON_DESC=	Neon plugin
 SPEEDPITCH_DESC=Speed and Pitch plugin
 LIRC_DESC=	LIRC plugin
 MP3FILEWRITER=	Filewriter plugin for MP3
+MPRIS_DESC=	NPRIS plugin
 
 .include <bsd.port.options.mk>
 
@@ -349,11 +347,15 @@ CONFIGURE_ARGS+=--disable-lirc
 PLIST_SUB+=	LIRC="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MMPRIS}
+CONFIGURE_ARGS+=--enable-mpris2
+PLIST_SUB+=	MPRIS=""
+.else
+CONFIGURE_ARGS+=--disable-mpris2
+PLIST_SUB+=	MPRIS="@comment "
+.endif
+
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
 		-exec ${STRIP_CMD} {} \;
 
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 8ffb067..f842bb4 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.5.2.tar.bz2) = 179600d7f8ae31a7d9c5785ce6fa7e09184dbd1271e0adb8c57760432c6a4cd9
-SIZE (audacious-plugins-3.5.2.tar.bz2) = 1734588
+SHA256 (audacious-plugins-3.6.2.tar.bz2) = e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8
+SIZE (audacious-plugins-3.6.2.tar.bz2) = 1786338
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 94e78c2..94b7ba5 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -13,6 +13,7 @@ lib/audacious/Effect/echo.so
 lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
 %%RESAMPLEPLUGIN%%lib/audacious/Effect/resample.so
+lib/audacious/Effect/silence-removal.so
 %%SPEEDPITCHPLUGIN%%lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
@@ -26,14 +27,15 @@ lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
 %%LIRC%%lib/audacious/General/lirc.so
 lib/audacious/General/lyricwiki.so
+%%MPRIS%%lib/audacious/General/mpris2.so
 %%NOTIFY%%lib/audacious/General/notify.so
+lib/audacious/General/playlist-manager.so
 %%SCROBBLERPLUGIN%%lib/audacious/General/scrobbler.so
 lib/audacious/General/search-tool.so
 lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 %%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
 %%AACPLUGIN%%lib/audacious/Input/aac-raw.so
-%%AACPLUGIN%%lib/audacious/Input/aac.so
 %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
 %%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
 %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
@@ -53,7 +55,7 @@ lib/audacious/Input/xsf.so
 %%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
 %%ALSAPLUGIN%%lib/audacious/Output/alsa.so
 lib/audacious/Output/filewriter.so
-%%JACKPLUGIN%%lib/audacious/Output/jackout.so
+%%JACKPLUGIN%%lib/audacious/Output/jack-ng.so
 %%OSS4PLUGIN%%lib/audacious/Output/oss4.so
 %%PULSE%%lib/audacious/Output/pulse_audio.so
 %%SDL%%lib/audacious/Output/sdlout.so
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 47f6179..de270dc 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libmcs.so:${PORTSDIR}/devel/libmcs \
 		libmowgli.so:${PORTSDIR}/devel/libmowgli
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake tar:bzip2 desktop-file-utils gettext-tools
+USES=		pkgconfig gmake tar:bzip2 desktop-file-utils gettext-tools compiler:c++11-lib
 USE_XORG=	x11 sm
 USE_GNOME=	gtk30 libxml2
 USE_LDCONFIG=	yes
@@ -73,9 +73,9 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audacious
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.2.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.2.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.1.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.3.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.3.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.2.0.0
 .if ${PORT_OPTIONS:MDBUS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audtool
 .endif
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 3ddfbe8..8a19dab 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.5.2.tar.bz2) = 3915b9692ef8acb2588b0e26c2738e59e36766cfe83e7e52c0e601688e6c1956
-SIZE (audacious-3.5.2.tar.bz2) = 448436
+SHA256 (audacious-3.6.2.tar.bz2) = b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
+SIZE (audacious-3.6.2.tar.bz2) = 539843
diff --git a/multimedia/audacious/files/patch-src-audacious-fft.c b/multimedia/audacious/files/patch-src-audacious-fft.c
deleted file mode 100644
index f3ceb0a..0000000
--- a/multimedia/audacious/files/patch-src-audacious-fft.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/audacious/fft.c.orig	2014-06-25 12:30:54.752468573 +0200
-+++ src/audacious/fft.c	2014-06-25 12:32:43.785461802 +0200
-@@ -30,6 +30,13 @@
- static float complex roots[N / 2];    /* N-th roots of unity */
- static char generated = 0;            /* set if tables have been generated */
- 
-+#if defined(__FreeBSD__)
-+#include <osreldate.h>
-+#if __FreeBSD_version < 900000
-+#define cexpf(x) (expf(crealf(x))*(cosf(cimagf(x))+sinf(cimagf(x))*I))
-+#endif
-+#endif
-+
- /* Reverse the order of the lowest LOGN bits in an integer. */
- 
- static int bit_reverse (int x)
diff --git a/multimedia/audacious/files/patch-src-audacious-util.c b/multimedia/audacious/files/patch-src-audacious-util.c
deleted file mode 100644
index 8e01741..0000000
--- a/multimedia/audacious/files/patch-src-audacious-util.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/audacious/util.c.orig	2014-04-23 04:36:33.000000000 +0200
-+++ src/audacious/util.c	2014-06-19 23:47:29.000000000 +0200
-@@ -35,6 +35,9 @@
- 
- #include <libaudcore/audstrings.h>
- 
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+
- #include "debug.h"
- #include "i18n.h"
- #include "misc.h"
-@@ -212,7 +215,19 @@
-             return NULL;
-     }
- #else
--    return NULL;
-+    char path[PATH_MAX + 1];
-+    size_t len = PATH_MAX + 1;
-+    int mib[4];
-+
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_PATHNAME;
-+    mib[3] = -1;
-+
-+    if (sysctl(mib, 4, &path, &len, NULL, 0) != 0)
-+        return NULL;
-+
-+    return str_get (path);
- #endif
- }
- 
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 729857d..5c99046 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,50 +1,45 @@
 bin/audacious
 %%WITH_DBUS%%bin/audtool
-include/audacious/api-alias-begin.h
-include/audacious/api-alias-end.h
-include/audacious/api-define-begin.h
-include/audacious/api-define-end.h
-include/audacious/api.h
 include/audacious/audtag.h
-include/audacious/debug.h
-include/audacious/drct-api.h
-include/audacious/drct.h
-include/audacious/i18n.h
-include/audacious/input-api.h
-include/audacious/input.h
-include/audacious/misc-api.h
-include/audacious/misc.h
-include/audacious/playlist-api.h
-include/audacious/playlist.h
-include/audacious/plugin.h
-include/audacious/plugins-api.h
-include/audacious/plugins.h
-include/audacious/preferences.h
-include/audacious/types.h
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
-include/libaudcore/core.h
+include/libaudcore/drct.h
+include/libaudcore/equalizer.h
 include/libaudcore/hook.h
+include/libaudcore/i18n.h
 include/libaudcore/index.h
 include/libaudcore/inifile.h
+include/libaudcore/interface.h
+include/libaudcore/list.h
+include/libaudcore/mainloop.h
 include/libaudcore/multihash.h
+include/libaudcore/objects.h
+include/libaudcore/playlist.h
+include/libaudcore/plugin.h
+include/libaudcore/plugins.h
+include/libaudcore/preferences.h
+include/libaudcore/probe.h
+include/libaudcore/ringbuf.h
+include/libaudcore/runtime.h
+include/libaudcore/templates.h
 include/libaudcore/tinylock.h
 include/libaudcore/tuple.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_async.h
+include/libaudcore/visualizer.h
 include/libaudgui/libaudgui-gtk.h
 include/libaudgui/libaudgui.h
 include/libaudgui/list.h
 include/libaudgui/menu.h
 lib/libaudcore.so
-lib/libaudcore.so.2
-lib/libaudcore.so.2.0.0
+lib/libaudcore.so.3
+lib/libaudcore.so.3.0.0
 lib/libaudgui.so
-lib/libaudgui.so.2
-lib/libaudgui.so.2.0.0
+lib/libaudgui.so.3
+lib/libaudgui.so.3.0.0
 lib/libaudtag.so
-lib/libaudtag.so.1
-lib/libaudtag.so.1.0.0
+lib/libaudtag.so.2
+lib/libaudtag.so.2.0.0
 libdata/pkgconfig/audacious.pc
 man/man1/audacious.1.gz
 man/man1/audtool.1.gz
@@ -52,6 +47,7 @@ share/applications/audacious.desktop
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
 %%DATADIR%%/images/about-logo.png
+%%DATADIR%%/images/about-logo.svg
 %%DATADIR%%/images/album.png
 %%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/audio.png