Add dev-libs/weston-9999 ebuild for pulling latest from freedesktop git, compiles with musl

4 files changed, 64 insertions, 46 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index b368abf..78c74a2 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,12 @@
 AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
-AUX weston-1.9.0-make-error-portable.patch 1846 SHA256 7260f4c22e3af7b55bb314e68d99c5bed9c20c5f28c9528a8d76816a3bf379f6 SHA512 9116bdf0f93886cfdef97597a8260f7e724a7695c379ddcb81ec1f3c10f8570394a10de830ed2295080b153518e6d4c8d1ddc4ed60d470b2115336155c9e88ff WHIRLPOOL 94791922d22246868ed64b5f5b494c42fb38d441ab14020313d3072a3454140aea08e30fd0cc2a6d12b928d21ab81c10ac4afdcf39c94b00f5f98a130c6090b8
-DIST weston-1.10.0.tar.xz 1239280 SHA256 e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1 SHA512 0eaa339c5fb18f75526dbd0a172dbcf9c98320e657d4dbd2ce8975d9dfdc780800283f44774b5ded320276918d57e7f7dc6ee08d98605fd5ce07fbc23c9b0937 WHIRLPOOL 2248a6c715010de0545cbef241858afa7044fbca46a11c7c554bb3cfaaa6d8966c2e57ea7162092de5d9773fb0c0c0bb038472b3b8a0d860472a1f35b88a31c6
-DIST weston-1.9.0.tar.xz 1238240 SHA256 9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66 WHIRLPOOL 3329a1783da2c7509fb93a64343b6b70f6d45de614a15e17d3a2a2439b440298e25c3dd4504042de38e501877cf47d909849fd6263b081c6ccc0bf8e1362287b
-EBUILD weston-1.10.0-r1.ebuild 3527 SHA256 70fa98ecac7ab1f0da740da2c1893ecdd0ce8f2b989e6a1f4c3f05f7968c307c SHA512 2b0063dfed3cf979a8fd02e4256ea8739c284db7a14ac77e3c39909ee253557c010a584d7c6c3350f9d664310f2fb3eff7be2713f5d9680340f0860ce801c04f WHIRLPOOL 412ef6b72188e64f8ca23aa59b83ef8d4f7722a91e5daa98b002eae063269155c52c19f7afd29bdcd01708e12403ab7488bb009d9787d4ad7c3e8a0a8967241e
-EBUILD weston-1.9.0-r99.ebuild 3259 SHA256 66d6ff785f2467ac8f889861602467d057f346abbcf0c8f24520029902b37840 SHA512 190d3a3e654d961e5c83d5a1953f747158799d7ae6e6d7f46508772173d661ead9643061d6862f54a644ab0fb86c5e82d43acee80b7dbc8f2cfaf7ca4b932fd2 WHIRLPOOL 03673b306b5ca3f5002a280c28233f2d80418cf876b09d5484ced196411e8e61aad4bc7c2a73bfdae6908e7b10f3afc8eae0185ed28b704774bb1dbdacafce74
+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
 MISC metadata.xml 1257 SHA256 30a5608ab189260222d32fa240fd3791b3e17a471e29e7a2e4a04466b21dfb29 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3 WHIRLPOOL e53b1747e2e014af1e179c8fa6b8f77aa1dd2db43aec27e433561faa5c93700e57247c4bc06c74baa75f454672410dbf3b0e7d0375b9e7c620d6990ed5e42055
