x11-drivers/xf86-video-intel: bump to 2.5.0 with patches to remove old symlinks

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64)

6 files changed, 275 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 3856e3b90434..4f6d3105e36a 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,17 @@
 # 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.3 2008/10/23 18:23:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.4 2008/10/28 13:52:40 remi Exp $
+
+*xf86-video-intel-2.5.0 (28 Oct 2008)
+
+  28 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patc
+  h, +files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch,
+  +files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
+  ,
+  +files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.pat
+  ch, +xf86-video-intel-2.5.0.ebuild:
+  bump to 2.5.0 with patches to remove old symlinks
 
   22 Oct 2008; Rémi Cardona <remi@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.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
new file mode 100644
index 000000000000..e197177b0b02
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
@@ -0,0 +1,52 @@
+From c07321e220df325c315f2138b05ef70146fed5ad Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Mon, 20 Oct 2008 18:46:49 -0700
+Subject: [PATCH 1/4] Default kernel mode setting to off, add configure flag to enable
+
+Should help avoid unpleasantness.
+---
+ configure.ac |   21 ++++++++++++++-------
+ 1 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ccbdf..a53b225 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,11 @@ AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
+               [XVMC="$enableval"],
+               [XVMC=auto])
+ 
++AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
++                                  [Enable kernel mode setting support [[default=no]]]),
++              [KMS="$enableval"],
++              [KMS=no])
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+@@ -107,13 +112,15 @@ if test x$DRI != xno; then
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+ 	AC_CHECK_FILE([${sdkdir}/damage.h],
+                       [have_damage_h="yes"], [have_damage_h="no"])
+-	AC_CHECK_HEADER(xf86drmMode.h,
+-			[DRM_MODE=yes],[DRM_MODE=no]
+-			[#include "stdint.h"])
+-	dnl exaGetPixmapDriverPrivate required for DRM_MODE.
+-	PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
+-	if test "x$DRM_MODE" = xyes; then
+-	   	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
++	if test x$KMS != xno; then
++		AC_CHECK_HEADER(xf86drmMode.h,
++				[DRM_MODE=yes],[DRM_MODE=no]
++				[#include "stdint.h"])
++		dnl exaGetPixmapDriverPrivate required for DRM_MODE.
++		PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
++		if test "x$DRM_MODE" = xyes; then
++	   		AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
++		fi
+ 	fi
+ fi
+ AC_MSG_CHECKING([whether to include DRI support])
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
new file mode 100644
index 000000000000..17c0047020ef
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
@@ -0,0 +1,53 @@
+From 7b847b328e314ac24cdad56dc9846a06b9d44e23 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Mon, 20 Oct 2008 11:27:36 +0200
+Subject: [PATCH 2/4] clean up man pages generation and installation
+
+---
+ man/Makefile.am |   21 +++++----------------
+ 1 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 7432d5a..2a1cc81 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -25,21 +25,14 @@
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+-
+-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@
++	$(DRIVER_NAME).$(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
+@@ -61,9 +54,5 @@ 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@
++i810.$(DRIVER_MAN_SUFFIX):
++	echo .so man$(DRIVER_MAN_SUFFIX)/$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) > $@
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
new file mode 100644
index 000000000000..c5ebdc1f534e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
@@ -0,0 +1,41 @@
+From d437f3107635a85486faae15e48a7237b6d69e42 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Mon, 20 Oct 2008 13:17:32 +0200
+Subject: [PATCH 3/4] use standard automake macros for handling symlinks
+
+---
+ configure.ac    |    1 +
+ src/Makefile.am |    6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a53b225..36852aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AC_PROG_LIBTOOL
+ DOLT
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AC_PROG_LN_S
+ 
+ AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
+ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9b32215..b16ba6c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -223,8 +223,8 @@ 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)
++install-exec-hook:
++	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
+ 
+-uninstall-local:
++uninstall-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch b/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
new file mode 100644
index 000000000000..8e46c35a0df4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
@@ -0,0 +1,76 @@
+From ef7a85624b6bf3ab9935c8a797978a18e6334dec Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr>
+Date: Wed, 22 Oct 2008 12:15:35 +0200
+Subject: [PATCH 4/4] add a configure switch for pre-2.0 compatibility symlinks
+
+Conflicts:
+
+	configure.ac
+---
+ configure.ac    |    8 ++++++++
+ man/Makefile.am |    7 ++++---
+ src/Makefile.am |    2 ++
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36852aa..b725acf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,6 +81,11 @@ AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
+               [KMS="$enableval"],
+               [KMS=no])
+ 
++AC_ARG_ENABLE(symlinks, AC_HELP_STRING([--enable-symlinks],
++                                       [Disable old "i810" symlinks [[default=yes]]]),
++              [SYMLINKS="$enableval"],
++              [SYMLINKS="yes"])
++
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+@@ -262,6 +267,9 @@ if test "$XVMC" = yes; then
+     	AC_SUBST([XVMCLIB_CFLAGS])
+ fi
+ 
++AC_MSG_CHECKING([whether to setup old "i810" symlinks])
++AC_MSG_RESULT([$SYMLINKS])
++AM_CONDITIONAL(SYMLINKS, [test "$SYMLINKS" = "yes"])
+ 
+ AC_SUBST([DRI_CFLAGS])
+ AC_SUBST([XORG_CFLAGS])
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 2a1cc81..b07b3f0 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -25,9 +25,10 @@
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+-driverman_DATA = \
+-	$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \
+-	i810.$(DRIVER_MAN_SUFFIX)
++driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
++if SYMLINKS
++driverman_DATA += i810.$(DRIVER_MAN_SUFFIX)
++endif
+ 
+ EXTRA_DIST = $(DRIVER_NAME).man
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b16ba6c..881fbaa 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -223,8 +223,10 @@ intel_drv_la_SOURCES += \
+ 	$(INTEL_XVMC_SRCS)
+ endif
+ 
++if SYMLINKS
+ install-exec-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
++endif
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
new file mode 100644
index 000000000000..0d7b60838f98
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
@@ -0,0 +1,41 @@
+# 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.0.ebuild,v 1.1 2008/10/28 13:52:40 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-Default-kernel-mode-setting-to-off-add-configure-fl.patch"
+"${FILESDIR}/${PV}-0002-clean-up-man-pages-generation-and-installation.patch"
+"${FILESDIR}/${PV}-0003-use-standard-automake-macros-for-handling-symlinks.patch"
+"${FILESDIR}/${PV}-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.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
+}