x11-libs/libdrm: drop unneeded patches from files/

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 7 insertions, 53 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 6ed78827e3b3..21800ae44b78 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.77 2009/05/16 08:05:35 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.78 2009/05/16 08:09:55 remi Exp $
+
+  16 May 2009; Rémi Cardona <remi@gentoo.org>
+  -files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch,
+  -files/2.4.6-makefile.patch:
+  drop unneeded patches from files/
 
   16 May 2009; Rémi Cardona <remi@gentoo.org>
   -libdrm-2.3.1_pre20080528.ebuild, -libdrm-2.4.1.ebuild,
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index dd749d22acb0..0876427621a0 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,5 +1,3 @@
-AUX 2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch 1072 RMD160 dcc181854552f2a4e6466fe5ed45bae7240b4ef0 SHA1 b33355561f3951a22eff352d077ea4d4f145bbbc SHA256 48dfaabfaff6e4124673a1d430493eb93660703eb334f7019db0d4845f3b2f53
-AUX 2.4.6-makefile.patch 557 RMD160 9e82191fac3080927748832072c4e6aa2c5859e6 SHA1 74c2c97019b3f36f6eecef017b21ac96d6d73014 SHA256 4a9c7411f7b544e87bbef9f621536b9ab9409306c0862e30bbf411443df30654
 AUX 2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch 711 RMD160 6942f00eb8e45868fdcb1f52f2583cacf3806a0d SHA1 1c889f475e7e1ee6a03dabdf66088b787c0a0ceb SHA256 adb1d9052789290078315e14e7cd3e4a202f649bf8ad37181bc67caf38520849
 AUX 2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch 708 RMD160 795b4dbf84914bbc13c5db086769d0b500385441 SHA1 187780606e0100c8d2de251af4af8cb773955180 SHA256 cfc0325d305c5d534a0c564d90f63f2ff27a45968203453defd531d38d853c3e
 AUX 2.4.9-0003-libdrm-mode-align-subpixel-results.patch 901 RMD160 1a66e30396a1c6a04d8e398dabe7f42c975e8327 SHA1 12eb648b7f41de9e5ce4f2a3dcec32d1d93e07a6 SHA256 567f496c402ee78ad99d4a95e2ee297208ea4593d1be2040eaf368edc6a2d7ba
@@ -14,5 +12,5 @@ EBUILD libdrm-2.3.1.ebuild 1162 RMD160 c4462641ad27a4dc22e466c7c25d5d8d8520b93d
 EBUILD libdrm-2.4.11.ebuild 907 RMD160 c6406aa31364b2527e619b3da08c67a9d7d04ce0 SHA1 8bdd19d0e661169f97d346aacd8b4a436abcf43e SHA256 9b55ff3efad9c5682442ea67fb5db5314846cdbb3fb9ed7f38da4535e947f8c8
 EBUILD libdrm-2.4.5.ebuild 920 RMD160 6d1901bf7dafbabad63f0491a25bbb9eaed4b0bc SHA1 9e2c82cf78b7133e8f6ddb08a3129515ef0a0d67 SHA256 4507280973a34e3ae6af8bc2f3bd6c2b8e6c80b1e48833b2b48a1b624b4855c1
 EBUILD libdrm-2.4.9.ebuild 1256 RMD160 1626eacbb32f6d306453529eccd1c544b45bad4f SHA1 421a5166ef361871a1dd996c28e909cb5775316c SHA256 43fee92ff340d00d74fffe5a903d48a1684ad8b5ade1e83f204ced230afe1759
-MISC ChangeLog 10369 RMD160 4952b3533f712a51c564d9a22bc2471ffaed5d45 SHA1 ef5502afd299dd2c7381ad4908244b043ac57f8d SHA256 f335f3502249dc04f0e69fa75c4bf5b811744fc9475512d742e30121dd97f329
+MISC ChangeLog 10558 RMD160 e12003ed3ffb650aede2d735fa25f68c9f19148b SHA1 f85e421f52dabe417d0df34536d7319187ec6ed1 SHA256 660c5880058776e24d5a8ed1a65dde9c31080ff564d79fc6328821c76f376f02
 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
deleted file mode 100644
index d333fbed079f..000000000000
--- a/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/2.4.6-makefile.patch b/x11-libs/libdrm/files/2.4.6-makefile.patch
deleted file mode 100644
index 61bee916ca64..000000000000
--- a/x11-libs/libdrm/files/2.4.6-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1faab66cfd1a854925da6ff7109aa614292dea90 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@linux.ie>
-Date: Mon, 06 Apr 2009 23:26:32 +0000
-Subject: drm: fix test makefile
-
-no idea if this is correct but it works so meh
----
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bc99447..e5e9fc4 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -2,6 +2,8 @@ AM_CFLAGS = \
- 	-I $(top_srcdir)/shared-core \
- 	-I $(top_srcdir)/libdrm
- 
-+AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
-+
- noinst_PROGRAMS = \
- 	dristat \
- 	drmstat
---
-cgit v0.8.2