libdrm: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/patches/intel-cloexec-kbsd.diff | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
intel/intel_bufmgr_gem.c | 3 +++
4 files changed, 42 insertions(+)
New commits:
commit e3013e8b96ee530475fb0df3e0e92684f405873f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 12:47:04 2013 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6b967e1..ce42af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+libdrm (2.4.40-1~deb7u2) sid; urgency=low
* Fix FTBFS on kfreebsd:
- fix missing ETIME (cherry-picked from upstream)
- work around missing O_CLOEXEC
- -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2013 12:44:49 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2013 12:46:52 +0100
libdrm (2.4.40-1~deb7u1) sid; urgency=low
commit 112d146e15c65aa5df60df9e618af155d97b6621
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 12:45:36 2013 +0100
Fix FTBFS on kfreebsd
diff --git a/debian/changelog b/debian/changelog
index 653e7e9..6b967e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.40-1~deb7u2) UNRELEASED; urgency=low
+
+ * Fix FTBFS on kfreebsd:
+ - fix missing ETIME (cherry-picked from upstream)
+ - work around missing O_CLOEXEC
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 06 Jan 2013 12:44:49 +0100
+
libdrm (2.4.40-1~deb7u1) sid; urgency=low
* Revert nouveau to the 2.4.33 state (ie before the rewrite).
diff --git a/debian/patches/intel-cloexec-kbsd.diff b/debian/patches/intel-cloexec-kbsd.diff
new file mode 100644
index 0000000..6772721
--- /dev/null
+++ b/debian/patches/intel-cloexec-kbsd.diff
@@ -0,0 +1,30 @@
+From 5488edc26442124dc8e8498336982e34a2ddb3e7 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 6 Jan 2013 12:42:18 +0100
+Subject: [PATCH] intel: work around the lack of O_CLOEXEC definition on
+ kfreebsd
+
+Provide our own instead, per
+http://svnweb.freebsd.org/base/head/sys/sys/fcntl.h?r1=219999&r2=219998&pathrev=219999
+---
+ intel/intel_bufmgr_gem.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 512bc6f..bc035af 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -2470,6 +2470,10 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
+ return &bo_gem->bo;
+ }
+
++/* XXX hack for kfreebsd */
++#if !defined(O_CLOEXEC) && defined(__FreeBSD_kernel__)
++#define O_CLOEXEC 0x00100000
++#endif
+ int
+ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
+ {
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c20e4b9..a21307d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_default_perms.diff
03_build_against_librt.diff
revert-nouveau-rewrite.diff
+intel-cloexec-kbsd.diff
commit 26dca5adf4f9e7bc333db348cd173c57771f76f8
Author: David Shao <davshao@gmail.com>
Date: Sat Nov 10 00:24:56 2012 -0500
intel: Fix missing ETIME on BSD operating systems
Originally posted to Free Desktop bug #52549 by David Shao.
Resolves Gentoo Bug #433403.
Commit message by Richard Yao.
Reviewed-by: Richard Yao <ryao@gentoo.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
References: https://bugs.freedesktop.org/show_bug.cgi?id=52549
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
(cherry picked from commit 7d42b49c0cf19dbb4531cd84efae51f95db2eea1)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8d45839..512bc6f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -54,6 +54,9 @@
#include <stdbool.h>
#include "errno.h"
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
#include "libdrm_lists.h"
#include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h"
Reply to: