configure.ac | 7 +++++--
debian/changelog | 3 +++
hw/xfree86/xorg-wrapper.c | 8 ++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 1849da078eb0c87bbe590eca66833ae03ed6fc60
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Mon Oct 19 23:26:48 2015 +0200
Fix xorg-wrapper on hurd (cherry-picked from master)
diff --git a/debian/changelog b/debian/changelog
index 214df08..8d9be72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.17.2-4) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Add NEWS file for xserver-xorg-core with info about the -legacy split.
+ [ Samuel Thibault ]
+ * Fix xorg-wrapper on hurd (cherry-picked from master).
+
-- Andreas Boll <andreas.boll....@gmail.com> Thu, 08 Oct 2015 21:29:12 +0200
xorg-server (2:1.17.2-3) unstable; urgency=medium
commit fcf4047735dd1164b16d628632520114b1dce337
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Mon Oct 19 23:15:36 2015 +0200
hurd: fix xorg-wrapper build
hurd does not have any PATH_MAX limitation. misc.h provides a default value
which is fine here.
Reviewed-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
(cherry picked from commit 113c0bb4fd764da8c08d8f30abe350c7650c9fc2)
diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index 75d120a..7cc79be 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -44,6 +44,8 @@
#include <xf86drm.h> /* For DRM_DEV_NAME */
#endif
+#include "misc.h"
+
#define CONFIG_FILE SYSCONFDIR "/X11/Xwrapper.config"
static const char *progname;
commit 1cfecd5702602afb810545830d9761af4e3610c6
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Mon Oct 19 14:47:43 2015 +0200
xorg-wrapper: fix build without libdrm
Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
(cherry picked from commit 08c4912406b965bbac0a3a52413c374a073c051b)
diff --git a/configure.ac b/configure.ac
index b38393f..e853cd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -924,8 +924,6 @@ fi
AM_CONDITIONAL(SYSTEMD_LOGIND, [test "x$SYSTEMD_LOGIND" = xyes])
if test "x$SUID_WRAPPER" = xyes; then
- dnl The wrapper uses libdrm headers, so ensure they are available
- PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
dnl This is a define so that if some platforms want to put the wrapper
dnl somewhere else this can be easily changed
AC_DEFINE_DIR(SUID_WRAPPER_DIR, libexecdir, [Where to install the Xorg
binary and Xorg.wrap])
diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index 22e97ad..75d120a 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -39,8 +39,10 @@
#include <sys/consio.h>
#endif
#include <unistd.h>
+#ifdef WITH_LIBDRM
#include <drm.h>
#include <xf86drm.h> /* For DRM_DEV_NAME */
+#endif
#define CONFIG_FILE SYSCONFDIR "/X11/Xwrapper.config"
@@ -183,7 +185,9 @@ static int on_console(int fd)
int main(int argc, char *argv[])
{
+#ifdef WITH_LIBDRM
struct drm_mode_card_res res;
+#endif
char buf[PATH_MAX];
int i, r, fd;
int kms_cards = 0;
@@ -219,6 +223,7 @@ int main(int argc, char *argv[])
}
}
+#ifdef WITH_LIBDRM
/* Detect if we need root rights, except when overriden by the config */
if (needs_root_rights == -1) {
for (i = 0; i < 16; i++) {
@@ -237,6 +242,7 @@ int main(int argc, char *argv[])
close(fd);
}
}
+#endif
/* If we've found cards, and all cards support kms, drop root rights */
if (needs_root_rights == 0 || (total_cards && kms_cards == total_cards)) {
commit 112697311f6577cf1dfd3ed73b7a17fa38cf9ec9
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Mon Oct 19 14:47:42 2015 +0200
hurd: disable detecting drm
Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
(cherry picked from commit a4cd8ee5f8e8de776c7f764656770311cdbde0d2)
diff --git a/configure.ac b/configure.ac
index d8f0e74..b38393f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,6 +752,11 @@ case $host_os in
XF86VIDMODE=no
fi
;;
+ gnu*)
+ DRM=no
+ DRI2=no
+ DRI3=no
+ ;;
*) XQUARTZ=no ;;
esac
