fix build with USE=-wayland but wayland is installed, bug #553468

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 36 insertions, 8 deletions

diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index c4fc860e6e7c..7dff5db2b5a7 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libva-intel-driver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.43 2015/07/14 08:46:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.44 2015/07/14 09:21:17 aballier Exp $
+
+  14 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  libva-intel-driver-1.6.0.ebuild,
+  +files/libva-intel-driver-1.6.0-wayland-automagic.patch:
+  fix build with USE=-wayland but wayland is installed, bug #553468
 
   14 Jul 2015; Alexis Ballier <aballier@gentoo.org>
   libva-intel-driver-1.6.0.ebuild, libva-intel-driver-9999.ebuild:
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 3031a4404032..4d41e8f98c51 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX libva-intel-driver-1.5.1-wayland-automagic.patch 812 SHA256 0adee95b3153deea44f0209091d6e3149c0e873b8b7cc1fe5e88c2e45a59ea6c SHA512 7646eb21b6b3afbc47a4d81da8661e4bc6ffa005e9326e679b7c4c02f66328eaa176409e1e2c18213778448592222ace0496e41cf979cc5d62d60f01ea5a7005 WHIRLPOOL be25380c0d988e3e6b24cc7139761739da655827c3aa6f8d1cb338a5111256c7191741164017e7e4ac0f131aa37d5c1623e2a0cb6f813d3743bf32b2f86939ae
+AUX libva-intel-driver-1.6.0-wayland-automagic.patch 838 SHA256 22a575716fa7ffe033b3583849fe7a8b91dd2b35cc0c4b5fa4000dc7034f44c7 SHA512 8bcb65c22cbc44a9990c7c5215ed708c946d9bab1edb54d405369166780bda147b188f40d441ddd2f9e9a46a4a2eb211431914491f892998bd75d6df537cdae9 WHIRLPOOL f8f066c26cd013678523b9f32bb7ba15a6ec104669a859d945a7c0f2899ac849e81047432810dfaaf4dd9654c83dde25994410c3dbc8a440ba5bb20b80e096a0
 AUX nox.patch 972 SHA256 4f3c920e51913aef332430eae9795ffe489d7240b920b1728187b3e31bbdc548 SHA512 99d0c6ed169fdf4edd7ee2885a269fc4eb2a06e2ecf8c25605f31ebd0a0d63b60fc0e86d890e20f497483a5f1a2c2ec3b14ffe8bb64403cdd5fac3c5ebea3784 WHIRLPOOL 615578cbb9b0a381d278555269ff45890782398ee804c12ba9d9a052bcc8f3ed27f7e56bd6a9fc6f8753083104138ea5aa800fc65848ecab3be066011b26db33
 DIST libva-intel-driver-1.3.0.tar.bz2 965030 SHA256 734c15e78495f53fecb9862a22579d05ca5994fac4d04e3cc804ca9cbaa7fb6c SHA512 09566199409f76b8a533857c6bef26c35cd21b1555d29b395e72649fa0337b86b4a65eb5adf4144649ae26d5d8c93f1462d19011c95de9256728cadf56975e5d WHIRLPOOL 727b1bd14a55baa60092a5f2f9bc0bfb2ca39328103f812ccb3be8391246c0b0c4e99b596527e7189e2700d91d15aceed1e5284808644d46e26b2d470d67194f
 DIST libva-intel-driver-1.4.1.tar.bz2 980214 SHA256 fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec SHA512 1b0d868c50ae18dde025618618b984ffc71d3e7827edda125479a42cd4c197c8059f764c7ffe601d83c2838038a6dd18e6a80caf13176897ac271bec75644550 WHIRLPOOL 7b36831efc3619a315c5711210af06a8637411b59fd9941256248e783305b482df402c2bdc84d15175c01adc18abf8995b123e8952e6b525e69104833676f34e
@@ -12,14 +13,14 @@ EBUILD libva-intel-driver-1.3.0.ebuild 1446 SHA256 60925b501e471faa36a19cfd2709c
 EBUILD libva-intel-driver-1.4.1.ebuild 1562 SHA256 7320000fdd0bb4f0c7f4cb31805ee9c0f56ccc9c0fb750bdbd8b1d7849566bb0 SHA512 78f10e7acf99d5d66d35075c09d03a24b188d993f65b99edddf008420954636bee3a52033e7d77a0745a84a7932b4a67481c1c1c7e0d916c54e57655e8c6a670 WHIRLPOOL 578e78e5ecd7778186f5347361b16799970579892ea2715fcc807b24d4b9555d7e6b85e30a6a298007dc4515b1a13d2102c6a9463ff1c0e222f5c80723dc9bea
 EBUILD libva-intel-driver-1.5.0.ebuild 1598 SHA256 47eb12df8e410f63646ab8359f4a2f0a16bd4780b11a54405a910f23dcf66eef SHA512 5f18d7753557247a7882756550e4fbc867095482a564b53e47106f897d1ac8f4e0734e31dd7b6c018b88d763679bd8c3230a6cbca1d72193a0a1452574ec9f39 WHIRLPOOL 9950ac265b7b91ca915623891d57a57320d126b0417a5dc6865e23981820ec0a176ed6ba2e09d6dee635ae9b452f1a876023daa1886ac236a4e4470b362ab7c5
 EBUILD libva-intel-driver-1.5.1.ebuild 1714 SHA256 fb5657361ba6d17a8e90dd0db98473a75d190b977e8e6a17a059a2b7dbbe5df8 SHA512 69ce1b2cb1e59845ac10426ca93bd9e5f34ccfc5da8714e513e4946e129d7fe62ab0699e9a3ea6acba5cfa49c9ffa93ed20cac8c2a8cabf44dda90a2eb4b1962 WHIRLPOOL b1db5f6af9a8312c4caecd63d4267ff3da7a978c5785d104d0c41418769ea25000e45052280cf315351f92e54201f1c692f20ded2a4215655a390296ea3a4170
