From 32dc463939259105bfacd39235483fdcebfb53d6 Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Mon, 7 Mar 2022 16:29:03 -0500 Subject: 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 --- audio/mixxx/Makefile | 8 +++--- audio/mixxx/distinfo | 6 ++--- .../files/patch-cmake_modules_FindLibUSB.cmake | 14 ----------- ...b_rigtorp_SPSCQueue_include_rigtorp_SPSCQueue.h | 11 -------- audio/mixxx/files/patch-src_util_versionstore.cpp | 11 -------- audio/mixxx/pkg-plist | 29 +++++++++++++++++++--- 6 files changed, 34 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 17550a80a199..071267188818 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -1,8 +1,8 @@ # Created by: Jean-Yves Lefort 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