audio/mixxx: update to 2.3.4

ChangeLog at:	https://github.com/mixxxdj/mixxx/blob/2.3.2/CHANGELOG.md
PR:		259059
Reported by:	fbsd-bugzilla  _at_  schlachter.ca

6 files changed, 34 insertions, 45 deletions

diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 17550a80a199..071267188818 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,8 +1,8 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 
 PORTNAME=	mixxx
-DISTVERSION=	2.3.0
-PORTREVISION=	6
+DISTVERSION=	2.3.2
+PORTREVISION=	0
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org
@@ -80,9 +80,11 @@ WAVPACK_CMAKE_BOOL=	WAVPACK
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx|" \
-		${WRKSRC}/res/linux/mixxx.desktop
+		${WRKSRC}/res/linux/org.mixxx.Mixxx.desktop
 	@${REINPLACE_CMD} -e "s,(Q_OS_LINUX),(Q_OS_LINUX) || defined(Q_OS_FREEBSD),g" \
 		${WRKSRC}/src/util/screensaver.h
+	@${REINPLACE_CMD} -e "s|QUIET hidapi-libusb|QUIET hidapi|" \
+		${WRKSRC}/cmake/modules/Findhidapi.cmake
 .for i in midi/midimessage.h
 	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
 .endfor
diff --git a/audio/mixxx/distinfo b/audio/mixxx/distinfo
index 93d37be19745..1af8a683240d 100644
--- a/audio/mixxx/distinfo
+++ b/audio/mixxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625856636
-SHA256 (mixxxdj-mixxx-2.3.0_GH0.tar.gz) = ea0dad33bafa9f7a3523f19efa7c3163070fc8b946e93159907a2efb6037babe
-SIZE (mixxxdj-mixxx-2.3.0_GH0.tar.gz) = 39736601
+TIMESTAMP = 1646682590
+SHA256 (mixxxdj-mixxx-2.3.2_GH0.tar.gz) = b6a0ed80bfbda5b65014e75ffd132f8a7474b260ef18d1e4e2c203e21bb28695
+SIZE (mixxxdj-mixxx-2.3.2_GH0.tar.gz) = 40138947
diff --git a/audio/mixxx/files/patch-cmake_modules_FindLibUSB.cmake b/audio/mixxx/files/patch-cmake_modules_FindLibUSB.cmake
deleted file mode 100644
index 239103f163d8..000000000000
--- a/audio/mixxx/files/patch-cmake_modules_FindLibUSB.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmake/modules/FindLibUSB.cmake.orig	2021-06-28 20:04:59 UTC
-+++ cmake/modules/FindLibUSB.cmake
-@@ -57,7 +57,11 @@ find_path(LibUSB_INCLUDE_DIR
- mark_as_advanced(LibUSB_INCLUDE_DIR)
- 
- find_library(LibUSB_LIBRARY
-+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+  NAMES usb
-+else
-   NAMES usb-1.0
-+endif()
-   PATHS ${PC_LibUSB_LIBRARY_DIRS}
-   DOC "LibUSB library"
- )
diff --git a/audio/mixxx/files/patch-lib_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h b/audio/mixxx/files/patch-lib_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h
deleted file mode 100644
index 8579a04256b9..000000000000
--- a/audio/mixxx/files/patch-lib_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h.orig	2021-06-28 20:04:59 UTC
-+++ lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h
-@@ -189,7 +189,7 @@ template <typename T, typename Allocator = std::alloca
- // on macOS there is a bug in libc++ where __cpp_lib_hardware_interference_size
- // is defined but std::hardware_destructive_interference_size is not actually implemented
- // https://bugs.llvm.org/show_bug.cgi?id=41423
--#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__)
-+#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__) && ! defined(__FreeBSD__)
-   static constexpr size_t kCacheLineSize =
-       std::hardware_destructive_interference_size;
- #else
diff --git a/audio/mixxx/files/patch-src_util_versionstore.cpp b/audio/mixxx/files/patch-src_util_versionstore.cpp
deleted file mode 100644
index 38048b39347d..000000000000
--- a/audio/mixxx/files/patch-src_util_versionstore.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util/versionstore.cpp.orig	2021-07-17 15:58:25 UTC
-+++ src/util/versionstore.cpp
-@@ -77,6 +77,8 @@ QString VersionStore::platform() {
-     QString base = QStringLiteral("Linux");
- #elif defined(__WINDOWS__)
-     QString base = QStringLiteral("Windows");
-+#elif defined(__FreeBSD__)
-+    QString base = QStringLiteral("FreeBSD");
- #else
-     QString base = QStringLiteral("Unknown OS");
- #endif
diff --git a/audio/mixxx/pkg-plist b/audio/mixxx/pkg-plist
index c884e4b5e5da..eefd30423b1a 100644
--- a/audio/mixxx/pkg-plist
+++ b/audio/mixxx/pkg-plist
@@ -1,8 +1,16 @@
 bin/mixxx
-share/applications/mixxx.desktop
+share/applications/org.mixxx.Mixxx.desktop
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Mixxx-Keyboard-Shortcuts.pdf
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+share/icons/hicolor/128x128/apps/mixxx.png
+share/icons/hicolor/256x256/apps/mixxx.png
 share/icons/hicolor/32x32/apps/mixxx.png
+share/icons/hicolor/512x512/apps/mixxx.png
+share/icons/hicolor/64x64/apps/mixxx.png
 share/icons/hicolor/scalable/apps/mixxx.svg
-share/metainfo/mixxx.metainfo.xml
+share/metainfo/org.mixxx.Mixxx.metainfo.xml
 %%DATADIR%%/controllers/.eslintrc.json
 %%DATADIR%%/controllers/Akai MPD24.midi.xml
 %%DATADIR%%/controllers/Akai-LPD8-RK-scripts.js
@@ -163,6 +171,7 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/controllers/Numark MIXTRACK.midi.xml
 %%DATADIR%%/controllers/Numark Mixtrack 2.midi.xml
 %%DATADIR%%/controllers/Numark Mixtrack Platinum.midi.xml
+%%DATADIR%%/controllers/Numark Mixtrack Pro FX.midi.xml
 %%DATADIR%%/controllers/Numark Mixtrack Pro.midi.xml
 %%DATADIR%%/controllers/Numark N4.midi.xml
 %%DATADIR%%/controllers/Numark NS7.midi.xml
@@ -176,6 +185,7 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/controllers/Numark-Mixtrack-3-scripts.js
 %%DATADIR%%/controllers/Numark-Mixtrack-3.midi.xml
 %%DATADIR%%/controllers/Numark-Mixtrack-Platinum-scripts.js
+%%DATADIR%%/controllers/Numark-Mixtrack-Pro-FX-scripts.js
 %%DATADIR%%/controllers/Numark-Mixtrack-Pro-scripts.js
 %%DATADIR%%/controllers/Numark-N4-scripts.js
 %%DATADIR%%/controllers/Numark-NS7-scripts.js
@@ -183,6 +193,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/controllers/Numark-Total-Control-scripts.js
 %%DATADIR%%/controllers/Numark-V7-scripts.js
 %%DATADIR%%/controllers/Numark-iDJ-Live-II-scripts.js
+%%DATADIR%%/controllers/Numark_DJ2GO2_Touch.midi.xml
+%%DATADIR%%/controllers/Numark_DJ2GO2_Touch_scripts.js
 %%DATADIR%%/controllers/Pioneer CDJ HID.hid.xml
 %%DATADIR%%/controllers/Pioneer CDJ-2000.midi.xml
 %%DATADIR%%/controllers/Pioneer CDJ-350 Ch1.midi.xml
@@ -201,6 +213,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/controllers/Pioneer-DDJ-SB.midi.xml
 %%DATADIR%%/controllers/Pioneer-DDJ-SB2-scripts.js
 %%DATADIR%%/controllers/Pioneer-DDJ-SB2.midi.xml
+%%DATADIR%%/controllers/Pioneer-DDJ-SB3-scripts.js
+%%DATADIR%%/controllers/Pioneer-DDJ-SB3.midi.xml
 %%DATADIR%%/controllers/Pioneer-DDJ-SX-scripts.js
 %%DATADIR%%/controllers/README.txt
 %%DATADIR%%/controllers/Reloop Beatmix 2-4.midi.xml
@@ -284,7 +298,7 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/controllers/novation-launchpad/.gitignore
 %%DATADIR%%/controllers/novation-launchpad/LICENSE
 %%DATADIR%%/controllers/novation-launchpad/Makefile
-%%DATADIR%%/controllers/novation-launchpad/README.MD
+%%DATADIR%%/controllers/novation-launchpad/README.md
 %%DATADIR%%/controllers/novation-launchpad/docs/lp-1.png
 %%DATADIR%%/controllers/novation-launchpad/docs/lp-2.png
 %%DATADIR%%/controllers/novation-launchpad/docs/lp-3.png
@@ -491,6 +505,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/skins/Deere/icon/ic_lib_spinbox_up_white.svg
 %%DATADIR%%/skins/Deere/icon/ic_library_bpm_locked.svg
 %%DATADIR%%/skins/Deere/icon/ic_library_bpm_unlocked.svg
+%%DATADIR%%/skins/Deere/icon/ic_library_checkbox.svg
+%%DATADIR%%/skins/Deere/icon/ic_library_checkbox_checked.svg
 %%DATADIR%%/skins/Deere/icon/ic_library_checkmark_blue.svg
 %%DATADIR%%/skins/Deere/icon/ic_library_checkmark_grey.svg
 %%DATADIR%%/skins/Deere/icon/ic_library_checkmark_orange.svg
@@ -734,6 +750,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
+%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkbox.svg
+%%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg
 %%DATADIR%%/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg
@@ -1200,6 +1218,7 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg
@@ -1611,6 +1630,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/skins/Shade/btn/btn_kill_overdown_summer.png
 %%DATADIR%%/skins/Shade/btn/btn_lib_bpm_locked.svg
 %%DATADIR%%/skins/Shade/btn/btn_lib_bpm_unlocked.svg
+%%DATADIR%%/skins/Shade/btn/btn_lib_checkbox.svg
+%%DATADIR%%/skins/Shade/btn/btn_lib_checkbox_checked.svg
 %%DATADIR%%/skins/Shade/btn/btn_lib_checkmark.svg
 %%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_black.svg
 %%DATADIR%%/skins/Shade/btn/btn_lib_checkmark_dark_grey.svg
@@ -2246,6 +2267,8 @@ share/metainfo/mixxx.metainfo.xml
 %%DATADIR%%/skins/Tango/buttons/btn_keylock_on.svg
 %%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_locked.svg
 %%DATADIR%%/skins/Tango/buttons/btn_lib_bpm_unlocked.svg
+%%DATADIR%%/skins/Tango/buttons/btn_lib_checkbox.svg
+%%DATADIR%%/skins/Tango/buttons/btn_lib_checkbox_checked.svg
 %%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark.svg
 %%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_dark_grey.svg
 %%DATADIR%%/skins/Tango/buttons/btn_lib_checkmark_grey.svg