UPDATE audacious-4.2

Diff below updates {audio,meta}/audacious to 4.2. Release notes can be
found at
https://audacious-media-player.org/news/53-audacious-4-2-released.

Run tested on amd64.

OK?


diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index 9b8b2e4813e..2434ee8e8cb 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -1,5 +1,5 @@
# Do not forget to sync meta/audacious
-VERSION = 4.1
+VERSION = 4.2

CATEGORIES = audio multimedia

diff --git audio/audacious/player/Makefile audio/audacious/player/Makefile
index 75db983640a..c0c6e744ef1 100644
--- audio/audacious/player/Makefile
+++ audio/audacious/player/Makefile
@@ -2,11 +2,10 @@ COMMENT = graphical audio player which supports lots of formats

DISTNAME = audacious-${VERSION}
PKGNAME = audacious-player-${VERSION}
-REVISION = 2

-SHARED_LIBS += audcore 5.2 # 5.3
+SHARED_LIBS += audcore 5.2 # 5.3
SHARED_LIBS += audtag 3.0 # 3.0
-SHARED_LIBS += audqt 0.0 # 2.3
+SHARED_LIBS += audqt 0.1 # 2.4

# BSD
PERMIT_PACKAGE = Yes
@@ -14,7 +13,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl m

-RUN_DEPENDS = devel/desktop-file-utils
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
# needed for displaying icons
RUN_DEPENDS += x11/qt5/qtsvg

diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo
index 90ea7f1f21b..e92bca49cb1 100644
--- audio/audacious/player/distinfo
+++ audio/audacious/player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-4.1.tar.bz2) = H1iFj5eJ6GfFE7UnKYfxO9+wkzKwPCgUrUxuKfUl41w=
-SIZE (audacious-4.1.tar.bz2) = 586472
+SHA256 (audacious-4.2.tar.bz2) = /rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=
+SIZE (audacious-4.2.tar.bz2) = 612155
diff --git audio/audacious/player/patches/patch-src_libaudqt_Makefile audio/audacious/player/patches/patch-src_libaudqt_Makefile
index cc56dc05f4a..6d69686b2a4 100644
--- audio/audacious/player/patches/patch-src_libaudqt_Makefile
+++ audio/audacious/player/patches/patch-src_libaudqt_Makefile
@@ -6,5 +6,5 @@ Index: src/libaudqt/Makefile
+SHARED_LIB = ${LIB_PREFIX}audqt.so.${LIBaudqt_VERSION}
+
LIB_MAJOR = 2
- LIB_MINOR = 3
+ LIB_MINOR = 4

diff --git audio/audacious/player/pkg/PLIST audio/audacious/player/pkg/PLIST
index 409eb0a4b04..8d37aa94d81 100644
--- audio/audacious/player/pkg/PLIST
+++ audio/audacious/player/pkg/PLIST
@@ -55,6 +55,7 @@ share/audacious/AUTHORS
share/audacious/COPYING
share/icons/hicolor/48x48/apps/audacious.png
share/icons/hicolor/scalable/apps/audacious.svg
+share/locale/af/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
@@ -75,6 +76,10 @@ share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/audacious.mo
share/locale/et/LC_MESSAGES/audacious.mo
+share/locale/eu/LC_MESSAGES/audacious.mo
+share/locale/fa_IR/
+share/locale/fa_IR/LC_MESSAGES/
+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
@@ -110,6 +115,7 @@ 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/uz/LC_MESSAGES/audacious.mo
share/locale/zh_CN/LC_MESSAGES/audacious.mo
share/locale/zh_TW/LC_MESSAGES/audacious.mo
@tag update-desktop-database
diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile
index 2674e8175fb..6e4874bc49c 100644
--- audio/audacious/plugins/Makefile
+++ audio/audacious/plugins/Makefile
@@ -1,7 +1,6 @@
COMMENT = input and output plugins for Audacious

DISTNAME = audacious-plugins-${VERSION}
-REVISION = 3

