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:27
Message-Id: 1627527737.d5bab85e064169bc48b49c455444f8f5e9dfaef3.ionen@gentoo
1 commit: d5bab85e064169bc48b49c455444f8f5e9dfaef3
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 29 01:37:43 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 29 03:02:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bab85e
7
8 media-libs/glfw: tidy ebuild
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 media-libs/glfw/glfw-3.3.4-r1.ebuild | 25 +++++++++++--------------
13 1 file changed, 11 insertions(+), 14 deletions(-)
14
15 diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r1.ebuild
16 index 1cf0a04e003..d813e2d1124 100644
17 --- a/media-libs/glfw/glfw-3.3.4-r1.ebuild
18 +++ b/media-libs/glfw/glfw-3.3.4-r1.ebuild
19 @@ -6,7 +6,7 @@ EAPI=7
20 CMAKE_ECLASS=cmake
21 inherit cmake-multilib
22
23 -DESCRIPTION="The Portable OpenGL FrameWork"
24 +DESCRIPTION="Portable OpenGL FrameWork"
25 HOMEPAGE="https://www.glfw.org/"
26 SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
27
28 @@ -15,8 +15,13 @@ SLOT="0"
29 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
30 IUSE="wayland-only"
31
32 +# note: libglfw uses dlopen() for most of these at runtime
33 RDEPEND="
34 x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
35 + wayland-only? (
36 + dev-libs/wayland[${MULTILIB_USEDEP}]
37 + media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
38 + )
39 !wayland-only? (
40 virtual/opengl[${MULTILIB_USEDEP}]
41 x11-libs/libX11[${MULTILIB_USEDEP}]
42 @@ -24,32 +29,24 @@ RDEPEND="
43 x11-libs/libXinerama[${MULTILIB_USEDEP}]
44 x11-libs/libXrandr[${MULTILIB_USEDEP}]
45 x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
46 - )
47 - wayland-only? (
48 - dev-libs/wayland[${MULTILIB_USEDEP}]
49 - media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
50 - )
51 -"
52 + )"
53 DEPEND="
54 ${RDEPEND}
55 + wayland-only? ( dev-libs/wayland-protocols )
56 !wayland-only? (
57 x11-base/xorg-proto
58 x11-libs/libXi[${MULTILIB_USEDEP}]
59 - )
60 - wayland-only? ( dev-libs/wayland-protocols )
61 -"
62 + )"
63 BDEPEND="
64 wayland-only? (
65 dev-util/wayland-scanner
66 kde-frameworks/extra-cmake-modules
67 - )
68 -"
69 + )"
70
71 src_configure() {
72 local mycmakeargs=(
73 -DGLFW_BUILD_EXAMPLES=no
74 - -DGLFW_USE_WAYLAND="$(usex wayland-only wayland)"
75 - -DBUILD_SHARED_LIBS=1
76 + -DGLFW_USE_WAYLAND=$(usex wayland-only)
77 )
78 cmake-multilib_src_configure
79 }