commit: 51bb9b7819c2f252977cbe16fa8c6ef82a919194 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Apr 10 21:37:50 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Apr 10 21:37:50 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=51bb9b78
dev-qt/qtmultimedia: Patch upstreamed Upstream commit ff4c7bc3bf7ba4b748fdeb9d09887271c2b28505 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/qtmultimedia-5.15.2-no-qtopengl.patch | 14 -------------- dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild | 2 -- 2 files changed, 16 deletions(-) diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch deleted file mode 100644 index 471bfabc..00000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch +++ /dev/null @@ -1,14 +0,0 @@ -Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency -remained: https://bugreports.qt.io/browse/QTBUG-81902 - ---- a/src/multimediawidgets/multimediawidgets.pro -+++ b/src/multimediawidgets/multimediawidgets.pro -@@ -2,8 +2,6 @@ - TARGET = QtMultimediaWidgets - QT = core gui multimedia widgets-private - QT_PRIVATE += multimedia-private --qtHaveModule(opengl): \ -- QT_PRIVATE += opengl - - PRIVATE_HEADERS += \ - qvideowidget_p.h \ diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild index 531227bb..54a09964 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.9999.ebuild @@ -40,8 +40,6 @@ DEPEND="${RDEPEND} gstreamer? ( x11-base/xorg-proto ) " -PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" ) - src_prepare() { sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ src/multimedia/multimedia.pro || die
