dev-libs/weston: update some items to match upstream ebuild

4 files changed, 178 insertions, 7 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index b41fbd6..259c89e 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,6 +1,9 @@
-AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
-AUX weston-1.11-make-error-portable.patch 1732 SHA256 1b5bbbc8ba161d0b8cd70d4ef98bcf5e6e81a9fa8b0a06e421728bf606ba7775 SHA512 b781558017b2a1f7a3b07e80da7e7fbaf6a3478d49a2a83bb1c4dc15929e6fb9aac79fe466a7af09c02997331ca7ca4f54230bbf1aa81eace9c8493803c03689 WHIRLPOOL ddc6a80129e809e5947655eff6d88f674dccc6f73c420966075399884c36045550e7a85dfb8545aabbe0d643b9a3da59f4eec6dac48f6236d695d206e7613931
-AUX weston-1.11-stdinth.patch 264 SHA256 cf917f59e5883fe1390389bb22675e6181915ea9f80ae4f866188056ca167b4c SHA512 b145ea120b052e5113586ed2d7a7e377c7b6ad3c4670cbe8f4f9d54f20e54bf2e3aa9aa1f016a5c163674e99f5194a50e8f7e7017cbef169954656023f2f4cb5 WHIRLPOOL 49eef4720f5649e72ac016e1f28fba0006ddbb256f2abc2838a11e34c84e6737f5c318f28004d9d1db20bc5aeaa0cbc6290746e1b50c90baee5293464a511790
-AUX weston-timeh.patch 269 SHA256 a67fe651e75c7864dbff95d6d098c0b093753cd10bc241e4e25f5eac8f88e9a7 SHA512 8e818db5753b93e75178ced7923cfee1431c5c79f7dd0579d85f959ffb88c3d07541ec4f495cadfc5ba9a708f757d895bf79a80ea0775fe8a8b8d0d270d5276b WHIRLPOOL 3387b5e2dd3253a93f8f0b474f1a4870e3a2ccb1abace74162aa8885da59a63cd13f7eb0116375218fb8d5e79dbb9bbecd421cb9e3ff9e78501d1da855268d04
-EBUILD weston-9999.ebuild 3591 SHA256 a2a18a69f5c267fa87f4ef33cd17c677e591fa73fa86da7e4831300e9c30dba4 SHA512 e72415ab16c85ba9eb7eaea43fdffecec30a70cc40c9e2feae2690b62de461905326d13e5e5a3486f5eccbafa10d4e587d734b70f919497eb1c6093e7f3a0b03 WHIRLPOOL 9cfa9682c9bcdc200f67903bca79234a45c233897e95ea742fb9bbeef6bc67d8689ecb25011d1e76c7999a666fc7d656e3a106961277d67477778978485a9fe9
-MISC metadata.xml 1257 SHA256 30a5608ab189260222d32fa240fd3791b3e17a471e29e7a2e4a04466b21dfb29 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3 WHIRLPOOL e53b1747e2e014af1e179c8fa6b8f77aa1dd2db43aec27e433561faa5c93700e57247c4bc06c74baa75f454672410dbf3b0e7d0375b9e7c620d6990ed5e42055
+AUX 3.0.0-musl.patch 363 BLAKE2B f47c2730890d8d0ed5c27acb3a1330d2cccda8f6b6c5f06296dbc9657cf440d7e85b06983b5613e01681b7f9c1fa325b938b0a6cb312997225ae1134ad2575b3 SHA512 a8164c274d5e18b1e6f8bd938d2a94a0f6009c33cceeb907535195dd3c2addbd16986624de1aa7468d1ab25b00884b4997a662d0a14504ed49e4b42feec374b0
+AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-1.11-make-error-portable.patch 1732 BLAKE2B 3c6e4ee4ae94a3f1803e6b55f1975bcbf3b807800e26f9f244d0dda5dc8822f7e4f634ef6e2902470b0d2fd6401be09be7e03d119d41ce633e8dcfc6891b9ea1 SHA512 b781558017b2a1f7a3b07e80da7e7fbaf6a3478d49a2a83bb1c4dc15929e6fb9aac79fe466a7af09c02997331ca7ca4f54230bbf1aa81eace9c8493803c03689
+AUX weston-1.11-stdinth.patch 264 BLAKE2B 4d04d747cbceadf9c604b6e2e27b20df59376a151d98653fe52626fa8a14360abbbcbd3c046389b8e0921738534c96d6e858a4088438444cae5bb041ecdbb9ce SHA512 b145ea120b052e5113586ed2d7a7e377c7b6ad3c4670cbe8f4f9d54f20e54bf2e3aa9aa1f016a5c163674e99f5194a50e8f7e7017cbef169954656023f2f4cb5
+AUX weston-timeh.patch 269 BLAKE2B 571ea29ce8fc19ec1fa448e6b189e77b698df80e995f5cd725b3d8612db7173a3460dfcf570b402d5ac02e502ff58b03514fc051ace038842534de3c9863e2ce SHA512 8e818db5753b93e75178ced7923cfee1431c5c79f7dd0579d85f959ffb88c3d07541ec4f495cadfc5ba9a708f757d895bf79a80ea0775fe8a8b8d0d270d5276b
+DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
+EBUILD weston-3.0.0.ebuild 3557 BLAKE2B ccf5d78e556f0f95b5470b34e0c0c10d6a6b840a2075386914f61e1b196b1fb3b038f24d1ff0783cb6e4d988b4948326e026b2ca94a437c3892f16c4ea15c46c SHA512 47cb03b02e90592dafa1f3b35503d7a6f2ec15b0b6f658932fcff0b4596275e8139e7b39d2b3a1702363a12ecd52ff97287b7beea8feb68e6515d41f5cb15ab6
+EBUILD weston-9999.ebuild 3611 BLAKE2B f170f6344e53f7b518d99059847c89c1d476a3390f992456309b661799a8c996027067c16d656eecdd3355a12c0f13607de94d061037a95edb05b4c6dd0bb4fd SHA512 9f1f1a0932a5fcfb996ed9b082de0a55fadaa268f106be30d584a6393eb42b283006df675fad0632f5f02ebddd09381d9d446a73c6ce5c78891dab7aaa972c37
+MISC metadata.xml 1257 BLAKE2B b39cdb4dd7eaff943e5784cba3eba7e1ce3fad5e704bf88a901de482f7c347608a24eca3f68094903ea8d2d7ed47417778d4e1cd69893e2ea9519f65cd70ec85 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3
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-3.0.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild
new file mode 100644
index 0000000..7112063
--- /dev/null
+++ b/dev-libs/weston/weston-3.0.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/${PN}.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	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 +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	screen-sharing? ( rdp )
+	systemd? ( dbus )
+	test? ( headless xwayland )
+	wayland-compositor? ( gles2 )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.12.0
+	>=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-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-1.6 )
+	drm? (
+		media-libs/mesa[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	unwind? ( sys-libs/libunwind )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[xcb]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-musl.patch
+	"${FILESDIR}/${PN}-1.11-make-error-portable.patch"
+)
+
+src_prepare() {
+	default
+	if [[ ${PV} = 9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use examples || use test; then
+		myconf="--enable-simple-clients"
+	else
+		myconf="--disable-simple-clients"
+	fi
+
+	econf \
+		$(use_enable examples demo-clients-install) \
+		$(use_enable fbdev fbdev-compositor) \
+		$(use_enable dbus) \
+		$(use_enable drm drm-compositor) \
+		$(use_enable headless headless-compositor) \
+		$(use_enable ivi ivi-shell) \
+		$(use_enable lcms) \
+		$(use_enable rdp rdp-compositor) \
+		$(use_enable wayland-compositor) \
+		$(use_enable X x11-compositor) \
+		$(use_enable launch weston-launch) \
+		$(use_enable colord) \
+		$(use_enable gles2 egl) \
+		$(use_enable unwind libunwind) \
+		$(use_enable resize-optimization) \
+		$(use_enable screen-sharing) \
+		$(use_enable suid setuid-install) \
+		$(use_enable systemd systemd-login) \
+		$(use_enable systemd systemd-notify) \
+		$(use_enable xwayland) \
+		$(use_enable xwayland xwayland-test) \
+		$(use_with jpeg) \
+		$(use_with webp) \
+		--with-cairo=image \
+		--disable-junit-xml \
+		--disable-simple-dmabuf-drm-client \
+		--disable-simple-dmabuf-v4l-client \
+		--disable-simple-egl-clients \
+		--disable-vaapi-recorder \
+		${myconf}
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	cd "${BUILD_DIR}" || die
+	emake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 6b18e71..0ff6088 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11-make-error-portable.patch"
 	"${FILESDIR}/${PN}-1.11-stdinth.patch"
-	"${FILESDIR}/${PN}-timeh.patch"
 	)
 
 
@@ -134,9 +133,11 @@ src_configure() {
 		$(use_with jpeg) \
 		$(use_with webp) \
 		--with-cairo=image \
+		--disable-junit-xml \
 		--disable-simple-dmabuf-drm-client \
 		--disable-simple-dmabuf-v4l-client \
 		--disable-simple-egl-clients \
+		--disable-vaapi-recorder \
 		${myconf}
 }