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

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 72 insertions, 1 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/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"
+)