* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2016-01-21 17:40 Davide Pesavento
0 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2016-01-21 17:40 UTC (permalink / raw
To: gentoo-commits
commit: d5da89885c536255b3f8ae328f4a97b169321675
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 17:36:58 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 17:40:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5da8988
dev-qt/qtmultimedia: fix alsa detection for versions >= 1.1.0
Gentoo-Bug: 572426
Package-Manager: portage-2.2.27
...5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch | 118 +++++++++++++++++++++
dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild | 83 +++++++++++++++
2 files changed, 201 insertions(+)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch
new file mode 100644
index 0000000..3300205
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch
@@ -0,0 +1,118 @@
+From 3b322323d036ae2fc9f685bfc74d1ebcd5532159 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Fri, 27 Nov 2015 14:36:50 +0100
+Subject: [PATCH] alsa: Relax ALSA version checks for 1.1.x to be detected.
+
+Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA
+1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with
+ALSA 1.1.
+
+Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34
+Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
+---
+ config.tests/alsa/alsatest.cpp | 2 +-
+ src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 8 ++++----
+ src/plugins/alsa/qalsaaudioinput.cpp | 4 ++--
+ src/plugins/alsa/qalsaaudiooutput.cpp | 4 ++--
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
+index a9f9c24..1b59cb1 100644
+--- a/config.tests/alsa/alsatest.cpp
++++ b/config.tests/alsa/alsatest.cpp
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+
+ #include <alsa/asoundlib.h>
+-#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+
+diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
+index be90ca6..3d31087 100644
+--- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
++++ b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp
+@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
+ QList<QByteArray> devices = availableDevices(mode);
+
+ if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ if (devices.size() > 0)
+ dev = QLatin1String(devices.first().constData());
+ else
+@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
+ dev = QLatin1String("hw:0,0");
+ #endif
+ } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = device;
+ #else
+ int idx = 0;
+@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const
+ snd_pcm_hw_params_t *params;
+ QString dev;
+
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = device;
+ if (dev.compare(QLatin1String("default")) == 0) {
+ QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
+@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
+ QList<QByteArray> devices;
+ QByteArray filter;
+
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ // Create a list of all current audio devices that support mode
+ void **hints, **n;
+ char *name, *descr, *io;
+diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp
+index 4a8dd80..d6d8adc 100644
+--- a/src/plugins/alsa/qalsaaudioinput.cpp
++++ b/src/plugins/alsa/qalsaaudioinput.cpp
+@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
+ QString dev = QString(QLatin1String(m_device.constData()));
+ QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput);
+ if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ if (devices.size() > 0)
+ dev = QLatin1String(devices.first());
+ else
+@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
+ dev = QLatin1String("hw:0,0");
+ #endif
+ } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = QLatin1String(m_device);
+ #else
+ int idx = 0;
+diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
+index 7b7da50..f8f0f58 100644
+--- a/src/plugins/alsa/qalsaaudiooutput.cpp
++++ b/src/plugins/alsa/qalsaaudiooutput.cpp
+@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
+ QString dev = QString(QLatin1String(m_device.constData()));
+ QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
+ if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ if (devices.size() > 0)
+ dev = QLatin1String(devices.first());
+ else
+@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
+ dev = QLatin1String("hw:0,0");
+ #endif
+ } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = QLatin1String(m_device);
+ #else
+ int idx = 0;
+--
+2.7.0
+
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
new file mode 100644
index 0000000..cfdd747
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+
+RDEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ alsa? ( media-libs/alsa-lib )
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
+ dev-libs/glib:2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:0.10
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ qml? (
+ ~dev-qt/qtdeclarative-${PV}
+ gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
+ !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ ~dev-qt/qtopengl-${PV}
+ ~dev-qt/qtwidgets-${PV}
+ )
+"
+DEPEND="${RDEPEND}
+ gstreamer? ( x11-proto/videoproto )
+"
+
+PATCHES=(
+ # bug 572426
+ "${FILESDIR}/${P}-Relax-ALSA-version-checks-for-1.1.x.patch"
+)
+
+src_prepare() {
+ # do not rely on qtbase configuration
+ sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+ qtmultimedia.pro || die
+
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod qml quick \
+ src/src.pro \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex gstreamer 'GST_VERSION=1.0' '')
+ $(usex gstreamer010 'GST_VERSION=0.10' '')
+ )
+ qt5-build_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2024-07-24 2:20 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2024-07-24 2:20 UTC (permalink / raw
To: gentoo-commits
commit: b0a889f4e2fbd63db77ecd5a08792e5dcf66ed4a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 23:20:08 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 02:19:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a889f4
dev-qt/qtmultimedia: update >=6.8 live
Originally thought it added native pipewire audio support, but this
is only for screencast and so not doing USE=pipewire.
Split off [X=] hack and add a redundant [X?] in case we are ever
able to remove it (aka gst not broken without xorg-proto, xorg-proto
in RDEPEND, or if a new EAPI adds a way declare DEPEND-only deps for
reverse deps).
gst[egl] could technically be optional, but feel it's not worth
introducing a USE. Arguably feel it should be unconditionally
enabled on gst if USE=opengl.
Updating the ebuild also exposed a bug in cmake's checks with gl_x11
and gl_wayland, been reported and doing a temporary workaround for now.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
...qtmultimedia-6.8.0-gst-x11-wayland-detect.patch | 19 ++++++++++++
dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 34 +++++++++++++++++++---
dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 34 +++++++++++++++++++---
3 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch
new file mode 100644
index 000000000000..dab821a3bdb3
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch
@@ -0,0 +1,19 @@
+Temporary workaround while waiting for upstream's fix.
+
+https://bugreports.qt.io/browse/QTBUG-127484
+--- a/cmake/FindGStreamer.cmake
++++ b/cmake/FindGStreamer.cmake
+@@ -163,5 +163,5 @@
+ HEADER gst/gl/x11/gstgldisplay_x11.h
+ LIBRARY gstgl-1.0
+- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl XCB::XCB )
++ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl )
+ endif()
+
+@@ -171,5 +171,5 @@
+ HEADER gst/gl/wayland/gstgldisplay_wayland.h
+ LIBRARY gstgl-1.0
+- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl Wayland::Client )
++ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl )
+ endif()
+
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 5c1df1f65c0e..59aa5849582b 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -11,15 +11,22 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+IUSE="
+ +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
+ qml screencast v4l vaapi vulkan wayland
+"
# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
REQUIRED_USE="
|| ( ffmpeg gstreamer )
eglfs? ( ffmpeg opengl )
- vaapi? ( ffmpeg opengl )
+ screencast? ( ffmpeg )
test? ( qml )
+ vaapi? ( ffmpeg opengl )
"
+# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
+# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
+# := skipped on pipewire due to only being used through dbus
RDEPEND="
~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
alsa? (
@@ -37,8 +44,12 @@ RDEPEND="
gstreamer? (
dev-libs/glib:2
media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0[X=,opengl?]
+ media-libs/gst-plugins-base:1.0[X=]
media-libs/gstreamer:1.0
+ opengl? (
+ ~dev-qt/qtbase-${PV}:6[X?,wayland?]
+ media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
+ )
)
opengl? ( media-libs/libglvnd )
pulseaudio? ( media-libs/libpulse )
@@ -46,6 +57,10 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}:6
~dev-qt/qtquick3d-${PV}:6
)
+ screencast? (
+ ~dev-qt/qtbase-${PV}:6[dbus]
+ media-video/pipewire
+ )
"
DEPEND="
${RDEPEND}
@@ -73,6 +88,10 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch
+)
+
src_configure() {
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
@@ -81,8 +100,15 @@ src_configure() {
$(cmake_use_find_package qml Qt6Qml)
$(qt_feature ffmpeg)
$(qt_feature gstreamer)
- $(usev gstreamer $(qt_feature opengl gstreamer_gl))
+ $(usev gstreamer "
+ $(qt_feature opengl gstreamer_gl)
+ $(usev opengl "
+ $(qt_feature X gstreamer_gl_x11)
+ $(qt_feature wayland gstreamer_gl_wayland)
+ ")
+ ")
$(qt_feature pulseaudio)
+ $(qt_feature screencast pipewire)
$(qt_feature v4l linux_v4l)
$(qt_feature vaapi)
-DQT_UNITY_BUILD=OFF # currently fails to build with
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 5c1df1f65c0e..59aa5849582b 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -11,15 +11,22 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+IUSE="
+ +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
+ qml screencast v4l vaapi vulkan wayland
+"
# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
REQUIRED_USE="
|| ( ffmpeg gstreamer )
eglfs? ( ffmpeg opengl )
- vaapi? ( ffmpeg opengl )
+ screencast? ( ffmpeg )
test? ( qml )
+ vaapi? ( ffmpeg opengl )
"
+# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
+# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
+# := skipped on pipewire due to only being used through dbus
RDEPEND="
~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
alsa? (
@@ -37,8 +44,12 @@ RDEPEND="
gstreamer? (
dev-libs/glib:2
media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0[X=,opengl?]
+ media-libs/gst-plugins-base:1.0[X=]
media-libs/gstreamer:1.0
+ opengl? (
+ ~dev-qt/qtbase-${PV}:6[X?,wayland?]
+ media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
+ )
)
opengl? ( media-libs/libglvnd )
pulseaudio? ( media-libs/libpulse )
@@ -46,6 +57,10 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}:6
~dev-qt/qtquick3d-${PV}:6
)
+ screencast? (
+ ~dev-qt/qtbase-${PV}:6[dbus]
+ media-video/pipewire
+ )
"
DEPEND="
${RDEPEND}
@@ -73,6 +88,10 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch
+)
+
src_configure() {
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
@@ -81,8 +100,15 @@ src_configure() {
$(cmake_use_find_package qml Qt6Qml)
$(qt_feature ffmpeg)
$(qt_feature gstreamer)
- $(usev gstreamer $(qt_feature opengl gstreamer_gl))
+ $(usev gstreamer "
+ $(qt_feature opengl gstreamer_gl)
+ $(usev opengl "
+ $(qt_feature X gstreamer_gl_x11)
+ $(qt_feature wayland gstreamer_gl_wayland)
+ ")
+ ")
$(qt_feature pulseaudio)
+ $(qt_feature screencast pipewire)
$(qt_feature v4l linux_v4l)
$(qt_feature vaapi)
-DQT_UNITY_BUILD=OFF # currently fails to build with
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2024-07-28 13:50 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2024-07-28 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 304e4eaef8b6ae2c327f9f84fe4cc53956d8b1f5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 13:48:22 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 13:49:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304e4eae
dev-qt/qtmultimedia: drop obsolete patch in 6.8+
Fixed upstream.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qtmultimedia-6.8.0-gst-x11-wayland-detect.patch | 19 -------------------
dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 4 ----
dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 4 ----
3 files changed, 27 deletions(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch
deleted file mode 100644
index dab821a3bdb3..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.0-gst-x11-wayland-detect.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Temporary workaround while waiting for upstream's fix.
-
-https://bugreports.qt.io/browse/QTBUG-127484
---- a/cmake/FindGStreamer.cmake
-+++ b/cmake/FindGStreamer.cmake
-@@ -163,5 +163,5 @@
- HEADER gst/gl/x11/gstgldisplay_x11.h
- LIBRARY gstgl-1.0
-- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl XCB::XCB )
-+ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl )
- endif()
-
-@@ -171,5 +171,5 @@
- HEADER gst/gl/wayland/gstgldisplay_wayland.h
- LIBRARY gstgl-1.0
-- DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl Wayland::Client )
-+ DEPENDENCIES GStreamer::Video GStreamer::Base GStreamer::Core GStreamer::Gl )
- endif()
-
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 59aa5849582b..fe60a09af174 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -88,10 +88,6 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
-PATCHES=(
- "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch
-)
-
src_configure() {
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 59aa5849582b..fe60a09af174 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -88,10 +88,6 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
-PATCHES=(
- "${FILESDIR}"/${PN}-6.8.0-gst-x11-wayland-detect.patch
-)
-
src_configure() {
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2024-09-12 3:16 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2024-09-12 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 8c66f04d366049d1c073b563126646fac97c4856
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 03:12:07 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 03:16:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c66f04d
dev-qt/qtmultimedia: backport minor fix for ffmpeg-6.1.2+
See patch comment, do not believe this is worth a revbump.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch | 42 ++++++++++++++++++++++
dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
new file mode 100644
index 000000000000..d364699fc401
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
@@ -0,0 +1,42 @@
+Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2.
+
+Should hardly be an issue but it does cause a test failure when it
+attempts to compare the return error when reading a (intentionally)
+corrupted file (aborts either way, just differently). Still some time
+until 6.7.3, and prefer to keep tests in a working state meanwhile.
+
+https://bugreports.qt.io/browse/QTBUG-126687
+https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d
+From: Pavel Dubsky <pavel.dubsky@qt.io>
+Date: Wed, 10 Jul 2024 14:42:51 +0200
+Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input
+
+FFmpeg version n7.0.1 changed the error code that is returned from
+function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA.
+
+Task-number: QTBUG-126687
+Pick-to: 6.8 6.7 6.5
+Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac
+Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
+--- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
++++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
+@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel
+ auto code = QMediaPlayer::ResourceError;
+ if (ret == AVERROR(EACCES))
+ code = QMediaPlayer::AccessDeniedError;
+- else if (ret == AVERROR(EINVAL))
++ else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA)
+ code = QMediaPlayer::FormatError;
+
+ return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") };
+--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
++++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded()
+ });
+
+ m_fixture->player.setSource(sdpUrl);
+- QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError);
++ QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError);
+ #endif // QT_CONFIG(process)
+ }
+
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
index 74869683aa32..75aefa2fa156 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
@@ -57,6 +57,7 @@ BDEPEND="~dev-qt/qtshadertools-${PV}:6"
PATCHES=(
"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
+ "${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
)
CMAKE_SKIP_TESTS=(
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2024-11-16 21:47 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2024-11-16 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 1abba40bcfa175649b835cc9fab7a4be21e1cad8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 21:30:04 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 21:46:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abba40b
dev-qt/qtmultimedia: fix eigen vectorization build fail on ppc+ppc64
Not an ideal "fix" for ppc32, but rather go for a simple workaround
if it's 32bit arches (esp. ppc32) and it's non-invasive to keep.
Still not quite sure why ppc32 surfaced as an issue now except maybe
different gcc? The bit about Qt passing -maltivec been there since
Qt 6.4 (long before we keyworded+stabilized it for ppc) unless I'm
overlooking something. And then (for the ppc64 issue) dev-cpp/eigen
only received the vsx patch somewhat recently, albeit that one is
due to some more specific hardware so it makes more sense.
Closes: https://bugs.gentoo.org/943402
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch | 152 +++++++++++++++++++++
dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild | 7 +
dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild | 7 +
dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 7 +
dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 7 +
5 files changed, 180 insertions(+)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch
new file mode 100644
index 000000000000..d7b2351134e2
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch
@@ -0,0 +1,152 @@
+Imported from dev-cpp/eigen to use with bundled's (ideally would
+unbundle but rather not w/ Qt unless there is an upstream-supported
+cmake switch, is likely broken w/ the upcoming eigen version too).
+
+This is a backport from eigen upstream, so should no longer be needed
+whenever there is a bump (not in a release as of the writing of this)
+and it is updated here.
+
+https://bugs.gentoo.org/943402
+https://bugs.gentoo.org/936107
+https://gitlab.com/libeigen/eigen/-/merge_requests/1028
+--- a/src/3rdparty/eigen/Eigen/Core
++++ b/src/3rdparty/eigen/Eigen/Core
+@@ -348,3 +348,3 @@
+
+-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
++#if defined(EIGEN_VECTORIZE_VSX)
+ #include "src/Core/arch/AltiVec/MatrixProduct.h"
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/Complex.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/Complex.h
+@@ -102,2 +102,3 @@
+ HasMax = 0,
++ HasSqrt = 1,
+ #ifdef __VSX__
+@@ -322,2 +323,3 @@
+ HasMax = 0,
++ HasSqrt = 1,
+ HasSetLinear = 0
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h
+@@ -42,2 +42,3 @@
+
++#ifdef __VSX__
+ #ifndef EIGEN_COMP_CLANG
+@@ -48,6 +49,3 @@
+ }
+-#endif
+
+-#ifdef __VSX__
+-#ifndef EIGEN_COMP_CLANG
+ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
+@@ -76,2 +74,22 @@
+ }
++
++template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
++ BF16_TO_F32_UNARY_OP_WRAPPER(psqrt<Packet4f>, a);
++}
++
++#ifndef EIGEN_COMP_CLANG
++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
++ BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
++}
++#endif
++#else
++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS
++Packet4f psqrt<Packet4f>(const Packet4f& x)
++{
++ Packet4f a;
++ for (Index i = 0; i < packet_traits<float>::size; i++) {
++ a[i] = numext::sqrt(x[i]);
++ }
++ return a;
++}
+ #endif
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
+@@ -177,2 +177,5 @@
+ #endif
++ HasTanh = EIGEN_FAST_MATH,
++ HasErf = EIGEN_FAST_MATH,
++ HasRint = 1,
+ #else
+@@ -180,4 +183,5 @@
+ HasRsqrt = 0,
+- HasTanh = EIGEN_FAST_MATH,
+- HasErf = EIGEN_FAST_MATH,
++ HasTanh = 0,
++ HasErf = 0,
++ HasRint = 0,
+ #endif
+@@ -186,3 +190,2 @@
+ HasCeil = 1,
+- HasRint = 1,
+ HasNegate = 1,
+@@ -219,2 +222,3 @@
+ #endif
++ HasRint = 1,
+ #else
+@@ -222,5 +226,6 @@
+ HasRsqrt = 0,
+- HasTanh = EIGEN_FAST_MATH,
+- HasErf = EIGEN_FAST_MATH,
++ HasRint = 0,
+ #endif
++ HasTanh = 0,
++ HasErf = 0,
+ HasRound = 1,
+@@ -228,3 +233,2 @@
+ HasCeil = 1,
+- HasRint = 1,
+ HasNegate = 1,
+@@ -874,15 +878,25 @@
+
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_le(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmplt(a,b)); }
+@@ -939,2 +953,3 @@
+ template<> EIGEN_STRONG_INLINE Packet4f pfloor<Packet4f>(const Packet4f& a) { return vec_floor(a); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f>(const Packet4f& a)
+@@ -949,2 +964,3 @@
+ }
++#endif
+
+@@ -1343,8 +1359,2 @@
+
+-template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
+- BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a);
+-}
+-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
+- BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
+-}
+ template<> EIGEN_STRONG_INLINE Packet8bf pexp<Packet8bf> (const Packet8bf& a){
+@@ -1392,2 +1402,3 @@
+ }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8bf print<Packet8bf> (const Packet8bf& a){
+@@ -1395,2 +1406,3 @@
+ }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8bf pmadd(const Packet8bf& a, const Packet8bf& b, const Packet8bf& c) {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
index 5551e4ef4321..4c90076675b9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
@@ -83,7 +83,14 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
src_configure() {
+ # eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+ use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
index 90448d9168fe..36775e529d95 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
src_configure() {
+ # eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+ use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 2b44b871eb93..dccb2e3e1506 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
src_configure() {
+ # eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+ use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 2b44b871eb93..dccb2e3e1506 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
tst_qwindowcapturebackend
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
src_configure() {
+ # eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+ use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
# normally passed by the build system, but needed for 32-on-64 chroots
use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2025-01-06 12:02 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2025-01-06 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 7750ac667d4ff950bf3da4b2356956080d151a90
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 11:36:29 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 12:02:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750ac66
dev-qt/qtmultimedia: fix build w/ USE="gstreamer pulseaudio -vulkan"
QVersionNumber is only used with USE="gstreamer pulseaudio", but the
required header is not included for it. Seems works with USE="vulkan"
given Qt vulkan headers just happen to include it.
Furthermore only fails with clang, albeit haven't looked for what is
being treated differently with it (perhaps a version check somewhere
includes the header with gcc).
Closes: https://bugs.gentoo.org/947606
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch | 8 ++++++++
dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild | 3 ++-
dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 3 ++-
dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild | 3 ++-
dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 3 ++-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
new file mode 100644
index 000000000000..625c760fb1ce
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/947606
+TODO: needs upstreaming
+--- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
++++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
+@@ -13,2 +13,3 @@
+ #if QT_CONFIG(pulseaudio)
++# include <QVersionNumber>
+ # include <pulse/version.h>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
index f018b0b87f76..3bed1852e8eb 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
PATCHES=(
"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+ "${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
)
src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
PATCHES=(
"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+ "${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
)
src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
PATCHES=(
"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+ "${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
)
src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
PATCHES=(
"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+ "${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
@ 2025-01-06 22:51 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2025-01-06 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 2c084f5bb50cb7b987704df90a40a9514300e4ff
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 22:53:59 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 22:48:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c084f5b
dev-qt/qtmultimedia: drop 6.7.2-r2, 6.7.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtmultimedia/Manifest | 2 -
.../files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch | 42 -------
.../qtmultimedia-6.7.2-gstreamer-no-v4l.patch | 20 ---
dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild | 122 ------------------
dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild | 140 ---------------------
5 files changed, 326 deletions(-)
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b06f423b8581..cd40ae1bc062 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
DIST qtmultimedia-5.15.16-gentoo-kde-1.tar.xz 1496 BLAKE2B 760f0ee32f353849c0e826622fea0e744ceb4e96d3ae3a6e903b32e7e5211d803e29761538c45797f61f0766ae726206fd799fc4d2fa094f46176ee0d6d5a0fb SHA512 97b161727450864643c0c2d395757d3f78503c02d26151017bdbebfd55e7ffeeffc63e530baecdba4a43dc364dad614dd893278eb84e89587c8ac51f89e14f87
DIST qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz 3824912 BLAKE2B d98fcc82164d36f2bc21769796ce69c4b0aff57295795004cc609662a10fa80ecf8709c39ed53f96576071fd9e1e2d6eaadcc4eeb97c3fa6406ca7e2f8dcafe7 SHA512 a848affbc38a532455a34bdf887948210ff9794dae312115be0622246993324902b81209c2cac89ca5db63e6fcc29690f47c1255b1b7c4de68bf6ad5a6ecc5e7
-DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
-DIST qtmultimedia-everywhere-src-6.7.3.tar.xz 9360356 BLAKE2B c3ba0c1729b412022959900d4ee7b31f92df5c1b03326ffaea974a59a217be8f39cacf62e03374d63e1d804798ac1bfcfda011a42047ebaa53f5dc1511a44f06 SHA512 6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a
DIST qtmultimedia-everywhere-src-6.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
deleted file mode 100644
index d364699fc401..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2.
-
-Should hardly be an issue but it does cause a test failure when it
-attempts to compare the return error when reading a (intentionally)
-corrupted file (aborts either way, just differently). Still some time
-until 6.7.3, and prefer to keep tests in a working state meanwhile.
-
-https://bugreports.qt.io/browse/QTBUG-126687
-https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d
-From: Pavel Dubsky <pavel.dubsky@qt.io>
-Date: Wed, 10 Jul 2024 14:42:51 +0200
-Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input
-
-FFmpeg version n7.0.1 changed the error code that is returned from
-function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA.
-
-Task-number: QTBUG-126687
-Pick-to: 6.8 6.7 6.5
-Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac
-Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
---- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-+++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel
- auto code = QMediaPlayer::ResourceError;
- if (ret == AVERROR(EACCES))
- code = QMediaPlayer::AccessDeniedError;
-- else if (ret == AVERROR(EINVAL))
-+ else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA)
- code = QMediaPlayer::FormatError;
-
- return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") };
---- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded()
- });
-
- m_fixture->player.setSource(sdpUrl);
-- QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError);
-+ QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError);
- #endif // QT_CONFIG(process)
- }
-
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
deleted file mode 100644
index 0f61539b00d2..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/934582
-
---- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-+++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const
- return control.value;
- });
- }
-+#endif // QT_CONFIG(linux_v4l)
-
- QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera)
- : QGstreamerCameraBase{
-@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active)
- emit activeChanged(active);
- }
-
--#endif
--
- QT_END_NAMESPACE
-
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
deleted file mode 100644
index 75aefa2fa156..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
- || ( ffmpeg gstreamer )
- eglfs? ( ffmpeg opengl qml )
- vaapi? ( ffmpeg opengl )
- test? ( qml )
-"
-
-RDEPEND="
- ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
- alsa? (
- !pulseaudio? ( media-libs/alsa-lib )
- )
- ffmpeg? (
- ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
- media-video/ffmpeg:=[vaapi?]
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- )
- )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0[X=,opengl?]
- media-libs/gstreamer:1.0
- )
- opengl? ( media-libs/libglvnd )
- pulseaudio? ( media-libs/libpulse )
- qml? (
- ~dev-qt/qtdeclarative-${PV}:6
- ~dev-qt/qtquick3d-${PV}:6
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- v4l? ( sys-kernel/linux-headers )
- vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gstreamer-no-v4l.patch
- "${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
-)
-
-CMAKE_SKIP_TESTS=(
- # unimportant and expects all backends to be available (bug #928420)
- tst_backends
- # tries to use real alsa or pulseaudio and fails in sandbox
- tst_qaudiosink
- tst_qaudiosource
- tst_qmediacapturesession
- tst_qmediaplayerbackend
- tst_qsoundeffect
- # may try to use v4l2 or hardware acceleration depending on availability
- tst_qscreencapture_integration
- tst_qscreencapturebackend
- tst_qvideoframebackend
- # fails with offscreen rendering
- tst_qvideoframecolormanagement
- tst_qwindowcapturebackend
-)
-
-src_configure() {
- # normally passed by the build system, but needed for 32-on-64 chroots
- use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
- local mycmakeargs=(
- $(cmake_use_find_package qml Qt6Qml)
- $(qt_feature ffmpeg)
- $(qt_feature gstreamer)
- $(usev gstreamer $(qt_feature opengl gstreamer_gl))
- $(qt_feature pulseaudio)
- $(qt_feature v4l linux_v4l)
- $(qt_feature vaapi)
- )
-
- # ALSA backend is experimental off-by-default and can take priority
- # causing problems (bug #935146), disable if USE=pulseaudio is set
- # (also do not want unnecessary usage of ALSA plugins -> pulse)
- if use alsa && use pulseaudio; then
- # einfo should be enough given pure-ALSA users tend to disable pulse
- einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
- mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
- else
- mycmakeargs+=( $(qt_feature alsa) )
- fi
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete=( # sigh
- "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
- "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
- "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
- "${D}${QT6_PLUGINDIR}"/multimedia/objects-*
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
deleted file mode 100644
index 4c90076675b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
- +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
- qml v4l vaapi vulkan wayland
-"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
- || ( ffmpeg gstreamer )
- eglfs? ( ffmpeg opengl qml )
- test? ( qml )
- vaapi? ( ffmpeg opengl )
-"
-
-# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
-# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
-RDEPEND="
- ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
- alsa? (
- !pulseaudio? ( media-libs/alsa-lib )
- )
- ffmpeg? (
- ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
- media-video/ffmpeg:=[vaapi?]
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- )
- )
- gstreamer? (
- dev-libs/glib:2
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0[X=]
- media-libs/gstreamer:1.0
- opengl? (
- ~dev-qt/qtbase-${PV}:6[X?,wayland?]
- media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
- )
- )
- opengl? ( media-libs/libglvnd )
- pulseaudio? ( media-libs/libpulse )
- qml? (
- ~dev-qt/qtdeclarative-${PV}:6
- ~dev-qt/qtquick3d-${PV}:6
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- v4l? ( sys-kernel/linux-headers )
- vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
- # unimportant and expects all backends to be available (bug #928420)
- tst_backends
- # tries to use real alsa or pulseaudio and fails in sandbox
- tst_qaudiosink
- tst_qaudiosource
- tst_qmediacapture_gstreamer
- tst_qmediacapturesession
- tst_qmediaplayerbackend
- tst_qsoundeffect
- # may try to use v4l2 or hardware acceleration depending on availability
- tst_qscreencapture_integration
- tst_qscreencapturebackend
- tst_qvideoframebackend
- # fails with offscreen rendering
- tst_qvideoframecolormanagement
- tst_qwindowcapturebackend
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
-)
-
-src_configure() {
- # eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
- use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
-
- # normally passed by the build system, but needed for 32-on-64 chroots
- use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
- local mycmakeargs=(
- $(cmake_use_find_package qml Qt6Qml)
- $(qt_feature ffmpeg)
- $(qt_feature gstreamer)
- $(usev gstreamer "
- $(qt_feature opengl gstreamer_gl)
- $(usev opengl "
- $(qt_feature X gstreamer_gl_x11)
- $(qt_feature wayland gstreamer_gl_wayland)
- ")
- ")
- $(qt_feature pulseaudio)
- $(qt_feature v4l linux_v4l)
- $(qt_feature vaapi)
- )
-
- # ALSA backend is experimental off-by-default and can take priority
- # causing problems (bug #935146), disable if USE=pulseaudio is set
- # (also do not want unnecessary usage of ALSA plugins -> pulse)
- if use alsa && use pulseaudio; then
- # einfo should be enough given pure-ALSA users tend to disable pulse
- einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
- mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
- else
- mycmakeargs+=( $(qt_feature alsa) )
- fi
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- if use test; then
- local delete=( # sigh
- "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
- "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
- "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
- "${D}${QT6_PLUGINDIR}"/multimedia/objects-*
- )
- # using -f given not tracking which tests may be skipped or not
- rm -rf -- "${delete[@]}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-01-06 22:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-16 21:47 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 22:51 Ionen Wolkens
2025-01-06 12:02 Ionen Wolkens
2024-09-12 3:16 Ionen Wolkens
2024-07-28 13:50 Ionen Wolkens
2024-07-24 2:20 Ionen Wolkens
2016-01-21 17:40 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox