weston: Add time.h include

3 files changed, 31 insertions, 25 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 78c74a2..d7f6f48 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,12 +1,6 @@
 AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
-AUX nvidia/weston-nvidia-compositor-drm-1.patch 2648 SHA256 e6302ad8f4cba6e8dbfeafe6d11cb2801ba3d5611d86785569fecf711e11cbf9 SHA512 c8ac7077878a81f8d8d936dad272cd3fa69b6c69f54f7e93823e5e7a13f45b7d2db98b302ecd4a40e62734b47c796ba4c5fa6f43ee682b3cba4559479ea897ba WHIRLPOOL 369c677ea881a5241327faca6b9bac528729244d91d965a9d590ee4cb8bd727392976663aa1aa6f24c3474e35ff726ba9bb2b653cc821ec5663cfd9e06d4a7de
-AUX nvidia/weston-nvidia-compositor-drm-2.patch 7035 SHA256 4a53471d16a69ff50e8de26a1237fb3807ae3a5ec3de17d39c295868ad0081ca SHA512 a048bcb655a12630cdd07271066d99e114c846882c981a08c6d586e76a6bf38886adadfdfbcbf9ed03c9b00bd65286aabd67c617d06a5bbe2335236b959df758 WHIRLPOOL b52a733961d99bc7f49fe8b65ace9e1938dfb5459b706ae091bb0182f364d1f870c30617e9ebd42de88a43fef69c62cf5c826ebd98736b53929aa711df8d4a66
-AUX nvidia/weston-nvidia-compositor-drm-3.patch 16444 SHA256 d7642d4541c05ba74e928ab5a24c4fdbc5f114fb6dae34c9535172270dc60039 SHA512 7889d89bad0c95fcba2bc55f2e39b13b292d6046a26a51f65b1a497c2b019dfd1d560e0f93585331b75646f3d68be7f1d4e85357b65f4175fa7e7ff3b87dd970 WHIRLPOOL 3027ced1e5be5296a3123a3804a09f402cd38c65d72206fba6190a4f7f9c329c0ad09e324860487a66ef7f3bce82248bbfdd95688eb2f937f4d1b50c1da41d9c
-AUX nvidia/weston-nvidia-gl-renderer-1.patch 7429 SHA256 6ac5f8644e147ccdc6ba08ba87b74992890eb53e9f58a9043ce276586bb78770 SHA512 061b87613cd6ac611fa0c7a9f0fc1fa10988e104a38a7e715056d65ad251159071a8cd079fceb9dd6ae93e90b7122a659d87ebf3301ed6c5018501276c98ec52 WHIRLPOOL 2e96a71b775d559d66aac9a0c6b335f2584e147f70aa114c69856ade6df4593af2f7e553abc84670651bb3454b8f601c33f5719dfe5310494ae391b183bbec02
-AUX nvidia/weston-nvidia-gl-renderer-2.patch 5081 SHA256 fe087a2d540919d698401fb1b59f137e683aaa962b2769a008bb98b12265ed2e SHA512 791459d7d78249c961e84486aace15f41500993e41aced8df23ffb08839b223d3ecf6a5d9f908cc41ee996a87efa6514baa7e33bdf4e9a18a57196993d4d9592 WHIRLPOOL f2642fbd5a3772a13f698e3a3bfe52faeec245e0683d639054882438770b8db9dffc8a938006e39c7658411ba1d2b475a003c5bd1dcd6b51956bfed4b88dcafc
-AUX nvidia/weston-nvidia-gl-renderer-3.patch 4887 SHA256 bbe378ddb58bc11bb0073eafd99ad93eeab7ee12d670b12961bc564f397c7660 SHA512 c8656b1d296c1b2ba7aff73e05d39b5b1c3fd6c21c5464a9e179279cac86efbaaa4580e1b5d6a912162ea059f601f1da1022a7a941e6a020aa0d380231e8098e WHIRLPOOL 62fda1046f0d2a8f31d8287effcef267f94c7919e126940dbe10ae4036a0454315d6a8eb4408128bdb968d8e80c7b232fd30f75ab2ff67648370a8e223398fc8
-AUX nvidia/weston-nvidia-gl-renderer-4.patch 27647 SHA256 43a85739e92467d74485449e1becafb271504edf9adecc0b1f03a8f6beee5045 SHA512 5b95d21f3d3d21d3457af7467f11c5dbc16496587365dc588f5520255fe6d770f9aa27f1e70d67fe83908179232f04fdf696ce6107bf70474523b52065c90748 WHIRLPOOL b8c699ced4dc970b155ab7e5aa4c0b3a45314c837d91ed518be7dc5b4aa2d60464c0dc64b90ca8498ccab50f36a97c44a151909c89e6745d4d1aada5be7ed874
 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
