xorg-server: Changes to 'ubuntu'
ChangeLog | 621 +++++++++++++++++++
Xext/saver.c | 8
Xi/exevents.c | 155 ++--
Xi/ungrdevb.c | 2
Xi/ungrdevk.c | 2
Xi/xipassivegrab.c | 2
configure.ac | 6
debian/changelog | 108 ++-
debian/control | 14
debian/patches/02_improve-posix-saved-ids-check.diff | 65 +
debian/patches/03_static-nettle.diff | 17
debian/patches/04_hashtabletest-s390x.diff | 27
debian/patches/10_Include-missing-selection-h.diff | 20
debian/patches/series | 5
debian/rules | 23
dix/cursor.c | 29
dix/devices.c | 4
dix/dispatch.c | 3
dix/events.c | 101 +--
dix/grabs.c | 21
dix/main.c | 3
dix/pixmap.c | 2
dix/touch.c | 114 ++-
dix/window.c | 15
fb/fbpixmap.c | 1
glx/glxdri.c | 2
hw/xfree86/common/xf86platformBus.c | 8
hw/xfree86/modes/xf86Crtc.c | 34 -
hw/xfree86/modes/xf86Cursors.c | 4
hw/xfree86/ramdac/xf86Cursor.c | 28
include/cursor.h | 4
include/dixgrabs.h | 2
include/eventstr.h | 1
include/input.h | 2
include/inputstr.h | 2
render/animcur.c | 3
xfixes/cursor.c | 6
37 files changed, 1206 insertions(+), 258 deletions(-)
New commits:
commit 7fa0c4c3109a4d599dc441ba43ade014de117277
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 3 18:17:43 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index e705c9d..9a468f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
+xorg-server (2:1.14.2.901-2) experimental; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
@@ -6,7 +6,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
* Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
- -- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 03 Aug 2013 18:17:30 +0200
xorg-server (2:1.14.2.901-1) experimental; urgency=low
commit c1cb0e67380f8d0c21929bd5e8e1dec0cb1c4bc0
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 3 00:10:53 2013 +0200
Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
diff --git a/debian/changelog b/debian/changelog
index 17a6253..e705c9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
Require dpkg-dev 1.16.1.
* Also improve POSIX_SAVED_IDS check to work on kbsd.
* Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
+ * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/04_hashtabletest-s390x.diff b/debian/patches/04_hashtabletest-s390x.diff
new file mode 100644
index 0000000..0401035
--- /dev/null
+++ b/debian/patches/04_hashtabletest-s390x.diff
@@ -0,0 +1,27 @@
+From 3562cb865b13d6f59e5c3b472d073ad6bbc06ceb Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 2 Aug 2013 23:40:55 +0200
+Subject: [PATCH] test: include dix-config.h in hashtabletest.c
+
+Missing _XSERVER64 define caused inconsistent sizeof(XID) between the
+test and hashtable code, leading to test failures on 64bit big endian
+archs like s390x or ppc64.
+---
+ test/hashtabletest.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/hashtabletest.c b/test/hashtabletest.c
+index 64c7091..6af14a8 100644
+--- a/test/hashtabletest.c
++++ b/test/hashtabletest.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_DIX_CONFIG_H
++#include <dix-config.h>
++#endif
++
+ #include <misc.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 015811b..c42a991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
001_fedora_extramodes.patch
02_improve-posix-saved-ids-check.diff
03_static-nettle.diff
+04_hashtabletest-s390x.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit 73d2fba2c9c61d4e4f45089fece8e18a58d9becb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 20:18:37 2013 +0200
Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
diff --git a/debian/changelog b/debian/changelog
index 4318093..17a6253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
* Also improve POSIX_SAVED_IDS check to work on kbsd.
+ * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff
new file mode 100644
index 0000000..4a48338
--- /dev/null
+++ b/debian/patches/03_static-nettle.diff
@@ -0,0 +1,17 @@
+Link against static libnettle
+
+There's no libnettle udeb.
+
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac 2013-08-02 20:15:25.471466837 +0200
++++ xorg-server/configure.ac 2013-08-02 20:17:12.875999417 +0200
+@@ -1433,7 +1433,7 @@
+ if test "x$with_sha1" = xlibnettle; then
+ AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
+ [Use libnettle SHA1 functions])
+- SHA1_LIBS=-lnettle
++ SHA1_LIBS=-l:libnettle.a
+ fi
+ AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+ if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
diff --git a/debian/patches/series b/debian/patches/series
index c85071a..015811b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
02_improve-posix-saved-ids-check.diff
+03_static-nettle.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit d816d729d2746a186ee1489ce4ddc3cdd211fa4b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 19:18:47 2013 +0200
Replace kbsd fix with a better one
issetugid is now declared by libc, and we can use _POSIX_SAVED_IDS
diff --git a/debian/changelog b/debian/changelog
index 6938725..4318093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
- * Also add missing include and AC_CHECK_DECLS([issetugid]) for more kfreebsd
- fail.
+ * Also improve POSIX_SAVED_IDS check to work on kbsd.
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/02_improve-posix-saved-ids-check.diff b/debian/patches/02_improve-posix-saved-ids-check.diff
new file mode 100644
index 0000000..657dd23
--- /dev/null
+++ b/debian/patches/02_improve-posix-saved-ids-check.diff
@@ -0,0 +1,65 @@
+From a2b08b941b841db226d7c9dfd264045abcd8f8b4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 27 Jul 2013 20:09:16 +0200
+Subject: [PATCH] xfree86: improve check for posix saved ids
+
+Replace hardcoded SVR4 || linux || CSRG_BASED with an autoconf check and
+the _POSIX_SAVED_IDS macro.
+
+Suggested-by: Mark Kettenis <mark.kettenis@xs4all.nl>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ configure.ac | 2 +-
+ hw/xfree86/parser/write.c | 3 ++-
+ include/xorg-config.h.in | 3 +++
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6ecba4..d27ca23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,7 +215,7 @@ AC_SUBST(DLOPEN_LIBS)
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
+ getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
+- mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
++ mmap seteuid shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
+ AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup])
+
+ dnl Find the math libary, then check for cbrt function in it.
+diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
+index 9c706a0..eb5e3cf 100644
+--- a/hw/xfree86/parser/write.c
++++ b/hw/xfree86/parser/write.c
+@@ -55,6 +55,7 @@
+ #include <xorg-config.h>
+ #endif
+
++#include "os.h"
+ #include "xf86Parser.h"
+ #include "xf86tokens.h"
+ #include "Configint.h"
+@@ -65,7 +66,7 @@
+ #include <signal.h>
+ #include <errno.h>
+
+-#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
++#if defined(HAVE_SETEUID) && defined(_POSIX_SAVED_IDS) && _POSIX_SAVED_IDS > 0
+ #define HAS_SAVED_IDS_AND_SETEUID
+ #endif
+ #if defined(WIN32)
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index a71b25d..0df31ae 100644
+--- a/include/xorg-config.h.in
++++ b/include/xorg-config.h.in
+@@ -139,4 +139,7 @@
+ /* Have X server platform bus support */
+ #undef XSERVER_PLATFORM_BUS
+
++/* Define to 1 if you have the `seteuid' function. */
++#undef HAVE_SETEUID
++
+ #endif /* _XORG_CONFIG_H_ */
+--
+1.7.10.4
+
diff --git a/debian/patches/02_kbsd-issetugid.diff b/debian/patches/02_kbsd-issetugid.diff
deleted file mode 100644
index 4ac82de..0000000
--- a/debian/patches/02_kbsd-issetugid.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-From e3eef88873d47ee62df5d01eaf1577e7e71cefe5 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 27 Jul 2013 20:01:50 +0200
-Subject: [PATCH 1/2] xfree86: Check for issetugid declaration
-
-Avoids 'implicit function declaration' build error on gnu/kfreebsd.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- configure.ac | 1 +
- hw/xfree86/common/xf86Init.c | 2 +-
- include/xorg-config.h.in | 4 ++++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c6ecba4..a93e903 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,7 @@ AC_CHECK_FUNC([dlopen], [],
- AC_SUBST(DLOPEN_LIBS)
-
- dnl Checks for library functions.
-+AC_CHECK_DECLS([issetugid])
- AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
- getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
- mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 91ec4c8..6caaa51 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -253,7 +253,7 @@ xf86PrivsElevated(void)
- privsElevated = TRUE;
- }
- else {
--#if defined(HAVE_ISSETUGID)
-+#if defined(HAVE_ISSETUGID) && HAVE_DECL_ISSETUGID
- privsElevated = issetugid();
- #elif defined(HAVE_GETRESUID)
- uid_t ruid, euid, suid;
-diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
-index a71b25d..d9e7ec5 100644
---- a/include/xorg-config.h.in
-+++ b/include/xorg-config.h.in
-@@ -130,6 +130,10 @@
- /* Use libpciaccess */
- #undef XSERVER_LIBPCIACCESS
-
-+/* Define to 1 if you have the declaration of `issetugid', and to 0 if you
-+ don't. */
-+#undef HAVE_DECL_ISSETUGID
-+
- /* Have setugid */
- #undef HAVE_ISSETUGID
-
---
-1.7.10.4
-
diff --git a/debian/patches/03_kbsd-parser-include.diff b/debian/patches/03_kbsd-parser-include.diff
deleted file mode 100644
index a03661b..0000000
--- a/debian/patches/03_kbsd-parser-include.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9079fc23e3cd7c78885ee9316be11878312d0de Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 27 Jul 2013 20:09:16 +0200
-Subject: [PATCH 2/2] xfree86: include os.h for FatalError
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- hw/xfree86/parser/write.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
-index 9c706a0..b525b11 100644
---- a/hw/xfree86/parser/write.c
-+++ b/hw/xfree86/parser/write.c
-@@ -67,6 +67,8 @@
-
- #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
- #define HAS_SAVED_IDS_AND_SETEUID
-+#else
-+#include "os.h"
- #endif
- #if defined(WIN32)
- #define HAS_NO_UIDS
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 7dc7264..c85071a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
-02_kbsd-issetugid.diff
-03_kbsd-parser-include.diff
+02_improve-posix-saved-ids-check.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit e8236644c6808ac7b21d99867c6a789ad445d9fc
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 20:13:48 2013 +0200
kfreebsd build fix
diff --git a/debian/changelog b/debian/changelog
index de97c37..6938725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
* Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1.
+ * Also add missing include and AC_CHECK_DECLS([issetugid]) for more kfreebsd
+ fail.
-- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
diff --git a/debian/patches/02_kbsd-issetugid.diff b/debian/patches/02_kbsd-issetugid.diff
new file mode 100644
index 0000000..4ac82de
--- /dev/null
+++ b/debian/patches/02_kbsd-issetugid.diff
@@ -0,0 +1,57 @@
+From e3eef88873d47ee62df5d01eaf1577e7e71cefe5 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 27 Jul 2013 20:01:50 +0200
+Subject: [PATCH 1/2] xfree86: Check for issetugid declaration
+
+Avoids 'implicit function declaration' build error on gnu/kfreebsd.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ configure.ac | 1 +
+ hw/xfree86/common/xf86Init.c | 2 +-
+ include/xorg-config.h.in | 4 ++++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6ecba4..a93e903 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -213,6 +213,7 @@ AC_CHECK_FUNC([dlopen], [],
+ AC_SUBST(DLOPEN_LIBS)
+
+ dnl Checks for library functions.
++AC_CHECK_DECLS([issetugid])
+ AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
+ getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
+ mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 91ec4c8..6caaa51 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -253,7 +253,7 @@ xf86PrivsElevated(void)
+ privsElevated = TRUE;
+ }
+ else {
+-#if defined(HAVE_ISSETUGID)
++#if defined(HAVE_ISSETUGID) && HAVE_DECL_ISSETUGID
+ privsElevated = issetugid();
+ #elif defined(HAVE_GETRESUID)
+ uid_t ruid, euid, suid;
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index a71b25d..d9e7ec5 100644
+--- a/include/xorg-config.h.in
++++ b/include/xorg-config.h.in
+@@ -130,6 +130,10 @@
+ /* Use libpciaccess */
+ #undef XSERVER_LIBPCIACCESS
+
++/* Define to 1 if you have the declaration of `issetugid', and to 0 if you
++ don't. */
++#undef HAVE_DECL_ISSETUGID
++
+ /* Have setugid */
+ #undef HAVE_ISSETUGID
+
+--
+1.7.10.4
+
diff --git a/debian/patches/03_kbsd-parser-include.diff b/debian/patches/03_kbsd-parser-include.diff
new file mode 100644
index 0000000..a03661b
--- /dev/null
+++ b/debian/patches/03_kbsd-parser-include.diff
@@ -0,0 +1,26 @@
+From d9079fc23e3cd7c78885ee9316be11878312d0de Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 27 Jul 2013 20:09:16 +0200
+Subject: [PATCH 2/2] xfree86: include os.h for FatalError
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ hw/xfree86/parser/write.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
+index 9c706a0..b525b11 100644
+--- a/hw/xfree86/parser/write.c
++++ b/hw/xfree86/parser/write.c
+@@ -67,6 +67,8 @@
+
+ #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
+ #define HAS_SAVED_IDS_AND_SETEUID
++#else
++#include "os.h"
+ #endif
+ #if defined(WIN32)
+ #define HAS_NO_UIDS
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index b231575..7dc7264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
-#13_debian_add_xkbpath_env_variable.diff
+02_kbsd-issetugid.diff
+03_kbsd-parser-include.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit 1e2c8637ff648ed3fcd09e81289ac0cbca5c3d7f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 18:51:09 2013 +0200
Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
Require dpkg-dev 1.16.1 for dpkg-buildflags --export=configure.
diff --git a/debian/changelog b/debian/changelog
index 63f9c84..de97c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
+
+ * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
+ Require dpkg-dev 1.16.1.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 18:48:37 +0200
+
xorg-server (2:1.14.2.901-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 90aaa86..9901864 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
# everything on is for the DMX and Xnest servers.
Build-Depends:
debhelper (>= 7),
+ dpkg-dev (>= 1.16.1),
quilt,
lsb-release,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 993372e..0c3257f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,6 @@ $(STAMP_DIR)/stampdir:
include /usr/share/quilt/quilt.make
-# we don't have a good way to check for dpkg-dev version, so use presence of
-# buildflags.mk as a substitute.
-ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
-vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0" dpkg-buildflags --export=configure)
-else
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-CPPFLAGS = -DPRE_RELEASE=0
-vars = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-endif
-
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -79,11 +64,14 @@ else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
config_backend += --disable-config-udev
config_backend_main += --enable-config-hal
config_backend_udeb += --disable-config-hal
- libs = LIBS=-lbsd
+ libs = $(shell pkg-config --libs libbsd-overlay)
+ cppflags = $(shell pkg-config --cflags libbsd-overlay)
else # hurd
config_backend += --disable-config-udev --disable-config-hal
endif
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)"
+
ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
config_tests = --disable-unit-tests
else
@@ -125,8 +113,7 @@ confflags += \
--disable-xquartz \
--disable-xwin \
--disable-xfake \
- --disable-install-setuid \
- $(libs)
+ --disable-install-setuid
confflags_main = \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins" \
commit 7b684f9fe7edafda652bf7c003332d5f66dd728b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 13:18:50 2013 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index c264855..63f9c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.2.901-1) experimental; urgency=low
* New upstream release
@@ -29,7 +29,7 @@ xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
d/rules.
* Make build-deps match xserver-xorg-dev dependencies and configure checks.
- -- Julien Cristau <jcristau@debian.org> Fri, 26 Jul 2013 14:05:51 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 27 Jul 2013 13:18:28 +0200
xorg-server (2:1.12.4-6.1) unstable; urgency=low
commit d227ac876d909f0ace65ff6a39f93fec05e5135d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 13:17:59 2013 +0200
Make build-deps match xserver-xorg-dev dependencies and configure checks.
diff --git a/debian/changelog b/debian/changelog
index eef11b2..c264855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
* Merge sid branch up to 2:1.12.4-6.1.
* Drop old --disable-builddocs, --disable-xcalibrate configure options from
d/rules.
+ * Make build-deps match xserver-xorg-dev dependencies and configure checks.
-- Julien Cristau <jcristau@debian.org> Fri, 26 Jul 2013 14:05:51 +0200
diff --git a/debian/control b/debian/control
index ee4b6ef..90aaa86 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends:
x11proto-randr-dev (>= 1.4.0),
x11proto-record-dev (>= 1.13.99.1),
x11proto-render-dev (>= 2:0.11),
- x11proto-resource-dev,
+ x11proto-resource-dev (>= 1.2.0),
x11proto-scrnsaver-dev,
x11proto-video-dev,
x11proto-xcmisc-dev (>= 1.2.0),
@@ -162,22 +162,21 @@ Architecture: any
Depends:
libpixman-1-dev (>= 0.27.2),
x11proto-core-dev (>= 7.0.22),
- x11proto-input-dev (>= 2.2.99.1),
+ x11proto-input-dev (>= 2.3),
x11proto-xext-dev (>= 7.1.99),
x11proto-video-dev,
x11proto-randr-dev (>= 1.4.0),
x11proto-render-dev (>= 2:0.11),
x11proto-dri2-dev (>= 2.8),
- x11proto-gl-dev,
+ x11proto-gl-dev (>= 1.4.16),
x11proto-fonts-dev,
x11proto-xinerama-dev,
x11proto-kb-dev,
x11proto-xf86dri-dev,
- x11proto-resource-dev,
+ x11proto-resource-dev (>= 1.2.0),
x11proto-scrnsaver-dev,
libxkbfile-dev,
libpciaccess-dev,
- libpixman-1-dev (>= 0.21.8),
mesa-common-dev,
${misc:Depends},
Description: Xorg X server - development files
commit 28b1774c24d03c2a28ac9ae4870b39418bc14a36
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 13:17:10 2013 +0200
Drop old unrecognized configure options from d/rules.
diff --git a/debian/changelog b/debian/changelog
index 245abbd..eef11b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Merge sid branch up to 2:1.12.4-6.1.
+ * Drop old --disable-builddocs, --disable-xcalibrate configure options from
+ d/rules.
-- Julien Cristau <jcristau@debian.org> Fri, 26 Jul 2013 14:05:51 +0200
diff --git a/debian/rules b/debian/rules
index 5fc0a3c..993372e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,12 +112,10 @@ confflags += \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
- --disable-builddocs \
--disable-install-libxf86config \
--enable-mitshm \
--enable-xres \
--disable-xcsecurity \
- --disable-xcalibrate \
--disable-tslib \
--enable-dbe \
--disable-xf86bigfont \
commit 632ab7067a375c418f8f86928c974b877f234dd9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 26 14:06:36 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 3ce76d4..800af89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,624 @@
+commit bc41226f7741098e55a3b0df924986991576d50a
+Merge: 4ebd618 2cd62dc
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Jul 25 22:56:24 2013 -0600
+
+ Merge branch 'server-1.14-touch-fixes' of git://people.freedesktop.org/~whot/xserver into server-1.14-branch
+
+commit 4ebd618bc5ef71507e708e7191091828eca3a7e8
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Jul 25 22:24:00 2013 -0600
+
+ Bah, bad rev number. Fixed: changed 1.14.3-rc1 to 1.14.2.901
+
+commit fef66ffe7a7e899a9126a1e431b94d881163b00d
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Jul 25 22:02:26 2013 -0600
+
+ bump rev from 1.14.2 to 1.14.3-rc1
+
+commit 2cd62dc02b67c70d2417b2ccd307ead9596a2967
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 1 08:43:58 2013 +1000
+
+ Xi: return !Success from DeliverTouchEmulatedEvent if we didn't deliver
+
+ All callers currently ignore the new value, so this patch has no effect.
+ Inverse call graph:
+
+ DeliverTouchEmulatedEvent
+ DeliverEmulatedMotionEvent Ignores value
+ DeliverTouchBeginEvent
+ DeliverTouchEvent
+ DeliverTouchEvents Ignores value
+ DeliverTouchEndEvent
+ DeliverTouchEvent
+ DeliverTouchEvents Ignores value
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9978b57b8d94f061d72a67b99a02b0ba16a11429)
+
+commit c203568905bcbb65fb1e079b626d2c1e90ecb72d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 13 15:22:12 2013 +1000
+
+ Xi: fix warning - remove unused 'rc'
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit fd5ea0237db6d725a48f76b706135df9d3246b82)
+
+commit 93f063c40dc4b339ae9114551071c57b52d98dba
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 12 14:10:10 2013 +1000
+
+ dix: UpdateTouchesForGrab must only free the listener grab if it is non-NULL
+
+ If a client calls XIGrabDevice in response to a ButtonPress event (regular
+ event selection), the device will have a grab, but listener->grab is NULL.
+
+ Check for that, to avoid logspam.
+
+ [ 26293.863] (EE) BUG: triggered 'if (!pGrab)'
+ [ 26293.863] (EE) BUG: grabs.c:256 in FreeGrab()
+ [ 26293.863] (EE)
+ [ 26293.863] (EE) Backtrace:
+ [ 26293.864] (EE) 0: /usr/bin/Xorg (FreeGrab+0x54) [0x45d3fc]
+ [ 26293.864] (EE) 1: /usr/bin/Xorg (UpdateTouchesForGrab+0x135) [0x447d4e]
+ [ 26293.864] (EE) 2: /usr/bin/Xorg (ActivatePointerGrab+0x1ba) [0x447f3d]
+ [ 26293.864] (EE) 3: /usr/bin/Xorg (GrabDevice+0x3e6) [0x4503bc]
+ [ 26293.864] (EE) 4: /usr/bin/Xorg (ProcXIGrabDevice+0x1f9) [0x5981b1]
+ [ 26293.865] (EE) 5: /usr/bin/Xorg (ProcIDispatch+0x78) [0x58aa17]
+ [ 26293.865] (EE) 6: /usr/bin/Xorg (Dispatch+0x30d) [0x43347e]
+ [ 26293.865] (EE) 7: /usr/bin/Xorg (main+0x61d) [0x498175]
+ [ 26293.865] (EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x3df5621b75]
+ [ 26293.865] (EE) 9: /usr/bin/Xorg (_start+0x29) [0x423a19]
+ [ 26293.866] (EE) 10: ? (?+0x29) [0x29]
+ [ 26293.866] (EE)
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 0e3be0b25fcfeff386bad132526352c2e45f1932)
+
+commit ecd178e632a99ae2f12d2d9b6e9a48eaa421335d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 9 13:27:19 2013 +1000
+
+ dix: when ungrabbing an active grab, accept pointer grabs (#66720)
+
+ Ungrabbing a device during an active touch grab rejects the grab. Ungrabbing
+ a device during an active pointer grab accepts the grab.
+
+ Rejection is not really an option for a pointer-emulated grab, if a client
+ has a button mask on the window it would get a ButtonPress emulated after
+ UngrabDevice. That is against the core grab behaviour.
+
+ X.Org Bug 66720 <http://bugs.freedesktop.org/show_bug.cgi?id=66720>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
+ (cherry picked from commit 8eeaa74bc241acb41f1d3ed64971e0b01e794776)
+
+commit 54a7ae04a8475df6ce87e52ff995de22fafc7c92
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 27 13:46:49 2013 +1000
+
+ dix: remove logspam in RefCursor()
+
+ This shouldn't have been in the patch
+
+ Reported-by: Colin Harrison <colin.harrison@virgin.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit c21344add2fc589df83b29be5831c36a372201bd)
+
+commit 1e29b269fd712ae1e3552eeddd3529015baee7ae
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed May 15 19:01:11 2013 +1000
+
+ Abstract cursor refcounting
+
+ Too many callers relied on the refcnt being handled correctly. Use a simple
+ wrapper to handle that case.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 9a5ad65330693b3273972b63d10f2907d9ab954a)
+
+commit c0be1168fd3dd2eb01187789ddc30d7aab909a98
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue May 14 14:51:31 2013 +1000
+
+ dix: call UpdateDeviceState() for emulated TouchEndEvents
+
+ ProcessTouchEvents() calls UDS for all touch events, but if the event type
+ was switched to TouchUpdate(pending end) UDS is a noop.
+
+ Daniel Drake found this can cause stuck buttons if a touch grab is
+ activated, rejected and the touch event is passed to a regular listener.
+ This sequence causes the TouchEnd to be changed to TouchUpdate(pending end).
+
+ The actual TouchEnd event is later generated by the server once it is passed
+ to the next listener. UDS is never called for this event, thus the button
+ remains logically down.
+
+ A previous patch suggested for UDS to handle TouchUpdate events [1], however
+ this would release the button when the first TouchEvent is processed, not
+ when the last grab has been released (as is the case for sync pointer
+ grabs). A client may thus have the grab on the device, receive a ButtonPress
+ but see the button logically up in an XQueryPointer request.
+
+ This patch adds a call to UDS to TouchEmitTouchEnd(). The device state must
+ be updated once a TouchEnd event was sent to the last grabbing listener and
+ the number of grabs on the touchpoint is 0.
+
+ [1] http://patchwork.freedesktop.org/patch/13464/
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 35c2e263db01b2b61354298e5e85aa3cae8ac317)
+
+commit 5c32bd0e2c104deaa2820c62289916fff6a4e3cd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri May 3 15:07:58 2013 +1000
+
+ dix: fix cursor refcounting
+
+ The cursor is referenced during CopyGrab(), thus doesn't need to be handled
+ manually anymore. It does need to be refcounted for temp grabs though.
+
+ The oldGrab handling in ProcGrabPointer is a leftover from the cursor in the
+ grab being refcounted, but the grab itself being a static struct in the
+ DeviceIntRec. Now that all grabs are copied, this lead to a double-free of
+ the cursor (Reproduced in Thunderbird, dragging an email twice (or more
+ often) causes a crash).
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 481702101b86fff003430e952dc65fb41eb56400)
+
+commit 0ee9704f3c70fa7cf77edef55d158ad78df72a25
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri May 3 15:02:05 2013 +1000
+
+ dix: free the old grab when activating a new grab
+
+ A client may call XIGrabDevice twice, overwriting the existing grab. Thus,
+ make sure we free the old copy after we copied it. Free it last, to make
+ sure our refcounts don't run to 0 and inadvertantly free something on the
+ way.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 3093f78d17e48a506aab170a9089cd10e21af299)
+
+commit ef0fff102d1feb5bccffc918da5c0dc7c0d28f3b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 24 14:46:06 2013 +1000
+
+ Xi: check for HAS_ACCEPTED only for grab listeners
+
+ If we have one listener left but it's not a grab, it cannot be in
+ LISTENER_HAS_ACCEPTED state.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 2566bdd8bc996cccde77b846819808c6239a89d2)
+
+commit f3d63710d57aea0184ae07f0422a76b0fd6d415f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 24 14:40:31 2013 +1000
+
+ Move TouchListenerGone call to CloseDownClient
+
+ TouchListenerGone cleans up if a client disappears. Having this in
+ FreeGrab() triggers cyclic removal of grabs, emitting wrong events. In
+ particular, it would clean up a passive grab record while that grab is
+ active.
+
+ Move it to CloseDownClient() instead, cleaning up before we go.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 5b00fc52270e9cfdfe7ac1838a21defe50fc3d31)
+
+commit 6c880c143f6a32d3bbc529e4a0ab1663ddecf0a0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 24 12:53:52 2013 +1000
+
+ dix: remove all listeners when freeing a touch
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 34c9b39d9937c2e19c2dffc9748605f90d40f965)
+
+commit ab76a3a3fc56cf8f530e5ab9b6389b09da1cdc12
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 17 20:15:35 2013 +1000
+
+ dix: always copy grabs, don't reference them
+
+ Introduced in xorg-server-1.13.99.901-2-g9ad0fdb. Storing the grab pointer
+ in the listener turns out to be a bad idea. If the grab is not an active
+ grab or an implicit grab, the pointer stored is the one to the grab attached
+ on the window. This grab may be removed if the client calls UngrabButton or
+ similar while the touch is still active, leaving a dangling pointer.
+
+ To avoid this, copy the grab wherever we need to reference it later. This
+ is also what we do for pointer/keyboard grabs, where we copy the grab as
+ soon as it becomes active.
+
+ Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 395124bd2782823de37e5c5b2f15dba49cff05f6)
+
+commit 6bd9badc780ec9d1fb147dfa0c671979c75b722c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Apr 23 15:52:18 2013 +1000
+
+ dix: AllocGrab can copy if an argument is passed in
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 925e35122ebad877395bcf13676e9dbeb254bdfa)
+
+commit 479f8bf236d17e2a2093d349d2ef6471ff089a53
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Apr 23 15:46:04 2013 +1000
+
+ dix: freeing a null grab is a bug, complain if doing so
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reply to: