x11-drivers/xf86-video-i810: Add patch to fix build with USE=-dri (see bug #103192)

Package-Manager: portage-2.1.4

5 files changed, 67 insertions, 27 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 55806b71067c..00fafd699bb0 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.69 2008/01/10 14:28:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.70 2008/01/13 08:55:48 remi Exp $
+
+  13 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.1.1-fix_build_without_dri.patch,
+  xf86-video-i810-2.1.1.ebuild, xf86-video-i810-2.2.0-r1.ebuild:
+  Add patch to fix build with USE=-dri (see bug #103192)
 
   10 Jan 2008; Daniel Gryniewicz <dang@gentoo.org>
   xf86-video-i810-2.1.1.ebuild:
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 583ad6412f06..2d951876c7d3 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 MD5 2208ca768eace896ac5d3a762c3045c8 files/1.6.5-fix_no_dri.patch 1236
 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 files/1.6.5-fix_no_dri.patch 1236
@@ -17,6 +14,10 @@ AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f
 MD5 a7f1da50867a369008e22efbbcc8b7db files/i810.xinf 1442
 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 files/i810.xinf 1442
 SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347 files/i810.xinf 1442
+AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
+MD5 7ce3f30e7fc40d4e9771e73934db991a files/xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207
+RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 files/xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207
+SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61 files/xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207
 AUX xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018 RMD160 1b989baf999dc8c8697fa1624d079dbb1e704a04 SHA1 a8a15459796be87640861a2028864e1012f3a9af SHA256 ab7253f729c82b049439e3110df11910c31c0d0ef37e4145b573d0511ada9db8
 MD5 7ec2441ae917312d224790f766bc2944 files/xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018
 RMD160 1b989baf999dc8c8697fa1624d079dbb1e704a04 files/xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018
@@ -46,26 +47,26 @@ EBUILD xf86-video-i810-2.1.0.ebuild 1133 RMD160 d4f400d4e75e89cc6cd9a21ae233c05c
 MD5 56f29e0a7a8ac13dd501cbfac89ade3a xf86-video-i810-2.1.0.ebuild 1133
 RMD160 d4f400d4e75e89cc6cd9a21ae233c05ca048bf45 xf86-video-i810-2.1.0.ebuild 1133
 SHA256 c360cf823ae87df495932200027d763a3a9f012bd664dd3f9b5b51ebb701b349 xf86-video-i810-2.1.0.ebuild 1133
-EBUILD xf86-video-i810-2.1.1.ebuild 1133 RMD160 21f77825a4c98bdf13f4863213ddda201f028dcb SHA1 d230aecb4cf3a25df510bcca400de2f560814166 SHA256 fd1c0592b68503b82137ad345b14d34a532e131dea3f2dcb2c71d619a3e32bf7
-MD5 3e4cc0cdcb19a58aff41035e2b623275 xf86-video-i810-2.1.1.ebuild 1133
-RMD160 21f77825a4c98bdf13f4863213ddda201f028dcb xf86-video-i810-2.1.1.ebuild 1133
-SHA256 fd1c0592b68503b82137ad345b14d34a532e131dea3f2dcb2c71d619a3e32bf7 xf86-video-i810-2.1.1.ebuild 1133
+EBUILD xf86-video-i810-2.1.1.ebuild 1245 RMD160 48d71180ecaae2860bf1e28a4ed57bc1580abf23 SHA1 6030b801865a2fdbefbaeaea425ebc24f4f9448e SHA256 950cbce3795370c185031c0b03c5dc6063e690968ff497a4672fc251cda29c26
+MD5 3d9395bb2cc1779f487569a9be3620c1 xf86-video-i810-2.1.1.ebuild 1245
+RMD160 48d71180ecaae2860bf1e28a4ed57bc1580abf23 xf86-video-i810-2.1.1.ebuild 1245
+SHA256 950cbce3795370c185031c0b03c5dc6063e690968ff497a4672fc251cda29c26 xf86-video-i810-2.1.1.ebuild 1245
 EBUILD xf86-video-i810-2.1.99.ebuild 1105 RMD160 2af2edf9f962a3979d5cc1476f20f95b49adfcd0 SHA1 45d27a871d7addaa815443669e4dabf7061fedac SHA256 850eb92e2365fbd7e552b50208bee830ba7a849423337c3240b8d42bd782a319
 MD5 8a147350d8fefab5f6c366a177de15b5 xf86-video-i810-2.1.99.ebuild 1105
 RMD160 2af2edf9f962a3979d5cc1476f20f95b49adfcd0 xf86-video-i810-2.1.99.ebuild 1105
 SHA256 850eb92e2365fbd7e552b50208bee830ba7a849423337c3240b8d42bd782a319 xf86-video-i810-2.1.99.ebuild 1105
-EBUILD xf86-video-i810-2.2.0-r1.ebuild 1244 RMD160 69ab15b2e87269fbd80138a8182d0fbe84e749e6 SHA1 167ed90654833d1f64b2b6bed9679c96862cfcb8 SHA256 4708403cc231a121bc2723ddac8c2877dc6455695f9bd534fe31449d654fb2e6
-MD5 ae5e81b4bef8dabddd9d745f9e4293ff xf86-video-i810-2.2.0-r1.ebuild 1244
-RMD160 69ab15b2e87269fbd80138a8182d0fbe84e749e6 xf86-video-i810-2.2.0-r1.ebuild 1244
-SHA256 4708403cc231a121bc2723ddac8c2877dc6455695f9bd534fe31449d654fb2e6 xf86-video-i810-2.2.0-r1.ebuild 1244
+EBUILD xf86-video-i810-2.2.0-r1.ebuild 1306 RMD160 905f07b8b43f35d82711f234e4d74a656347417b SHA1 4c89e1f39b468ae074ad01c947292161066c718c SHA256 59b7878dac100aedd66150aef6eed4705ecfd199a74574873cb51742a3633277
+MD5 ac0d60df5d152d05dbc7c02b8369a000 xf86-video-i810-2.2.0-r1.ebuild 1306
+RMD160 905f07b8b43f35d82711f234e4d74a656347417b xf86-video-i810-2.2.0-r1.ebuild 1306
+SHA256 59b7878dac100aedd66150aef6eed4705ecfd199a74574873cb51742a3633277 xf86-video-i810-2.2.0-r1.ebuild 1306
 EBUILD xf86-video-i810-2.2.0.ebuild 1140 RMD160 30532b690fe1624268cd922d0a7b2e9c928e9799 SHA1 f24dd540b0cde5eaf9aa839b4cb4f4d9a0986cc1 SHA256 0e89526773697fa97f3b759a08b01864e766202b4b75d8d86088ac50cbc0fd54
 MD5 797cd40140b40235fd46fdc75d592494 xf86-video-i810-2.2.0.ebuild 1140
 RMD160 30532b690fe1624268cd922d0a7b2e9c928e9799 xf86-video-i810-2.2.0.ebuild 1140
 SHA256 0e89526773697fa97f3b759a08b01864e766202b4b75d8d86088ac50cbc0fd54 xf86-video-i810-2.2.0.ebuild 1140
-MISC ChangeLog 12676 RMD160 122358326c3e64f65fd134d94536279aca194bc1 SHA1 86c2bf3cbe5447df3d1e75a09db09f34a1d48e46 SHA256 775b48bedeb65297b3a5df6224c153162c55e5882cc96bce60766debef1f1092
-MD5 004f0866157c0c52be71a273d7d40a6e ChangeLog 12676
-RMD160 122358326c3e64f65fd134d94536279aca194bc1 ChangeLog 12676
-SHA256 775b48bedeb65297b3a5df6224c153162c55e5882cc96bce60766debef1f1092 ChangeLog 12676
+MISC ChangeLog 12906 RMD160 49088b6312f00a9fed5cf3bef9c4a3212234bdaa SHA1 1aac4eb0672e1bc72f96e4a2b3a771f904739ad0 SHA256 57e42e0584d7d3731e13c6fb8afcc7e3d1751ba538d06b08f219db88c33f25de
+MD5 4787a8da595a843fd91c733103a832a1 ChangeLog 12906
+RMD160 49088b6312f00a9fed5cf3bef9c4a3212234bdaa ChangeLog 12906
+SHA256 57e42e0584d7d3731e13c6fb8afcc7e3d1751ba538d06b08f219db88c33f25de ChangeLog 12906
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
 MD5 9739cf35f0671c04c5d300e32b32e746 metadata.xml 248
 RMD160 1bc22252fb59ed171fe013e765baa171151843cf metadata.xml 248
@@ -94,10 +95,3 @@ SHA256 5820877be3c0a8795f247d9a1ebb748de550e418e13157da607844c020bffc61 files/di
 MD5 d355560c22c54c77fb5bd39acad9e4a5 files/digest-xf86-video-i810-2.2.0-r1 271
 RMD160 44a597a41d10c5f1164f61023023a480fb69445c files/digest-xf86-video-i810-2.2.0-r1 271
 SHA256 5820877be3c0a8795f247d9a1ebb748de550e418e13157da607844c020bffc61 files/digest-xf86-video-i810-2.2.0-r1 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iD8DBQFHhiu8omPajV0RnrERAmhpAJ9zwIGFhgPhQb/UtLnUi3CUtiDZfwCfawlu
-wkJtaDch1Jz3Sgzs+z0WgFo=
-=zMFH
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.1.1-fix_build_without_dri.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.1.1-fix_build_without_dri.patch
new file mode 100644
index 000000000000..bc06c9755b04
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.1.1-fix_build_without_dri.patch
@@ -0,0 +1,35 @@
+From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Thu, 3 Jan 2008 19:16:15 +0000 (-0800)
+Subject: Fix compilation error when not using DRI
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=f2ffc0f6e038357dda268363e52c11ada1d0b810
+
+Fix compilation error when not using DRI
+
+This patch complements 88f8b688e2316ae4a1f7485f0010ce90de54783a which
+added uint64_t typed variables to avoid unsigned long overflows in
+32-bit architectures but didn't include <stdint.h> with the required
+definition.
+
+When XF86DRI and _XF86DRI_SERVER_ are defined this header gets
+indirectly included through "i830_dri.h", thanks to "i830_common.h"
+which masquerades this problem as released in 2.1.0 and that manifests
+with :
+
+In file included from i810_driver.c:88:
+i830.h:137: error: expected specifier-qualifier-list before 'uint64_t'
+i830.h:240: error: expected specifier-qualifier-list before 'uint64_t'
+
+Patch from Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
+---
+
+--- a/src/i830.h
++++ b/src/i830.h
+@@ -40,6 +40,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #define I830DEBUG
+ #endif
+ 
++#include <stdint.h>
++
+ #ifndef REMAP_RESERVED
+ #define REMAP_RESERVED 0
+ #endif
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild
index 00ecd6cd6152..eda3d6c165fd 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild,v 1.3 2008/01/10 14:28:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.1.1.ebuild,v 1.4 2008/01/13 08:55:48 remi Exp $
 
 # Must be before x-modular eclass is inherited
 # Enable snapshot to get the man page in the right place
@@ -8,7 +8,7 @@
 #SNAPSHOT="yes"
 XDPVER=-1
 
-inherit x-modular
+inherit x-modular eutils
 
 # This really needs a pkgmove...
 SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
@@ -34,6 +34,11 @@ DEPEND="${RDEPEND}
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
+src_unpack() {
+	x-modular_unpack_source
+	epatch "${FILESDIR}/${PN}-2.1.1-fix_build_without_dri.patch"
+}
+
 pkg_setup() {
 	if use dri && ! built_with_use x11-base/xorg-server dri; then
 		die "Build x11-base/xorg-server with USE=dri."
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild
index fe5cc78d4bbd..a3acc4eccf38 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild,v 1.1 2007/12/27 16:36:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.0-r1.ebuild,v 1.2 2008/01/13 08:55:48 remi Exp $
 
 # Must be before x-modular eclass is inherited
 # Enable snapshot to get the man page in the right place
@@ -37,6 +37,7 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 src_unpack() {
 	x-modular_unpack_source
 	epatch "${FILESDIR}/${PN}-2.2.0-fix_xv_segfault.patch"
+	epatch "${FILESDIR}/${PN}-2.1.1-fix_build_without_dri.patch"
 }
 
 pkg_setup() {