commit: 5f25335db0535ca9dbd538cc8d32626d00d5ad37 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Fri Sep 15 05:00:38 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Fri Sep 15 05:00:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5f25335d
dev-libs/weston: version bump to 3.0.0 dev-libs/weston/Manifest | 8 +++--- dev-libs/weston/files/1.12.0-musl.patch | 11 -------- dev-libs/weston/files/3.0.0-musl.patch | 11 ++++++++ dev-libs/weston/weston-1.11.0.ebuild | 2 +- .../{weston-1.12.0.ebuild => weston-3.0.0.ebuild} | 32 +++++++++++----------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index c9c3590..bd577f1 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,8 +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 3.0.0-musl.patch 363 SHA256 f45cadd9b5fd74b8bdc354f2508b1a732dd8df2280a65eb3fc5a60012dc6a358 SHA512 a8164c274d5e18b1e6f8bd938d2a94a0f6009c33cceeb907535195dd3c2addbd16986624de1aa7468d1ab25b00884b4997a662d0a14504ed49e4b42feec374b0 WHIRLPOOL 07a93ebe1c3e828dec7c0f7310778bf0505291fa51dd0310e24619d34932226be76f6694de0c3925122230853489cb19216f0a89d5e546ea2237279a1fd4facb AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81 DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876 -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 +DIST weston-3.0.0.tar.xz 1300340 SHA256 cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58 WHIRLPOOL 8b46b199f40e51530c17f782a12e0a3a5b65bffebc090db0c9296454b0bdcb053c0dfd6de3d0c5150e2404ea87d49280c11a0475382e2350699ae27deb204383 +EBUILD weston-1.11.0.ebuild 3597 SHA256 47841bcd45a2f677177c1f13ee8d318341f6e7cf5432ce3de5c66d918b58326b SHA512 2dfe8137e23abe4d7fe4142198fecb248c18131077efd53d17cd2ff6bde6ac5a578d84fbd5283f11609c0c42c39f4a8d4dd6239a9f12e1e8e881211f1d491704 WHIRLPOOL ef8b0fa5f405f12322d315e3927e23060efdb083ecc27d852ad34f998761aa3992cfff27eaaaf0173853803e369a5251443be064ce947ec670132d821989b8c9 +EBUILD weston-3.0.0.ebuild 3505 SHA256 ce6693174c048c4eeb6eb76b8010f8bf54e4b8c95b8550c76c5b76fefdadee4c SHA512 592da6f7083da1b62e1aeeb254e013f84dc247b06437f276f882a8bc5239ba61a477f6ad9647f3addec8cc7c4b25e8aba12e03dcdc8a33e1e1f77e6ed828d0ad WHIRLPOOL de3d726c193200f3ee9494396a1353474f7143863a14ea71fc1712df4a10e904ec88115582d7c61a47cb50f3c60eb63b393cc0ca05568155f2d1a5858a8c1d69 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 deleted file mode 100644 index f5bbbc9..0000000 --- a/dev-libs/weston/files/1.12.0-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ -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/files/3.0.0-musl.patch b/dev-libs/weston/files/3.0.0-musl.patch new file mode 100644 index 0000000..a7d9f7c --- /dev/null +++ b/dev-libs/weston/files/3.0.0-musl.patch @@ -0,0 +1,11 @@ +diff -Naur weston-3.0.0.orig/shared/timespec-util.h weston-3.0.0/shared/timespec-util.h +--- weston-3.0.0.orig/shared/timespec-util.h 2017-09-14 21:48:11.637801876 -0700 ++++ weston-3.0.0/shared/timespec-util.h 2017-09-14 21:48:47.289800862 -0700 +@@ -28,6 +28,7 @@ + + #include <stdint.h> + #include <assert.h> ++#include <time.h> + + #define NSEC_PER_SEC 1000000000 + diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild index 2401e76..eb5bd50 100644 --- a/dev-libs/weston/weston-1.11.0.ebuild +++ b/dev-libs/weston/weston-1.11.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" + EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git" GIT_ECLASS="git-r3" EXPERIMENTAL="true" fi diff --git a/dev-libs/weston/weston-1.12.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild similarity index 85% rename from dev-libs/weston/weston-1.12.0.ebuild rename to dev-libs/weston/weston-3.0.0.ebuild index 61e4e30..b840e78 100644 --- a/dev-libs/weston/weston-1.12.0.ebuild +++ b/dev-libs/weston/weston-3.0.0.ebuild @@ -4,14 +4,12 @@ EAPI=6 if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" + EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git" GIT_ECLASS="git-r3" EXPERIMENTAL="true" fi -VIRTUALX_REQUIRED="test" -RESTRICT="test" -inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS +inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS DESCRIPTION="Wayland reference compositor" HOMEPAGE="https://wayland.freedesktop.org/" @@ -33,29 +31,29 @@ REQUIRED_USE=" drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) - test? ( X ) + test? ( headless xwayland ) wayland-compositor? ( gles2 ) " RDEPEND=" >=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 - >=dev-libs/wayland-protocols-1.2 + >=dev-libs/wayland-protocols-1.8 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 - x11-libs/libxkbcommon - x11-libs/pixman + >=x11-libs/libxkbcommon-0.5.0 + >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) - dbus? ( sys-apps/dbus ) + dbus? ( >=sys-apps/dbus-1.6 ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 @@ -68,18 +66,18 @@ RDEPEND=" rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) systemd? ( sys-auth/pambase[systemd] - sys-apps/systemd[pam] + >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( - x11-libs/libxcb + >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] - x11-libs/libxcb + >=x11-libs/libxcb-1.9 x11-libs/libXcursor ) " @@ -106,8 +104,6 @@ src_configure() { myconf="--disable-simple-clients" fi - myconf+=" --with-cairo=image --disable-simple-egl-clients" - econf \ $(use_enable examples demo-clients-install) \ $(use_enable fbdev fbdev-compositor) \ @@ -132,8 +128,12 @@ src_configure() { $(use_enable xwayland xwayland-test) \ $(use_with jpeg) \ $(use_with webp) \ - --disable-simple-dmabuf-intel-client \ + --with-cairo=image \ + --disable-junit-xml \ + --disable-simple-dmabuf-drm-client \ --disable-simple-dmabuf-v4l-client \ + --disable-simple-egl-clients \ + --disable-vaapi-recorder \ ${myconf} } @@ -143,7 +143,7 @@ src_test() { chmod 0700 "${XDG_RUNTIME_DIR}" || die cd "${BUILD_DIR}" || die - virtx emake check + emake check } src_install() {