1 |
commit: 0ae1e6b57cf93579b34e93b9b69eb27b4bad8fd0 |
2 |
Author: Matt Turner <mattst88 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Aug 30 00:47:02 2015 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 00:47:02 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=0ae1e6b5 |
7 |
|
8 |
dev-libs/wayland+weston: Delete (moved to main tree) |
9 |
|
10 |
dev-libs/wayland/metadata.xml | 5 -- |
11 |
dev-libs/wayland/wayland-9999.ebuild | 62 -------------- |
12 |
dev-libs/weston/files/README.gentoo | 9 -- |
13 |
dev-libs/weston/metadata.xml | 25 ------ |
14 |
dev-libs/weston/weston-9999.ebuild | 160 ----------------------------------- |
15 |
profiles/package.mask | 2 - |
16 |
6 files changed, 263 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml |
19 |
deleted file mode 100644 |
20 |
index 01c4c00..0000000 |
21 |
--- a/dev-libs/wayland/metadata.xml |
22 |
+++ /dev/null |
23 |
@@ -1,5 +0,0 @@ |
24 |
-<?xml version="1.0" encoding="UTF-8"?> |
25 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
26 |
-<pkgmetadata> |
27 |
-<herd>x11</herd> |
28 |
-</pkgmetadata> |
29 |
|
30 |
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild |
31 |
deleted file mode 100644 |
32 |
index 45acdef..0000000 |
33 |
--- a/dev-libs/wayland/wayland-9999.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,62 +0,0 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-if [[ ${PV} = 9999* ]]; then |
43 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" |
44 |
- GIT_ECLASS="git-r3" |
45 |
- EXPERIMENTAL="true" |
46 |
- AUTOTOOLS_AUTORECONF=1 |
47 |
-fi |
48 |
- |
49 |
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS |
50 |
- |
51 |
-DESCRIPTION="Wayland protocol libraries" |
52 |
-HOMEPAGE="http://wayland.freedesktop.org/" |
53 |
- |
54 |
-if [[ $PV = 9999* ]]; then |
55 |
- SRC_URI="${SRC_PATCHES}" |
56 |
-else |
57 |
- SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" |
58 |
-fi |
59 |
- |
60 |
-LICENSE="MIT" |
61 |
-SLOT="0" |
62 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
63 |
-IUSE="doc static-libs" |
64 |
- |
65 |
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
66 |
- >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]" |
67 |
-DEPEND="${RDEPEND} |
68 |
- doc? ( |
69 |
- >=app-doc/doxygen-1.6[dot] |
70 |
- app-text/xmlto |
71 |
- >=media-gfx/graphviz-2.26.0 |
72 |
- sys-apps/grep[pcre] |
73 |
- ) |
74 |
- virtual/pkgconfig" |
75 |
- |
76 |
-src_configure() { |
77 |
- local myeconfargs=( |
78 |
- $(use_enable static-libs static) |
79 |
- $(use_enable doc documentation) |
80 |
- ) |
81 |
- if tc-is-cross-compiler ; then |
82 |
- myeconfargs+=( --disable-scanner ) |
83 |
- fi |
84 |
- if ! multilib_is_native_abi; then |
85 |
- myeconfargs+=( --disable-documentation ) |
86 |
- fi |
87 |
- |
88 |
- autotools-multilib_src_configure |
89 |
-} |
90 |
- |
91 |
-src_test() { |
92 |
- export XDG_RUNTIME_DIR="${T}/runtime-dir" |
93 |
- mkdir "${XDG_RUNTIME_DIR}" || die |
94 |
- chmod 0700 "${XDG_RUNTIME_DIR}" || die |
95 |
- |
96 |
- autotools-multilib_src_test |
97 |
-} |
98 |
|
99 |
diff --git a/dev-libs/weston/files/README.gentoo b/dev-libs/weston/files/README.gentoo |
100 |
deleted file mode 100644 |
101 |
index ed8c5c3..0000000 |
102 |
--- a/dev-libs/weston/files/README.gentoo |
103 |
+++ /dev/null |
104 |
@@ -1,9 +0,0 @@ |
105 |
-For running Weston you need to have $XDG_RUNTIME_DIR in your environment, |
106 |
-directory must exist and have correct permissions. If you are not using systemd, |
107 |
-it will not be created automatically, you can create it using your shell, |
108 |
-add these lines to ~/.bash_profile: |
109 |
- |
110 |
-# wayland |
111 |
-export XDG_RUNTIME_DIR=/tmp/.runtime-${USER} |
112 |
-mkdir -p "${XDG_RUNTIME_DIR}" |
113 |
-chmod 0700 "${XDG_RUNTIME_DIR}" |
114 |
|
115 |
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml |
116 |
deleted file mode 100644 |
117 |
index be0b9a0..0000000 |
118 |
--- a/dev-libs/weston/metadata.xml |
119 |
+++ /dev/null |
120 |
@@ -1,25 +0,0 @@ |
121 |
-<?xml version="1.0" encoding="UTF-8"?> |
122 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
123 |
-<pkgmetadata> |
124 |
-<herd>x11</herd> |
125 |
-<use> |
126 |
- <flag name='colord'>Allow setting color managment</flag> |
127 |
- <flag name='drm'>Enable drm compositor support</flag> |
128 |
- <flag name='editor'>Install wayland-editor example application</flag> |
129 |
- <flag name='egl'>Enable egl acceleration</flag> |
130 |
- <flag name='fbdev'>Enable fbdev compositor support</flag> |
131 |
- <flag name='gles2'>Use GLESv2 cairo instead of full GL</flag> |
132 |
- <flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes</flag> |
133 |
- <flag name='ivi'>Enable the IVI shell</flag> |
134 |
- <flag name='launch'>Install weston-launch utility</flag> |
135 |
- <flag name='rdp'>Enable Remote Desktop Protocol compositor support</flag> |
136 |
- <flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag> |
137 |
- <flag name='rpi'>Raspberry Pi GPU support</flag> |
138 |
- <flag name='screen-sharing'>Enable screen-sharing through RDP</flag> |
139 |
- <flag name='tablet'>Enable interface for tablets</flag> |
140 |
- <flag name='unwind'>Enable libunwind usage for backtraces</flag> |
141 |
- <flag name='view'>Install wayland-view example application</flag> |
142 |
- <flag name='wayland-compositor'>Enable Wayland compositor support</flag> |
143 |
- <flag name='xwayland'>Enable ability support native X11 applications</flag> |
144 |
-</use> |
145 |
-</pkgmetadata> |
146 |
|
147 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild |
148 |
deleted file mode 100644 |
149 |
index 06fe4da..0000000 |
150 |
--- a/dev-libs/weston/weston-9999.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,160 +0,0 @@ |
153 |
-# Copyright 1999-2015 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
-# $Id$ |
156 |
- |
157 |
-EAPI=5 |
158 |
- |
159 |
-if [[ ${PV} = 9999* ]]; then |
160 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" |
161 |
- GIT_ECLASS="git-r3" |
162 |
- EXPERIMENTAL="true" |
163 |
-fi |
164 |
-VIRTUALX_REQUIRED="test" |
165 |
-RESTRICT="test" |
166 |
- |
167 |
-inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS |
168 |
- |
169 |
-DESCRIPTION="Wayland reference compositor" |
170 |
-HOMEPAGE="http://wayland.freedesktop.org/" |
171 |
- |
172 |
-if [[ $PV = 9999* ]]; then |
173 |
- SRC_URI="${SRC_PATCHES}" |
174 |
-else |
175 |
- SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" |
176 |
-fi |
177 |
- |
178 |
-LICENSE="MIT CC-BY-SA-3.0" |
179 |
-SLOT="0" |
180 |
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux" |
181 |
-IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless ivi +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland" |
182 |
- |
183 |
-REQUIRED_USE=" |
184 |
- drm? ( egl ) |
185 |
- egl? ( || ( gles2 opengl ) ) |
186 |
- gles2? ( !opengl ) |
187 |
- screen-sharing? ( rdp ) |
188 |
- test? ( X ) |
189 |
- wayland-compositor? ( egl ) |
190 |
-" |
191 |
- |
192 |
-RDEPEND=" |
193 |
- >=dev-libs/libinput-0.8.0 |
194 |
- >=dev-libs/wayland-1.7.0 |
195 |
- media-libs/lcms:2 |
196 |
- media-libs/libpng:0= |
197 |
- media-libs/libwebp:0= |
198 |
- virtual/jpeg |
199 |
- >=x11-libs/cairo-1.11.3[gles2(-)?,opengl?] |
200 |
- >=x11-libs/libdrm-2.4.30 |
201 |
- x11-libs/libxkbcommon |
202 |
- x11-libs/pixman |
203 |
- x11-misc/xkeyboard-config |
204 |
- fbdev? ( |
205 |
- >=sys-libs/mtdev-1.1.0 |
206 |
- >=virtual/udev-136 |
207 |
- ) |
208 |
- colord? ( >=x11-misc/colord-0.1.27 ) |
209 |
- dbus? ( sys-apps/dbus ) |
210 |
- drm? ( |
211 |
- media-libs/mesa[gbm] |
212 |
- >=sys-libs/mtdev-1.1.0 |
213 |
- >=virtual/udev-136 |
214 |
- ) |
215 |
- egl? ( |
216 |
- media-libs/glu |
217 |
- media-libs/mesa[gles2,wayland] |
218 |
- ) |
219 |
- editor? ( x11-libs/pango ) |
220 |
- gles2? ( |
221 |
- media-libs/mesa[wayland] |
222 |
- ) |
223 |
- opengl? ( |
224 |
- media-libs/mesa[wayland] |
225 |
- ) |
226 |
- rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) |
227 |
- rpi? ( |
228 |
- >=sys-libs/mtdev-1.1.0 |
229 |
- >=virtual/udev-136 |
230 |
- ) |
231 |
- systemd? ( |
232 |
- sys-auth/pambase[systemd] |
233 |
- sys-apps/systemd[pam] |
234 |
- ) |
235 |
- launch? ( sys-auth/pambase ) |
236 |
- unwind? ( sys-libs/libunwind ) |
237 |
- X? ( |
238 |
- x11-libs/libxcb |
239 |
- x11-libs/libX11 |
240 |
- ) |
241 |
- xwayland? ( |
242 |
- x11-base/xorg-server[wayland] |
243 |
- x11-libs/cairo[xcb] |
244 |
- x11-libs/libxcb |
245 |
- x11-libs/libXcursor |
246 |
- ) |
247 |
-" |
248 |
-DEPEND="${RDEPEND} |
249 |
- virtual/pkgconfig |
250 |
-" |
251 |
- |
252 |
-src_prepare() { |
253 |
- if [[ ${PV} = 9999* ]]; then |
254 |
- eautoreconf |
255 |
- fi |
256 |
-} |
257 |
- |
258 |
-src_configure() { |
259 |
- local myconf |
260 |
- if use examples || use gles2 || use test; then |
261 |
- myconf="--enable-simple-clients |
262 |
- $(use_enable egl simple-egl-clients)" |
263 |
- else |
264 |
- myconf="--disable-simple-clients |
265 |
- --disable-simple-egl-clients" |
266 |
- fi |
267 |
- |
268 |
- if use gles2; then |
269 |
- myconf+=" --with-cairo=glesv2" |
270 |
- elif use opengl; then |
271 |
- myconf+=" --with-cairo=gl" |
272 |
- else |
273 |
- myconf+=" --with-cairo=image" |
274 |
- fi |
275 |
- |
276 |
- econf \ |
277 |
- $(use_enable examples demo-clients-install) \ |
278 |
- $(use_enable fbdev fbdev-compositor) \ |
279 |
- $(use_enable dbus) \ |
280 |
- $(use_enable drm drm-compositor) \ |
281 |
- $(use_enable headless headless-compositor) \ |
282 |
- $(use_enable ivi ivi-shell) \ |
283 |
- $(use_enable rdp rdp-compositor) \ |
284 |
- $(use_enable rpi rpi-compositor) \ |
285 |
- $(use_enable wayland-compositor) \ |
286 |
- $(use_enable X x11-compositor) \ |
287 |
- $(use_enable launch weston-launch) \ |
288 |
- $(use_enable colord) \ |
289 |
- $(use_enable egl) \ |
290 |
- $(use_enable unwind libunwind) \ |
291 |
- $(use_enable resize-optimization) \ |
292 |
- $(use_enable screen-sharing) \ |
293 |
- $(use_enable suid setuid-install) \ |
294 |
- $(use_enable xwayland) \ |
295 |
- $(use_enable xwayland xwayland-test) \ |
296 |
- ${myconf} |
297 |
-} |
298 |
- |
299 |
-src_test() { |
300 |
- export XDG_RUNTIME_DIR="${T}/runtime-dir" |
301 |
- mkdir "${XDG_RUNTIME_DIR}" || die |
302 |
- chmod 0700 "${XDG_RUNTIME_DIR}" || die |
303 |
- |
304 |
- cd "${BUILD_DIR}" || die |
305 |
- Xemake check |
306 |
-} |
307 |
- |
308 |
-src_install() { |
309 |
- default |
310 |
- |
311 |
- readme.gentoo_src_install |
312 |
-} |
313 |
|
314 |
diff --git a/profiles/package.mask b/profiles/package.mask |
315 |
index 0137b16..5f34957 100644 |
316 |
--- a/profiles/package.mask |
317 |
+++ b/profiles/package.mask |
318 |
@@ -1,7 +1,5 @@ |
319 |
# Don't let people install these accidentally |
320 |
=dev-libs/libevdev-9999 |
321 |
-=dev-libs/wayland-9999 |
322 |
-=dev-libs/weston-9999 |
323 |
=x11-apps/mkfontdir-9999 |
324 |
=x11-apps/mkfontscale-9999 |
325 |
=x11-apps/radeontop-9999 |