Attachment 232139 Details for Bug 259059 – Patch to update mixxx to 2.3.1 release

[patch] Patch to update mixxx to 2.3.1 release

mix-2.3.1-2022-02-27.patch (text/plain), 9.59 KB, created by David Schlachter on 2022-02-27 15:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Schlachter

Created: 2022-02-27 15:18:54 UTC

Size: 9.59 KB

patch

obsolete

>From 8f04817af8247a5171e4dfb532d1a484758b38d0 Mon Sep 17 00:00:00 2001
>From: David Schlachter <github@schlachter.ca>
>Date: Sun, 10 Oct 2021 23:43:37 -0400
>Subject: [PATCH] Update mixxx to 2.3.1
>
>---
> audio/mixxx/Makefile                          |  5 ++--
> audio/mixxx/distinfo                          |  6 ++---
> .../patch-cmake_modules_FindLibUSB.cmake      | 14 -----------
> ...torp_SPSCQueue_include_rigtorp_SPSCQueue.h | 11 ---------
> .../files/patch-src_util_versionstore.cpp     | 11 ---------
> audio/mixxx/pkg-plist                         | 23 ++++++++++++++++---
> 6 files changed, 25 insertions(+), 45 deletions(-)
> delete mode 100644 audio/mixxx/files/patch-cmake_modules_FindLibUSB.cmake
> delete mode 100644 audio/mixxx/files/patch-lib_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h
> delete mode 100644 audio/mixxx/files/patch-src_util_versionstore.cpp
>
>diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
>index 6c05d667cd70..8ec2e7cc66cf 100644
>--- a/audio/mixxx/Makefile
>+++ b/audio/mixxx/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Jean-Yves Lefort <jylefort@brutele.be>
> 
> PORTNAME=	mixxx
>-DISTVERSION=	2.3.0
>-PORTREVISION=	5
>+DISTVERSION=	2.3.1
> CATEGORIES=	audio
> 
> MAINTAINER=	acm@FreeBSD.org
>@@ -80,7 +79,7 @@ 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
> .for i in midi/midimessage.h
>diff --git a/audio/mixxx/distinfo b/audio/mixxx/distinfo
>index 93d37be19745..ee4007d185f0 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 = 1633921966
>+SHA256 (mixxxdj-mixxx-2.3.1_GH0.tar.gz) = 35cff9acece5f651af472c11952ba59d5bc22e36225e6cb65c931afe0bc25b71
>+SIZE (mixxxdj-mixxx-2.3.1_GH0.tar.gz) = 39977210
>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..a5388e021ee4 100644
>--- a/audio/mixxx/pkg-plist
>+++ b/audio/mixxx/pkg-plist
>@@ -1,8 +1,12 @@
> bin/mixxx
>-share/applications/mixxx.desktop
>+share/applications/org.mixxx.Mixxx.desktop
>+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 +167,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 +181,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 +189,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
>@@ -284,7 +292,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 +499,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 +744,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 +1212,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 +1624,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 +2261,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
>-- 
>2.32.0
>
>

Actions: View | Diff

Attachments on bug 259059: 228576 | 232139 | 232141