commit: 4869f037a9eec5178abc4c6c0dcece3ac636526e
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar 9 17:49:52 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar 9 17:49:52 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4869f037
dev-libs/weston: version bump to 1.12.0
dev-libs/weston/Manifest | 5 ++++-
dev-libs/weston/files/1.12.0-musl.patch | 11 +++++++++++
dev-libs/weston/weston-1.11.0.ebuild | 5 ++++-
.../{weston-1.11.0.ebuild => weston-1.12.0.ebuild} | 23 ++++++++++------------
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 4c33fa3..c9c3590 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,8 @@
AUX 1.11.0-musl.patch 1127 SHA256
51e3abf15fbeaf908febecfd5ede898760c2ae5325db60a2b11c4bca3b56503d SHA512
29866a9b22ddc7050467738b98b956df3906299a547edd74d2a861ba3367ca159d3747ffa3df5e9fbdba4e17966f47f33b56b7697418cf9f7f1f2bea62dd9f2f
WHIRLPOOL
0eed5a00eb4495b3c3667d0019b99adf60fa9f54d2cc3436628e696729e9195dd4b1545112161edd0bd4f069734c687ae3da23d79fb07c79b3ba84fca1d23779
+AUX 1.12.0-musl.patch 411 SHA256
a0a4a126b74c6858e0587ba82bd0321578bf2b90f1f3accf95850800739b72fd SHA512
3c43e95037cd004fafc4c0ec443e54275fafb3a41784e782429228bfd7f79d5c59c95df1cff83c47d608b92d765fdb8ccd532ce025e51e2b8bb77f1855a66eba
WHIRLPOOL
d5f6d78e2f666bc989832b9c96e0348d52f3d72bafb142916bf8b929f81969633e292eec441c24de87cc4f2b441568489cd44f0c7234186a73ba0d290ccccb51
AUX README.gentoo 383 SHA256
ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512
e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
WHIRLPOOL
8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
DIST weston-1.11.0.tar.xz 1242244 SHA256
05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512
30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5
WHIRLPOOL
5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
-EBUILD weston-1.11.0.ebuild 3549 SHA256
b77d4422dd25616e2ff0a4f3ab71a8f6625e5e2b21c9d87afb41697932de2594 SHA512
69d14b889daff658079e0a187cac5ba3059d583a4ea572bb725ec8df0386e45f7e6fffeb8d6b80579260828e838821ec6ef1e872383325ba20b73f739dd83817
WHIRLPOOL
01a31df9ed78a148508e48f6a7727e7c5b72199616c72dec529197409a6075f04a8d87dc6afccd0f969da7e7e93f83cd8a598f78c8de96d0d8d024cec4a3ab8b
+DIST weston-1.12.0.tar.xz 1260892 SHA256
ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 SHA512
80cf7c01951cc72b32284a5a6960c2ae7a8dfffffb155cb0f94cd3585b0afa3f06bb8e2b87467d18ab95f0fd673ad9319a6e14ee5f3cec1d3b72c7c0146c927e
WHIRLPOOL
a809994ea312c01548280e1e5b5915fa3f0fae32ae152a0e64edd0b86db4995a97705d4ab5af5b09cfce32633ae9cdaa6f5db2afad3e0f3c5faab583d1109725
+EBUILD weston-1.11.0.ebuild 3590 SHA256
816befe0fa487c926b12961370561faa8e35c12f86019755dd32a89c171e57cf SHA512
4f7c00597d7ba2ece0d5499ab67bd4ef12544c57b102bb25769c137cfceeb40e2f7866fc641ca5c3af5ec02e462370a541550bfde983d8429829590694e44727
WHIRLPOOL
347c85f1505b96dd7e7f6c6f4d5b97b4e847cd487bfd5929c0e4addaf56479b8cbbb0a3aa0a9e22c7643a8ad66849e8015d585786f75f5607aebe5ef66e0e093
+EBUILD weston-1.12.0.ebuild 3451 SHA256
ff4902087fd80f4ab2736a571fd91010ba28371ff931139e4938dbc7b84c67ee SHA512
437ca12ca3101be75708a65bd43f1bc266fc1049844577b64a560b07dd6906259a8358e63c2020f71e0cbbb4ac6c7fb426a5f607af63448a16378ab63f3cc108
WHIRLPOOL
63bad157b35216bf18efdb17b9d58a136cc5dfa1da33d3f46ec3c6ae25546b450696a7dfe02c5cfcaaeaf6d670ddc30340a6c90a94971a92a6d671996a00e62a
MISC metadata.xml 1346 SHA256
2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512
27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094
WHIRLPOOL
70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
diff --git a/dev-libs/weston/files/1.12.0-musl.patch
b/dev-libs/weston/files/1.12.0-musl.patch
new file mode 100644
index 0000000..f5bbbc9
--- /dev/null
+++ b/dev-libs/weston/files/1.12.0-musl.patch
@@ -0,0 +1,11 @@
+diff -Naur weston-1.12.0.orig/shared/string-helpers.h
weston-1.12.0/shared/string-helpers.h
+--- weston-1.12.0.orig/shared/string-helpers.h 2017-03-09 09:42:17.167310112
-0800
++++ weston-1.12.0/shared/string-helpers.h 2017-03-09 09:43:04.018026289
-0800
+@@ -27,6 +27,7 @@
+ #define WESTON_STRING_HELPERS_H
+
+ #include <stdbool.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <assert.h>
diff --git a/dev-libs/weston/weston-1.11.0.ebuild
b/dev-libs/weston/weston-1.11.0.ebuild
index 19a648d..2401e76 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -65,7 +65,10 @@ RDEPEND="
gles2? (
media-libs/mesa[gles2,wayland]
)
- rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+ rdp? (
+ >=net-misc/freerdp-1.1.0_beta1_p20130710
+ <net-misc/freerdp-2.0.0_pre20161219
+ )
rpi? (
>=sys-libs/mtdev-1.1.0
>=virtual/udev-136
diff --git a/dev-libs/weston/weston-1.11.0.ebuild
b/dev-libs/weston/weston-1.12.0.ebuild
similarity index 88%
copy from dev-libs/weston/weston-1.11.0.ebuild
copy to dev-libs/weston/weston-1.12.0.ebuild
index 19a648d..61e4e30 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.12.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
@@ -18,16 +18,16 @@ HOMEPAGE="https://wayland.freedesktop.org/";
if [[ $PV = 9999* ]]; then
SRC_URI="${SRC_PATCHES}"
- KEYWORDS="amd64 arm x86"
+ KEYWORDS=""
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz";
- KEYWORDS="amd64 arm x86 ~arm-linux"
+ KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
fi
LICENSE="MIT CC-BY-SA-3.0"
SLOT="0"
-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"
+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"
REQUIRED_USE="
drm? ( gles2 )
@@ -39,7 +39,7 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.10.0
+ >=dev-libs/wayland-1.12.0
>=dev-libs/wayland-protocols-1.2
lcms? ( media-libs/lcms:2 )
media-libs/libpng:0=
@@ -66,10 +66,6 @@ RDEPEND="
media-libs/mesa[gles2,wayland]
)
rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
- rpi? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
systemd? (
sys-auth/pambase[systemd]
sys-apps/systemd[pam]
@@ -91,13 +87,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${PV}-musl.patch" )
+PATCHES=( "${FILESDIR}"/${PV}-musl.patch )
src_prepare() {
+ default
if [[ ${PV} = 9999* ]]; then
eautoreconf
+ else
+ elibtoolize
fi
- epatch "${PATCHES[@]}"
}
src_configure() {
@@ -119,7 +117,6 @@ src_configure() {
$(use_enable ivi ivi-shell) \
$(use_enable lcms) \
$(use_enable rdp rdp-compositor) \
- $(use_enable rpi rpi-compositor) \
$(use_enable wayland-compositor) \
$(use_enable X x11-compositor) \
$(use_enable launch weston-launch) \
@@ -146,7 +143,7 @@ src_test() {
chmod 0700 "${XDG_RUNTIME_DIR}" || die
cd "${BUILD_DIR}" || die
- Xemake check
+ virtx emake check
}
src_install() {
