xorg-server: Changes to 'ubuntu+1'
.gitignore | 1
ChangeLog |54396 ++++++++-----
Xext/Makefile.am | 4
Xext/xres.c | 4
Xext/xselinux_hooks.c | 4
Xi/Makefile.am | 5
Xi/exevents.c | 22
composite/compext.c | 13
composite/compinit.c | 24
composite/compint.h | 7
composite/compositeext.h | 4
composite/compwindow.c | 19
config/10-quirks.conf | 16
config/config.c | 103
config/dbus-core.c | 4
config/hal.c | 16
config/udev.c | 74
configure.ac | 119
debian/changelog | 104
debian/control | 33
debian/patches/02_kbsd-input-devd.diff | 560
debian/patches/03_static-nettle.diff | 6
debian/patches/05_Revert-Unload-submodules.diff | 10
debian/patches/08_xfree86_fix_ia64_inx_outx.diff | 8
debian/patches/disable-rotation-transform-gpuscreens.patch | 22
debian/patches/drm_device_keep_trying.patch | 172
debian/patches/fix-detach-gpu.patch | 89
debian/patches/mi-dont-process-disabled.patch | 62
debian/patches/series | 7
debian/patches/xi-dont-copy-too-much.patch | 67
debian/patches/xi2-resize-touch.patch | 34
debian/rules | 28
debian/serverminver | 6
debian/xwayland.install | 1
dix/devices.c | 15
dix/dixfonts.c | 2
dix/dixutils.c | 25
dix/events.c | 54
dix/gc.c | 8
dix/globals.c | 3
dix/main.c | 4
dri3/dri3.h | 14
dri3/dri3_request.c | 38
dri3/dri3_screen.c | 16
fb/Makefile.am | 3
fb/fbblt.c | 60
fb/fbpict.c | 6
fb/fbpict.h | 15
fb/fbscreen.c | 2
glamor/Makefile.am | 23
glamor/glamor.c | 158
glamor/glamor.h | 113
glamor/glamor_addtraps.c | 2
glamor/glamor_context.h | 9
glamor/glamor_copyarea.c | 37
glamor/glamor_copyplane.c | 15
glamor/glamor_core.c | 133
glamor/glamor_egl.c | 278
glamor/glamor_egl_stubs.c | 4
glamor/glamor_eglmodule.c | 3
glamor/glamor_fbo.c | 47
glamor/glamor_fill.c | 90
glamor/glamor_fillspans.c | 108
glamor/glamor_font.c | 183
glamor/glamor_font.h | 49
glamor/glamor_getimage.c | 98
glamor/glamor_getspans.c | 92
glamor/glamor_glx.c | 32
glamor/glamor_glyphblt.c | 278
glamor/glamor_glyphs.c | 26
glamor/glamor_gradient.c | 103
glamor/glamor_image.c | 180
glamor/glamor_largepixmap.c | 10
glamor/glamor_picture.c | 4
glamor/glamor_pixmap.c | 63
glamor/glamor_points.c | 141
glamor/glamor_polyfillrect.c | 124
glamor/glamor_polylines.c | 28
glamor/glamor_polyops.c | 82
glamor/glamor_priv.h | 250
glamor/glamor_program.c | 386
glamor/glamor_program.h | 94
glamor/glamor_putimage.c | 358
glamor/glamor_rects.c | 187
glamor/glamor_render.c | 239
glamor/glamor_segment.c | 44
glamor/glamor_setspans.c | 112
glamor/glamor_spans.c | 434
glamor/glamor_text.c | 534
glamor/glamor_tile.c | 17
glamor/glamor_transfer.c | 262
glamor/glamor_transfer.h | 55
glamor/glamor_transform.c | 215
glamor/glamor_transform.h | 87
glamor/glamor_trapezoid.c | 158
glamor/glamor_triangles.c | 15
glamor/glamor_utils.h | 48
glamor/glamor_vbo.c | 177
glamor/glamor_xv.c | 43
glx/glxcmds.c | 22
glx/glxdri2.c | 124
glx/glxdricommon.c | 2
glx/glxdriswrast.c | 10
glx/glxext.c | 48
glx/glxserver.h | 1
hw/Makefile.am | 9
hw/dmx/Makefile.am | 1
hw/dmx/config/xdmxconfig.c | 3
hw/dmx/dmxfont.c | 2
hw/dmx/dmxinit.c | 4
hw/dmx/glxProxy/glxcmds.c | 2
hw/kdrive/ephyr/Makefile.am | 20
hw/kdrive/ephyr/ephyr.c | 45
hw/kdrive/ephyr/ephyr.h | 14
hw/kdrive/ephyr/ephyr_glamor_glx.c | 346
hw/kdrive/ephyr/ephyr_glamor_glx.h | 83
hw/kdrive/ephyr/ephyrinit.c | 19
hw/kdrive/ephyr/hostx.c | 141
hw/kdrive/linux/linux.c | 7
hw/kdrive/src/Makefile.am | 5
hw/kdrive/src/kdrive.c | 9
hw/kdrive/src/kxv.c | 27
hw/kdrive/src/kxv.h | 36
hw/vfb/InitOutput.c | 5
hw/vfb/Makefile.am | 11
hw/xfree86/.gitignore | 2
hw/xfree86/Makefile.am | 23
hw/xfree86/Xorg.sh.in | 11
hw/xfree86/common/compiler.h | 10
hw/xfree86/common/xf86Bus.c | 4
hw/xfree86/common/xf86Config.c | 36
hw/xfree86/common/xf86Events.c | 43
hw/xfree86/common/xf86Extensions.c | 5
hw/xfree86/common/xf86Globals.c | 2
hw/xfree86/common/xf86Helper.c | 31
hw/xfree86/common/xf86Init.c | 19
hw/xfree86/common/xf86Module.h | 4
hw/xfree86/common/xf86Privstr.h | 4
hw/xfree86/common/xf86Xinput.c | 84
hw/xfree86/common/xf86Xinput.h | 8
hw/xfree86/common/xf86platformBus.c | 87
hw/xfree86/common/xf86platformBus.h | 18
hw/xfree86/common/xf86str.h | 3
hw/xfree86/dixmods/Makefile.am | 4
hw/xfree86/dixmods/glxmodule.c | 8
hw/xfree86/doc/ddxDesign.xml | 4
hw/xfree86/dri/dri.c | 14
hw/xfree86/dri2/dri2.c | 29
hw/xfree86/glamor_egl/Makefile.am | 43
hw/xfree86/int10/stub.c | 2
hw/xfree86/int10/xf86x86emu.c | 1
hw/xfree86/loader/loadmod.c | 6
hw/xfree86/man/Makefile.am | 7
hw/xfree86/man/Xorg.man | 6
hw/xfree86/man/Xorg.wrap.man | 67
hw/xfree86/man/Xwrapper.config.man | 1
hw/xfree86/man/xorg.conf.man | 30
hw/xfree86/modes/xf86Crtc.h | 4
hw/xfree86/modes/xf86Cursors.c | 81
hw/xfree86/modes/xf86RandR12.c | 7
hw/xfree86/os-support/linux/Makefile.am | 6
hw/xfree86/os-support/linux/lnx_init.c | 25
hw/xfree86/os-support/linux/lnx_platform.c | 42
hw/xfree86/os-support/linux/lnx_video.c | 4
hw/xfree86/os-support/linux/systemd-logind.c | 608
hw/xfree86/os-support/shared/posix_tty.c | 6
hw/xfree86/parser/DRI.c | 1
hw/xfree86/parser/Device.c | 6
hw/xfree86/parser/Extensions.c | 1
hw/xfree86/parser/Layout.c | 6
hw/xfree86/parser/Screen.c | 6
hw/xfree86/parser/xf86Parser.h | 3
hw/xfree86/parser/xf86tokens.h | 1
hw/xfree86/ramdac/IBM.c | 10
hw/xfree86/ramdac/TI.c | 5
hw/xfree86/ramdac/xf86Cursor.c | 11
hw/xfree86/ramdac/xf86Cursor.h | 32
hw/xfree86/ramdac/xf86CursorPriv.h | 2
hw/xfree86/ramdac/xf86HWCurs.c | 23
hw/xfree86/shadowfb/shadow.c | 1592
hw/xfree86/xorg-wrapper.c | 272
hw/xfree86/xorgconf.cpp | 2
hw/xnest/Makefile.am | 9
hw/xquartz/Makefile.am | 1
hw/xquartz/X11Controller.m | 5
hw/xquartz/bundle/Info.plist.cpp | 4
hw/xquartz/darwin.c | 16
hw/xquartz/quartz.c | 5
hw/xquartz/xpr/xprScreen.c | 16
hw/xwayland/.gitignore | 3
hw/xwayland/Makefile.am | 30
hw/xwayland/xwayland-cursor.c | 193
hw/xwayland/xwayland-cvt.c | 304
hw/xwayland/xwayland-input.c | 666
hw/xwayland/xwayland-output.c | 226
hw/xwayland/xwayland-shm.c | 292
hw/xwayland/xwayland.c | 656
hw/xwayland/xwayland.h | 164
hw/xwin/InitInput.c | 9
hw/xwin/InitOutput.c | 12
hw/xwin/Makefile.am | 9
hw/xwin/glx/indirect.c | 13
hw/xwin/man/XWin.man | 6
hw/xwin/win.h | 3
hw/xwin/winauth.c | 4
hw/xwin/windialogs.c | 56
hw/xwin/winglobals.c | 1
hw/xwin/winglobals.h | 1
hw/xwin/winmsgwindow.c | 4
hw/xwin/winmultiwindowicons.c | 26
hw/xwin/winmultiwindowwm.c | 49
hw/xwin/winmultiwindowwndproc.c | 24
hw/xwin/winprocarg.c | 5
hw/xwin/winresource.h | 3
hw/xwin/winwin32rootless.c | 1
hw/xwin/winwndproc.c | 6
include/Makefile.am | 1
include/dix-config.h.in | 12
include/dix.h | 2
include/extension.h | 3
include/hotplug.h | 33
include/input.h | 7
include/misc.h | 18
include/opaque.h | 3
include/os.h | 6
include/scrnintstr.h | 7
include/servermd.h | 27
include/systemd-logind.h | 45
include/xkbsrv.h | 18
include/xorg-config.h.in | 14
include/xwin-config.h.in | 3
man/Xserver.man | 5
manpages.am | 1
mi/mi.h | 4
mi/mibitblt.c | 2
mi/mieq.c | 4
mi/miinitext.c | 46
mi/miscrinit.c | 1
mi/miwindow.c | 66
miext/sync/misyncstr.h | 1
os/busfault.c | 1
os/connection.c | 56
os/log.c | 75
os/utils.c | 18
present/present.c | 126
present/present_priv.h | 1
randr/randr.c | 2
randr/rrcrtc.c | 7
randr/rrprovider.c | 4
randr/rrsdispatch.c | 138
render/render.c | 2
test/.gitignore | 3
test/Makefile.am | 15
test/hashtabletest.c | 2
test/input.c | 14
test/signal-logging.c | 11
xfixes/cursor.c | 2
xfixes/region.c | 6
xkb/ddxLoad.c | 244
xkb/xkb.c | 16
xkb/xkbAccessX.c | 2
xkb/xkbActions.c | 102
xkb/xkbInit.c | 42
xkb/xkbUtils.c | 43
xkb/xkmread.c | 6
265 files changed, 45622 insertions(+), 25372 deletions(-)
New commits:
commit 7f1b342722a982e0628558f0dd7c1db5168746d5
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 22:05:02 2014 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 09123c7..372e7a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.15.99.903-3) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.903-3) experimental; urgency=medium
* Set shared memory dir to /dev/shm (closes: #747894).
* Disable dri3 on kfreebsd again to fix FTBFS.
- -- Julien Cristau <jcristau@debian.org> Tue, 10 Jun 2014 21:40:49 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 10 Jun 2014 21:50:06 +0200
xorg-server (2:1.15.99.903-2) experimental; urgency=medium
commit 8d4e53b07eb706e6bba043d1cf192be17de3ac94
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 21:48:25 2014 +0200
Disable dri3 on kfreebsd again to fix FTBFS.
diff --git a/debian/changelog b/debian/changelog
index 3d0d857..09123c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.15.99.903-3) UNRELEASED; urgency=medium
* Set shared memory dir to /dev/shm (closes: #747894).
+ * Disable dri3 on kfreebsd again to fix FTBFS.
-- Julien Cristau <jcristau@debian.org> Tue, 10 Jun 2014 21:40:49 +0200
diff --git a/debian/rules b/debian/rules
index 33b67b4..b56902d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,12 +52,18 @@ else
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
- dri = --disable-dri --disable-dri2 --disable-dri3
+ dri = --disable-dri --disable-dri2
else
- dri = --enable-dri --enable-dri2 --enable-dri3
+ dri = --enable-dri --enable-dri2
dri += --enable-glamor
endif
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ dri += --enable-dri3
+else
+ dri += --disable-dri3
+endif
+
config_backend = --disable-config-dbus --disable-config-hal
ifeq ($(DEB_HOST_ARCH_OS), linux)
config_backend += --enable-config-udev
commit bbcd34bbab901deb5bc92a1f1ccacb0a7010c322
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 21:41:02 2014 +0200
Set shared memory dir to /dev/shm (closes: #747894).
diff --git a/debian/changelog b/debian/changelog
index d77febc..3d0d857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.903-3) UNRELEASED; urgency=medium
+
+ * Set shared memory dir to /dev/shm (closes: #747894).
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 10 Jun 2014 21:40:49 +0200
+
xorg-server (2:1.15.99.903-2) experimental; urgency=medium
* Enable xwayland for the main build on linux (closes: #747950).
diff --git a/debian/rules b/debian/rules
index 5309815..33b67b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,6 +99,7 @@ confflags += \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
+ --with-shared-memory-dir=/dev/shm \
--disable-install-libxf86config \
--enable-mitshm \
--enable-xres \
commit 464e674b7736a7aa47c19d18e623683049f8f0e0
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 10 21:31:43 2014 +0200
Adjust devd patch to avoid configure warning
diff --git a/debian/patches/02_kbsd-input-devd.diff b/debian/patches/02_kbsd-input-devd.diff
index 1f2cd5b..d0de2a5 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -496,6 +496,15 @@ Index: xorg-server/configure.ac
if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
USE_SIGIO_BY_DEFAULT_VALUE=TRUE
else
+@@ -2495,7 +2511,7 @@ AC_SUBST([prefix])
+
+ AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep])
+
+-if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
++if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno && test "x$CONFIG_DEVD" = xno; then
+ AC_MSG_WARN([
+ ***********************************************
+ Neither HAL nor udev backend will be enabled.
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86Config.c
commit 50b416bdf6c8c0b0dfb20fccfce1593156a067bb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 22:10:56 2014 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index d113ad6..d77febc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.903-2) experimental; urgency=medium
* Enable xwayland for the main build on linux (closes: #747950).
- -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:26:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:58:45 +0200
xorg-server (2:1.15.99.903-1) experimental; urgency=medium
commit d20afdd4966699247849bb0fd0c1bbbba24f6784
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 21:32:33 2014 +0200
Enable xwayland for the main build on linux (closes: #747950).
diff --git a/debian/changelog b/debian/changelog
index 755c8e0..d113ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+
+ * Enable xwayland for the main build on linux (closes: #747950).
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:26:21 +0200
+
xorg-server (2:1.15.99.903-1) experimental; urgency=medium
* New upstream release candidate
diff --git a/debian/control b/debian/control
index 5d15562..77cdf84 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,8 @@ Build-Depends:
x11-xkb-utils,
# getpeereid()
libbsd-dev [kfreebsd-any],
+# xwayland
+ libwayland-dev [linux-any],
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -362,3 +364,14 @@ Description: Xorg X server - source files
.
Unless you are building a software product using X server sources,
you probably want xserver-xorg and/or xserver-xorg-core instead.
+
+Package: xwayland
+Architecture: linux-any
+Depends:
+ xserver-common (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Xwayland X server
+ This package provides an X server running on top of wayland, using wayland
+ input devices for input and forwarding either the root window or individual
+ top-level windows as wayland surfaces.
diff --git a/debian/rules b/debian/rules
index 673dbc9..5309815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,10 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
selinux = --enable-xselinux
+ wayland = --enable-xwayland
else
selinux = --disable-xselinux
+ wayland = --disable-xwayland
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -109,7 +111,6 @@ confflags += \
--enable-xorg \
--disable-linux-acpi \
--disable-linux-apm \
- --disable-xwayland \
--disable-xquartz \
--disable-xwin \
--disable-xfake \
@@ -137,6 +138,7 @@ confflags_main = \
--enable-xace \
$(selinux) \
--enable-xfree86-utils \
+ $(wayland) \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
@@ -168,6 +170,7 @@ confflags_udeb = \
--disable-xace \
--disable-xselinux \
--disable-xfree86-utils \
+ --disable-xwayland \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
diff --git a/debian/xwayland.install b/debian/xwayland.install
new file mode 100644
index 0000000..4e62413
--- /dev/null
+++ b/debian/xwayland.install
@@ -0,0 +1 @@
+main/usr/bin/Xwayland usr/bin
commit 523a890370763fd69d35a2d73ffe8773bf700dd3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 20:15:06 2014 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 99edaca..755c8e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.903-1) experimental; urgency=medium
* New upstream release candidate
- reverted quirk for "Evoluent VerticalMouse 3" (closes: #739537)
@@ -11,7 +11,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium
* Bump video ABI and serverminver.
* Explicitly disable xwayland.
- -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 19:16:24 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 20:14:56 +0200
xorg-server (2:1.15.99.902-1) experimental; urgency=medium
commit 22476e285070a225f05ae27468ff90f225084101
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 20:05:59 2014 +0200
Explicitly disable xwayland.
diff --git a/debian/changelog b/debian/changelog
index 6672f4d..99edaca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium
* Enable glamor.
* Don't run tests in parallel.
* Bump video ABI and serverminver.
+ * Explicitly disable xwayland.
-- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 19:16:24 +0200
diff --git a/debian/rules b/debian/rules
index edee01f..673dbc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,6 +109,7 @@ confflags += \
--enable-xorg \
--disable-linux-acpi \
--disable-linux-apm \
+ --disable-xwayland \
--disable-xquartz \
--disable-xwin \
--disable-xfake \
commit 1d2cda4a1cd5bf333b25d51347b064eb07fea2bd
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 19:47:30 2014 +0200
Add missing libegl-dev build-dep for glamor
diff --git a/debian/control b/debian/control
index 5a36bde..5d15562 100644
--- a/debian/control
+++ b/debian/control
@@ -72,6 +72,7 @@ Build-Depends:
libxshmfence-dev (>= 1.1) [!hurd-i386],
# glamor
libepoxy-dev [linux-any kfreebsd-any],
+ libegl1-mesa-dev [linux-any kfreebsd-any],
libgbm-dev [linux-any],
# XCB bits for Xephyr
libxcb1-dev,
commit 38809f14970929d73bfe438e981885c65b275011
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 19:38:39 2014 +0200
Bump video ABI and serverminver.
diff --git a/debian/changelog b/debian/changelog
index de92d67..6672f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.15.99.903-1) UNRELEASED; urgency=medium
* Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
* Enable glamor.
* Don't run tests in parallel.
+ * Bump video ABI and serverminver.
-- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 19:16:24 +0200
diff --git a/debian/serverminver b/debian/serverminver
index 7f1627c..13cf097 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.15.99.902
-ABI_VIDEODRV_VERSION:17.0
+2:1.15.99.903
+ABI_VIDEODRV_VERSION:18.0
ABI_XINPUT_VERSION:21.0
commit 9d971940bf749059dfce67f764c8c3cde7640057
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 19:33:03 2014 +0200
Refresh patch stack
diff --git a/debian/patches/02_kbsd-input-devd.diff b/debian/patches/02_kbsd-input-devd.diff
index 0264e77..1f2cd5b 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -466,7 +466,7 @@ Index: xorg-server/configure.ac
===================================================================
--- xorg-server.orig/configure.ac
+++ xorg-server/configure.ac
-@@ -613,6 +613,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
+@@ -614,6 +614,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
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])
@@ -474,7 +474,7 @@ Index: xorg-server/configure.ac
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])
-@@ -955,6 +956,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
+@@ -956,6 +957,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration])
fi
@@ -500,7 +500,7 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86Config.c
+++ xorg-server/hw/xfree86/common/xf86Config.c
-@@ -1379,15 +1379,18 @@ checkCoreInputDevices(serverLayoutPtr se
+@@ -1391,15 +1391,18 @@ checkCoreInputDevices(serverLayoutPtr se
}
if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {
diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff
index c4bc7d4..9424870 100644
--- a/debian/patches/03_static-nettle.diff
+++ b/debian/patches/03_static-nettle.diff
@@ -6,7 +6,7 @@ Index: xorg-server/configure.ac
===================================================================
--- xorg-server.orig/configure.ac
+++ xorg-server/configure.ac
-@@ -1656,7 +1656,7 @@ fi
+@@ -1657,7 +1657,7 @@ fi
if test "x$with_sha1" = xlibnettle; then
AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
[Use libnettle SHA1 functions])
diff --git a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
index 10dbbe9..8c506aa 100644
--- a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
+++ b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
@@ -5,9 +5,11 @@ Call the equivalent glibc functions.
Debian bug #685750
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -438,6 +438,54 @@ extern _X_EXPORT unsigned int inl(unsign
+Index: xorg-server/hw/xfree86/common/compiler.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/compiler.h
++++ xorg-server/hw/xfree86/common/compiler.h
+@@ -439,6 +439,54 @@ extern _X_EXPORT unsigned int inl(unsign
#include <machine/pio.h>
#endif /* __NetBSD__ */
commit a0aa9c562f00bfff921d791ec72dee5f208729e8
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 19:30:18 2014 +0200
Delete patch applied upstream
diff --git a/debian/patches/04_wayland_scanner.diff b/debian/patches/04_wayland_scanner.diff
deleted file mode 100644
index 3852332..0000000
--- a/debian/patches/04_wayland_scanner.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
-To: xorg-devel@lists.freedesktop.org
-Subject: [PATCH 3/3] configure.ac: Remove check for WAYLAND_SCANNER_RULES
-Date: Tue, 8 Apr 2014 09:24:12 -0700
-Message-Id: <1396974252-6462-3-git-send-email-krh@bitplanet.net>
-Content-Type: text/plain; charset="utf-8"
-
-This makes configure fail if the wayland autoconf macros aren't found.
-We don't need the scanner for shm-only xwayland so just drop this line for
-now.
-
-Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -2474,7 +2474,6 @@ if test "x$XWAYLAND" = xyes; then
- XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS"
- AC_SUBST([XWAYLAND_LIBS])
- AC_SUBST([XWAYLAND_SYS_LIBS])
-- WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland'])
- fi
-
-
diff --git a/debian/patches/series b/debian/patches/series
index df5e560..82c708e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
001_fedora_extramodes.patch
02_kbsd-input-devd.diff
03_static-nettle.diff
-04_wayland_scanner.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
08_xfree86_fix_ia64_inx_outx.diff
commit a18aee29cb33b0e678f24f129d460546c56c7bc7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 19:28:56 2014 +0200
New upstream release candidate
diff --git a/ChangeLog b/ChangeLog
index fd1abea..302f727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1975 @@
+commit 08820f03768e904f1746ef93ca01660330dc5406
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 4 22:28:57 2014 -0700
+
+ Update to version 1.15.99.903
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9fb08310b51b46736f3ca8dbc04efdf502420403
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed May 21 10:07:31 2014 +1000
+
+ mi: don't process events from disabled devices (#77884)
+
+ Once a device is disabled, it doesn't have a sprite pointer anymore. If an
+ event is still in the queue and processed after DisableDevice finished, a
+ dereference causes a crash. Example backtrace (crash forced by injecting an
+ event at the right time):
+
+ (EE) 0: /opt/xorg/bin/Xorg (OsSigHandler+0x3c) [0x48d334]
+ (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x37fcc0f74f]
+ (EE) 2: /opt/xorg/bin/Xorg (mieqMoveToNewScreen+0x38) [0x609240]
+ (EE) 3: /opt/xorg/bin/Xorg (mieqProcessDeviceEvent+0xd4) [0x609389]
+ (EE) 4: /opt/xorg/bin/Xorg (mieqProcessInputEvents+0x206) [0x609720]
+ (EE) 5: /opt/xorg/bin/Xorg (ProcessInputEvents+0xd) [0x4aeb58]
+ (EE) 6: /opt/xorg/bin/Xorg (xf86VTSwitch+0x1a6) [0x4af457]
+ (EE) 7: /opt/xorg/bin/Xorg (xf86Wakeup+0x2bf) [0x4af0a7]
+ (EE) 8: /opt/xorg/bin/Xorg (WakeupHandler+0x83) [0x4445cb]
+ (EE) 9: /opt/xorg/bin/Xorg (WaitForSomething+0x3fe) [0x491bf6]
+ (EE) 10: /opt/xorg/bin/Xorg (Dispatch+0x97) [0x435748]
+ (EE) 11: /opt/xorg/bin/Xorg (dix_main+0x61d) [0x4438a9]
+ (EE) 12: /opt/xorg/bin/Xorg (main+0x28) [0x49ba28]
+ (EE) 13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x37fc821d65]
+ (EE) 14: /opt/xorg/bin/Xorg (_start+0x29) [0x425e69]
+ (EE) 15: ? (?+0x29) [0x29]
+
+ xf86VTSwitch() calls ProcessInputEvents() before disabling a device, and
+ DisableDevice() calls mieqProcessInputEvents() again when flushing touches and
+ button events. Between that and disabling the device (which causes new events
+ to be refused) there is a window where events may be triggered and enqueued.
+ On the next call to PIE that event is processed on a now defunct device,
+ causing the crash.
+
+ The simplest fix to this is to discard events from disabled devices. We flush
+ the queue often enough before disabling that when we get here, we really don't
+ care about the events from this device.
+
+ X.Org Bug 77884 <http://bugs.freedesktop.org/show_bug.cgi?id=77884>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e6f5d9d7b7efdacea0f22f1808efca849bcede4c
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jan 27 11:23:58 2014 -0800
+
+ present: Queue flips for later execution
+
+ When a flip (or unflip) is pending and a flip request comes in, leave
+ it queued until the pending flip completes and then execute it.
+
+ This fixes a bug where an application submitting back-to-back
+ present_pixmap requests for sequential frames would alternate between
+ flipping and copying as the pending flip would cause the new
+ present_pixmap request to not use a flip.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Tested-by: Frank Binns <frank.binns@imgtec.com>
+
+commit 2f5cf9ff9a0f713b7e038636484c77f113a5f10a
+Author: Frank Binns <frank.binns@imgtec.com>
+Date: Thu Apr 24 11:37:48 2014 +0100
+
+ xfixes: disable cursor on X server reset
+
+ The initial state of the cursor is set to disabled but this was
+ never be re-disabled during X server reset. This meant any
+ application run after an X server reset would have the cursor
+ displayed even if it hadn't requested this to be the case.
+
+ Signed-off-by: Frank Binns <frank.binns@imgtec.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b92d86a982504af2605042c19ef796d135074ee1
+Author: Brendan King <brendan.king@imgtec.com>
+Date: Thu Apr 24 11:37:47 2014 +0100
+
+ dix: fix pixmap leak on server reset
+
+ The server is leaking a pixmap (created by CreateDefaultStipple()) on
+ reset. The leak is caused by some X Server graphics contexts not being
+ freed on reset by the machine independent cursor code in the server,
+ which in turn is caused by the cursor cleanup code
+ (miSpriteDeviceCursorCleanup()) not being called.
+
+ Ensures the DeviceCursorCleanup() function is called when the associated
+ input device is closed on server reset.
+
+ Signed-off-by: Frank Binns <frank.binns@imgtec.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a99c061aafd4aaa5728c776dca7d0a1789ac739a
+Author: Brendan King <brendan.king@imgtec.com>
+Date: Thu Apr 24 11:37:46 2014 +0100
+
+ dix: reference the cursor just once in InitializeSprite()
+
+ The new current cursor was being referenced twice, resulting in a
+ memory leak when the current server generation ended.
+
+ Signed-off-by: Frank Binns <frank.binns@imgtec.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 444a1f7a8802999e27ecf5f6eb598df2206f7277
+Author: Brendan King <brendan.king@imgtec.com>
+Date: Thu Apr 24 11:37:45 2014 +0100
+
+ fb: fix screen pixmap leak on server reset
+
+ Call FreePixmap() instead of free() to destroy the screen pixmap in
+ fbCloseScreen().
+
+ Signed-off-by: Frank Binns <frank.binns@imgtec.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7ca458493aa2f0aa091c989ea0768611e0730bf5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed May 28 08:14:00 2014 +0100
+
+ xfree86: Report Present as a built-in module
+
+ This is so that drivers can do a runtime check that Present is available,
+ similar to existing runtime checks performed by the drivers for DRI.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed May 28 08:13:59 2014 +0100
+
+ xfree86: Report DRI3 as a built-in module
+
+ This is so that drivers can do a runtime check that DRI3 is available,
+ similar to existing runtime checks performed by the drivers for DRI and
+ DRI2.
+
+ v2: Only add DRI3 to the list if the module was actually built into the
+ server (Mark Kettenis).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Mark Kettenis <mark.kettenis@xs4all.nl>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b5526141f78df15bc5df2497bc4b4a17f1a6368d
+Merge: dc8d068 a205ec3
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 2 13:08:23 2014 -0700
+
+ Merge remote-tracking branch 'jturney/master'
+
+commit dc8d0688471695ec5a8db5fef93fbcfc064891d5
+Author: Max Filippov <jcmvbkbc@gmail.com>
+Date: Mon Jun 2 01:17:31 2014 +0400
+
+ xtensa: add support for xtensa architecture
+
+ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f
+Merge: 63c48de 1c10b37
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 2 11:30:24 2014 -0700
+
+ Merge remote-tracking branch 'jeremyhu/master'
+
+commit 63c48de63becdee680e90cb2363984c2f8f77fd1
+Author: Søren Sandmann <soren.sandmann@gmail.com>
+Date: Fri May 30 16:50:35 2014 -0400
+
+ xfree86: Add "modesetting" to list of fallback drivers
+
+ To make X -configure work properly, the output of fixup_video_driver_list()
+ should be in order of preference. Otherwise, the config file may use
+ the incorrect driver for some devices.
+
+ In particular, the drivers that work for all (or many) devices need to be
+ last in the list. Since the modesetting driver works for many devices,
+ it needs to be considered a fallback driver.
+
+ Signed-off-by: Søren Sandmann <ssp@redhat.com>
+ Acked-by: Daniel Stone <daniels@collabora.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ab47ec9636b21a7f542d2e8612834915e7c8cc64
+Merge: 0df871c cfaf2ab
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 2 11:22:48 2014 -0700
+
+ Merge remote-tracking branch 'whot/for-keith'
+
+commit 0df871cf34ee5f1a85586206027de9b02fb364ec
+Author: Robert Ancell <robert.ancell@canonical.com>
+Date: Thu May 22 10:43:52 2014 +1200
+
+ Fix overflow checking extension versions
+
+ The easiest way to check for the version of an extension is to send the maximum
+ possible version numbers in the QueryVersion request. The X server overflows on
+ these as it assumes you will send a reasonable version number.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4cbd3fabaa41e89579530bceb01b9239fa2afdb7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 09:22:49 2014 -0400
+
+ configure: Require sufficiently new wayland-client for xwayland ddx
+
+ The explicit release requests were added in 1.3.0, don't try to build
+ against older.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a205ec3ab77c6765d44f77c526a832345fef77b0
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat Apr 5 15:15:46 2014 +0100
+
+ configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used
+
+ Commit f37a46913489397d8628ffe578c8d4ed50b6ca72 removed this from
+ xwin-config.h.in for some reason, but it is used.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
Reply to: