add wayland support wrt #504136

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 30 insertions, 20 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index 8a151121d2e8..05809352277c 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.14 2014/04/21 07:56:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.15 2014/05/10 16:46:06 hasufell Exp $
+
+  10 May 2014; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.2-r1.ebuild:
+  add wayland support wrt #504136
 
   21 Apr 2014; Michał Górny <mgorny@gentoo.org> libsdl2-2.0.2-r1.ebuild:
   Use the new multilib_native_use* functions.
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 4f594ca6233a..b34f56e3ecff 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,26 +6,26 @@ AUX libsdl2-2.0.2-static-libs.patch 4633 SHA256 aa3ce99668a0a504e22b8f4d6d225855
 DIST SDL2-2.0.1.tar.gz 3660224 SHA256 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 SHA512 012125d72b6baa677c4c4d4747a058d7c0e406d84b21712fe538bd8ecfc1d74cbc0569ce25046a766266460c9e040d2f2c62ccc52fd6e371683999c95c314c33 WHIRLPOOL 353d2909e3738b13885b26d57f2d690ac55c4992650dba552b0ba17d35d4b04946828d76b621de69201aed1676be8dc7ce11bb4c72af95b96df0481fc3785084
 DIST SDL2-2.0.2.tar.gz 3812882 SHA256 590157f85a8a8b52723848169a74eec6ca07ab4a75cec15beedde648f980e850 SHA512 73f628a893d3e7efb2180783ab5ea0103e943dddbd4e0b2b7e1add5c2cf975c85179da6e09747ad1a9d8a25067d6fc9e4467927cf111762ae322600ab810a348 WHIRLPOOL 1e396f2621fbdb6bb10f06b5828271aad23ab5d5c07254ebeaf760cf1b170441ccc89db233749b4ac4fa7341e4204ba1cd705d08ed0490b07a1855d38aa08051
 EBUILD libsdl2-2.0.1-r1.ebuild 3497 SHA256 b58f136902cb96dd79a0537a684dbd6a8e5d38c9a62a223ad6a1e4eb6e1e4761 SHA512 ccaadae89739986ee3b19ad3bed0e3cb319e2603cdbfcc47ec7d8be87b798b2c04dca813316942939a74ec97d63e1c729288a27a4f7b3b674064705acbe6c539 WHIRLPOOL a499471c4c9d3ab9ab0fa8049fd688d9f38343bed1416d8333b1e787c6f26f47d3876f1a29bc7539af0387757a3d0b514fa969bd1b8aefe13a8d3b8ed95942a2
-EBUILD libsdl2-2.0.2-r1.ebuild 4058 SHA256 cf0042bd2a2d642b6354d72de9640dd423ade5a6ab90bb2b58685028de88d984 SHA512 2333aeb146e0a09f96eccb6745a66d8f7ce18746806368606e5ab5f5fce5976bc69833641fc9dae1b9138b98ae407465d4848aa1e1294323a4bc9745781f1fa8 WHIRLPOOL 68777d76ec5ae39416d8ece94afce8dd6f821122a26ebbeb98bccd3a6b57690fef0cbf1988b1bf4268fac866685fd99992fb14b2ee92747735717bb23ee3179f
+EBUILD libsdl2-2.0.2-r1.ebuild 4281 SHA256 4f0669e009a172af8ade1b73482e10de5ad132fce477deb9b2ee2b2a412e7166 SHA512 b1bebbb3d1e4092190463db84fee8a755a1feb96294486746e5609d1d821cea3410963cd4b16a09f3f8e72c4a6bde51619086c64e9a03bfe4fff6d9a03d3160b WHIRLPOOL 4eddd5e62b8295dc0005254c5a45cb07656fc15832cd5215398a57054a4e3cd3c10303e7ee9b10df8490510bf1d1c6a487c76bea8ba52c27713812c14e140106
 EBUILD libsdl2-2.0.2.ebuild 3494 SHA256 c999a442f19fb1818fdeb9323aa4f40483e85162f9f0c18ade8c5ecfde4cd257 SHA512 17cb93af4d94931c82d9529b12f29d61fd0df5a8bb9a56577e28c599166ec58edc7aa0a9241ad26833a44428c4a70f28f9c282e26fa627b4e26edbebbdeff21b WHIRLPOOL d50c84f900981b793dd1971b943499d33f8c63a740232ccd349e49e98c5ed78b7211b40663ab0dc11222b80affd901ac5f4f41659fbadf394476b9fab185724b
-MISC ChangeLog 2464 SHA256 731dffcf5fb4b75aedb39fd05afb7f2ef5b71af2833bfa4e62e7cb9a59ef1939 SHA512 8ce58f56f2c8cd3c5c4404cf399c71af562268dabca685f335393049a5878dd1cf8795503bdaf9e9146a58ed65fe9de4d471dbee5bd954d6afe40c07a1233725 WHIRLPOOL cd1c1d8156939a1d087a57760a074d675aca216531867fe8d86f5cad531ce5e708ca6653062c4e102263105b988ce9d32af6dda2159ff43d6fa5b68828504616
+MISC ChangeLog 2577 SHA256 c562c8311f36881486dd1b5b3c2cc012618bc81583531a9117b33a8e636af6e8 SHA512 a355728d34051e8ff8fa80a94b4a4e9aedaecab4000b1066456c37e13f958416191abc334fb8a4be9e0e64e3a6cedbe66ab419d1b16984098813eebffb6d35b4 WHIRLPOOL dba1a3902f469bc6c121d8ef5be9efa9d2d34bc5f4338aca9434248eff1096e6540d6bbd831f2f158ae1bee62d6300525c9cfffc117bba5d52e03eaf5c78c28b
 MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTVM9FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAb8QAK9lmnWDo2HW1FFGAoDYN4c0
-dPDsrmHYgS+1z1cddnRNS+4NKouwYo0F8vWgRZdYSW8gzXnyihYYaj4uMB7294NL
-y3CUEGXu2LMJYdlylBTeBjgknGOSJCApR3sBO4Un9FXUiWgrkqvUhqEGenb+HXjs
-4paVEIoQS4PlkoWrePBtZ7BkocVms9o7oulT0CXzraLMoLHcbu5iEQKt7HCVPjiC
-kWhvqjCpZwl0x7eX/+DI1t3YoN97daZ9UQr6Tb3ciVd0vkjPMlOyQlTSSW7v6fhS
-ao6hvrjuanJWQcQFgm5Yxs/HNs0jEnQQlfFlkMTElX1w3Ut4Jd9qC8Fm2dVFB1up
-agHejOtCA0/NrmDBCJxPyGQQbhWcb+TDqDAm2hpxGf1x6FlobvMeppiX9XgnAjvQ
-AL9yZPP7u4dWrQmx4E8Oky8F+2819G+vQISObG+wpglugRjPKHWrhzgnYhsMpAz/
-+XzdXntdRVM3CU2WrPZXtMgwJFgCTUtP1SZq2Mf9wH903pm+ouK/4w2tEIj+JYlA
-npc98yUtypbwGIqf/iTrNqHKNecLAwL7zx6RBey5uUzsyfCCiBgBr/OUvVpOsarA
-DZ4oXvv7zO1oN7rqF9AH++BB0rqd+L7okg0MTrO2K7oTrL7TrlI4QIMl/8pt8CfD
-aWe7V/skQ1G7dCspcBUD
-=sT24
+iQJ8BAEBCABmBQJTblfSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgI/kP/jZE7OpGNGVOnxCAHwcCRr3Y
+rh7yb4OIliZBzujNoAGqAGETdXLo/PmZOKT1tvpa683SUm9extftpIavTbCKmY7P
+WIgbrKQqC8ibs+lGnCdn84o3Ju5+pKBY+09rLurlyPCg/On2GZUMlbXMeyVy87uZ
+bDPlzpC38kBKLMh2bMkpbmShey7OEyJbqUvWWCwCy93F8DU+DbJAad/R3q30Qbed
+2w43rtLP97HIDi0a0CCc1pVWOZse45PgYcMME5wEcsPWEZzQo0XCxOtlH+3I7hZH
+n00VlMve8NXHTB27K6JfmNqwtjstzNEBg5pq7J/yT0z3tBgq+2/MJtGtLLZOGJh1
+/pmB9/w0DP8WW2RF88i137Z9O2RPkoGDYrcOTtI+LdU7bwufw4p4pZ7w/0NSJl82
+unydG/kBWpIqZmpvL/BH7jVzE5BNyGIcEw6RXQ4NtG1lf8axHs+oo2I5LWRkz1X6
+rERd5JoPESOvjz7zM74HfmeF2yxWnkXyGPEssRhpzlEOnSJeO7RG2aaLvb2mJM/P
+2AoZgkSlUE3IZFKG0ox4ffGkIiNqTycpwcUXYpvmIKlGEQYU8mQb530hjE7k/44H
+1numSXYrFsZIuYEEJgd2ngxzog6otkE9l6qhLIRiVJuNyYf0xgwJn6h7GBHKaUX2
+4TQL+je3KBDwr6L0gxGP
+=PT7d
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
index 4fe2007d70c3..90eaae78f094 100644
--- a/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild,v 1.3 2014/04/21 07:56:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild,v 1.4 2014/05/10 16:46:06 hasufell Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -16,7 +16,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( audio )
 	fusionsound? ( audio )
@@ -40,6 +40,11 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	tslib? ( x11-libs/tslib[${MULTILIB_USEDEP}] )
 	udev? ( virtual/udev[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		media-libs/mesa[${MULTILIB_USEDEP},wayland]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -107,6 +112,8 @@ multilib_src_configure() {
 		$(use_enable audio dummyaudio) \
 		$(use_enable X video-x11) \
 		--disable-x11-shared \
+		$(use_enable wayland video-wayland) \
+		--disable-wayland-shared \
 		$(use_enable X video-x11-xcursor) \
 		$(use_enable xinerama video-x11-xinerama) \
 		$(use_enable X video-x11-xinput) \