# BSD / GPL
PERMIT_PACKAGE = Yes
diff --git audio/audacious/plugins/distinfo audio/audacious/plugins/distinfo
index cebb914ddef..fafccdebf3e 100644
--- audio/audacious/plugins/distinfo
+++ audio/audacious/plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-4.1.tar.bz2) = 2tb8YlBVNJ1Ynjbo5ciuffr83f6WiUgGUJaW2Cu2HUw=
-SIZE (audacious-plugins-4.1.tar.bz2) = 1802825
+SHA256 (audacious-plugins-4.2.tar.bz2) = b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=
+SIZE (audacious-plugins-4.2.tar.bz2) = 1947472
diff --git audio/audacious/plugins/patches/patch-configure audio/audacious/plugins/patches/patch-configure
index 9798ceff93b..ef7aacd8fc3 100644
--- audio/audacious/plugins/patches/patch-configure
+++ audio/audacious/plugins/patches/patch-configure
@@ -5,7 +5,7 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB.
Index: configure
--- configure.orig
+++ configure
-@@ -11424,8 +11424,6 @@ printf "%s\n" "yes" >&6; }
+@@ -11411,8 +11411,6 @@ printf "%s\n" "yes" >&6; }

fi

@@ -14,7 +14,7 @@ Index: configure


if test $HAVE_DARWIN = yes ; then
-@@ -16672,6 +16670,8 @@ then :
+@@ -16600,6 +16598,8 @@ then :

fi

diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST
index 0e9fe8efda0..c7bd024c243 100644
--- audio/audacious/plugins/pkg/PLIST
+++ audio/audacious/plugins/pkg/PLIST
@@ -11,6 +11,7 @@ lib/audacious/Container/
@so lib/audacious/Container/pls.so
@so lib/audacious/Container/xspf.so
lib/audacious/Effect/
+@so lib/audacious/Effect/bitcrusher.so
@so lib/audacious/Effect/compressor.so
@so lib/audacious/Effect/crossfade.so
@so lib/audacious/Effect/crystalizer.so
@@ -193,6 +194,7 @@ share/audacious/Skins/TinyPlayer/text.png
share/audacious/Skins/TinyPlayer/titlebar.png
share/audacious/Skins/TinyPlayer/viscolor.txt
share/audacious/Skins/TinyPlayer/volume.png
+share/locale/af/LC_MESSAGES/audacious-plugins.mo
share/locale/ar/LC_MESSAGES/audacious-plugins.mo
share/locale/be/LC_MESSAGES/audacious-plugins.mo
share/locale/bg/LC_MESSAGES/audacious-plugins.mo
@@ -207,6 +209,8 @@ share/locale/es/LC_MESSAGES/audacious-plugins.mo
share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
share/locale/et/LC_MESSAGES/audacious-plugins.mo
+share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
share/locale/fi/LC_MESSAGES/audacious-plugins.mo
share/locale/fr/LC_MESSAGES/audacious-plugins.mo
share/locale/gl/LC_MESSAGES/audacious-plugins.mo
@@ -234,5 +238,6 @@ share/locale/sv/LC_MESSAGES/audacious-plugins.mo
share/locale/ta/LC_MESSAGES/audacious-plugins.mo
share/locale/tr/LC_MESSAGES/audacious-plugins.mo
share/locale/uk/LC_MESSAGES/audacious-plugins.mo
+share/locale/uz/LC_MESSAGES/audacious-plugins.mo
share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo
diff --git meta/audacious/Makefile meta/audacious/Makefile
index af56757cecb..81224d5c6fe 100644
--- meta/audacious/Makefile
+++ meta/audacious/Makefile
@@ -1,7 +1,6 @@
COMMENT = audacious meta-package

-VERSION = 4.1
-REVISION = 0
+VERSION = 4.2
PKGNAME = audacious-${VERSION}

MAINTAINER = Bjorn Ketelaars <bket@openbsd.org>