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
