backport fix from upstream to build with USE=-X, bug #538706

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 40 insertions, 7 deletions

diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index 6dfa24d0bdba..f3378d6245f0 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2015/01/05 13:20:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.38 2015/02/05 10:40:04 aballier Exp $
+
+  05 Feb 2015; Alexis Ballier <aballier@gentoo.org>
+  libva-intel-driver-1.5.0.ebuild, +files/nox.patch:
+  backport fix from upstream to build with USE=-X, bug #538706
 
 *libva-intel-driver-1.5.0 (05 Jan 2015)
 
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 74f73f8b8cbe..0a739910bc1c 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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.3.2.tar.bz2 957834 SHA256 11d956ce11cb85bb009c8eb1ebb768403da2cb82675a6d66649f9c49ef4908d1 SHA512 94b09a64cbc2186b2c2cb863fbc8b390314e2b91bdf05b756d5d83a707db3847cca72072bb79bb09e69e335a711343f809552bc02b229679f8f5bb2b85602e1c WHIRLPOOL 8423b7b4de79032a0a5fcaa23ef7edbc303169ad85151a86859dd322c71f3af0a9d08c4d2e6385fcd874b0c1f4f6b3210b92a3b7d0460024069868f70aca5037
 DIST libva-intel-driver-1.4.0.tar.bz2 969607 SHA256 f487cee5ddbfb5f11d83a825f4ee72092c9e36018f282e6b2d76baa2ba1abfa2 SHA512 2ab3be0a4ff9d721a94c1096333d1c92483a8ccbbae42bedd3f83a6bf0f8bb836d44090d77187d3c963e4718a9a1b31620689f1eeb7268666150272f9283093b WHIRLPOOL 6114bf9bda40e2d21cfc2c178ff10a4ddff933b1982ab180fb7e535224558219fc8a036b2d0a4aa037351bdc265aca85ae23ddf81a65232b38c4e7cdfc9b681c
@@ -10,14 +11,14 @@ EBUILD libva-intel-driver-1.3.0.ebuild 1446 SHA256 60925b501e471faa36a19cfd2709c
 EBUILD libva-intel-driver-1.3.2.ebuild 1451 SHA256 e0ab50c57d69bd33325713ebb6d560dde3904ee52a41be2d8d08d0c12f23cbc4 SHA512 4d746b35d10e73d9582af8e606026491ad55f0be8219fa37bce11be94444f1e397ede4c2d7a550f15dff34b07d69bc99da59391e4d7ea5f9c19904d5c4cdab8d WHIRLPOOL ae59427d82f1fcbb9b9b553b47f5d639389f5353e7496abb4911a369e8a6a50a91ee409547238cd83975f139f2cd8ded99490eed17d24e52f2ce3b94a511ead3
 EBUILD libva-intel-driver-1.4.0.ebuild 1449 SHA256 4018b02730eedbb9bcad98cb2149b4d699a6d120aecb3fac8bd87361486cf47a SHA512 ba69701336fa546f939b1dbbf1016bf393c3d072d6391a8c233c5a9b728136580cfbdd06fdda8aac70c83c2b084dd055a79e22d0f5f6ac6c9210008a6fdc9726 WHIRLPOOL 7702f598e557283d8f742f360166376d9d3366d314ddda5bb2337596acd3b5d19d522e6163a917982e3d08e38c3f0df58bdb168aa839d928fea1da73fe0e58dd
 EBUILD libva-intel-driver-1.4.1.ebuild 1562 SHA256 7320000fdd0bb4f0c7f4cb31805ee9c0f56ccc9c0fb750bdbd8b1d7849566bb0 SHA512 78f10e7acf99d5d66d35075c09d03a24b188d993f65b99edddf008420954636bee3a52033e7d77a0745a84a7932b4a67481c1c1c7e0d916c54e57655e8c6a670 WHIRLPOOL 578e78e5ecd7778186f5347361b16799970579892ea2715fcc807b24d4b9555d7e6b85e30a6a298007dc4515b1a13d2102c6a9463ff1c0e222f5c80723dc9bea
-EBUILD libva-intel-driver-1.5.0.ebuild 1562 SHA256 8a8d5160123bbf218751baa005c3181732479247ad8f8972670807452e0b5014 SHA512 8d275f9513c30c7df559ed3064a1587aef51d4b779ecd54ade6d98f5af422174965719ca331cb0a2f2a810ff82455238b60caa79fe352f51e2a994147a21093d WHIRLPOOL ee0b06b1cbd215f6fd9eac136910b0d47c50003a70fd450bf8cfef1f41ffef9756a1c8ddae8efecce04d616ab7f3e327f1f5db54a03bb068622f82113e080915
+EBUILD libva-intel-driver-1.5.0.ebuild 1598 SHA256 47eb12df8e410f63646ab8359f4a2f0a16bd4780b11a54405a910f23dcf66eef SHA512 5f18d7753557247a7882756550e4fbc867095482a564b53e47106f897d1ac8f4e0734e31dd7b6c018b88d763679bd8c3230a6cbca1d72193a0a1452574ec9f39 WHIRLPOOL 9950ac265b7b91ca915623891d57a57320d126b0417a5dc6865e23981820ec0a176ed6ba2e09d6dee635ae9b452f1a876023daa1886ac236a4e4470b362ab7c5
 EBUILD libva-intel-driver-9999.ebuild 1562 SHA256 32294c2564401cc661991d95b9f4e0b64bf0318f22e032b508a6ed0bebc362ee SHA512 da61050bd90e13bc60d481ddde2f1ed239153574ae631c89fd718dc899fdc690d633a48b037cf38b4bdfb7a08c4ce16c441d3015bd4a2727e8b904eefbf8c336 WHIRLPOOL 27546189bebd8a95086d02d2317c2d42020c0b379974ee2432ce24f5fb99374e0588d76702873e7b2c966a23308dfa0acf3a22dcd7139e0533d704960a0a0202
