diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 50592ea8137c..fe0596e7fcbf 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -1,123 +1,126 @@ PORTNAME= mixxx DISTVERSION= 2.5.0 PORTREVISION= 5 CATEGORIES= audio +PATCH_SITES= https://github.com/mixxxdj/mixxx/commit/ +PATCHFILES+= 355eb9ce880349ff94759f731bb7ae747bf6677c.patch:-p1 # Fix build with Qt >= 6.9.0 + MAINTAINER= acm@FreeBSD.org COMMENT= DJ mixing application WWW= https://mixxx.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= benchmark>0:devel/benchmark \ googletest>0:devel/googletest \ lv2>=1.14.0:audio/lv2 \ microsoft-gsl>0:devel/microsoft-gsl LIB_DEPENDS= libabsl_base.so:devel/abseil \ 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 \ 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:testing compiler:c++20-lang ebur128 gl iconv ninja pkgconfig \ sqlite ssl xorg FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} qt5_CONFLICTS= mixxx-qt6 qt6_CONFLICTS= mixxx-qt5 USE_XORG= ice sm x11 xext USE_GL= gl glu USE_GITHUB= yes GH_ACCOUNT= mixxxdj .if ${FLAVOR} == qt6 PKGNAMESUFFIX= -qt6 USES+= qt:6 USE_QT= 5compat base:run declarative:build tools:build shadertools \ sqldriver-sqlite:run svg CMAKE_ARGS+= -DQT6=ON QTKEYCHAIN_LIB_DEPENDS= libqt6keychain.so:security/qtkeychain@qt6 PLIST_SUB+= QT6="" .else PKGNAMESUFFIX= -qt5 USES+= qt:5 USE_QT= buildtools concurrent core dbus declarative gui linguisttools:build \ network opengl printsupport qmake:build sql sql-sqlite3 svg testlib \ widgets x11extras xml CMAKE_ARGS+= -DQT6=OFF QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 PLIST_SUB+= QT6="@comment " .endif 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 ENGINEPRIME 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 ENGINEPRIME_DESC= Denon Engine Prime library export support ENGINEPRIME_LIB_DEPENDS= libdjinterop.so:audio/libdjinterop ENGINEPRIME_CMAKE_BOOL= ENGINEPRIME 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_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/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 81497dcb9024..87bbde7abdf7 100644 --- a/audio/mixxx/distinfo +++ b/audio/mixxx/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1735235861 +TIMESTAMP = 1745041655 SHA256 (mixxxdj-mixxx-2.5.0_GH0.tar.gz) = 95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089 SIZE (mixxxdj-mixxx-2.5.0_GH0.tar.gz) = 39580922 +SHA256 (355eb9ce880349ff94759f731bb7ae747bf6677c.patch) = 8088f444cc914003dbdfab239778101d45af03ab1e4e986d443df4358fd7f19a +SIZE (355eb9ce880349ff94759f731bb7ae747bf6677c.patch) = 1979 diff --git a/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h b/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h new file mode 100644 index 000000000000..beeeb4ed9f69 --- /dev/null +++ b/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h @@ -0,0 +1,18 @@ +Fix build with Qt >= 6.9.0 + +https://github.com/mixxxdj/mixxx/issues/14122 + +--- src/qml/qmlwaveformoverview.h.orig 2024-12-24 01:32:09 UTC ++++ src/qml/qmlwaveformoverview.h +@@ -58,7 +58,11 @@ class QmlWaveformOverview : public QQuickPaintedItem { + signals: + void playerChanged(); + void channelsChanged(mixxx::qml::QmlWaveformOverview::Channels channels); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++ void rendererChanged(Renderer renderer); ++#else + void rendererChanged(mixxx::qml::QmlWaveformOverview::Renderer renderer); ++#endif + void colorHighChanged(const QColor& color); + void colorMidChanged(const QColor& color); + void colorLowChanged(const QColor& color);