diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 17550a80a199..071267188818 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -1,90 +1,92 @@ # 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 COMMENT= DJ mixing application LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= lv2>=1.14.0:audio/lv2 LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libFLAC.so:audio/flac \ libfftw3.so:math/fftw3 \ libhidapi.so:comms/hidapi \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ libmodplug.so:audio/libmodplug \ libportaudio.so:audio/portaudio \ libSoundTouch.so:audio/soundtouch \ libebur128.so:audio/libebur128 \ librubberband.so:audio/rubberband \ libsndfile.so:audio/libsndfile \ libogg.so:audio/libogg \ libvorbisfile.so:audio/libvorbis \ libtag.so:audio/taglib \ libprotobuf.so:devel/protobuf \ liblilv-0.so:audio/lilv \ libportmidi.so:audio/portmidi \ libupower-glib.so:sysutils/upower \ libkeyfinder.so:audio/libkeyfinder \ libmp3lame.so:audio/lame USES= cmake compiler:c++11-lang gl iconv ninja qt:5 pkgconfig sqlite \ ssl xorg USE_XORG= ice sm x11 xext USE_GL= gl glu USE_GITHUB= yes GH_ACCOUNT= mixxxdj USE_QT= buildtools concurrent core dbus gui linguisttools_build network \ opengl qmake_build script scripttools sql sql-sqlite3 svg \ testlib x11extras xml xmlpatterns widgets CONFLICTS= mixxx22* CMAKE_ARGS+= -DINSTALL_USER_UDEV_RULES:BOOL=OFF \ -DOPTIMIZE:STRING=portable \ -DBATTERY:BOOL=OFF \ -DFAAD:BOOL=OFF \ -DMODPLUG:BOOL=ON \ -DMAD:BOOL=ON PORTDOCS= * OPTIONS_DEFINE= BROADCAST DOCS FFMPEG GPERFTOOLS HID OPUS \ QTKEYCHAIN WAVPACK OPTIONS_DEFAULT= BROADCAST FFMPEG HID OPUS QTKEYCHAIN WAVPACK OPTIONS_SUB= yes BROADCAST_DESC= Live Broadcasting (Shoutcast) support #BROADCAST_LIB_DEPENDS= libshout-idjc.so:audio/shout-idjc BROADCAST_CMAKE_BOOL= BROADCAST FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= FFMPEG GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools GPERFTOOLS_CMAKE_BOOL= GPERFTOOLS HID_DESC= USB HID controllers support HID_CMAKE_BOOL= HID OPUS_LIB_DEPENDS= libopus.so:audio/opus \ libopusfile.so:audio/opusfile OPUS_CMAKE_BOOL= OPUS QTKEYCHAIN_DESC= Secure credentials storage for Live Broadcasting profiles QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain QTKEYCHAIN_CMAKE_BOOL= QTKEYCHAIN WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack 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 .include 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