-MISC ChangeLog 6591 SHA256 0b22b26443ab3e419641e70a89f9a56ef997df8b4ee765ab0bc57ef888c23133 SHA512 cd388cc690a33046f2733daef77ab346d8019c7bee40c4e22dab3469c70effc4d386f81e3c82d49371ce6d1943000759ceede18a3dd07eea1b4a432e26df18f7 WHIRLPOOL bf0c44413dd692863f3ddb274020f5a825953d2e4baae7cff77f96f0f5076a65e9f1f352fa4ebcf7c0befeac70baea73853b0ca4075b688f6a8b1fe6f2a527e1
+MISC ChangeLog 6760 SHA256 05fa531bd089b54c5e6eff7ec6834e89bc9a69c888388e0d206ffdc3c0783d5c SHA512 c96a1a30f3c964ca60544e827508c8b5fbe6ebe8e8d2554e6b6fb037467129f0a8d777ffab3f790fdcc1d4af0862663003e309735eb215ae86ba2ad3fafccea9 WHIRLPOOL 91055413075bacbbfe01870abd51f5e8127c94b24719befa813a80b850116243d8d1676143953f9133ed08914de461ff9b13f1092ef70376ae62e99e45c094c9
 MISC metadata.xml 440 SHA256 ababbea513452ff834ddeb767611edd4ccee13c993042948c0e831e1c69c6181 SHA512 b1305b545b6fef13c319fcfd6c8f34f65e372e941975b54048499482d5f034ad780d9e744dff5e27ce4a3565d25c2ce924c0a1dd02e552dc27de97c22cf765ab WHIRLPOOL e7079730071ecd6491e45bd5d7d23e0763e3cd4a971819b8045af592459882a3b0c7c4cc16c37cd1774ae6102e0a153e38d2219a70d95eba716b0ef2071b2ef8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSqj6UACgkQvFcC4BYPU0r01wCfXqYa+XCEh4rn/8RAW4/pcjXP
-56wAoMUggyxe5XzpDB1ivNqhx0Aq84Tw
-=XvrZ
+iEYEAREIAAYFAlTTSIUACgkQvFcC4BYPU0rARQCePHX2ZsWzvKX/dnjHpa7VblQm
+azYAnRGN1RyOTeQ4BgfnLiERMhSO21Vi
+=7Gwi
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/files/nox.patch b/x11-libs/libva-intel-driver/files/nox.patch
new file mode 100644
index 000000000000..ac41f4fa08e9
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/nox.patch
@@ -0,0 +1,27 @@
+commit bf324e3440246a487997a1624ac862e3e4027f9e
+Author: Michael Olbrich <m.olbrich@pengutronix.de>
+Date:   Mon Aug 4 19:05:18 2014 +0200
+
+    add missing include
+    
+    Without this building without HAVE_VA_X11 fails with:
+    [...]
+    In file included from i965_drv_video.c:37:0:
+    i965_output_wayland.h:31:26: error: unknown type name 'VADriverContextP'
+    i965_output_wayland.h:34:31: error: unknown type name 'VADriverContextP'
+    i965_drv_video.c:5243:9: error: 'i965_output_wayland_init' undeclared here (not in a function)
+    i965_drv_video.c:5244:9: error: 'i965_output_wayland_terminate' undeclared here (not in a function)
+    [....]
+
+diff --git a/src/i965_output_wayland.h b/src/i965_output_wayland.h
+index 61ca39f..acea8d9 100644
+--- a/src/i965_output_wayland.h
++++ b/src/i965_output_wayland.h
+@@ -26,6 +26,7 @@
+ #define I965_OUTPUT_WAYLAND_H
+ 
+ #include <stdbool.h>
++#include <va/va_backend.h>
+ 
+ bool
+ i965_output_wayland_init(VADriverContextP ctx);
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
index 516d1b937ab9..3b0f67050a0a 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.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.5.0.ebuild,v 1.1 2015/01/05 13:20:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild,v 1.2 2015/02/05 10:40:04 aballier Exp $
 
 EAPI=5
 
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/nox.patch" )
 
 src_prepare() {
 	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die