x11-drivers/xf86-video-intel: add build patch (see bug #245095)

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 75 insertions, 12 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index abbde35ca809..c7b85d204906 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.8 2008/11/26 23:26:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.9 2008/12/17 10:09:42 remi Exp $
+
+*xf86-video-intel-2.5.1-r1 (17 Dec 2008)
+
+  17 Dec 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch,
+  +xf86-video-intel-2.5.1-r1.ebuild:
+  add build patch (see bug #245095)
 
   26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xf86-video-intel-1.6.5.ebuild, xf86-video-intel-1.7.4.ebuild,
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index f30d8ac90509..25b32eb54b16 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/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
 AUX 2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
 AUX 2.2.1-0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e
@@ -14,6 +11,7 @@ AUX 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch 1408 RMD160
 AUX 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch 1211 RMD160 d25c957761de6602df9d2ee712b52fc22bbe0b4a SHA1 ae5ecc1c0733e2a095283f352fa765b82ae9d89e SHA256 304206372466cf5b65603472a86de15a44abd4843f0fadd78d21996ea68e27c5
 AUX 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch 2123 RMD160 bfbdfbf0f2357aaba78a7d701d6474b9cfeedec4 SHA1 0935a784a3068bc75c3e76e90c0773dfda0608c3 SHA256 34b1119de22b38c089618be533552bd029f1da83a76a73e54c3f4f743ec31a2b
 AUX 2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c
+AUX 2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch 820 RMD160 6df19b267a211a1c013de7c1a302b73daeee74d7 SHA1 5345c0a409c2ca98ec2f315da152e175b49c6eb1 SHA256 5892c7acf43ac13ad032ace5dbaf4c3216a144b66be3757540b25cdd4cf31c9b
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
 DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2 SHA1 3c2837283ec3e9d1aeec430bb2460178aec94a90 SHA256 ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259
@@ -32,13 +30,7 @@ EBUILD xf86-video-intel-2.3.2.ebuild 788 RMD160 f52a3ba4fe74fefb6a42ed09d6a9d15a
 EBUILD xf86-video-intel-2.4.2-r3.ebuild 937 RMD160 79e983699321c20ec785ce530ef2e4f91bf92597 SHA1 1369229a44f8cbc10a40bf8813ceb6bca38cb756 SHA256 f10c0b5addd9ccc9740912b90fb2d771078a84ab7d06e709f22573c5805620a4
 EBUILD xf86-video-intel-2.4.3.ebuild 805 RMD160 a3f03f6d96d84fcc74662b9ea9e4023e9a130f24 SHA1 6279539da257cd4d804f72fca70823f24c3eac93 SHA256 5830b5a1365781e46a3ba4b153aa17975c14c23152c4ef7ee405dc1297c2363a
 EBUILD xf86-video-intel-2.5.0.ebuild 1088 RMD160 deca6ae6167302abd46c52d10b81a4e08f61de82 SHA1 516346078aaa06b5f3889fcbf38f04312b5ee8b6 SHA256 9a88567f4260c50006e3e45641a9afaa72a20636d753c2df6c2fbccb2f4d078a
+EBUILD xf86-video-intel-2.5.1-r1.ebuild 923 RMD160 03582e051720b1a3b36bdec4b5e7f4e8d642fc9e SHA1 1b395b140833e4bd62c9de02632c391ef700868d SHA256 a5178e64b32bc18028a57631cb0d7a1b5a4894d8796233c30edd52f9fbfd0760
 EBUILD xf86-video-intel-2.5.1.ebuild 844 RMD160 3b81dcc4b05a8c6a4b851eea9dd0771f5aeb6942 SHA1 627005e1ff4e774618f7312e6e5a7a5ef3f19608 SHA256 bcc44830fb803d470a0b182d15c77124338bfc142fb3e833b315fdaec96414c3
-MISC ChangeLog 28284 RMD160 30f3405756b3ab66e3f689b03afca9debfa728bc SHA1 6061c8329cec784b0cbe295d406ac058d77e068e SHA256 dd60b72594f87482c3f8a6a50a4809bba42f1380e74a0ef50ba322aa797cbb1d
+MISC ChangeLog 28519 RMD160 c358431d8f9460cd9906c9bdbc7c13af40f43faf SHA1 4de7a0a97aaf15e08129c8d77860b2756aacf047 SHA256 71dfe12d0f215e9ca297b9e47871b162e509dcdd394cd8d70a367f3997fed2e0
 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkt2y8ACgkQXVaO67S1rttF7gCgsXBpmhdYT/uW/WJx0nia5R51
-2IUAoOj8qiPhSksKvOJ5rUyUWytDaiRh
-=C4sY
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch b/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch
new file mode 100644
index 000000000000..599e21b4ae39
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.1-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch
@@ -0,0 +1,31 @@
+From cd63414bc0efa0b9f1691e28be9ddfca9fef0486 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 24 Nov 2008 13:31:20 +0100
+Subject: [PATCH] include <X11/Xmd.h> to define CARD16 needed by edid.h
+
+---
+ src/bios_reader/bios_reader.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
+index 2a6906d..1e41778 100644
+--- a/src/bios_reader/bios_reader.c
++++ b/src/bios_reader/bios_reader.c
+@@ -38,9 +38,11 @@
+ 
+ #include "../i830_bios.h"
+ 
+-typedef uint8_t CARD8;
+-typedef uint16_t CARD16;
+-typedef uint32_t CARD32;
++/* backwards compatibility with edid.h from xorg-server 1.5 and older */
++#ifndef CARD16
++#include <X11/Xmd.h>
++#endif
++
+ #define _PARSE_EDID_
+ #include "edid.h"
+ 
+-- 
+1.6.0.4
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..434644595e14
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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-intel/xf86-video-intel-2.5.1-r1.ebuild,v 1.1 2008/12/17 10:09:42 remi Exp $
+
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			x11-proto/glproto
+			>=x11-libs/libdrm-2.4.0
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri) --disable-symlinks"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
+"${FILESDIR}/${PV}-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch"
+)