fix xv build against pre 1.13 servers, bug #499442.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 43 insertions, 4 deletions

diff --git a/x11-libs/glamor/ChangeLog b/x11-libs/glamor/ChangeLog
index 3f0e7559769c..9731c3d1eba2 100644
--- a/x11-libs/glamor/ChangeLog
+++ b/x11-libs/glamor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/glamor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.26 2014/01/26 17:12:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/ChangeLog,v 1.27 2014/02/11 12:08:24 chithanh Exp $
+
+  11 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/glamor-0.6.0-xv-add-missing-include.patch, glamor-0.6.0.ebuild:
+  fix xv build against pre 1.13 servers, bug #499442.
 
 *glamor-0.6.0 (26 Jan 2014)
 
diff --git a/x11-libs/glamor/Manifest b/x11-libs/glamor/Manifest
index 5354763b3cce..0dccaf28c2c7 100644
--- a/x11-libs/glamor/Manifest
+++ b/x11-libs/glamor/Manifest
@@ -1,3 +1,4 @@
+AUX glamor-0.6.0-xv-add-missing-include.patch 888 SHA256 0ec439343ee113093d14b5b755f3bb841e9891dad990943619d34629c07c5b0f SHA512 636f1315b43e85ea1df2b8faa394d803c967e409401c95858eb28e63a861f63613e880d7a85017aae3344da9c65a7ac542c1182ed174d30f645a6e17bc81f86f WHIRLPOOL cc24670e821b13ae9a5b9765fbb5d0b80a8986d9827667b3c4c83af60f412b2113eb7f89af1754a96eb661e69bd239127b9be216fa983227591303fd92993eab
 DIST glamor-0.5.tar.gz 134709 SHA256 92c5a8b1f7484a756e808979d7126a0e89e0848075da2be905ca2c8366eb9608 SHA512 834cf2e1ed67e6b9bad3f249e5d6ed500c31d6876969325ca5461cacd90e7efc39fbf35bf9e87ce60d251f9db93e86ec91b514cdef5d18e303618d785b1a1fa8 WHIRLPOOL 8b5abee26f95dfd50559bc7843f0861e9b7f21dd2bce9cd507ced931e360456217f95bcacd87a0b6e0c1b37ea185d4629f8a36bdb8c4a3736a211348632c2812
 DIST glamor-egl-0.5.1.tar.bz2 415902 SHA256 f42805b68e2bddc90cb5d9d3811e4f2176659c5686f295865839b20b7be7f359 SHA512 64d319e81a08b70f450c171152a218be3cad8ba8995806606a3f8a62e39e8e4c3efdf19576265cc5b3f48b98a8267305878cf58b18351780968101404133292b WHIRLPOOL 82947f2956d64a8908b4ae5679b0a4a9ac8e4bd99cf938f887a73111dc71e2bd75128d819268f53bf9c7d5112e48949d8e425725e5579abc830106873bf6ad1e
 DIST glamor-egl-0.6.0.tar.bz2 428912 SHA256 66531b56e6054eb53daa7bd57eb6358a7ead1b84f63419606e69d1092365e5c9 SHA512 aa3a88e85ae069e487c88a1839c21b0404c5a2a343a63f2c1d71ffb8d86288eb42dfcb30c8cce4c417b361417e9fae7c1cdabadc07ad40bb97c995c410dc0c1b WHIRLPOOL 54965c21eb65a73ecc7227de511b2d2e37760fefe90a9145385f4202d03286004af4a89edc5e251538e500e5d17efca0b82419d23112a4df441504747b1d8f24
@@ -5,6 +6,6 @@ EBUILD glamor-0.5-r1.ebuild 865 SHA256 9dff3751cc51b2e800303390d3bffaa5a18a297f9
 EBUILD glamor-0.5.1-r1.ebuild 1089 SHA256 a70340f288c844c905f0ccca4659a8550103b90bfa1c0838f440e8be05645035 SHA512 42abfcb12657faf7fdc16c7e4e6125f061ab07af801cbcda88ab4cc5e401a8e08f4caad9eb5bbe0ffbedc8bf423a26ec066067693f724d68834d87a5c6320dad WHIRLPOOL 0c73d0ca7a885235dc91cd5377230103dc66039c64ce65a5fbefdc69c20c737501298b95b1a12e651169bfd129c101dceb686c4e71f90f2b00f8208ff45890c3
 EBUILD glamor-0.5.1.ebuild 945 SHA256 7d0bef199c4935c0c09fe53418e877a63ffbd4d2b6567635495b4e2fbe7f6db6 SHA512 f4c9e9bbdbb2880cb483ddeb66faf35805e3378a45a0ace17ed6d59dbaecc60d0e1d30e04a00e9ba6f7bc6f70042e389d1e1f658e9d204cbd8fc21e256e4e864 WHIRLPOOL 7fe57cc2fcd0e8a334ed331582257823de9c57bf4193d7dbaa828f71de480ad54a0e2c0f75fbca4604c9d24ba1884058bc6f00483f74d9071ea3ca2de7bbd7e8
 EBUILD glamor-0.5.ebuild 823 SHA256 388aa3a7ebbc499aad662bd773f3f877e257edd1bcd6eed29036c695d9975dbe SHA512 509d91cdac4b3463f921e9bb60ffd15b9365610352735891625f04a118eb408df0fcecf06f4f63e9632a0954e583d3f98da98660789d5f0c0292619487cfa83f WHIRLPOOL 9baa0f4dc40c44ea9fcc6dd453db4665315fa26103c3313f89d2f98a312b3e4fb8ee177859e0530971c5df478b4528043e22150812c8b4b3001cdacada5edff4
