audacious: Update to 3.10.0

Upstream decided to drop GTK3 support.
GTK3 was previously the default UI in pkgsrc.

I've changed the deafult to Qt5 to retain HiDPI support.
GTK2 is also available for those who want it.

New plugins: sox-resampler, silence-removal, ffaudio (used for formats
not handled by other plugins like opus), alsa

7 files changed, 137 insertions, 89 deletions

diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index e5db376bee6..1b90ce90b8f 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2018/11/14 22:20:59 kleink Exp $
+# $NetBSD: Makefile,v 1.55 2019/07/06 13:17:00 nia Exp $
 
-DISTNAME=	audacious-3.5.2
-PKGREVISION=	10
+DISTNAME=	audacious-3.10.1
 CATEGORIES=	audio
-MASTER_SITES=	http://distfiles.audacious-media-player.org/
+MASTER_SITES=	https://distfiles.audacious-media-player.org/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,25 +11,18 @@ COMMENT=	Media player based on BMP and XMMS
 LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		intltool msgfmt msgmerge xgettext
 GNU_CONFIGURE=		yes
-# requires libguess which is not available any more
-CONFIGURE_ARGS+=	--disable-chardet
 PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
-TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
 # XXX does not solve linking problem completely
 LDFLAGS.Darwin+=	-flat_namespace -undefined suppress
 
-.include "../../devel/atk/buildlink3.mk"
+.include "options.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacious/PLIST b/audio/audacious/PLIST
index 71761a45c72..e79eea065f9 100644
--- a/audio/audacious/PLIST
+++ b/audio/audacious/PLIST
@@ -1,68 +1,64 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/09 15:02:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/07/06 13:17:00 nia Exp $
 bin/audacious
-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
+${PLIST.dbus}bin/audtool
 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/export.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/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
+include/libaudcore/visualizer.h
+${PLIST.gtk}include/libaudgui/libaudgui-gtk.h
+${PLIST.gtk}include/libaudgui/libaudgui.h
+${PLIST.gtk}include/libaudgui/list.h
+${PLIST.gtk}include/libaudgui/menu.h
+${PLIST.qt}include/libaudqt/export.h
+${PLIST.qt}include/libaudqt/iface.h
+${PLIST.qt}include/libaudqt/info-widget.h
+${PLIST.qt}include/libaudqt/libaudqt.h
+${PLIST.qt}include/libaudqt/menu.h
 lib/libaudcore.so
-lib/libaudcore.so.2
-lib/libaudcore.so.2.0.0
-lib/libaudgui.so
-lib/libaudgui.so.2
-lib/libaudgui.so.2.0.0
+lib/libaudcore.so.5
+lib/libaudcore.so.5.1.0
+${PLIST.gtk}lib/libaudgui.so
+${PLIST.gtk}lib/libaudgui.so.5
+${PLIST.gtk}lib/libaudgui.so.5.0.0
+${PLIST.qt}lib/libaudqt.so
+${PLIST.qt}lib/libaudqt.so.2
+${PLIST.qt}lib/libaudqt.so.2.1.0
 lib/libaudtag.so
-lib/libaudtag.so.1
-lib/libaudtag.so.1.0.0
+lib/libaudtag.so.3
+lib/libaudtag.so.3.0.0
 lib/pkgconfig/audacious.pc
 man/man1/audacious.1
 man/man1/audtool.1
 share/applications/audacious.desktop
 share/audacious/AUTHORS
 share/audacious/COPYING
-share/audacious/images/about-logo.png
-share/audacious/images/album.png
-share/audacious/images/appearance.png
-share/audacious/images/audio.png
-share/audacious/images/connectivity.png
-share/audacious/images/info.png
-share/audacious/images/playlist.png
-share/audacious/images/plugins.png
 share/icons/hicolor/48x48/apps/audacious.png
 share/icons/hicolor/scalable/apps/audacious.svg
-share/locale/ast/LC_MESSAGES/audacious.mo
+share/locale/ar/LC_MESSAGES/audacious.mo
 share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
@@ -72,7 +68,6 @@ share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/en_GB/LC_MESSAGES/audacious.mo
-share/locale/eo/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
 share/locale/es_AR/LC_MESSAGES/audacious.mo
 share/locale/es_MX/LC_MESSAGES/audacious.mo
@@ -82,7 +77,6 @@ share/locale/fa_IR/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
 share/locale/gl/LC_MESSAGES/audacious.mo
-share/locale/he/LC_MESSAGES/audacious.mo
 share/locale/hu/LC_MESSAGES/audacious.mo
 share/locale/id_ID/LC_MESSAGES/audacious.mo
 share/locale/it/LC_MESSAGES/audacious.mo
@@ -101,14 +95,11 @@ share/locale/ro/LC_MESSAGES/audacious.mo
 share/locale/ru/LC_MESSAGES/audacious.mo
 share/locale/si/LC_MESSAGES/audacious.mo
 share/locale/sk/LC_MESSAGES/audacious.mo
-share/locale/sq/LC_MESSAGES/audacious.mo
 share/locale/sr/LC_MESSAGES/audacious.mo
-share/locale/sr@latin/LC_MESSAGES/audacious.mo
 share/locale/sr_RS/LC_MESSAGES/audacious.mo
 share/locale/sv/LC_MESSAGES/audacious.mo
 share/locale/ta/LC_MESSAGES/audacious.mo
 share/locale/tr/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
-share/locale/vi/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index 547ed86426b..5ecefc6cfee 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,22 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.39 2018/11/14 22:20:59 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2019/07/06 13:17:00 nia Exp $
 
 BUILDLINK_TREE+=	audacious
 
 .if !defined(AUDACIOUS_BUILDLINK3_MK)
 AUDACIOUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.5.1
-BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.5.2nb10
+BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.10.1
+BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.10.1
 BUILDLINK_PKGSRCDIR.audacious?=		../../audio/audacious
 
-.include "../../devel/atk/buildlink3.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+
+pkgbase := audacious
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus)
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
 .endif # AUDACIOUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-audacious
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index 5eac4730a21..938b3ec0756 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2018/07/31 13:46:31 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2019/07/06 13:17:00 nia Exp $
 
-SHA1 (audacious-3.5.2.tar.bz2) = 1c92ddb079ec1b0109cd4bc65a1329db5eb8cb1b
-RMD160 (audacious-3.5.2.tar.bz2) = dd41e56544d9563b47401a670d96a34d7be920b6
-SHA512 (audacious-3.5.2.tar.bz2) = 70fd5bf81fd86a867102917c9328e1e647e9566ecfbc773b15fe0d181f176cfb333976c817493b1e485f15a045da054f19a9d6d81106d55636fca14ac09f8008
-Size (audacious-3.5.2.tar.bz2) = 448436 bytes
-SHA1 (patch-configure) = b35fcc193c90401ed5b927d200022e8b05e1fee8
+SHA1 (audacious-3.10.1.tar.bz2) = 297000119e0d7b94e355bd78d484c85baeab3795
+RMD160 (audacious-3.10.1.tar.bz2) = 6fc2c88fc681a58f42f45d19de36f2f24bc7e1bf
+SHA512 (audacious-3.10.1.tar.bz2) = e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
+Size (audacious-3.10.1.tar.bz2) = 564481 bytes
+SHA1 (patch-configure) = 2f310b55fdfc4147af6132dd821a9f81a1be6864
+SHA1 (patch-src_libaudcore_audio.h.in) = 621afba8a610ab0f30d064d5d9ed581e781de7d2
diff --git a/audio/audacious/options.mk b/audio/audacious/options.mk
new file mode 100644
index 00000000000..145741345ee
--- /dev/null
+++ b/audio/audacious/options.mk
@@ -0,0 +1,32 @@
+# $NetBSD: options.mk,v 1.1 2019/07/06 13:17:00 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.audacious
+PKG_OPTIONS_OPTIONAL_GROUPS=	ui
+PKG_OPTIONS_GROUP.ui=		qt5 gtk2
+PKG_SUPPORTED_OPTIONS+=		dbus
+PKG_SUGGESTED_OPTIONS+=		dbus qt5 gtk2
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	dbus gtk qt
+
+.if !empty(PKG_OPTIONS:Mdbus)
+PLIST.dbus=	yes
+TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+.include "../../sysutils/dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.qt=	yes
+CONFIGURE_ARGS+=	--enable-qt
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.gtk=	yes
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
diff --git a/audio/audacious/patches/patch-configure b/audio/audacious/patches/patch-configure
index 26ae75bba3f..047c4e605f1 100644
--- a/audio/audacious/patches/patch-configure
+++ b/audio/audacious/patches/patch-configure
@@ -1,24 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2018/07/31 13:46:31 jperkin Exp $
+$NetBSD: patch-configure,v 1.3 2019/07/06 13:17:01 nia Exp $
 
 Fix install_name on Darwin.
 
---- configure.orig	2014-10-17 00:00:43.000000000 +0000
+--- configure.orig	2018-12-26 07:25:42.000000000 +0000
 +++ configure
-@@ -5217,18 +5217,18 @@ $as_echo_n "checking for shared library
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+@@ -6935,7 +6935,7 @@ $as_echo_n "checking for shared library 
  $as_echo "Darwin" >&6; }
  			LIB_CFLAGS='-fPIC -DPIC'
--			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
-+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name ${libdir}/${SHARED_LIB}'
+ 			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+-			LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
++			LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/${SHARED_LIB}'
  			LIB_PREFIX='lib'
  			LIB_SUFFIX='.dylib'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
- 			PLUGIN_CFLAGS='-fPIC -DPIC'
- 			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
- 			PLUGIN_SUFFIX='.bundle'
--			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && install_name_tool -id ${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
- 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+@@ -6978,7 +6978,7 @@ $as_echo "OpenBSD" >&6; }
+ 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
  			CLEAN_LIB=''
  			;;
 -		solaris*)
diff --git a/audio/audacious/patches/patch-src_libaudcore_audio.h.in b/audio/audacious/patches/patch-src_libaudcore_audio.h.in
new file mode 100644
index 00000000000..8083a13e600
--- /dev/null
+++ b/audio/audacious/patches/patch-src_libaudcore_audio.h.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_libaudcore_audio.h.in,v 1.1 2019/07/06 13:17:01 nia Exp $
+
+NetBSD has these in libc.
+
+--- src/libaudcore/audio.h.in.orig	2018-12-26 06:55:16.000000000 +0000
++++ src/libaudcore/audio.h.in
+@@ -42,7 +42,10 @@ struct StereoVolume {
+ };
+ 
+ #ifdef WANT_AUD_BSWAP
+-
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/bswap.h>
++#else
+ #include <stdint.h>
+ 
+ #undef bswap16
+@@ -66,7 +69,7 @@ constexpr uint64_t bswap64 (uint64_t x)
+            ((x & 0x00000000ff000000) << 8) | ((x & 0x0000000000ff0000) << 24) |
+            ((x & 0x000000000000ff00) << 40) | ((x & 0x00000000000000ff) << 56);
+ }
+-
++#endif // __NetBSD__
+ #endif // WANT_AUD_BSWAP
+ 
+ #if @BIGENDIAN@