mixxx: Update to 2.2.2

This release includes many stability and usability fixes. Please note that we had to disable writing of file tags for .ogg files with the current TagLib version 1.11.1 that would otherwise corrupt your precious files. Upgrading from version 2.2.1 is strongly recommended.

    Fix battery widget with upower <= 0.99.7. #2221
    Fix BPM adjust in BpmControl. lp:1836480
    Disable track metadata export for .ogg files and TagLib 1.11.1. lp:1833190
    Fix interaction of hot cue buttons and looping. lp:1778246
    Fix detection of moved tracks. #2197
    Fix playlist import. lp:16878282
    Fix updating playlist labels. lp:1837315
    Fix potential segfault on exit. lp:1828360
    Fix parsing of invalid bpm values in MP3 files. lp:1832325
    Fix crash when removing rows from empty model. #2128
    Fix high DPI scaling of RGB overview waveforms. #2090
    Fix for OpenGL SL detection on macOS. lp:1828019
    Fix OpenGL ES detection. lp:1825461
    Fix FX1/2 buttons missing Mic unit in Deere (64 samplers). lp:1837716
    Tango64: Re-enable 64 samplers. #2223
    Numark DJ2Go re-enable note-off for deck A cue button. #2087
    Replace Flanger with QuickEffect in keyboard mapping. #2233

5 files changed, 20 insertions, 14 deletions

diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 1349974e159..9c629cf1505 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/09/18 14:17:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/06 13:45:42 nia Exp $
 
-DISTNAME=	mixxx-2.2.1
-PKGREVISION=	3
+DISTNAME=	mixxx-2.2.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mixxxdj/}
 GITHUB_TAG=	release-${PKGVERSION_NOREV}
@@ -19,6 +18,8 @@ USE_TOOLS+=	pkg-config
 # c++11
 GCC_REQD+=	4.9
 
+PLIST_SRCS+=	PLIST
+
 SCONS_ARGS+=	-j${MAKE_JOBS:U1}
 
 # scons fails otherwise
diff --git a/audio/mixxx/PLIST b/audio/mixxx/PLIST
index 92469265fff..771c7f363cc 100644
--- a/audio/mixxx/PLIST
+++ b/audio/mixxx/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2019/07/26 23:35:09 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/10/06 13:45:42 nia Exp $
 bin/mixxx
 lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
-${PLIST.wavpack}lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
 lib/mixxx/plugins/vampqt5/libmixxxminimal.so
 share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
@@ -1371,7 +1370,7 @@ share/mixxx/skins/Shade/vinyl_spinny_foreground.png
 share/mixxx/skins/Shade/vinyl_spinny_foreground_ghost.png
 share/mixxx/skins/Shade/vinylcontrol.xml
 share/mixxx/skins/Tango (64 Samplers)/preferences_preview_screenshot.png
-share/mixxx/skins/Tango (64 Samplers)/sample_decks.xml
+share/mixxx/skins/Tango (64 Samplers)/sampler_rack.xml
 share/mixxx/skins/Tango (64 Samplers)/skin.xml
 share/mixxx/skins/Tango (64 Samplers)/skin_settings.xml
 share/mixxx/skins/Tango (64 Samplers)/skin_settings_sampler_rows_64.xml
@@ -1772,6 +1771,7 @@ share/mixxx/translations/mixxx_ceb.qm
 share/mixxx/translations/mixxx_cs.qm
 share/mixxx/translations/mixxx_da.qm
 share/mixxx/translations/mixxx_de.qm
+share/mixxx/translations/mixxx_el-GR.qm
 share/mixxx/translations/mixxx_el.qm
 share/mixxx/translations/mixxx_en.qm
 share/mixxx/translations/mixxx_en_GB.qm
@@ -1787,6 +1787,7 @@ share/mixxx/translations/mixxx_fr-FR.qm
 share/mixxx/translations/mixxx_fr.qm
 share/mixxx/translations/mixxx_ga.qm
 share/mixxx/translations/mixxx_gl.qm
