git: 7d70c30fa69f - main - audio/mixxx: Update to 2.5.4

Reply: Jason E. Hale: "Re: git: 7d70c30fa69f - main - audio/mixxx: Update to 2.5.4"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sun, 28 Dec 2025 01:54:13 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d70c30fa69fd897019eabf46e866dba453a7746

commit 7d70c30fa69fd897019eabf46e866dba453a7746
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-28 01:50:56 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-28 01:54:03 +0000

    audio/mixxx: Update to 2.5.4
    
    - Remove FLAVORS. qt5 is EoL.
---
 audio/mixxx/Makefile  |  50 ++++----------
 audio/mixxx/distinfo  |   6 +-
 audio/mixxx/pkg-plist | 183 ++++++++++++++++++++++++++------------------------
 3 files changed, 113 insertions(+), 126 deletions(-)

diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 795f69c22109..0c27d4940690 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mixxx
-DISTVERSION=	2.5.3
-PORTREVISION=	2
+DISTVERSION=	2.5.4
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org
@@ -38,49 +37,20 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libxkbcommon.so:x11/libxkbcommon
 
 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
-
+		qt:6 sqlite ssl xorg
+USE_QT=		5compat base:run declarative:build tools:build shadertools \
+		sqldriver-sqlite:run svg
 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 declarative shadertools \
-		sqldriver-sqlite:run svg tools:build
-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 \
 		-DMODPLUG:BOOL=ON \
-		-DMAD:BOOL=ON
+		-DMAD:BOOL=ON \
+		-DQT6=ON
 
 PORTDOCS=	*
 
@@ -96,20 +66,28 @@ AAC_LIB_DEPENDS=	libfaad.so:audio/faad \
 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
+QTKEYCHAIN_LIB_DEPENDS=	libqt6keychain.so:security/qtkeychain@qt6
+
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_BOOL=	WAVPACK
 
diff --git a/audio/mixxx/distinfo b/audio/mixxx/distinfo
index 6d1d90d86c74..dfdc5167b666 100644
--- a/audio/mixxx/distinfo
+++ b/audio/mixxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1759982257
-SHA256 (mixxxdj-mixxx-2.5.3_GH0.tar.gz) = 517612e85e933d7e261bf40feb12354aac924da0f783402bc20f584976bc9b23
-SIZE (mixxxdj-mixxx-2.5.3_GH0.tar.gz) = 40055675
+TIMESTAMP = 1766880746
+SHA256 (mixxxdj-mixxx-2.5.4_GH0.tar.gz) = 53fb1a2a6c5ac6eb3562cb99c5bcae8777d81e48b96b5b3c292794c0c105b269
+SIZE (mixxxdj-mixxx-2.5.4_GH0.tar.gz) = 40315669
diff --git a/audio/mixxx/pkg-plist b/audio/mixxx/pkg-plist
index 869d61a27704..724ca20639b8 100644
--- a/audio/mixxx/pkg-plist
+++ b/audio/mixxx/pkg-plist
@@ -341,93 +341,93 @@ share/metainfo/org.mixxx.Mixxx.metainfo.xml
 %%DATADIR%%/keyboard/fr_FR.kbd.cfg
 %%DATADIR%%/keyboard/it_IT.kbd.cfg
 %%DATADIR%%/keyboard/ru_RU.kbd.cfg
