diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2008-07-01 19:17:33 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-07-01 19:17:33 +0000 |
| commit | 5e9c36c41fd81377aa72a5a5db0f1fda53561ac1 (patch) | |
| tree | 68c943ecd21ed5de310803f02776392aaef19c7d /x11-drivers | |
| parent | Add support for JAVA_ANT_ENCODING using build-xml-rewrite. (diff) | |
| download | gentoo-2-5e9c36c41fd81377aa72a5a5db0f1fda53561ac1.tar.gz gentoo-2-5e9c36c41fd81377aa72a5a5db0f1fda53561ac1.tar.bz2 gentoo-2-5e9c36c41fd81377aa72a5a5db0f1fda53561ac1.zip | |
(#227389) Fix building against released DRM versions. Don't assume libdrm 2.3.1 has TTM support, push that to 2.4.0 instead.
(Portage version: 2.1.5.6)
Diffstat (limited to 'x11-drivers')
4 files changed, 42 insertions, 4 deletions
diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog index 24a8cbcb1e86..200634669d8f 100644 --- a/x11-drivers/xf86-video-i810/ChangeLog +++ b/x11-drivers/xf86-video-i810/ChangeLog @@ -1,6 +1,12 @@ # 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.94 2008/06/18 05:34:10 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.95 2008/07/01 19:17:33 dberkholz Exp $ + + 01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/0001-intel-fix-drm-check.patch, xf86-video-i810-2.3.1-r2.ebuild, + xf86-video-i810-2.3.2.ebuild: + (#227389) Fix building against released DRM versions. Don't assume libdrm + 2.3.1 has TTM support, push that to 2.4.0 instead. *xf86-video-i810-2.3.2 (18 Jun 2008) diff --git a/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch b/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch new file mode 100644 index 000000000000..8ae16e3ae25e --- /dev/null +++ b/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch @@ -0,0 +1,27 @@ +From 55678c64bc6e3ed613ea6db14c105c18a0cf28ce Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@linux.ie> +Date: Tue, 1 Jul 2008 18:51:18 +1000 +Subject: [PATCH] intel: fix drm check. + +The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed +with GEM etc. +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index af87299..2dabd4f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -201,7 +201,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.3.1],[DRI_MM=yes], [DRI_MM=no]) ++ PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no]) + if test "x$DRI_MM" = xyes; then + AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management]) + fi +-- +1.5.5.4 + diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild index 63560aa660af..a86e741b8c4b 100644 --- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild +++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.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.3.1-r2.ebuild,v 1.1 2008/06/13 05:15:02 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild,v 1.2 2008/07/01 19:17:33 dberkholz Exp $ # Must be before x-modular eclass is inherited # Enable snapshot to get the man page in the right place @@ -60,7 +60,8 @@ PATCHES=( "${FILESDIR}/2.3.1/0022-Fix-TV-programming-add-vblank-wait-after-TV_CTL-wr.patch" "${FILESDIR}/2.3.1/0023-Two-more-Dell-quirks.patch" "${FILESDIR}/2.3.1/0024-Set-up-restore-PWRCTXA-from-enter-leavevt-not-server.patch" -"${FILESDIR}/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch") +"${FILESDIR}/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch" +"${FILESDIR}/0001-intel-fix-drm-check.patch") pkg_setup() { if use dri && ! built_with_use x11-base/xorg-server dri; then diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild index 220d9096377d..ede614f3eb7c 100644 --- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild +++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.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.3.2.ebuild,v 1.1 2008/06/18 05:34:10 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild,v 1.2 2008/07/01 19:17:33 dberkholz Exp $ # Must be before x-modular eclass is inherited # Enable snapshot to get the man page in the right place @@ -36,6 +36,10 @@ DEPEND="${RDEPEND} CONFIGURE_OPTIONS="$(use_enable dri)" +PATCHES=( +"${FILESDIR}/0001-intel-fix-drm-check.patch" +) + pkg_setup() { if use dri && ! built_with_use x11-base/xorg-server dri; then die "Build x11-base/xorg-server with USE=dri." |