1 |
commit: fa81453aceb0ceef422c5ba90fd0f261c14dd8c2 |
2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 9 14:35:04 2017 +0000 |
4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 9 14:35:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa81453a |
7 |
|
8 |
dev-libs/weston: Version bump to 1.12.0, fix cross compilation |
9 |
|
10 |
Based on contribution by Mykyta Holubakha. |
11 |
|
12 |
Closes: https://github.com/gentoo/gentoo/pull/2816 |
13 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=598238 |
14 |
|
15 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
16 |
|
17 |
dev-libs/weston/Manifest | 1 + |
18 |
.../weston/{weston-9999.ebuild => weston-1.12.0.ebuild} | 16 +++++++--------- |
19 |
dev-libs/weston/weston-9999.ebuild | 16 +++++++--------- |
20 |
3 files changed, 15 insertions(+), 18 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest |
23 |
index 454717bb010..069230921a5 100644 |
24 |
--- a/dev-libs/weston/Manifest |
25 |
+++ b/dev-libs/weston/Manifest |
26 |
@@ -1,2 +1,3 @@ |
27 |
DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876 |
28 |
+DIST weston-1.12.0.tar.xz 1260892 SHA256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 SHA512 80cf7c01951cc72b32284a5a6960c2ae7a8dfffffb155cb0f94cd3585b0afa3f06bb8e2b87467d18ab95f0fd673ad9319a6e14ee5f3cec1d3b72c7c0146c927e WHIRLPOOL a809994ea312c01548280e1e5b5915fa3f0fae32ae152a0e64edd0b86db4995a97705d4ab5af5b09cfce32633ae9cdaa6f5db2afad3e0f3c5faab583d1109725 |
29 |
DIST weston-1.9.0.tar.xz 1238240 SHA256 9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66 WHIRLPOOL 3329a1783da2c7509fb93a64343b6b70f6d45de614a15e17d3a2a2439b440298e25c3dd4504042de38e501877cf47d909849fd6263b081c6ccc0bf8e1362287b |
30 |
|
31 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-1.12.0.ebuild |
32 |
similarity index 91% |
33 |
copy from dev-libs/weston/weston-9999.ebuild |
34 |
copy to dev-libs/weston/weston-1.12.0.ebuild |
35 |
index 253af543185..b63753841a8 100644 |
36 |
--- a/dev-libs/weston/weston-9999.ebuild |
37 |
+++ b/dev-libs/weston/weston-1.12.0.ebuild |
38 |
@@ -1,7 +1,7 @@ |
39 |
# Copyright 1999-2017 Gentoo Foundation |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
|
42 |
-EAPI=5 |
43 |
+EAPI=6 |
44 |
|
45 |
if [[ ${PV} = 9999* ]]; then |
46 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" |
47 |
@@ -27,7 +27,7 @@ fi |
48 |
LICENSE="MIT CC-BY-SA-3.0" |
49 |
SLOT="0" |
50 |
|
51 |
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland" |
52 |
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland" |
53 |
|
54 |
REQUIRED_USE=" |
55 |
drm? ( gles2 ) |
56 |
@@ -39,7 +39,7 @@ REQUIRED_USE=" |
57 |
|
58 |
RDEPEND=" |
59 |
>=dev-libs/libinput-0.8.0 |
60 |
- >=dev-libs/wayland-1.10.0 |
61 |
+ >=dev-libs/wayland-1.12.0 |
62 |
>=dev-libs/wayland-protocols-1.2 |
63 |
lcms? ( media-libs/lcms:2 ) |
64 |
media-libs/libpng:0= |
65 |
@@ -66,10 +66,6 @@ RDEPEND=" |
66 |
media-libs/mesa[gles2,wayland] |
67 |
) |
68 |
rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) |
69 |
- rpi? ( |
70 |
- >=sys-libs/mtdev-1.1.0 |
71 |
- >=virtual/udev-136 |
72 |
- ) |
73 |
systemd? ( |
74 |
sys-auth/pambase[systemd] |
75 |
sys-apps/systemd[pam] |
76 |
@@ -92,8 +88,11 @@ DEPEND="${RDEPEND} |
77 |
" |
78 |
|
79 |
src_prepare() { |
80 |
+ default |
81 |
if [[ ${PV} = 9999* ]]; then |
82 |
eautoreconf |
83 |
+ else |
84 |
+ elibtoolize |
85 |
fi |
86 |
} |
87 |
|
88 |
@@ -116,7 +115,6 @@ src_configure() { |
89 |
$(use_enable ivi ivi-shell) \ |
90 |
$(use_enable lcms) \ |
91 |
$(use_enable rdp rdp-compositor) \ |
92 |
- $(use_enable rpi rpi-compositor) \ |
93 |
$(use_enable wayland-compositor) \ |
94 |
$(use_enable X x11-compositor) \ |
95 |
$(use_enable launch weston-launch) \ |
96 |
@@ -143,7 +141,7 @@ src_test() { |
97 |
chmod 0700 "${XDG_RUNTIME_DIR}" || die |
98 |
|
99 |
cd "${BUILD_DIR}" || die |
100 |
- Xemake check |
101 |
+ virtx emake check |
102 |
} |
103 |
|
104 |
src_install() { |
105 |
|
106 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild |
107 |
index 253af543185..b63753841a8 100644 |
108 |
--- a/dev-libs/weston/weston-9999.ebuild |
109 |
+++ b/dev-libs/weston/weston-9999.ebuild |
110 |
@@ -1,7 +1,7 @@ |
111 |
# Copyright 1999-2017 Gentoo Foundation |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
|
114 |
-EAPI=5 |
115 |
+EAPI=6 |
116 |
|
117 |
if [[ ${PV} = 9999* ]]; then |
118 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" |
119 |
@@ -27,7 +27,7 @@ fi |
120 |
LICENSE="MIT CC-BY-SA-3.0" |
121 |
SLOT="0" |
122 |
|
123 |
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland" |
124 |
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland" |
125 |
|
126 |
REQUIRED_USE=" |
127 |
drm? ( gles2 ) |
128 |
@@ -39,7 +39,7 @@ REQUIRED_USE=" |
129 |
|
130 |
RDEPEND=" |
131 |
>=dev-libs/libinput-0.8.0 |
132 |
- >=dev-libs/wayland-1.10.0 |
133 |
+ >=dev-libs/wayland-1.12.0 |
134 |
>=dev-libs/wayland-protocols-1.2 |
135 |
lcms? ( media-libs/lcms:2 ) |
136 |
media-libs/libpng:0= |
137 |
@@ -66,10 +66,6 @@ RDEPEND=" |
138 |
media-libs/mesa[gles2,wayland] |
139 |
) |
140 |
rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) |
141 |
- rpi? ( |
142 |
- >=sys-libs/mtdev-1.1.0 |
143 |
- >=virtual/udev-136 |
144 |
- ) |
145 |
systemd? ( |
146 |
sys-auth/pambase[systemd] |
147 |
sys-apps/systemd[pam] |
148 |
@@ -92,8 +88,11 @@ DEPEND="${RDEPEND} |
149 |
" |
150 |
|
151 |
src_prepare() { |
152 |
+ default |
153 |
if [[ ${PV} = 9999* ]]; then |
154 |
eautoreconf |
155 |
+ else |
156 |
+ elibtoolize |
157 |
fi |
158 |
} |
159 |
|
160 |
@@ -116,7 +115,6 @@ src_configure() { |
161 |
$(use_enable ivi ivi-shell) \ |
162 |
$(use_enable lcms) \ |
163 |
$(use_enable rdp rdp-compositor) \ |
164 |
- $(use_enable rpi rpi-compositor) \ |
165 |
$(use_enable wayland-compositor) \ |
166 |
$(use_enable X x11-compositor) \ |
167 |
$(use_enable launch weston-launch) \ |
168 |
@@ -143,7 +141,7 @@ src_test() { |
169 |
chmod 0700 "${XDG_RUNTIME_DIR}" || die |
170 |
|
171 |
cd "${BUILD_DIR}" || die |
172 |
- Xemake check |
173 |
+ virtx emake check |
174 |
} |
175 |
|
176 |
src_install() { |