-%%QT6%%%%DATADIR%%/qml/AuxiliaryUnit.qml
-%%QT6%%%%DATADIR%%/qml/Button.qml
-%%QT6%%%%DATADIR%%/qml/ComboBox.qml
-%%QT6%%%%DATADIR%%/qml/ControlButton.qml
-%%QT6%%%%DATADIR%%/qml/ControlKnob.qml
-%%QT6%%%%DATADIR%%/qml/ControlMiniKnob.qml
-%%QT6%%%%DATADIR%%/qml/ControlSlider.qml
-%%QT6%%%%DATADIR%%/qml/CrossfaderRow.qml
-%%QT6%%%%DATADIR%%/qml/Deck.qml
-%%QT6%%%%DATADIR%%/qml/DeckInfoBar.qml
-%%QT6%%%%DATADIR%%/qml/DeckRow.qml
-%%QT6%%%%DATADIR%%/qml/DeveloperToolsWindow.qml
-%%QT6%%%%DATADIR%%/qml/EffectRow.qml
-%%QT6%%%%DATADIR%%/qml/EffectSlot.qml
-%%QT6%%%%DATADIR%%/qml/EffectUnit.qml
-%%QT6%%%%DATADIR%%/qml/EmbeddedBackground.qml
-%%QT6%%%%DATADIR%%/qml/EmbeddedText.qml
-%%QT6%%%%DATADIR%%/qml/EqColumn.qml
-%%QT6%%%%DATADIR%%/qml/EqKnob.qml
-%%QT6%%%%DATADIR%%/qml/FadeBehavior.qml
-%%QT6%%%%DATADIR%%/qml/FocusedWidgetControl.qml
-%%QT6%%%%DATADIR%%/qml/Hotcue.qml
-%%QT6%%%%DATADIR%%/qml/HotcueButton.qml
-%%QT6%%%%DATADIR%%/qml/HotcuePopup.qml
-%%QT6%%%%DATADIR%%/qml/InfoBarButton.qml
-%%QT6%%%%DATADIR%%/qml/Knob.qml
-%%QT6%%%%DATADIR%%/qml/Library.qml
-%%QT6%%%%DATADIR%%/qml/LibraryControl.qml
-%%QT6%%%%DATADIR%%/qml/LibraryControlLoadSelectedTrackHandler.qml
-%%QT6%%%%DATADIR%%/qml/MicrophoneDuckingPanel.qml
-%%QT6%%%%DATADIR%%/qml/MicrophoneUnit.qml
-%%QT6%%%%DATADIR%%/qml/MiniKnob.qml
-%%QT6%%%%DATADIR%%/qml/Mixer.qml
-%%QT6%%%%DATADIR%%/qml/MixerColumn.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/Knob.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/Slider.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/Spinny.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/WaveformOverview.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/Controls/WaveformOverviewMarker.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/MathUtils.mjs
-%%QT6%%%%DATADIR%%/qml/Mixxx/PlayerDropArea.qml
-%%QT6%%%%DATADIR%%/qml/Mixxx/qmldir
-%%QT6%%%%DATADIR%%/qml/OrientationToggleButton.qml
-%%QT6%%%%DATADIR%%/qml/Sampler.qml
-%%QT6%%%%DATADIR%%/qml/SamplerRow.qml
-%%QT6%%%%DATADIR%%/qml/SectionBackground.qml
-%%QT6%%%%DATADIR%%/qml/SectionText.qml
-%%QT6%%%%DATADIR%%/qml/Slider.qml
-%%QT6%%%%DATADIR%%/qml/SyncButton.qml
-%%QT6%%%%DATADIR%%/qml/TextField.qml
-%%QT6%%%%DATADIR%%/qml/Theme/Theme.qml
-%%QT6%%%%DATADIR%%/qml/Theme/qmldir
-%%QT6%%%%DATADIR%%/qml/VuMeter.qml
-%%QT6%%%%DATADIR%%/qml/WaveformCue.qml
-%%QT6%%%%DATADIR%%/qml/WaveformHotcue.qml
-%%QT6%%%%DATADIR%%/qml/WaveformIntroOutro.qml
-%%QT6%%%%DATADIR%%/qml/WaveformLoop.qml
-%%QT6%%%%DATADIR%%/qml/WaveformOverview.qml
-%%QT6%%%%DATADIR%%/qml/WaveformRow.qml
-%%QT6%%%%DATADIR%%/qml/WaveformShader.qml
-%%QT6%%%%DATADIR%%/qml/images/auto@2x.png
-%%QT6%%%%DATADIR%%/qml/images/button.svg
-%%QT6%%%%DATADIR%%/qml/images/button_pressed.svg
-%%QT6%%%%DATADIR%%/qml/images/icon_passthrough.svg
-%%QT6%%%%DATADIR%%/qml/images/icon_quantize.svg
-%%QT6%%%%DATADIR%%/qml/images/knob.svg
-%%QT6%%%%DATADIR%%/qml/images/knob_shadow.svg
-%%QT6%%%%DATADIR%%/qml/images/mark_intro.svg
-%%QT6%%%%DATADIR%%/qml/images/mark_loop.svg
-%%QT6%%%%DATADIR%%/qml/images/mark_outro.svg
-%%QT6%%%%DATADIR%%/qml/images/miniknob.svg
-%%QT6%%%%DATADIR%%/qml/images/miniknob_shadow.svg
-%%QT6%%%%DATADIR%%/qml/images/realty@2x.png
-%%QT6%%%%DATADIR%%/qml/images/section.svg
-%%QT6%%%%DATADIR%%/qml/images/services@2x.png
-%%QT6%%%%DATADIR%%/qml/images/slider_bpm.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_crossfader.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_handle.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_handle_crossfader.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_handle_micducking.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_micducking.svg
-%%QT6%%%%DATADIR%%/qml/images/slider_volume.svg
-%%QT6%%%%DATADIR%%/qml/images/work@2x.png
-%%QT6%%%%DATADIR%%/qml/main.qml
-%%QT6%%%%DATADIR%%/qml/skin.ini
-%%QT6%%%%DATADIR%%/qml/skin_preview.png
+%%DATADIR%%/qml/AuxiliaryUnit.qml
+%%DATADIR%%/qml/Button.qml
+%%DATADIR%%/qml/ComboBox.qml
+%%DATADIR%%/qml/ControlButton.qml
+%%DATADIR%%/qml/ControlKnob.qml
+%%DATADIR%%/qml/ControlMiniKnob.qml
+%%DATADIR%%/qml/ControlSlider.qml
+%%DATADIR%%/qml/CrossfaderRow.qml
+%%DATADIR%%/qml/Deck.qml
+%%DATADIR%%/qml/DeckInfoBar.qml
+%%DATADIR%%/qml/DeckRow.qml
+%%DATADIR%%/qml/DeveloperToolsWindow.qml
+%%DATADIR%%/qml/EffectRow.qml
+%%DATADIR%%/qml/EffectSlot.qml
+%%DATADIR%%/qml/EffectUnit.qml
+%%DATADIR%%/qml/EmbeddedBackground.qml
+%%DATADIR%%/qml/EmbeddedText.qml
+%%DATADIR%%/qml/EqColumn.qml
+%%DATADIR%%/qml/EqKnob.qml
+%%DATADIR%%/qml/FadeBehavior.qml
+%%DATADIR%%/qml/FocusedWidgetControl.qml
+%%DATADIR%%/qml/Hotcue.qml
+%%DATADIR%%/qml/HotcueButton.qml
+%%DATADIR%%/qml/HotcuePopup.qml
+%%DATADIR%%/qml/InfoBarButton.qml
+%%DATADIR%%/qml/Knob.qml
+%%DATADIR%%/qml/Library.qml
+%%DATADIR%%/qml/LibraryControl.qml
+%%DATADIR%%/qml/LibraryControlLoadSelectedTrackHandler.qml
+%%DATADIR%%/qml/MicrophoneDuckingPanel.qml
+%%DATADIR%%/qml/MicrophoneUnit.qml
+%%DATADIR%%/qml/MiniKnob.qml
+%%DATADIR%%/qml/Mixer.qml
+%%DATADIR%%/qml/MixerColumn.qml
+%%DATADIR%%/qml/Mixxx/Controls/Knob.qml
+%%DATADIR%%/qml/Mixxx/Controls/Slider.qml
+%%DATADIR%%/qml/Mixxx/Controls/Spinny.qml
+%%DATADIR%%/qml/Mixxx/Controls/WaveformOverview.qml
+%%DATADIR%%/qml/Mixxx/Controls/WaveformOverviewHotcueMarker.qml
+%%DATADIR%%/qml/Mixxx/Controls/WaveformOverviewMarker.qml
+%%DATADIR%%/qml/Mixxx/MathUtils.mjs
+%%DATADIR%%/qml/Mixxx/PlayerDropArea.qml
+%%DATADIR%%/qml/Mixxx/qmldir
+%%DATADIR%%/qml/OrientationToggleButton.qml
+%%DATADIR%%/qml/Sampler.qml
+%%DATADIR%%/qml/SamplerRow.qml
+%%DATADIR%%/qml/SectionBackground.qml
+%%DATADIR%%/qml/SectionText.qml
+%%DATADIR%%/qml/Slider.qml
+%%DATADIR%%/qml/SyncButton.qml
+%%DATADIR%%/qml/TextField.qml
+%%DATADIR%%/qml/Theme/Theme.qml
+%%DATADIR%%/qml/Theme/qmldir
+%%DATADIR%%/qml/VuMeter.qml
+%%DATADIR%%/qml/WaveformCue.qml
+%%DATADIR%%/qml/WaveformHotcue.qml
+%%DATADIR%%/qml/WaveformIntroOutro.qml
+%%DATADIR%%/qml/WaveformLoop.qml
+%%DATADIR%%/qml/WaveformOverview.qml
+%%DATADIR%%/qml/WaveformRow.qml
+%%DATADIR%%/qml/WaveformShader.qml
+%%DATADIR%%/qml/images/auto@2x.png
+%%DATADIR%%/qml/images/button.svg
+%%DATADIR%%/qml/images/button_pressed.svg
+%%DATADIR%%/qml/images/icon_passthrough.svg
+%%DATADIR%%/qml/images/icon_quantize.svg
+%%DATADIR%%/qml/images/knob.svg
+%%DATADIR%%/qml/images/knob_shadow.svg
+%%DATADIR%%/qml/images/mark_intro.svg
+%%DATADIR%%/qml/images/mark_loop.svg
+%%DATADIR%%/qml/images/mark_outro.svg
+%%DATADIR%%/qml/images/miniknob.svg
+%%DATADIR%%/qml/images/miniknob_shadow.svg
+%%DATADIR%%/qml/images/realty@2x.png
+%%DATADIR%%/qml/images/section.svg
+%%DATADIR%%/qml/images/services@2x.png
+%%DATADIR%%/qml/images/slider_bpm.svg
+%%DATADIR%%/qml/images/slider_crossfader.svg
+%%DATADIR%%/qml/images/slider_handle.svg
+%%DATADIR%%/qml/images/slider_handle_crossfader.svg
+%%DATADIR%%/qml/images/slider_handle_micducking.svg
+%%DATADIR%%/qml/images/slider_micducking.svg
+%%DATADIR%%/qml/images/slider_volume.svg
+%%DATADIR%%/qml/images/work@2x.png
+%%DATADIR%%/qml/main.qml
+%%DATADIR%%/qml/skin.ini
+%%DATADIR%%/qml/skin_preview.png
 %%DATADIR%%/skins/Deere (64 Samplers)/sample_decks.xml
 %%DATADIR%%/skins/Deere (64 Samplers)/skin.xml
 %%DATADIR%%/skins/Deere (64 Samplers)/skin_preview.png
