debian/changelog | 3 +
debian/patches/01_default_perms.diff | 2
debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff | 38 ++++++++-----
3 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit fd4342150d3d34f74f98af7d1298edc640d2da5e
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 2 20:51:34 2015 +0200
Fix kfreebsd patch that caused an FTBFS on Linux/x32
Only include <sys/sysctl.h> if configure detects it (closes: #787496).
Thanks, Thorsten Glaser.
diff --git a/debian/changelog b/debian/changelog
index d2756b9..022bb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ libdrm (2.4.62-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Update debian/upstream/signing-key.asc.
+ * Fix kfreebsd patch that caused an FTBFS on Linux/x32: only include
+ <sys/sysctl.h> if configure detects it (closes: #787496). Thanks,
+ Thorsten Glaser.
-- Sven Joachim <svenj...@gmx.de> Fri, 08 May 2015 21:35:41 +0200
diff --git a/debian/patches/01_default_perms.diff
b/debian/patches/01_default_perms.diff
index cdba93e..8315ba9 100644
--- a/debian/patches/01_default_perms.diff
+++ b/debian/patches/01_default_perms.diff
@@ -2,7 +2,7 @@ Index: libdrm/xf86drm.h
===================================================================
--- libdrm.orig/xf86drm.h
+++ libdrm/xf86drm.h
-@@ -70,7 +70,7 @@
+@@ -74,7 +74,7 @@ extern "C" {
/* Default /dev/dri directory permissions 0755 */
#define DRM_DEV_DIRMODE \
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
diff --git a/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
b/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
index 4489de5..980b7d0 100644
--- a/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
+++ b/debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff
@@ -3,23 +3,37 @@ From: Julien Cristau <jcris...@debian.org>
Date: Sun, 26 Apr 2015 11:53:02 +0200
Subject: [PATCH] Fix headers inclusion in xf86drmMode.c
-- add sys/sysctl.h to get sysctlbyname declaration on kFreeBSD
----
- xf86drmMode.c | 1 +
- 1 file changed, 1 insertion(+)
+Add sys/sysctl.h to get sysctlbyname declaration on kFreeBSD
-diff --git a/xf86drmMode.c b/xf86drmMode.c
-index f4b8d14..b7e0116 100644
---- a/xf86drmMode.c
-+++ b/xf86drmMode.c
-@@ -46,6 +46,7 @@
+Updated by Thorsten “mirabilos” Glaser <t.gla...@tarent.de>
+to add autoconf check and only include <sys/sysctl.h> if it
+is detected by configure as it’s unusable on Linux/x32 (and
+others, e.g. other new architectures).
+
+Index: libdrm/xf86drmMode.c
+===================================================================
+--- libdrm.orig/xf86drmMode.c
++++ libdrm/xf86drmMode.c
+@@ -46,6 +46,9 @@
#include <stdint.h>
#include <stdlib.h>
#include <sys/ioctl.h>
++#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
++#endif
#include <stdio.h>
#include <stdbool.h>
---
-2.1.4
-
+Index: libdrm/configure.ac
+===================================================================
+--- libdrm.orig/configure.ac
++++ libdrm/configure.ac
+@@ -53,7 +53,7 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
+ AC_FUNC_ALLOCA
+
+-AC_CHECK_HEADERS([sys/mkdev.h])
++AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h])
+
+ # Initialize libtool
+ LT_PREREQ([2.2])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zajj5-0000hv...@moszumanska.debian.org