-EBUILD libva-intel-driver-1.6.0.ebuild 1717 SHA256 d1d640ce0aa62bc8b17847a6bd3460faf1d6e155ae8690e977fe2e40b80018c1 SHA512 8a69deccc597e0758a4f0ef0c4d5a4f263d83824b8e1f96550d916e3f0ee4f5235737b28b8b003d3eb43b95bd0afc1ec92d22c91534b4b00aa896b539b7130b3 WHIRLPOOL ea5f4bcb2c3e7f6a8113cb51643a73b220863b0338d43e104a54f899cc3fbf8fb0fbeabb7f35cfae268cb08afeb448d1587cc33a31018ea49b60c23d2ded140a
+EBUILD libva-intel-driver-1.6.0.ebuild 1717 SHA256 49b2767856bec3a8ea80fe16a22a5901d81890de5862a8c4f6de4c5675aefca0 SHA512 efcb16fce92a1c25b2ac6d5c1e6bcab7ba15fba608aca299ba1da8e68a7d68dfbcc1c2f120857ff683100921ef911dae940e596f9bf9637ea57eaed2d332b900 WHIRLPOOL e518fd0b89be6387d0939d7e0f70e40011130aa6d96883c6535918a5c2981bc6549aa4de0e18c00b767334b0083f5c45962caf8cf51d6ecddfbe1d031733b138
 EBUILD libva-intel-driver-9999.ebuild 1562 SHA256 66e86d48906e4779661a69b487c9847b9447143ca1230a858afb9bf70f95e598 SHA512 108d113d28435654bff3faece5ac638719aaef7557437c699fc5722d16c04ce49f928691b23ca814039d93315f7b68179652f548eae96ae7c05bf6005228c4c3 WHIRLPOOL 27d3067f751d1b85e98d4e3ace2d5734432eb51b52458b29b01dd7ee3d41141650acd48ee0e7ee20cd92470a9ff6ab8342632845c031f992a8bc14d464965bd2
-MISC ChangeLog 7545 SHA256 b1b78f83835a633e55db3300bbe17834c7dfe15a902ca5d5d6eb6de09e3d4347 SHA512 4e33217e860040f4bc854f35d18ffe4d80532b8dad382d16a15af793294d407240fd53c326b92eab777933ff00d5e2aaba173ea75f57e79b1c631fb3a33424e9 WHIRLPOOL 951f9f2575071f2ca4bce8d8223e7621966d1334ce36fc4d47bf251730ee70fc66f911c137622b1ba0caf556ad4cb8a491103d5861fd19caea7548923fcb13b4
+MISC ChangeLog 7760 SHA256 029cfa706af30ec909fc9d2d43d775494e744f168f716544babf4c34a74516da SHA512 1167add4ecdfc57f1260614effb1499e91efe90b24465f5fa6192ee1e5f58706fb6de228c425c5792960000762a5707dee180d45a2d2304eebef175af846bea6 WHIRLPOOL 8bab91a3f9e0e643731dc33f2f4eaa3be1d08b2a2c3e05700d946908ecd5a64f83cf7eab86285800f163bfec6cc345b3589affea0fd4df9e6fac13f9b75d9424
 MISC metadata.xml 440 SHA256 ababbea513452ff834ddeb767611edd4ccee13c993042948c0e831e1c69c6181 SHA512 b1305b545b6fef13c319fcfd6c8f34f65e372e941975b54048499482d5f034ad780d9e744dff5e27ce4a3565d25c2ce924c0a1dd02e552dc27de97c22cf765ab WHIRLPOOL e7079730071ecd6491e45bd5d7d23e0763e3cd4a971819b8045af592459882a3b0c7c4cc16c37cd1774ae6102e0a153e38d2219a70d95eba716b0ef2071b2ef8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWkzHMACgkQvFcC4BYPU0qWsgCgw9b+9v454TpfblA2SXkIzuwm
-AYIAniejZfn5rTsQMyzj+SsWPk9uLdDz
-=olFa
+iEYEAREIAAYFAlWk1I4ACgkQvFcC4BYPU0rQygCgjaDX91kkZpjO3iSgf2UIhM8r
+3oEAoIQX/N7TUUPnVmUOWzSzdrcDXeu3
+=rE5g
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
new file mode 100644
index 000000000000..f729732117d1
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
@@ -0,0 +1,22 @@
+Index: libva-intel-driver-1.6.0/configure.ac
+===================================================================
+--- libva-intel-driver-1.6.0.orig/configure.ac
++++ libva-intel-driver-1.6.0/configure.ac
+@@ -165,12 +165,14 @@ if test "$enable_wayland" = "yes"; then
+     PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
+         [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
+         [USE_WAYLAND="no"])
+-fi
+-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+-
+ m4_ifdef([WAYLAND_SCANNER_RULES],
+     [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+     [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++else
++    wayland_scanner_rules=""
++    AC_SUBST(wayland_scanner_rules)
++fi
++AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+ 
+ AC_OUTPUT([
+     Makefile
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
index 059926423e5b..9eaa3bb6fbb4 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild,v 1.2 2015/07/14 08:46:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild,v 1.3 2015/07/14 09:21:17 aballier Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Fix automagic depend, bug #529388
 	# https://bugs.freedesktop.org/show_bug.cgi?id=79478
-	"${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+	"${FILESDIR}"/${PN}-1.6.0-wayland-automagic.patch
 )
 
 DOCS=( AUTHORS NEWS README )