Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glfw/
Date: Thu, 29 Jul 2021 03:09:28
Message-Id: 1627527620.391c7f55642b99cd89c4367207f2c3990f17a2f6.ionen@gentoo
1 commit: 391c7f55642b99cd89c4367207f2c3990f17a2f6
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 8 11:11:47 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 29 03:00:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=391c7f55
7
8 media-libs/glfw: rename wayland useflag to wayland-only
9
10 Closes: https://bugs.gentoo.org/616968
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/21566
13 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
14
15 media-libs/glfw/glfw-3.3.4-r1.ebuild | 14 +++++++-------
16 media-libs/glfw/metadata.xml | 3 +++
17 2 files changed, 10 insertions(+), 7 deletions(-)
18
19 diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r1.ebuild
20 index 43f33ee0dd7..1cf0a04e003 100644
21 --- a/media-libs/glfw/glfw-3.3.4-r1.ebuild
22 +++ b/media-libs/glfw/glfw-3.3.4-r1.ebuild
23 @@ -13,11 +13,11 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
24 LICENSE="ZLIB"
25 SLOT="0"
26 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
27 -IUSE="wayland"
28 +IUSE="wayland-only"
29
30 RDEPEND="
31 x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
32 - !wayland? (
33 + !wayland-only? (
34 virtual/opengl[${MULTILIB_USEDEP}]
35 x11-libs/libX11[${MULTILIB_USEDEP}]
36 x11-libs/libXcursor[${MULTILIB_USEDEP}]
37 @@ -25,21 +25,21 @@ RDEPEND="
38 x11-libs/libXrandr[${MULTILIB_USEDEP}]
39 x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
40 )
41 - wayland? (
42 + wayland-only? (
43 dev-libs/wayland[${MULTILIB_USEDEP}]
44 media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
45 )
46 "
47 DEPEND="
48 ${RDEPEND}
49 - !wayland? (
50 + !wayland-only? (
51 x11-base/xorg-proto
52 x11-libs/libXi[${MULTILIB_USEDEP}]
53 )
54 - wayland? ( dev-libs/wayland-protocols )
55 + wayland-only? ( dev-libs/wayland-protocols )
56 "
57 BDEPEND="
58 - wayland? (
59 + wayland-only? (
60 dev-util/wayland-scanner
61 kde-frameworks/extra-cmake-modules
62 )
63 @@ -48,7 +48,7 @@ BDEPEND="
64 src_configure() {
65 local mycmakeargs=(
66 -DGLFW_BUILD_EXAMPLES=no
67 - -DGLFW_USE_WAYLAND="$(usex wayland)"
68 + -DGLFW_USE_WAYLAND="$(usex wayland-only wayland)"
69 -DBUILD_SHARED_LIBS=1
70 )
71 cmake-multilib_src_configure
72
73 diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
74 index 6e5bbe58119..cd68a68804a 100644
75 --- a/media-libs/glfw/metadata.xml
76 +++ b/media-libs/glfw/metadata.xml
77 @@ -9,4 +9,7 @@
78 <remote-id type="github">glfw/glfw</remote-id>
79 <changelog>https://www.glfw.org/changelog.html</changelog>
80 </upstream>
81 + <use>
82 + <flag name="wayland-only">Enable wayland support and disable X11 support</flag>
83 + </use>
84 </pkgmetadata>