@@ -1195,34 +1195,42 @@ share/metainfo/org.mixxx.Mixxx.metainfo.xml
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__1_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__1_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__1_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__2.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__2_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__2_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__2_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__3.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__3_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__3_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__3_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__4.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__4_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__4_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__4_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__5.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__5_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__5_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__5_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__6.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__6_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__6_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__6_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__7.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__7_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__7_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__7_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__8.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__8_active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__8_loop.svg
+%%DATADIR%%/skins/LateNight/palemoon/buttons/btn__8_loop_dark.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn___active.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn___pressed.svg
 %%DATADIR%%/skins/LateNight/palemoon/buttons/btn__active.svg
@@ -2642,6 +2650,7 @@ share/metainfo/org.mixxx.Mixxx.metainfo.xml
 %%DATADIR%%/skins/Tango/graphics/vumeter_level.svg
 %%DATADIR%%/skins/Tango/graphics/vumeter_level_over.png
 %%DATADIR%%/skins/Tango/graphics/vumeter_level_over.svg
+%%DATADIR%%/skins/Tango/graphics/vumeter_mini_clipping.png
 %%DATADIR%%/skins/Tango/graphics/vumeter_mini_clipping_over.png
 %%DATADIR%%/skins/Tango/graphics/vumeter_mini_level.png
 %%DATADIR%%/skins/Tango/graphics/vumeter_mini_level_over.png