[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/, dev-qt/qtmultimedia/files/

[Andreas Sturmlechner]

commit:     3872ab8d795358f253d71927783d0b7b7f646812
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 08:14:42 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 20:01:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3872ab8d

dev-qt/qtmultimedia: Drop obsolete dev-qt/qtopengl dependency

Thanks-to: Davide Pesavento <pesa <AT> gentoo.org>
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtmultimedia-5.15.2-no-qtopengl.patch            | 14 ++++++++++++++
 dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild          |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..471bfabcce8
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
@@ -0,0 +1,14 @@
+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.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
index 46226e53182..8148aa4f31b 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		=dev-qt/qtopengl-${QT5_PV}*
 		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
 		media-libs/libglvnd
 	)
@@ -40,6 +39,8 @@ 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