summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-05-16 08:09:55 +0000
committerRémi Cardona <remi@gentoo.org>2009-05-16 08:09:55 +0000
commit1d2d22fcc5f2558188f0e235cabb37b9f0827425 (patch)
tree44c19184be195c4ffffa2e6fcab3e20887a63292 /x11-libs
parentVersion bump, still leaving bug #266129 open (diff)
downloadgentoo-2-1d2d22fcc5f2558188f0e235cabb37b9f0827425.tar.gz
gentoo-2-1d2d22fcc5f2558188f0e235cabb37b9f0827425.tar.bz2
gentoo-2-1d2d22fcc5f2558188f0e235cabb37b9f0827425.zip
x11-libs/libdrm: drop unneeded patches from files/
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/libdrm/ChangeLog7
-rw-r--r--x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch27
-rw-r--r--x11-libs/libdrm/files/2.4.6-makefile.patch22
3 files changed, 6 insertions, 50 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/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