* [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; 4+ 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] 4+ 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; 4+ 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] 4+ 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; 4+ 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] 4+ 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; 4+ 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] 4+ messages in thread
end of thread, other threads:[~2024-09-12 3:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-12 3:16 [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 --
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