debian/changelog | 10 ++++
debian/control | 2
debian/patches/02_kbsd-input-devd.diff | 72 ++++++++++++++-------------------
debian/rules | 1
4 files changed, 44 insertions(+), 41 deletions(-)
New commits:
commit 4609203dbfe3b7e413678f5fc42ea0c1cb12e676
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Wed Nov 23 19:32:13 2016 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 9d1287e..0f2a199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
+xorg-server (2:1.19.0-2) unstable; urgency=medium
* Disable glamor on the udeb build. It's not needed there.
This has the side effect of fixing the Hurd build.
@@ -6,7 +6,7 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
- Ported to NotifyFd. Fixes the kFreeBSD build.
* Bump Standards-Version to 3.9.8; no changes needed.
- -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 23 Nov 2016 18:49:56 +0100
+ -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 23 Nov 2016 19:32:09 +0100
xorg-server (2:1.19.0-1) unstable; urgency=medium
commit c0b55546f8fe96ed9540f604386f12f49851eec4
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Wed Nov 23 19:30:17 2016 +0100
Bump Standards-Version to 3.9.8
diff --git a/debian/changelog b/debian/changelog
index c41bd5f..9d1287e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
This has the side effect of fixing the Hurd build.
* debian/patches/02_kbsd-input-devd.diff:
- Ported to NotifyFd. Fixes the kFreeBSD build.
+ * Bump Standards-Version to 3.9.8; no changes needed.
-- Emilio Pozuelo Monfort <po...@debian.org> Wed, 23 Nov 2016 18:49:56 +0100
diff --git a/debian/control b/debian/control
index 9e544af..fcea06e 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Build-Depends:
libdbus-1-dev (>= 1.0) [linux-any],
# systemd-daemon
libsystemd-dev [linux-any],
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
Homepage: https://www.x.org/
commit 21cbf5b30ae307a9a4ad407c96e7b01835bd7b5a
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Wed Nov 23 19:27:47 2016 +0100
Port kfreebsd patch to NotifyFd
diff --git a/debian/changelog b/debian/changelog
index a8bae03..c41bd5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
* Disable glamor on the udeb build. It's not needed there.
This has the side effect of fixing the Hurd build.
+ * debian/patches/02_kbsd-input-devd.diff:
+ - Ported to NotifyFd. Fixes the kFreeBSD build.
-- Emilio Pozuelo Monfort <po...@debian.org> Wed, 23 Nov 2016 18:49:56 +0100
diff --git a/debian/patches/02_kbsd-input-devd.diff
b/debian/patches/02_kbsd-input-devd.diff
index 67af714..1365e2f 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -7,6 +7,10 @@ Based on original code by Baptiste Daroussin, with some fixes
made
by Koop Mast and myself.
Signed-off-by: Robert Millan <r...@freebsd.org>
+
+v2 - Emilio Pozuelo Monfort <po...@debian.org>
+
+ - Ported to NotifyFd API.
---
config/Makefile.am | 4 +
config/config-backends.h | 5 +
@@ -66,7 +70,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
--- /dev/null
+++ b/config/devd.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,375 @@
+/*
+ * Copyright © 2012 Baptiste Daroussin
+ * Copyright © 2014 Robert Millan
@@ -370,39 +374,29 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
+}
+
+static void
-+wakeup_handler(void *data, int err, void *read_mask)
++socket_handler(int fd, int ready, void *data)
+{
+ char *line = NULL;
+ char *walk;
+
-+ if (err < 0)
++ if (socket_getline(sock_devd, &line) < 0)
+ return;
+
-+ if (FD_ISSET(sock_devd, (fd_set *) read_mask)) {
-+ if (socket_getline(sock_devd, &line) < 0)
-+ return;
-+
-+ walk = strchr(line + 1, ' ');
-+ if (walk != NULL)
-+ walk[0] = '\0';
-+
-+ switch (*line) {
-+ case DEVD_EVENT_ADD:
-+ device_added(line + 1);
-+ break;
-+ case DEVD_EVENT_REMOVE:
-+ device_removed(line + 1);
-+ break;
-+ default:
-+ break;
-+ }
-+ free(line);
++ walk = strchr(line + 1, ' ');
++ if (walk != NULL)
++ walk[0] = '\0';
++
++ switch (*line) {
++ case DEVD_EVENT_ADD:
++ device_added(line + 1);
++ break;
++ case DEVD_EVENT_REMOVE:
++ device_removed(line + 1);
++ break;
++ default:
++ break;
+ }
-+}
-+
-+static void
-+block_handler(void *data, struct timeval **tv, void *read_mask)
-+{
++ free(line);
+}
+
+int
@@ -438,8 +432,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
+ return 0;
+ }
+
-+ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
-+ AddGeneralSocket(sock_devd);
++ SetNotifyFd(sock_devd, socket_handler, X_NOTIFY_READ, NULL);
+
+ return 1;
+}
@@ -450,8 +443,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
+ if (sock_devd < 0)
+ return;
+
-+ RemoveGeneralSocket(sock_devd);
-+ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
++ RemoveNotifyFd(sock_devd);
+ close(sock_devd);
+}
--- a/configure.ac
commit f273e480aac3d7db46d2eda018691f5118e93796
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Wed Nov 23 19:01:22 2016 +0100
Refresh debian/patches/02_kbsd-input-devd.diff
diff --git a/debian/patches/02_kbsd-input-devd.diff
b/debian/patches/02_kbsd-input-devd.diff
index 5f91666..67af714 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -21,7 +21,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
--- a/config/Makefile.am
+++ b/config/Makefile.am
-@@ -34,6 +34,10 @@ if CONFIG_WSCONS
+@@ -34,6 +34,10 @@
libconfig_la_SOURCES += wscons.c
endif # CONFIG_WSCONS
@@ -34,7 +34,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
endif # !CONFIG_UDEV
--- a/config/config-backends.h
+++ b/config/config-backends.h
-@@ -44,3 +44,8 @@ void config_hal_fini(void);
+@@ -44,3 +44,8 @@
int config_wscons_init(void);
void config_wscons_fini(void);
#endif
@@ -45,7 +45,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
+#endif
--- a/config/config.c
+++ b/config/config.c
-@@ -55,6 +55,9 @@ config_init(void)
+@@ -55,6 +55,9 @@
#elif defined(CONFIG_WSCONS)
if (!config_wscons_init())
ErrorF("[config] failed to initialise wscons\n");
@@ -55,7 +55,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
#endif
}
-@@ -67,6 +70,8 @@ config_fini(void)
+@@ -67,6 +70,8 @@
config_hal_fini();
#elif defined(CONFIG_WSCONS)
config_wscons_fini();
@@ -456,7 +456,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
+}
--- a/configure.ac
+++ b/configure.ac
-@@ -631,6 +631,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
+@@ -627,6 +627,7 @@
AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build
udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])
AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms],
[Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval],
[CONFIG_UDEV_KMS=auto])
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build
HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
@@ -464,7 +464,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build
wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval],
[CONFIG_WSCONS=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils],
[Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval],
[XF86UTILS=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg
with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
-@@ -1021,6 +1022,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
+@@ -1017,6 +1018,21 @@
AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration])
fi
@@ -486,7 +486,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
AC_MSG_CHECKING([for glibc...])
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-@@ -2598,7 +2614,7 @@ AC_SUBST([prefix])
+@@ -2566,7 +2582,7 @@
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep])
@@ -497,7 +497,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
Neither HAL nor udev backend will be enabled.
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
-@@ -1384,15 +1384,18 @@ checkCoreInputDevices(serverLayoutPtr se
+@@ -1375,15 +1375,18 @@
}
if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
@@ -520,7 +520,7 @@ Signed-off-by: Robert Millan <r...@freebsd.org>
"input devices.\n\tIf no devices become available, "
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
-@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = {
+@@ -122,7 +122,8 @@
.pmFlag = TRUE,
.disableRandR = FALSE,
.randRFrom = X_DEFAULT,
commit 01f8823e6397d868c6c731fe451b59dad0d405dc
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Wed Nov 23 18:51:35 2016 +0100
Disable glamor on the udeb build
diff --git a/debian/changelog b/debian/changelog
index e523a30..a8bae03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
+
+ * Disable glamor on the udeb build. It's not needed there.
+ This has the side effect of fixing the Hurd build.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 23 Nov 2016 18:49:56 +0100
+
xorg-server (2:1.19.0-1) unstable; urgency=medium
[ Andreas Boll ]
diff --git a/debian/rules b/debian/rules
index 3515c84..a19f5b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,6 +192,7 @@ confflags_udeb = \
--disable-glx \
--disable-dri \
--disable-dri2 \
+ --disable-glamor \
$(libdrm_udeb) \
--disable-xinerama \
--disable-xf86vidmode \
