Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/
Date: Sun, 14 Apr 2019 14:17:39
Message-Id: 1555251444.9789e20605e5313ab874b67c9cf9c71f2f5f0f17.chewi@gentoo
1 commit: 9789e20605e5313ab874b67c9cf9c71f2f5f0f17
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 14 14:15:47 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 14 14:17:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9789e206
7
8 dev-libs/weston: Version bump to 6.0.0, EAPI 7
9
10 The "devices" test fails most of the time but I haven't been able to
11 figure out why. It seems to work fine other than that.
12
13 Package-Manager: Portage-2.3.62, Repoman-2.3.12
14 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
15
16 dev-libs/weston/Manifest | 1 +
17 dev-libs/weston/metadata.xml | 2 ++
18 .../{weston-9999.ebuild => weston-6.0.0.ebuild} | 25 ++++++++++++----------
19 dev-libs/weston/weston-9999.ebuild | 22 +++++++++----------
20 4 files changed, 28 insertions(+), 22 deletions(-)
21
22 diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
23 index 2c30fde70a9..b383b67e848 100644
24 --- a/dev-libs/weston/Manifest
25 +++ b/dev-libs/weston/Manifest
26 @@ -1,2 +1,3 @@
27 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
28 DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
29 +DIST weston-6.0.0.tar.xz 1517032 BLAKE2B 598c525598f877715320d8b468618595d1f7b10ed56aa82c3535b05c369216d1a938d32354e3a8cc9077a0d910d0dbfdcf504fb687c73942d8ad92b13a124bd2 SHA512 127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f
30
31 diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
32 index c976a4437cf..c98075bd2fe 100644
33 --- a/dev-libs/weston/metadata.xml
34 +++ b/dev-libs/weston/metadata.xml
35 @@ -7,9 +7,11 @@
36 </maintainer>
37 <use>
38 <flag name="colord">Allow setting color managment</flag>
39 + <flag name="desktop">Enable the desktop shell</flag>
40 <flag name="drm">Enable drm compositor support</flag>
41 <flag name="editor">Install wayland-editor example application</flag>
42 <flag name="fbdev">Enable fbdev compositor support</flag>
43 + <flag name="fullscreen">Enable fullscreen/kiosk shell</flag>
44 <flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
45 <flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
46 <flag name="ivi">Enable the IVI shell</flag>
47
48 diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-6.0.0.ebuild
49 similarity index 81%
50 copy from dev-libs/weston/weston-9999.ebuild
51 copy to dev-libs/weston/weston-6.0.0.ebuild
52 index b06805e2e15..70df71207df 100644
53 --- a/dev-libs/weston/weston-9999.ebuild
54 +++ b/dev-libs/weston/weston-6.0.0.ebuild
55 @@ -1,7 +1,7 @@
56 # Copyright 1999-2019 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 -EAPI=6
60 +EAPI=7
61
62 if [[ ${PV} = 9999* ]]; then
63 EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
64 @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
65 EXPERIMENTAL="true"
66 fi
67
68 -inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
69 +inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
70
71 DESCRIPTION="Wayland reference compositor"
72 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
73 @@ -25,12 +25,12 @@ fi
74 LICENSE="MIT CC-BY-SA-3.0"
75 SLOT="0"
76
77 -IUSE="colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
78 +IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
79
80 REQUIRED_USE="
81 drm? ( gles2 )
82 screen-sharing? ( rdp )
83 - test? ( headless xwayland )
84 + test? ( desktop headless xwayland )
85 wayland-compositor? ( gles2 )
86 "
87
88 @@ -61,7 +61,7 @@ RDEPEND="
89 gles2? (
90 media-libs/mesa[gles2,wayland]
91 )
92 - rdp? ( >=net-misc/freerdp-1.1.0:= )
93 + rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
94 remoting? (
95 media-libs/gstreamer:1.0
96 media-libs/gst-plugins-base:1.0
97 @@ -83,7 +83,8 @@ RDEPEND="
98 x11-libs/libXcursor
99 )
100 "
101 -DEPEND="${RDEPEND}
102 +DEPEND="${RDEPEND}"
103 +BDEPEND="
104 virtual/pkgconfig
105 "
106
107 @@ -94,6 +95,7 @@ src_configure() {
108 $(meson_use headless backend-headless)
109 $(meson_use rdp backend-rdp)
110 $(meson_use screen-sharing screenshare)
111 + $(meson_use wayland-compositor backend-wayland)
112 $(meson_use X backend-x11)
113 $(meson_use fbdev backend-fbdev)
114 $(meson_use gles2 renderer-gl)
115 @@ -101,7 +103,8 @@ src_configure() {
116 $(meson_use xwayland)
117 $(meson_use systemd)
118 $(meson_use remoting)
119 - $(meson_use wayland-compositor shell-desktop)
120 + $(meson_use desktop shell-desktop)
121 + $(meson_use fullscreen shell-fullscreen)
122 $(meson_use ivi shell-ivi)
123 $(meson_use lcms color-management-lcms)
124 $(meson_use colord color-management-colord)
125 @@ -120,11 +123,11 @@ src_configure() {
126 }
127
128 src_test() {
129 - export XDG_RUNTIME_DIR="${T}/runtime-dir"
130 - mkdir "${XDG_RUNTIME_DIR}" || die
131 - chmod 0700 "${XDG_RUNTIME_DIR}" || die
132 + xdg_environment_reset
133 +
134 + # devices test usually fails.
135 cd "${BUILD_DIR}" || die
136 - meson_src_test
137 + meson test $(meson test --list | grep -Fxv devices) || die
138 }
139
140 src_install() {
141
142 diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
143 index b06805e2e15..f0ba4e027b7 100644
144 --- a/dev-libs/weston/weston-9999.ebuild
145 +++ b/dev-libs/weston/weston-9999.ebuild
146 @@ -1,7 +1,7 @@
147 # Copyright 1999-2019 Gentoo Authors
148 # Distributed under the terms of the GNU General Public License v2
149
150 -EAPI=6
151 +EAPI=7
152
153 if [[ ${PV} = 9999* ]]; then
154 EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
155 @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
156 EXPERIMENTAL="true"
157 fi
158
159 -inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
160 +inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
161
162 DESCRIPTION="Wayland reference compositor"
163 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
164 @@ -25,12 +25,12 @@ fi
165 LICENSE="MIT CC-BY-SA-3.0"
166 SLOT="0"
167
168 -IUSE="colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
169 +IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
170
171 REQUIRED_USE="
172 drm? ( gles2 )
173 screen-sharing? ( rdp )
174 - test? ( headless xwayland )
175 + test? ( desktop headless xwayland )
176 wayland-compositor? ( gles2 )
177 "
178
179 @@ -61,7 +61,7 @@ RDEPEND="
180 gles2? (
181 media-libs/mesa[gles2,wayland]
182 )
183 - rdp? ( >=net-misc/freerdp-1.1.0:= )
184 + rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
185 remoting? (
186 media-libs/gstreamer:1.0
187 media-libs/gst-plugins-base:1.0
188 @@ -83,7 +83,8 @@ RDEPEND="
189 x11-libs/libXcursor
190 )
191 "
192 -DEPEND="${RDEPEND}
193 +DEPEND="${RDEPEND}"
194 +BDEPEND="
195 virtual/pkgconfig
196 "
197
198 @@ -94,6 +95,7 @@ src_configure() {
199 $(meson_use headless backend-headless)
200 $(meson_use rdp backend-rdp)
201 $(meson_use screen-sharing screenshare)
202 + $(meson_use wayland-compositor backend-wayland)
203 $(meson_use X backend-x11)
204 $(meson_use fbdev backend-fbdev)
205 $(meson_use gles2 renderer-gl)
206 @@ -101,7 +103,8 @@ src_configure() {
207 $(meson_use xwayland)
208 $(meson_use systemd)
209 $(meson_use remoting)
210 - $(meson_use wayland-compositor shell-desktop)
211 + $(meson_use desktop shell-desktop)
212 + $(meson_use fullscreen shell-fullscreen)
213 $(meson_use ivi shell-ivi)
214 $(meson_use lcms color-management-lcms)
215 $(meson_use colord color-management-colord)
216 @@ -120,10 +123,7 @@ src_configure() {
217 }
218
219 src_test() {
220 - export XDG_RUNTIME_DIR="${T}/runtime-dir"
221 - mkdir "${XDG_RUNTIME_DIR}" || die
222 - chmod 0700 "${XDG_RUNTIME_DIR}" || die
223 - cd "${BUILD_DIR}" || die
224 + xdg_environment_reset
225 meson_src_test
226 }
Report Message
Find on MARC Find on Google Groups