x11-drivers/xf86-video-intel: bump to both 2.4.3 and 2.5.1

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

5 files changed, 228 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 0c3770508b95..1b769be9855e 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,15 @@
 # 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.5 2008/10/28 17:19:35 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.6 2008/11/17 10:57:54 remi Exp $
+
+*xf86-video-intel-2.5.1 (17 Nov 2008)
+*xf86-video-intel-2.4.3 (17 Nov 2008)
+
+  17 Nov 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.pat
+  ch, +files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch,
+  +xf86-video-intel-2.4.3.ebuild, +xf86-video-intel-2.5.1.ebuild:
+  bump to both 2.4.3 and 2.5.1
 
   28 Oct 2008; Rémi Cardona <remi@gentoo.org>
   xf86-video-intel-2.2.1.ebuild:
diff --git a/x11-drivers/xf86-video-intel/files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch b/x11-drivers/xf86-video-intel/files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch
new file mode 100644
index 000000000000..8084a5761dd6
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.4.3-0001-never-enable-DRI_MM-on-this-branch.patch
@@ -0,0 +1,25 @@
+From 4d7cd8cec7ba56230b298986d7a91a7587984bc4 Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Sun, 19 Oct 2008 23:45:14 +0200
+Subject: [PATCH] never enable DRI_MM on this branch
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 809e84d..04e31f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,7 +202,7 @@ if test "$DRI" = yes; then
+         PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
+         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+-	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
++	DRI_MM="no"
+ 	if test "x$DRI_MM" = xyes; then
+ 		AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
+ 	fi
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch b/x11-drivers/xf86-video-intel/files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch
new file mode 100644
index 000000000000..132acca1a206
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.1-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch
@@ -0,0 +1,117 @@
+From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Fri, 14 Nov 2008 13:55:52 +0100
+Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver
+
+---
+ man/Makefile.am   |   20 ++------------------
+ src/Makefile.am   |    6 ------
+ src/i810.h        |    1 -
+ src/i810_driver.c |   19 +------------------
+ 4 files changed, 3 insertions(+), 43 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 7432d5a..ac08621 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -25,21 +25,12 @@
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
++driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
+ 
+-DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
+-
+-driverman_PRE = @DRIVER_NAME@.man
+-
+-driverman_DATA = \
+-	$(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
+-	i810.@DRIVER_MAN_SUFFIX@
+-
+-EXTRA_DIST = @DRIVER_NAME@.man
++EXTRA_DIST = $(DRIVER_NAME).man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+-
+ # Strings to replace in man pages
+ XORGRELSTRING = @PACKAGE_STRING@
+   XORGMANNAME = X Version 11
+@@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+ 	sed $(MAN_SUBSTS) < $< > $@
+-
+-BUILT_SOURCES = shadows.DONE
+-
+-shadows.DONE:
+-	-rm -f i810.@DRIVER_MAN_SUFFIX@
+-	echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
+-		i810.@DRIVER_MAN_SUFFIX@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 232ac53..8e3cfad 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -222,9 +222,3 @@ if XVMC
+ intel_drv_la_SOURCES += \
+ 	$(INTEL_XVMC_SRCS)
+ endif
+-
+-install-data-local: install-intel_drv_laLTLIBRARIES
+-	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
+-
+-uninstall-local:
+-	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
+diff --git a/src/i810.h b/src/i810.h
+index 7ea2043..c88771e 100644
+--- a/src/i810.h
++++ b/src/i810.h
+@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #define I810_VERSION 4000
+ #define I810_NAME "intel"
+ #define I810_DRIVER_NAME "intel"
+-#define I810_LEGACY_DRIVER_NAME "i810"
+ 
+ #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+ #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
+diff --git a/src/i810_driver.c b/src/i810_driver.c
+index cc28ad8..404789d 100644
+--- a/src/i810_driver.c
++++ b/src/i810_driver.c
+@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = {
+ 
+ _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL };
+ 
+-static XF86ModuleVersionInfo i810VersRec = {
+-   "i810",
+-   MODULEVENDORSTRING,
+-   MODINFOSTRING1,
+-   MODINFOSTRING2,
+-   XORG_VERSION_CURRENT,
+-   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
+-   ABI_CLASS_VIDEODRV,
+-   ABI_VIDEODRV_VERSION,
+-   MOD_CLASS_VIDEODRV,
+-   {0, 0, 0, 0}
+-};
+-
+-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL };
+-
+ static pointer
+ i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+ {
+@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags)
+     * driver, and return if there are none.
+     */
+    if ((numDevSections =
+-	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 &&
+-       (numDevSections =
+-	xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) {
++	xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) {
+       return FALSE;
+    }
+ 
+-- 
+1.6.0.3
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild
new file mode 100644
index 000000000000..f30a9646d9fb
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild
@@ -0,0 +1,38 @@
+# 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.4.3.ebuild,v 1.1 2008/11/17 10:57:54 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.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-never-enable-DRI_MM-on-this-branch.patch"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild
new file mode 100644
index 000000000000..4cf7eda2469e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild
@@ -0,0 +1,38 @@
+# 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.ebuild,v 1.1 2008/11/17 10:57:54 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"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}