summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-07-30 20:00:04 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-07-30 20:00:04 +0800
commit22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1 (patch)
tree5fa1e96bd31f8172c9eb6b3c2a43c4c9091f4b42
parent310f77ade56de232438135f93893bf806e78dcfd (diff)
downloadxorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar.gz
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar.bz2
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar.lz
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar.xz
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.tar.zst
xorg-devel-ports-22dfd0e32bb9ab81cbbbf9d0f0e2ba01f94fbae1.zip
Update to 2.4.37
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@546 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--graphics/libdrm/Makefile2
-rw-r--r--graphics/libdrm/distinfo4
-rw-r--r--graphics/libdrm/files/patch-intel__intel__bufmgr__gem.c20
3 files changed, 23 insertions, 3 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index a53d11c..c2970da 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -39,7 +39,7 @@ PLIST_SUB+= KMS=""
PLIST_SUB+= KMS="@comment "
.endif
-LIBDRM_VERSION= 2.4.34
+LIBDRM_VERSION= 2.4.37
LIBDRM_REVISION=1
PLIST_SUB+= OLD="@comment " NEW=""
.else
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 04e30ea..00c16f4 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,4 +1,4 @@
SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.34.tar.bz2) = a468570e7c85107b7c2f8eaceeebaa8f8a0da86482618f445bb74fa0b0d0f8d0
-SIZE (libdrm-2.4.34.tar.bz2) = 572571
+SHA256 (libdrm-2.4.37.tar.bz2) = e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f
+SIZE (libdrm-2.4.37.tar.bz2) = 504014
diff --git a/graphics/libdrm/files/patch-intel__intel__bufmgr__gem.c b/graphics/libdrm/files/patch-intel__intel__bufmgr__gem.c
new file mode 100644
index 0000000..26ac65c
--- /dev/null
+++ b/graphics/libdrm/files/patch-intel__intel__bufmgr__gem.c
@@ -0,0 +1,20 @@
+--- intel/intel_bufmgr_gem.c.orig 2012-07-21 19:14:20.000000000 +0200
++++ intel/intel_bufmgr_gem.c 2012-07-21 19:14:46.000000000 +0200
+@@ -1488,7 +1488,7 @@
+ *
+ * Returns 0 if the wait was successful ie. the last batch referencing the
+ * object has completed within the allotted time. Otherwise some negative return
+- * value describes the error. Of particular interest is -ETIME when the wait has
++ * value describes the error. Of particular interest is -ETIMEDOUT when the wait has
+ * failed to yield the desired result.
+ *
+ * Similar to drm_intel_gem_bo_wait_rendering except a timeout parameter allows
+@@ -1517,7 +1517,7 @@
+ drm_intel_gem_bo_wait_rendering(bo);
+ return 0;
+ } else {
+- return drm_intel_gem_bo_busy(bo) ? -ETIME : 0;
++ return drm_intel_gem_bo_busy(bo) ? -ETIMEDOUT : 0;
+ }
+ }
+