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/qtbase/
Date: Fri, 24 Dec 2021 23:08:48
Message-Id: 1640366158.82ee335fd0fd43239d94c1f7e3d63ce1f195bdd9.asturm@gentoo
1 commit: 82ee335fd0fd43239d94c1f7e3d63ce1f195bdd9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 16:33:34 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 17:15:58 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=82ee335f
7
8 dev-qt/qtbase: Gentoo's GL impl. switched to media-libs/libglvnd
9
10 media-libs/libglvnd provides both libGL.so and opengl.pc as well
11 as libEGL.so and egl.pc, libGLESv2.so and glesv2.pc.
12
13 Follow-up to 02cb6e27f322666f6b466a5c8f070a2e1afae0fa and
14 eb80f984b8509d49b6f18ea1b97038bd442a4b8c but for Qt6.
15
16 Package-Manager: Portage-3.0.30, Repoman-3.0.3
17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
18
19 dev-qt/qtbase/qtbase-6.2.2.ebuild | 4 ++--
20 dev-qt/qtbase/qtbase-6.9999.ebuild | 4 ++--
21 2 files changed, 4 insertions(+), 4 deletions(-)
22
23 diff --git a/dev-qt/qtbase/qtbase-6.2.2.ebuild b/dev-qt/qtbase/qtbase-6.2.2.ebuild
24 index c0867b42..5841c484 100644
25 --- a/dev-qt/qtbase/qtbase-6.2.2.ebuild
26 +++ b/dev-qt/qtbase/qtbase-6.2.2.ebuild
27 @@ -58,10 +58,10 @@ DEPEND="
28 >=sys-apps/dbus-1.4.20
29 sys-libs/zlib:=
30 virtual/opengl
31 - egl? ( media-libs/mesa[egl] )
32 evdev? ( sys-libs/mtdev )
33 freetds? ( dev-db/freetds )
34 - gles2-only? ( media-libs/mesa[gles2] )
35 + gles2-only? ( media-libs/libglvnd )
36 + !gles2-only? ( media-libs/libglvnd[X] )
37 gssapi? ( virtual/krb5 )
38 gtk? (
39 x11-libs/gtk+:3
40
41 diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
42 index d6907aa7..3cd3f532 100644
43 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild
44 +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
45 @@ -58,10 +58,10 @@ DEPEND="
46 >=sys-apps/dbus-1.4.20
47 sys-libs/zlib:=
48 virtual/opengl
49 - egl? ( media-libs/mesa[egl] )
50 evdev? ( sys-libs/mtdev )
51 freetds? ( dev-db/freetds )
52 - gles2-only? ( media-libs/mesa[gles2] )
53 + gles2-only? ( media-libs/libglvnd )
54 + !gles2-only? ( media-libs/libglvnd[X] )
55 gssapi? ( virtual/krb5 )
56 gtk? (
57 x11-libs/gtk+:3