-EBUILD weston-9999.ebuild 3700 SHA256 434f16f37c65161f78b86487327455fb1de4658443797e0b455598ce5304d085 SHA512 12687efc329d04908e8166df4a7d90a4a0e6fcbad90dcc1f98ed72e4f93a60d3aa22fd9249b51150226cce2e176a641ab12d75f22b3dcc9339cf23bbca409ff3 WHIRLPOOL 0a91800fe736ecf63dd56471b774173231337373c55f1f15ead9a3edc6c30980aa42cd734d0b638da7a6abc06571f2bfbba561e74670aa96c469bbeeba039d82
+AUX weston-timeh.patch 269 SHA256 a67fe651e75c7864dbff95d6d098c0b093753cd10bc241e4e25f5eac8f88e9a7 SHA512 8e818db5753b93e75178ced7923cfee1431c5c79f7dd0579d85f959ffb88c3d07541ec4f495cadfc5ba9a708f757d895bf79a80ea0775fe8a8b8d0d270d5276b WHIRLPOOL 3387b5e2dd3253a93f8f0b474f1a4870e3a2ccb1abace74162aa8885da59a63cd13f7eb0116375218fb8d5e79dbb9bbecd421cb9e3ff9e78501d1da855268d04
+EBUILD weston-9999.ebuild 3547 SHA256 04110fb9d2008c2e0425d78604b2c349d7962276095d3f561ddab1a2fdfa494e SHA512 9c42ca24bcce9425e20a35d2abaeec5f3445f4e14e83682e656396810f1dc234c56f5bc750637b8ff17f64cc43081bbac949a4421fc21f412c5a91cac742fdaf WHIRLPOOL 2d6e3ce003edff06fb87bd95966e9ea47f3dc6ed02d5cc9c4807af669f98fafa7cb7b8028845d49ea6a44ae6296597207dffa4b0ffbcd99ee62cd879060dc398
 MISC metadata.xml 1257 SHA256 30a5608ab189260222d32fa240fd3791b3e17a471e29e7a2e4a04466b21dfb29 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3 WHIRLPOOL e53b1747e2e014af1e179c8fa6b8f77aa1dd2db43aec27e433561faa5c93700e57247c4bc06c74baa75f454672410dbf3b0e7d0375b9e7c620d6990ed5e42055
diff --git a/dev-libs/weston/files/weston-timeh.patch b/dev-libs/weston/files/weston-timeh.patch
new file mode 100644
index 0000000..b6914a1
--- /dev/null
+++ b/dev-libs/weston/files/weston-timeh.patch
@@ -0,0 +1,12 @@
+diff --git a/shared/timespec-util.h b/shared/timespec-util.h
+index 576b3e8f..34a120ae 100644
+--- a/shared/timespec-util.h
++++ b/shared/timespec-util.h
+@@ -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-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index c256e2f..e6165e3 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
@@ -28,8 +27,7 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_v4l"
-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_VIDEO_CARDS}"
+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 )
@@ -41,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=
@@ -68,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]
@@ -93,13 +87,20 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11-make-error-portable.patch"
+	"${FILESDIR}/${PN}-1.11-stdinth.patch"
+	"${FILESDIR}/${PN}-timeh.patch"
+	)
+
+
 src_prepare() {
+	default
 	if [[ ${PV} = 9999* ]]; then
 		eautoreconf
+	else
+		elibtoolize
 	fi
-
-	epatch "${FILESDIR}"/${PN}-1.11-make-error-portable.patch
-	epatch "${FILESDIR}"/${PN}-1.11-stdinth.patch
 }
 
 src_configure() {
@@ -121,7 +122,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) \
@@ -135,10 +135,10 @@ src_configure() {
 		$(use_enable systemd systemd-notify) \
 		$(use_enable xwayland) \
 		$(use_enable xwayland xwayland-test) \
-		$(use_enable video_cards_intel simple-dmabuf-intel-client) \
-		$(use_enable video_cards_v4l simple-dmabuf-v4l-client) \
 		$(use_with jpeg) \
 		$(use_with webp) \
+		--disable-simple-dmabuf-intel-client \
+		--disable-simple-dmabuf-v4l-client \
 		${myconf}
 }
 
@@ -148,7 +148,7 @@ src_test() {
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
 
 	cd "${BUILD_DIR}" || die
-	Xemake check
+	virtx emake check
 }
 
 src_install() {