Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/
Date: Tue, 15 Sep 2020 16:57:36
Message-Id: 1600189043.8be0a8391cbe7757ceefd63009311bc9bfcaf3eb.prometheanfire@gentoo
1 commit: 8be0a8391cbe7757ceefd63009311bc9bfcaf3eb
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 15 16:57:23 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 15 16:57:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be0a839
7
8 Revert "gui-libs/wlroots: cleanup"
9
10 This reverts commit ecb7777ad15d2aadc9682eb6a8f84f9836a58878.
11
12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
13
14 gui-libs/wlroots/Manifest | 2 +
15 gui-libs/wlroots/wlroots-0.10.0.ebuild | 77 +++++++++++++++++++++++++++++++++
16 gui-libs/wlroots/wlroots-0.10.1.ebuild | 78 ++++++++++++++++++++++++++++++++++
17 3 files changed, 157 insertions(+)
18
19 diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
20 index a53c8de1a2d..ec059680b81 100644
21 --- a/gui-libs/wlroots/Manifest
22 +++ b/gui-libs/wlroots/Manifest
23 @@ -1 +1,3 @@
24 +DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
25 +DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
26 DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
27
28 diff --git a/gui-libs/wlroots/wlroots-0.10.0.ebuild b/gui-libs/wlroots/wlroots-0.10.0.ebuild
29 new file mode 100644
30 index 00000000000..00bde310ba8
31 --- /dev/null
32 +++ b/gui-libs/wlroots/wlroots-0.10.0.ebuild
33 @@ -0,0 +1,77 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +inherit fcaps meson
40 +
41 +DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
42 +HOMEPAGE="https://github.com/swaywm/wlroots"
43 +
44 +if [[ ${PV} == 9999 ]]; then
45 + EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
46 + inherit git-r3
47 +else
48 + SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
49 + KEYWORDS="amd64 arm64 ~ppc64 x86"
50 +fi
51 +
52 +LICENSE="MIT"
53 +SLOT="0/10"
54 +IUSE="elogind icccm systemd x11-backend X"
55 +REQUIRED_USE="?? ( elogind systemd )"
56 +
57 +DEPEND="
58 + >=dev-libs/libinput-1.9.0:0=
59 + >=dev-libs/wayland-1.17.0
60 + media-libs/mesa[egl,gles2,gbm]
61 + virtual/libudev
62 + x11-libs/libdrm
63 + x11-libs/libxkbcommon
64 + x11-libs/pixman
65 + elogind? ( >=sys-auth/elogind-237 )
66 + icccm? ( x11-libs/xcb-util-wm )
67 + systemd? ( >=sys-apps/systemd-237 )
68 + x11-backend? ( x11-libs/libxcb:0= )
69 + X? (
70 + x11-base/xorg-server[wayland]
71 + x11-libs/libxcb:0=
72 + x11-libs/xcb-util-image
73 + )
74 +"
75 +RDEPEND="
76 + ${DEPEND}
77 +"
78 +BDEPEND="
79 + >=dev-libs/wayland-protocols-1.17
80 + virtual/pkgconfig
81 +"
82 +
83 +PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
84 +
85 +src_configure() {
86 + # xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
87 + local emesonargs=(
88 + "-Dxcb-errors=disabled"
89 + -Dlibcap=$(usex filecaps enabled disabled)
90 + -Dxcb-icccm=$(usex icccm enabled disabled)
91 + -Dxwayland=$(usex X enabled disabled)
92 + -Dx11-backend=$(usex x11-backend enabled disabled)
93 + "-Dexamples=false"
94 + "-Dwerror=false"
95 + )
96 + if use systemd; then
97 + emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
98 + elif use elogind; then
99 + emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
100 + else
101 + emesonargs+=("-Dlogind=disabled")
102 + fi
103 +
104 + meson_src_configure
105 +}
106 +
107 +pkg_postinst() {
108 + elog "You must be in the input group to allow your compositor"
109 + elog "to access input devices via libinput."
110 +}
111
112 diff --git a/gui-libs/wlroots/wlroots-0.10.1.ebuild b/gui-libs/wlroots/wlroots-0.10.1.ebuild
113 new file mode 100644
114 index 00000000000..49ac9be701a
115 --- /dev/null
116 +++ b/gui-libs/wlroots/wlroots-0.10.1.ebuild
117 @@ -0,0 +1,78 @@
118 +# Copyright 1999-2020 Gentoo Authors
119 +# Distributed under the terms of the GNU General Public License v2
120 +
121 +EAPI=7
122 +
123 +inherit fcaps meson
124 +
125 +DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
126 +HOMEPAGE="https://github.com/swaywm/wlroots"
127 +
128 +if [[ ${PV} == 9999 ]]; then
129 + EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
130 + inherit git-r3
131 +else
132 + SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
133 + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
134 +fi
135 +
136 +LICENSE="MIT"
137 +SLOT="0/10"
138 +IUSE="elogind icccm systemd x11-backend X"
139 +REQUIRED_USE="?? ( elogind systemd )"
140 +
141 +DEPEND="
142 + >=dev-libs/libinput-1.9.0:0=
143 + >=dev-libs/wayland-1.17.0
144 + media-libs/mesa[egl,gles2,gbm]
145 + virtual/libudev
146 + x11-libs/libdrm
147 + x11-libs/libxkbcommon
148 + x11-libs/pixman
149 + elogind? ( >=sys-auth/elogind-237 )
150 + icccm? ( x11-libs/xcb-util-wm )
151 + systemd? ( >=sys-apps/systemd-237 )
152 + x11-backend? ( x11-libs/libxcb:0= )
153 + X? (
154 + x11-base/xorg-server[wayland]
155 + x11-libs/libxcb:0=
156 + x11-libs/xcb-util-image
157 + )
158 +"
159 +RDEPEND="
160 + ${DEPEND}
161 +"
162 +BDEPEND="
163 + >=dev-libs/wayland-protocols-1.17
164 + virtual/pkgconfig
165 +"
166 +
167 +# Patch is in upstream master. Probably drop on 0.10.2 or 0.11.
168 +PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
169 +
170 +src_configure() {
171 + # xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
172 + local emesonargs=(
173 + "-Dxcb-errors=disabled"
174 + -Dlibcap=$(usex filecaps enabled disabled)
175 + -Dxcb-icccm=$(usex icccm enabled disabled)
176 + -Dxwayland=$(usex X enabled disabled)
177 + -Dx11-backend=$(usex x11-backend enabled disabled)
178 + "-Dexamples=false"
179 + "-Dwerror=false"
180 + )
181 + if use systemd; then
182 + emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
183 + elif use elogind; then
184 + emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
185 + else
186 + emesonargs+=("-Dlogind=disabled")
187 + fi
188 +
189 + meson_src_configure
190 +}
191 +
192 +pkg_postinst() {
193 + elog "You must be in the input group to allow your compositor"
194 + elog "to access input devices via libinput."
195 +}