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

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 88 insertions, 2 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/Manifest b/x11-libs/libdrm/Manifest
index 1c1413e53e1a..e53689b84e30 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,11 +1,14 @@
 AUX 2.4.0-intel-avoid-deadlock-in-intel_bufmgr_fake.patch 2095 RMD160 5513e5184ccbf27179997d8cd5d9bf04923edb85 SHA1 00cf20dd064d3a6a25afb5e8596e7e555ec5d32e SHA256 3c5c1dbf5e67df1f2991a477b7c9372bc713048fc09a80481997745786287779
 AUX 2.4.0-intel-ioctl-is-not-defined-to-return-errno.patch 930 RMD160 870f4d959237bcebcb8dca3b77a75561e61826ee SHA1 f8e1f30034d1c9f7debfea05e8ed56a8e3d94fd4 SHA256 b82f95f8e59537120217b4f6e829b20b277ebbb69dd1fd1afe5d6742940ddfb9
+AUX 2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch 1072 RMD160 dcc181854552f2a4e6466fe5ed45bae7240b4ef0 SHA1 b33355561f3951a22eff352d077ea4d4f145bbbc SHA256 48dfaabfaff6e4124673a1d430493eb93660703eb334f7019db0d4845f3b2f53
 DIST libdrm-2.3.0.tar.gz 391509 RMD160 2ca594cf17fc074b1addd1f370dd3409b5a03dd7 SHA1 fd62459b11c39a58e5b45b8af30a8217d5ce0e1b SHA256 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab
 DIST libdrm-2.3.1.tar.gz 413300 RMD160 15c8f03bb11f58a272eaf89f988e96256a7f43f1 SHA1 007903c738df3bc2a3cdab0289635baa95a2ed7a SHA256 1d1ad058916a412ec56c3a541c6d921dda11e015909105e84bd260d87ae25465
 DIST libdrm-2.4.0.tar.gz 457926 RMD160 1020d3bcb0004c9e2454aa473db1de5b48173565 SHA1 d9659fe2821e5d6c9895dc91b7b255873205e9d2 SHA256 971004d5ceb7f21d697383e36514f60a9feaf63ed9e9ea50d2a5a7968ee37060
+DIST libdrm-2.4.1.tar.gz 462373 RMD160 4fa1df2853228687c16dbcc47698c66416df61f3 SHA1 583c1c62f70877ec592245ca0316375662eeb693 SHA256 dd84fd09984d700225b6261d87a1deb8b92c6928318e815bf938f2b44deaa529
 EBUILD libdrm-2.3.0.ebuild 1144 RMD160 5d6ba23e2d8df6a9fd1b2dd3eddad62013e8788c SHA1 17fd56acbe70e7c9f1ae23b90f809a8cac9419d8 SHA256 1eeb4c79f8937876ba23d1179c07932e21f1732a5ce6fa2e8772687859f08093
 EBUILD libdrm-2.3.1.ebuild 1154 RMD160 1a0fc6e4567af1e6d84b2f0c682e0fa2668ca832 SHA1 c235c9ebff3165272eaa789a359ae53472c1a187 SHA256 782564e274c596a613874a1c86f2110abeeabee2ba5a8506c17b75d88d37531b
 EBUILD libdrm-2.3.1_pre20080528.ebuild 1309 RMD160 b5117772e5a9374d266ff1f00a1ec47e64d5c389 SHA1 8ca8b4596dccb3129783d732f722bc6b7e27e8e2 SHA256 4e3b87c117e3a151c5653a3a42cb2ea9bd758b916b6868c1c38b512d51b7041f
 EBUILD libdrm-2.4.0.ebuild 1416 RMD160 abc17054f0028706ebc742f4011fa421c4a1c9d1 SHA1 c3f6aa6d5ca25f68748134f32c4145c7590486da SHA256 d9f9abaec291c77acef2decc5d2dba89b1766362413613cb881e84e9dd2dad00
-MISC ChangeLog 7261 RMD160 14e1036e0b659a397716ca9c2ccfaa80d487c584 SHA1 74007416fafc4cbcc2fbd6be0eb1b5eabd626539 SHA256 af62316ae821d4b90df7dd0a7a43eaf82627f5993f7a461310c7ae175d54b933
+EBUILD libdrm-2.4.1.ebuild 1482 RMD160 8e9e46dcaa84c27a9dd9309cf859b332edd8b588 SHA1 5cb613d7ef7850bb937079753bb18d5aa4271efb SHA256 715dd6571544b1d6335c621bf5b0af7e4fb82b24bc2fd3258eeffbd4fce8cbe6
+MISC ChangeLog 7481 RMD160 bdff32c90aabdadbad002c79302ce1fed7aeca5b SHA1 95863074e08697596a09cb1519ec90dec8f922c4 SHA256 e80cb3af92137b0261b57cace5cdad609a58909550ad36446170dd1f2a1e4907
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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."
+}