+share/mixxx/translations/mixxx_he-IL.qm
 share/mixxx/translations/mixxx_he.qm
 share/mixxx/translations/mixxx_hr.qm
 share/mixxx/translations/mixxx_hu.qm
@@ -1808,6 +1809,8 @@ share/mixxx/translations/mixxx_mr.qm
 share/mixxx/translations/mixxx_ms.qm
 share/mixxx/translations/mixxx_my.qm
 share/mixxx/translations/mixxx_nb.qm
+share/mixxx/translations/mixxx_nl-BE.qm
+share/mixxx/translations/mixxx_nl-NL.qm
 share/mixxx/translations/mixxx_nl.qm
 share/mixxx/translations/mixxx_nn.qm
 share/mixxx/translations/mixxx_oc.qm
@@ -1830,6 +1833,7 @@ share/mixxx/translations/mixxx_tr.qm
 share/mixxx/translations/mixxx_uk.qm
 share/mixxx/translations/mixxx_uz.qm
 share/mixxx/translations/mixxx_vi.qm
+share/mixxx/translations/mixxx_zh-HK.qm
 share/mixxx/translations/mixxx_zh_CN.qm
 share/mixxx/translations/mixxx_zh_TW.Big5.qm
 share/mixxx/translations/mixxx_zh_TW.qm
diff --git a/audio/mixxx/PLIST.wv b/audio/mixxx/PLIST.wv
new file mode 100644
index 00000000000..0ef07d40e55
--- /dev/null
+++ b/audio/mixxx/PLIST.wv
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.wv,v 1.1 2019/10/06 13:45:42 nia Exp $
+lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
diff --git a/audio/mixxx/distinfo b/audio/mixxx/distinfo
index c130a7abee1..aab3aa119b0 100644
--- a/audio/mixxx/distinfo
+++ b/audio/mixxx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/07/26 23:35:09 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/10/06 13:45:42 nia Exp $
 
-SHA1 (mixxx-2.2.1.tar.gz) = b6da5dff30c8cdbccd84d55801fcbd67bd337b06
-RMD160 (mixxx-2.2.1.tar.gz) = 919d19785d8ee17ae8cb380ffe8df9ffe30ae93c
-SHA512 (mixxx-2.2.1.tar.gz) = 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
-Size (mixxx-2.2.1.tar.gz) = 34763333 bytes
+SHA1 (mixxx-2.2.2.tar.gz) = b078b4a57642419d581ee4364f6d1f91a04a2a0a
+RMD160 (mixxx-2.2.2.tar.gz) = a88f60a02d18939932ed63ed8b016a522fda8fc9
+SHA512 (mixxx-2.2.2.tar.gz) = 3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
+Size (mixxx-2.2.2.tar.gz) = 35050389 bytes
 SHA1 (patch-build_depends.py) = 0025d32ac9c57a65253fd3c59ea04b244b0f3cd4
 SHA1 (patch-build_features.py) = 52471069ffcda271f52cf8d87388ffbf3c1a3dc8
 SHA1 (patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp) = 656f09d146a81ea143af2ddd85cc66392fa3fce8
diff --git a/audio/mixxx/options.mk b/audio/mixxx/options.mk
index 6882362a58a..8108e97f2c4 100644
--- a/audio/mixxx/options.mk
+++ b/audio/mixxx/options.mk
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2019/07/20 10:39:18 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/06 13:45:42 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mixxx
 PKG_SUPPORTED_OPTIONS=		wavpack
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	wavpack
 .if !empty(PKG_OPTIONS:Mwavpack)
-PLIST.wavpack=	yes
+PLIST_SRCS+=	PLIST.wv
 SCONS_ARGS+=	wv=1
 .include "../../audio/wavpack/buildlink3.mk"
 .else