commit: 67f426e73f2d032cdfaeaa0e3ed66401897e9d39 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Mar 17 13:36:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 04:28:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f426e7
media-sound/mixxx: sync with 2.5.1. Add exp-QML-UI and gles2-only sync with 2.5.1 and some additional changes : * live version builds now with success with qtbase[gles2-only] * QML-UI is not functionnal for now but is under developpement. It has already proved to be useful for getting bug fixes from upstream. use experimental useflag for it. add a single additional dependency with qt5compat[+qml]. * patch for X11-less is not included to avoid error when merging. Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/41307 Closes: https://github.com/gentoo/gentoo/pull/41307 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/mixxx/metadata.xml | 1 + media-sound/mixxx/mixxx-9999.ebuild | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml index 816354871636..d3d428e66ae1 100644 --- a/media-sound/mixxx/metadata.xml +++ b/media-sound/mixxx/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="benchmark">Build and install benchmark binary: mixxx-test --benchmark</flag> + <flag name="experimental">Add support for experimental-QML-UI. Available with --qml arg</flag> <flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag> <flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag> <flag name="midi">Enable MIDI support via <pkg>media-libs/portmidi</pkg></flag> diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index f443853c094a..1d2e2a4f9aef 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -20,7 +20,8 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aac benchmark ffmpeg keyfinder lv2 midi modplug mp3 mp4 opus" +# gles2-only: at least not before 2.6 for keyworded ebuild +IUSE="aac benchmark experimental ffmpeg gles2-only keyfinder lv2 midi modplug mp3 mp4 opus" IUSE+=" qtkeychain rubberband shout test upower wavpack" REQUIRED_USE=" benchmark? ( test ) @@ -31,10 +32,11 @@ RESTRICT="!test? ( test )" RDEPEND=" dev-db/sqlite:3 + dev-cpp/abseil-cpp:= dev-libs/hidapi dev-libs/protobuf:= - dev-qt/qt5compat:6[qml] - dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,ssl,widgets,xml,X] + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,dbus,gles2-only=,gui,icu,network,opengl,sql,sqlite,ssl,widgets,xml,X] dev-qt/qtdeclarative:6 dev-qt/qtshadertools:6 dev-qt/qtsvg:6 @@ -47,9 +49,8 @@ RDEPEND=" media-libs/libsoundtouch:= media-libs/libvorbis media-libs/portaudio - <media-libs/taglib-2 + media-libs/taglib:= media-sound/lame - virtual/glu virtual/libusb:1 virtual/udev x11-libs/libX11 @@ -59,9 +60,10 @@ RDEPEND=" ) benchmark? ( dev-cpp/benchmark:= - dev-cpp/gtest + dev-cpp/gtest:= dev-util/google-perftools:= ) + experimental? ( dev-qt/qt5compat:6[qml] ) ffmpeg? ( media-video/ffmpeg:= ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) @@ -86,13 +88,10 @@ RDEPEND=" wavpack? ( media-sound/wavpack ) " DEPEND="${RDEPEND} + dev-cpp/gtest dev-cpp/ms-gsl - test? ( dev-cpp/gtest ) -" -BDEPEND=" - dev-util/spirv-tools - virtual/pkgconfig " +BDEPEND="virtual/pkgconfig" PATCHES=( # Fix strict-aliasing violations in vendored katai_cpp_stl_runtime @@ -134,7 +133,9 @@ src_configure() { -DOPTIMIZE=OFF -DOPUS="$(usex opus)" -DPORTMIDI="$(usex midi)" - -DQML=ON + -DQGLES2="$(usex gles2-only)" + # new QML-UI, experimental and not functionnal for now + -DQML=$(usex experimental) -DQTKEYCHAIN="$(usex qtkeychain)" -DRUBBERBAND="$(usex rubberband)" -DVINYLCONTROL=ON
