1 |
commit: 68371873bacbcd8ec53dd382fe0b9b1fd8d3dcb5 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 5 16:41:26 2022 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 5 17:00:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68371873 |
7 |
|
8 |
dev-libs/weston: Version bump to 10.0.0 |
9 |
|
10 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
11 |
|
12 |
dev-libs/weston/Manifest | 1 + |
13 |
.../files/weston-10.0.0-backend-default.patch | 27 ++++++++++++++++++++++ |
14 |
.../{weston-9999.ebuild => weston-10.0.0.ebuild} | 26 ++++++++++----------- |
15 |
dev-libs/weston/weston-9999.ebuild | 22 ++++++++---------- |
16 |
4 files changed, 50 insertions(+), 26 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest |
19 |
index a34e308ad4f7..1d2bf61666d9 100644 |
20 |
--- a/dev-libs/weston/Manifest |
21 |
+++ b/dev-libs/weston/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
+DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 |
24 |
DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 |
25 |
|
26 |
diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch |
27 |
new file mode 100644 |
28 |
index 000000000000..710639e7e9c5 |
29 |
--- /dev/null |
30 |
+++ b/dev-libs/weston/files/weston-10.0.0-backend-default.patch |
31 |
@@ -0,0 +1,27 @@ |
32 |
+From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001 |
33 |
+From: James Le Cuirot <chewi@g.o> |
34 |
+Date: Fri, 4 Feb 2022 23:43:50 +0000 |
35 |
+Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev |
36 |
+ deprecation |
37 |
+ |
38 |
+Signed-off-by: James Le Cuirot <chewi@g.o> |
39 |
+--- |
40 |
+ meson.build | 2 +- |
41 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
42 |
+ |
43 |
+diff --git a/meson.build b/meson.build |
44 |
+index 1c73e130..d761903e 100644 |
45 |
+--- a/meson.build |
46 |
++++ b/meson.build |
47 |
+@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer')) |
48 |
+ |
49 |
+ backend_default = get_option('backend-default') |
50 |
+ if backend_default == 'auto' |
51 |
+- foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ] |
52 |
++ foreach b : [ 'headless', 'x11', 'wayland', 'drm' ] |
53 |
+ if get_option('backend-' + b) |
54 |
+ backend_default = b |
55 |
+ endif |
56 |
+-- |
57 |
+2.34.1 |
58 |
+ |
59 |
|
60 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-10.0.0.ebuild |
61 |
similarity index 85% |
62 |
copy from dev-libs/weston/weston-9999.ebuild |
63 |
copy to dev-libs/weston/weston-10.0.0.ebuild |
64 |
index 97a1005e1360..5ab9746b8514 100644 |
65 |
--- a/dev-libs/weston/weston-9999.ebuild |
66 |
+++ b/dev-libs/weston/weston-10.0.0.ebuild |
67 |
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then |
68 |
SRC_URI="${SRC_PATCHES}" |
69 |
else |
70 |
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" |
71 |
- KEYWORDS="~amd64 ~arm ~x86" |
72 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
73 |
fi |
74 |
|
75 |
LICENSE="MIT CC-BY-SA-3.0" |
76 |
SLOT="0" |
77 |
|
78 |
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland" |
79 |
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland" |
80 |
RESTRICT="!test? ( test )" |
81 |
|
82 |
REQUIRED_USE=" |
83 |
@@ -40,14 +40,14 @@ REQUIRED_USE=" |
84 |
|
85 |
RDEPEND=" |
86 |
>=dev-libs/libinput-0.8.0 |
87 |
- >=dev-libs/wayland-1.17.0 |
88 |
- >=dev-libs/wayland-protocols-1.18 |
89 |
+ >=dev-libs/wayland-1.18.0 |
90 |
+ >=dev-libs/wayland-protocols-1.24 |
91 |
lcms? ( media-libs/lcms:2 ) |
92 |
media-libs/libpng:0= |
93 |
webp? ( media-libs/libwebp:0= ) |
94 |
jpeg? ( virtual/jpeg:0= ) |
95 |
>=x11-libs/cairo-1.11.3 |
96 |
- >=x11-libs/libdrm-2.4.68 |
97 |
+ >=x11-libs/libdrm-2.4.95 |
98 |
>=x11-libs/libxkbcommon-0.5.0 |
99 |
>=x11-libs/pixman-0.25.2 |
100 |
x11-misc/xkeyboard-config |
101 |
@@ -66,7 +66,7 @@ RDEPEND=" |
102 |
gles2? ( |
103 |
media-libs/mesa[gles2,wayland] |
104 |
) |
105 |
- pipewire? ( >=media-video/pipewire-0.2:= ) |
106 |
+ pipewire? ( >=media-video/pipewire-0.3:= ) |
107 |
rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) |
108 |
remoting? ( |
109 |
media-libs/gstreamer:1.0 |
110 |
@@ -78,7 +78,6 @@ RDEPEND=" |
111 |
>=sys-apps/dbus-1.6 |
112 |
>=sys-apps/systemd-209[pam] |
113 |
) |
114 |
- launch? ( sys-auth/pambase ) |
115 |
X? ( |
116 |
>=x11-libs/libxcb-1.9 |
117 |
x11-libs/libX11 |
118 |
@@ -95,6 +94,10 @@ BDEPEND=" |
119 |
virtual/pkgconfig |
120 |
" |
121 |
|
122 |
+PATCHES=( |
123 |
+ "${FILESDIR}"/${PN}-10.0.0-backend-default.patch |
124 |
+) |
125 |
+ |
126 |
src_configure() { |
127 |
local emesonargs=( |
128 |
$(meson_use drm backend-drm) |
129 |
@@ -104,10 +107,9 @@ src_configure() { |
130 |
$(meson_use screen-sharing screenshare) |
131 |
$(meson_use wayland-compositor backend-wayland) |
132 |
$(meson_use X backend-x11) |
133 |
- $(meson_use fbdev backend-fbdev) |
134 |
+ $(meson_use fbdev deprecated-backend-fbdev) |
135 |
-Dbackend-default=auto |
136 |
$(meson_use gles2 renderer-gl) |
137 |
- $(meson_use launch weston-launch) |
138 |
$(meson_use xwayland) |
139 |
$(meson_use seatd launcher-libseat) |
140 |
$(meson_use systemd) |
141 |
@@ -137,14 +139,12 @@ src_test() { |
142 |
xdg_environment_reset |
143 |
|
144 |
# devices test usually fails. |
145 |
+ # xwayland test can fail if X11 socket already exists. |
146 |
cd "${BUILD_DIR}" || die |
147 |
- meson test $(meson test --list | grep -Fxv devices) || die |
148 |
+ meson test $(meson test --list | grep -Exv "devices|xwayland") || die |
149 |
} |
150 |
|
151 |
src_install() { |
152 |
meson_src_install |
153 |
- if use launch && use suid; then |
154 |
- chmod u+s "${ED}"/usr/bin/weston-launch || die |
155 |
- fi |
156 |
readme.gentoo_create_doc |
157 |
} |
158 |
|
159 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild |
160 |
index 97a1005e1360..478f60d2b893 100644 |
161 |
--- a/dev-libs/weston/weston-9999.ebuild |
162 |
+++ b/dev-libs/weston/weston-9999.ebuild |
163 |
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then |
164 |
SRC_URI="${SRC_PATCHES}" |
165 |
else |
166 |
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" |
167 |
- KEYWORDS="~amd64 ~arm ~x86" |
168 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
169 |
fi |
170 |
|
171 |
LICENSE="MIT CC-BY-SA-3.0" |
172 |
SLOT="0" |
173 |
|
174 |
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland" |
175 |
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland" |
176 |
RESTRICT="!test? ( test )" |
177 |
|
178 |
REQUIRED_USE=" |
179 |
@@ -40,14 +40,14 @@ REQUIRED_USE=" |
180 |
|
181 |
RDEPEND=" |
182 |
>=dev-libs/libinput-0.8.0 |
183 |
- >=dev-libs/wayland-1.17.0 |
184 |
- >=dev-libs/wayland-protocols-1.18 |
185 |
+ >=dev-libs/wayland-1.18.0 |
186 |
+ >=dev-libs/wayland-protocols-1.24 |
187 |
lcms? ( media-libs/lcms:2 ) |
188 |
media-libs/libpng:0= |
189 |
webp? ( media-libs/libwebp:0= ) |
190 |
jpeg? ( virtual/jpeg:0= ) |
191 |
>=x11-libs/cairo-1.11.3 |
192 |
- >=x11-libs/libdrm-2.4.68 |
193 |
+ >=x11-libs/libdrm-2.4.95 |
194 |
>=x11-libs/libxkbcommon-0.5.0 |
195 |
>=x11-libs/pixman-0.25.2 |
196 |
x11-misc/xkeyboard-config |
197 |
@@ -66,7 +66,7 @@ RDEPEND=" |
198 |
gles2? ( |
199 |
media-libs/mesa[gles2,wayland] |
200 |
) |
201 |
- pipewire? ( >=media-video/pipewire-0.2:= ) |
202 |
+ pipewire? ( >=media-video/pipewire-0.3:= ) |
203 |
rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) |
204 |
remoting? ( |
205 |
media-libs/gstreamer:1.0 |
206 |
@@ -78,7 +78,6 @@ RDEPEND=" |
207 |
>=sys-apps/dbus-1.6 |
208 |
>=sys-apps/systemd-209[pam] |
209 |
) |
210 |
- launch? ( sys-auth/pambase ) |
211 |
X? ( |
212 |
>=x11-libs/libxcb-1.9 |
213 |
x11-libs/libX11 |
214 |
@@ -104,10 +103,9 @@ src_configure() { |
215 |
$(meson_use screen-sharing screenshare) |
216 |
$(meson_use wayland-compositor backend-wayland) |
217 |
$(meson_use X backend-x11) |
218 |
- $(meson_use fbdev backend-fbdev) |
219 |
+ $(meson_use fbdev deprecated-backend-fbdev) |
220 |
-Dbackend-default=auto |
221 |
$(meson_use gles2 renderer-gl) |
222 |
- $(meson_use launch weston-launch) |
223 |
$(meson_use xwayland) |
224 |
$(meson_use seatd launcher-libseat) |
225 |
$(meson_use systemd) |
226 |
@@ -137,14 +135,12 @@ src_test() { |
227 |
xdg_environment_reset |
228 |
|
229 |
# devices test usually fails. |
230 |
+ # xwayland test can fail if X11 socket already exists. |
231 |
cd "${BUILD_DIR}" || die |
232 |
- meson test $(meson test --list | grep -Fxv devices) || die |
233 |
+ meson test $(meson test --list | grep -Exv "devices|xwayland") || die |
234 |
} |
235 |
|
236 |
src_install() { |
237 |
meson_src_install |
238 |
- if use launch && use suid; then |
239 |
- chmod u+s "${ED}"/usr/bin/weston-launch || die |
240 |
- fi |
241 |
readme.gentoo_create_doc |
242 |
} |