Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
Date: Wed, 22 Sep 2021 07:19:05
Message-Id: 1632294639.085dd7532cb988e4fd4bc3f6ced67d7a4e5dd1d7.asturm@gentoo
1 commit: 085dd7532cb988e4fd4bc3f6ced67d7a4e5dd1d7
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 17 08:14:42 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 07:10:39 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=085dd753
7
8 dev-qt/qtmultimedia: Drop obsolete dev-qt/qtopengl dependency
9
10 Thanks-to: Davide Pesavento <pesa <AT> gentoo.org>
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../files/qtmultimedia-5.15.2-no-qtopengl.patch | 14 ++++++++++++++
15 dev-qt/qtmultimedia/qtmultimedia-5.15.2.9999.ebuild | 3 ++-
16 2 files changed, 16 insertions(+), 1 deletion(-)
17
18 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
19 new file mode 100644
20 index 00000000..471bfabc
21 --- /dev/null
22 +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
23 @@ -0,0 +1,14 @@
24 +Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
25 +remained: https://bugreports.qt.io/browse/QTBUG-81902
26 +
27 +--- a/src/multimediawidgets/multimediawidgets.pro
28 ++++ b/src/multimediawidgets/multimediawidgets.pro
29 +@@ -2,8 +2,6 @@
30 + TARGET = QtMultimediaWidgets
31 + QT = core gui multimedia widgets-private
32 + QT_PRIVATE += multimedia-private
33 +-qtHaveModule(opengl): \
34 +- QT_PRIVATE += opengl
35 +
36 + PRIVATE_HEADERS += \
37 + qvideowidget_p.h \
38
39 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2.9999.ebuild
40 index 46226e53..8148aa4f 100644
41 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.9999.ebuild
42 +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2.9999.ebuild
43 @@ -31,7 +31,6 @@ RDEPEND="
44 openal? ( media-libs/openal )
45 )
46 widgets? (
47 - =dev-qt/qtopengl-${QT5_PV}*
48 =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
49 media-libs/libglvnd
50 )
51 @@ -40,6 +39,8 @@ DEPEND="${RDEPEND}
52 gstreamer? ( x11-base/xorg-proto )
53 "
54
55 +PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
56 +
57 src_prepare() {
58 sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
59 src/multimedia/multimedia.pro || die