diff --git a/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch b/dev-libs/weston/files/weston-1.11-make-error-portable.patch
index 508ddbd..0021f8b 100644
--- a/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch
+++ b/dev-libs/weston/files/weston-1.11-make-error-portable.patch
@@ -1,10 +1,7 @@
-# Eliminate calls to error()/error.h, which are GNU extensions, not POSIX in order to compile with musl
-# See https://patchwork.freedesktop.org/patch/50793/
-
-diff -Naur weston-1.9.0.orig/configure.ac weston-1.9.0/configure.ac
---- weston-1.9.0.orig/configure.ac	2015-09-22 01:11:26.000000000 +0000
-+++ weston-1.9.0/configure.ac	2016-01-01 21:20:54.097472570 +0000
-@@ -57,6 +57,8 @@
+diff -Naur weston-9999.orig/configure.ac weston-9999/configure.ac
+--- weston-9999.orig/configure.ac	2016-09-10 07:48:34.245862655 +0000
++++ weston-9999/configure.ac	2016-09-10 07:50:33.030858472 +0000
+@@ -102,6 +102,8 @@
  	      [[#include <time.h>]])
  AC_CHECK_HEADERS([execinfo.h])
  
@@ -12,10 +9,29 @@ diff -Naur weston-1.9.0.orig/configure.ac weston-1.9.0/configure.ac
 +
  AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
  
- COMPOSITOR_MODULES="wayland-server >= 1.9.0 pixman-1 >= 0.25.2"
-diff -Naur weston-1.9.0.orig/src/weston-error.h weston-1.9.0/src/weston-error.h
---- weston-1.9.0.orig/src/weston-error.h	1970-01-01 00:00:00.000000000 +0000
-+++ weston-1.9.0/src/weston-error.h	2016-01-01 21:20:54.097472570 +0000
+ COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2"
+diff -Naur weston-9999.orig/libweston/weston-launch.c weston-9999/libweston/weston-launch.c
+--- weston-9999.orig/libweston/weston-launch.c	2016-09-10 07:48:34.273862654 +0000
++++ weston-9999/libweston/weston-launch.c	2016-09-10 07:51:07.096857273 +0000
+@@ -33,7 +33,6 @@
+ #include <poll.h>
+ #include <errno.h>
+ 
+-#include <error.h>
+ #include <getopt.h>
+ 
+ #include <sys/types.h>
+@@ -59,6 +58,7 @@
+ #endif
+ 
+ #include "weston-launch.h"
++#include "weston-error.h"
+ 
+ #define DRM_MAJOR 226
+ 
+diff -Naur weston-9999.orig/src/weston-error.h weston-9999/src/weston-error.h
+--- weston-9999.orig/libweston/weston-error.h	1970-01-01 00:00:00.000000000 +0000
++++ weston-9999/libweston/weston-error.h	2016-09-10 07:50:33.032858472 +0000
 @@ -0,0 +1,24 @@
 +/* TODO
 +   If S is zero error() will not exit so this macro should call warnx() in those cases
@@ -41,22 +57,3 @@ diff -Naur weston-1.9.0.orig/src/weston-error.h weston-1.9.0/src/weston-error.h
 +
 +#endif
 +
-diff -Naur weston-1.9.0.orig/src/weston-launch.c weston-1.9.0/src/weston-launch.c
---- weston-1.9.0.orig/src/weston-launch.c	2015-08-10 22:28:46.000000000 +0000
-+++ weston-1.9.0/src/weston-launch.c	2016-01-01 21:20:54.098472589 +0000
-@@ -33,7 +33,6 @@
- #include <poll.h>
- #include <errno.h>
- 
--#include <error.h>
- #include <getopt.h>
- 
- #include <sys/types.h>
-@@ -59,6 +58,7 @@
- #endif
- 
- #include "weston-launch.h"
-+#include "weston-error.h"
- 
- #define DRM_MAJOR 226
- 
diff --git a/dev-libs/weston/files/weston-1.11-stdinth.patch b/dev-libs/weston/files/weston-1.11-stdinth.patch
new file mode 100644
index 0000000..4ebd6b9
--- /dev/null
+++ b/dev-libs/weston/files/weston-1.11-stdinth.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/string-test.c b/tests/string-test.c
+index a72ec30..76ed9fd 100644
+--- a/tests/string-test.c
++++ b/tests/string-test.c
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
+ #include <stdio.h>
diff --git a/dev-libs/weston/weston-1.10.0-r1.ebuild b/dev-libs/weston/weston-9999.ebuild
index e30d1de..c256e2f 100644
--- a/dev-libs/weston/weston-1.10.0-r1.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -12,16 +12,16 @@ fi
 VIRTUALX_REQUIRED="test"
 RESTRICT="test"
 
-inherit autotools pax-utils readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
+inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="http://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 	KEYWORDS=""
 else
-	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
 fi
 
@@ -29,23 +29,24 @@ 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 lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland ${IUSE_VIDEO_CARDS}"
+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}"
 
 REQUIRED_USE="
 	drm? ( gles2 )
 	screen-sharing? ( rdp )
+	systemd? ( dbus )
 	test? ( X )
 	wayland-compositor? ( gles2 )
 "
 
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.9.90
-	>=dev-libs/wayland-protocols-1.0
+	>=dev-libs/wayland-1.10.0
+	>=dev-libs/wayland-protocols-1.2
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
-	media-libs/libwebp:0=
-	virtual/jpeg: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
@@ -97,7 +98,8 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	epatch "${FILESDIR}"/${PN}-1.9.0-make-error-portable.patch
+	epatch "${FILESDIR}"/${PN}-1.11-make-error-portable.patch
+	epatch "${FILESDIR}"/${PN}-1.11-stdinth.patch
 }
 
 src_configure() {
@@ -129,10 +131,14 @@ src_configure() {
 		$(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_enable video_cards_intel simple-dmabuf-intel-client) \
 		$(use_enable video_cards_v4l simple-dmabuf-v4l-client) \
+		$(use_with jpeg) \
+		$(use_with webp) \
 		${myconf}
 }
 
@@ -148,7 +154,5 @@ src_test() {
 src_install() {
 	default
 
-	pax-mark -m "${ED}"/usr/bin/weston
-
 	readme.gentoo_create_doc
 }