x11-libs/libdrm: bump to 2.4.1 with a patch from git master

(Portage version: 2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 i686)

3 files changed, 84 insertions, 1 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 9a3dfc0a6daf..e4d64905eadc 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.57 2008/10/19 21:36:06 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.58 2008/11/12 08:18:22 remi Exp $
+
+*libdrm-2.4.1 (12 Nov 2008)
+
+  12 Nov 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch,
+  +libdrm-2.4.1.ebuild:
+  bump to 2.4.1 with a patch from git master
 
 *libdrm-2.4.0 (19 Oct 2008)
 
diff --git a/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch b/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch
new file mode 100644
index 000000000000..d333fbed079f
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch
@@ -0,0 +1,27 @@
+From 930c0e7cf4f4776f7a69e7acc6fedeed7addb235 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 7 Nov 2008 12:58:52 -0800
+Subject: [PATCH 2/2] intel: Restart on interrupt of bo_wait_rendering instead of complaining.
+
+---
+ libdrm/intel/intel_bufmgr_gem.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
+index 5eaf5f5..9cb3359 100644
+--- a/libdrm/intel/intel_bufmgr_gem.c
++++ b/libdrm/intel/intel_bufmgr_gem.c
+@@ -658,7 +658,9 @@ drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo)
+     set_domain.handle = bo_gem->gem_handle;
+     set_domain.read_domains = I915_GEM_DOMAIN_GTT;
+     set_domain.write_domain = 0;
+-    ret = ioctl (bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
++    do {
++	ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
++    } while (ret == -1 && errno == EINTR);
+     if (ret != 0) {
+ 	fprintf (stderr, "%s:%d: Error setting memory domains %d (%08x %08x): %s .\n",
+ 		 __FILE__, __LINE__,
+-- 
+1.6.0.3
+
diff --git a/x11-libs/libdrm/libdrm-2.4.1.ebuild b/x11-libs/libdrm/libdrm-2.4.1.ebuild
new file mode 100644
index 000000000000..ac4cc931eb06
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.1.ebuild,v 1.1 2008/11/12 08:18:22 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+
+# FIXME, we should try to see how we can fit the --enable-udev configure flag
+
+PATCHES=(
+	"${FILESDIR}/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch"
+	)
+
+pkg_preinst() {
+	x-modular_pkg_preinst
+
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
+		cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${D}"/usr/$(get_libdir)/
+	fi
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then
+		elog "You must re-compile all packages that are linked against"
+		elog "libdrm 1 by using revdep-rebuild from gentoolkit:"
+		elog "# revdep-rebuild --library libdrm.so.1"
+		elog "After this, you can delete /usr/$(get_libdir)/libdrm.so.1"
+		elog "and /usr/$(get_libdir)/libdrm.so.1.0.0 ."
+		epause
+	fi
+
+	elog "If you have VIDEO_CARDS=\"intel\", then you *must* rebuild"
+	elog "media-libs/mesa and x11-drivers/xf86-video-intel."
+}