-EBUILD glamor-0.6.0.ebuild 1108 SHA256 400367b424d1d7c837fdcbb9f6752cb7a25e15fbf693746c38baba3c16e4688d SHA512 19329d8e0c5574ac448b22aa022eaccabe7e304f3cb25ede259bdea62da62dfc576d073a2623b4ca3bea6a29ddc0ef10ec08e5d63381c5534709dcc6503d568d WHIRLPOOL f5f4faa9ef92d15da665e421287843ccbf46058af2d0c1784ffab66e46d6c664594da831c8404ce39c76613736a2d7b6b13e8893bb8ec3bf254181f199b3c4bd
-MISC ChangeLog 3691 SHA256 ae9d2f0dd9103a8bf55a3bdc24146a0a9632e6e37875beee81384e927a75e464 SHA512 36f7eb57f9f2a86faa6ae19cbc4cf854ec1268bcdc5cf91fe9395085301589802a3b02854436a1098e3e0b7ef151a20b91c12f3f80de4a46ce681aceb6537eb9 WHIRLPOOL 1c9a6d4be68663ff52edc79c4be0ffc085a93c3d2f670fce702e4726f5789fc274f2e3a0b6ee93eeea347bbf537a188fe38598efd5fb5744aab439054893d28e
+EBUILD glamor-0.6.0.ebuild 1170 SHA256 e81224fc584f75130a92aab4dfd76ceb07fd755f6ab264a74f18420c18240db6 SHA512 5870745b7fe48870eff60ed8b6d7075711e605b9726def2b3578fef976ba9a97f2a1b749bea27fd7db9ae2b482aa438d5e7ff644e3a929023c31fc2520255975 WHIRLPOOL cfa369e594f3273de0f69ab88ad5a95b6fd6d3584de4091f06264efd8ac611b1f8f64c764dabf2511468d07ac203a7cca2f6b19ff8a7ae79e76d9f7b70e1400b
+MISC ChangeLog 3888 SHA256 0e04ba46b9247992d6b9c32ef56d5ea8815a22a586175047dff2c13a89926a4e SHA512 50716cc39b21fbdd0d81ebdac2ecba4e02c569675f653920a19354aa782eaf8b0c07ce780df2b89a5ed6e59340e374b7573ecc2168fcd6365581199cf04e450d WHIRLPOOL 95cf66d418de602ccb132db1fe2cb29403bfcd791364096f28b15654316b8cae893b28fe3ee3057ad2f78a30f04b021b53414f7e462ff787c8984762b7e4254e
 MISC metadata.xml 223 SHA256 205a40dbb7a17f67f6d4efcda4c5649d9f56f9b27f2e00d370a24f61103bff26 SHA512 5a5214399812d56f3393dc5baa5066e0127c99aeed8cbd3315d1fb3e7119232a5cd94272e46c7ede9a1b25c7f99909754a09962514b9748f3537cd1f7d627033 WHIRLPOOL fe893e5445e4ac431992a98c126ea52ed7495b334e217b992d86a3aa200ba587d1a5ca3ff9e83a68f1216ce47e3093125ca0d4bb572b0654bf0e7a587b1cc57c
diff --git a/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch b/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch
new file mode 100644
index 000000000000..ebd5433bdbe9
--- /dev/null
+++ b/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch
@@ -0,0 +1,30 @@
+From 55257ac3ee92143d0d8339faa0272f95a792febb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?=
+ <chithanh@gentoo.org>
+Date: Tue, 11 Feb 2014 12:08:07 +0100
+Subject: [PATCH] glamor_xv: add missing include
+
+glamor_xv.c uses DamageDamageRegion but does not include xorg/damage.h. This
+causes the build to fail if 9b8217f9ef6279fff6628631d18497bed0343ef9 is not
+present in the X server.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=499442
+---
+ src/glamor_xv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/glamor_xv.c b/src/glamor_xv.c
+index a89b4cd..b40b6e8 100644
+--- a/src/glamor_xv.c
++++ b/src/glamor_xv.c
+@@ -37,6 +37,7 @@
+ #ifdef GLAMOR_XV
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
++#include <xorg/damage.h>
+ #include "fourcc.h"
+ /* Reference color space transform data */
+ typedef struct tagREF_TRANSFORM
+-- 
+1.8.3.2
+
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild b/x11-libs/glamor/glamor-0.6.0.ebuild
index 388dcbea3c8a..2f1e0550b19b 100644
--- a/x11-libs/glamor/glamor-0.6.0.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0.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/x11-libs/glamor/glamor-0.6.0.ebuild,v 1.1 2014/01/26 17:12:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.6.0.ebuild,v 1.2 2014/02/11 12:08:24 chithanh Exp $
 
 EAPI=5
 
@@ -26,6 +26,10 @@ RDEPEND=">=x11-base/xorg-server-1.10
 	>=x11-libs/pixman-0.21.8"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-xv-add-missing-include.patch
+)
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable gles glamor-gles2)