.dir-locals.el | 1
COPYING | 1
ChangeLog | 8258 +++-
Makefile.am | 14
Xext/panoramiX.c | 25
Xext/panoramiXsrv.h | 1
Xext/security.c | 11
Xext/shm.c | 242
Xext/shmint.h | 24
Xext/sync.c | 53
Xext/syncsrv.h | 13
Xext/xvdisp.c | 21
Xext/xvmain.c | 4
Xi/chgdctl.c | 6
Xi/exevents.c | 37
Xi/extinit.c | 2
Xi/grabdev.c | 5
Xi/setdval.c | 3
Xi/setmode.c | 4
Xi/xibarriers.c | 12
Xi/xibarriers.h | 4
composite/compalloc.c | 4
composite/compext.c | 7
composite/compinit.c | 7
composite/compoverlay.c | 5
config/10-quirks.conf | 54
config/Makefile.am | 4
config/non-seat0.conf.multi-seat | 18
config/udev.c | 4
configure.ac | 376
damageext/damageext.c | 427
damageext/damageextint.h | 3
dbe/Makefile.am | 3
dbe/dbe.c | 81
dbe/dbestruct.h | 21
dbe/midbe.c | 126
dbe/midbestr.h | 75
debian/changelog | 69
debian/compat | 2
debian/control | 70
debian/patches/aarch64.patch | 39
debian/patches/glx-corner-case-drawablegone.patch | 39
debian/patches/glx-fix-memory-leak.patch | 237
debian/patches/glx-link-against-glapi.patch | 31
debian/patches/glx-remove-current-context-cache.patch | 338
debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch | 42
debian/patches/series | 9
debian/patches/xephyr-glx-register.patch | 39
debian/patches/xfree86-hurd-include-hurd.h.patch | 53
debian/patches/xmir.patch | 210
debian/rules | 58
debian/serverminver | 6
debian/xorg-server-source.install | 1
debian/xserver-xfbdev.install | 1
dix/Makefile.am | 3
dix/cursor.c | 6
dix/devices.c | 48
dix/dispatch.c | 117
dix/dixutils.c | 8
dix/events.c | 5
dix/getevents.c | 46
dix/inpututils.c | 30
dix/main.c | 12
dix/pixmap.c | 1
dix/privates.c | 1
dix/ptrveloc.c | 5
dix/region.c | 15
dix/registry.c | 25
dix/stubmain.c | 35
dix/window.c | 16
dri3/Makefile.am | 13
dri3/dri3.c | 92
dri3/dri3.h | 65
dri3/dri3_event.c | 163
dri3/dri3_priv.h | 80
dri3/dri3_request.c | 395
dri3/dri3_screen.c | 86
dri3/dri3int.h | 26
exa/Makefile.am | 6
exa/exa_classic.c | 1
exa/exa_migration_mixed.c | 12
exa/exa_mixed.c | 13
fb/fb.h | 34
fb/fbcopy.c | 27
fb/fbpict.c | 8
fb/wfbrename.h | 1
glx/Makefile.am | 24
glx/createcontext.c | 4
glx/dispatch.h |19816 ----------
glx/extension_string.c | 7
glx/extension_string.h | 6
glx/glapi.c | 504
glx/glapi.h | 135
glx/glapi_gentable.c |10058 -----
glx/glapitable.h | 1016
glx/glprocs.h | 3534 -
glx/glthread.h | 234
glx/glxcmds.c | 222
glx/glxcmdsswap.c | 4
glx/glxcontext.h | 11
glx/glxdri.c | 1168
glx/glxdri2.c | 78
glx/glxdricommon.c | 49
glx/glxdriswrast.c | 15
glx/glxext.c | 55
glx/glxext.h | 16
glx/glxscreens.c | 17
glx/glxscreens.h | 8
glx/glxserver.h | 16
glx/indirect_dispatch.c | 3446 -
glx/indirect_dispatch.h | 602
glx/indirect_dispatch_swap.c | 4231 --
glx/indirect_program.c | 63
glx/indirect_reqsize.c | 77
glx/indirect_reqsize.h | 47
glx/indirect_size.h | 12
glx/indirect_size_get.c | 204
glx/indirect_size_get.h | 16
glx/indirect_table.c | 468
glx/indirect_texture_compression.c | 27
glx/indirect_util.c | 7
glx/render2.c | 77
glx/render2swap.c | 77
glx/renderpix.c | 26
glx/renderpixswap.c | 26
glx/single2.c | 18
glx/single2swap.c | 16
glx/singlepix.c | 87
glx/singlepixswap.c | 88
glx/singlesize.c | 10
glx/swap_interval.c | 4
glx/xfont.c | 30
hw/dmx/Makefile.am | 2
hw/dmx/config/dmxcompat.c | 4
hw/dmx/dmx.h | 4
hw/dmx/dmx_glxvisuals.c | 32
hw/dmx/dmxcursor.c | 2
hw/dmx/dmxextension.c | 3
hw/dmx/dmxinit.c | 16
hw/dmx/dmxpict.c | 4
hw/dmx/dmxscrinit.c | 255
hw/dmx/dmxshadow.c | 70
hw/dmx/dmxshadow.h | 46
hw/dmx/glxProxy/Makefile.am | 1
hw/dmx/glxProxy/glxcmds.c | 60
hw/dmx/glxProxy/glxext.c | 6
hw/dmx/glxProxy/glxscreens.c | 9
hw/dmx/glxProxy/glxserver.h | 2
hw/dmx/glxProxy/glxsingle.c | 36
hw/dmx/glxProxy/glxutil.c | 37
hw/dmx/glxProxy/glxutil.h | 2
hw/dmx/glxProxy/glxvendor.c | 34
hw/dmx/input/dmxbackend.c | 6
hw/dmx/input/dmxcommon.c | 5
hw/dmx/input/dmxevents.c | 3
hw/dmx/input/usb-private.h | 4
hw/dmx/man/Xdmx.man | 10
hw/kdrive/ephyr/Makefile.am | 93
hw/kdrive/ephyr/XF86dri.c | 647
hw/kdrive/ephyr/ephyr.c | 454
hw/kdrive/ephyr/ephyr.h | 20
hw/kdrive/ephyr/ephyrdri.c | 202
hw/kdrive/ephyr/ephyrdri.h | 2
hw/kdrive/ephyr/ephyrdriext.c | 32
hw/kdrive/ephyr/ephyrglxext.c | 14
hw/kdrive/ephyr/ephyrhostglx.c | 662
hw/kdrive/ephyr/ephyrhostglx.h | 11
hw/kdrive/ephyr/ephyrhostproxy.c | 91
hw/kdrive/ephyr/ephyrhostproxy.h | 51
hw/kdrive/ephyr/ephyrhostvideo.c | 975
hw/kdrive/ephyr/ephyrhostvideo.h | 231
hw/kdrive/ephyr/ephyrinit.c | 43
hw/kdrive/ephyr/ephyrproxyext.c | 115
hw/kdrive/ephyr/ephyrproxyext.h | 33
hw/kdrive/ephyr/ephyrvideo.c | 770
hw/kdrive/ephyr/hostx.c | 1233
hw/kdrive/ephyr/hostx.h | 104
hw/kdrive/ephyr/man/Xephyr.man | 6
hw/kdrive/ephyr/os.c | 2
hw/kdrive/ephyr/xf86dri.h | 124
hw/kdrive/fake/Makefile.am | 2
hw/kdrive/fbdev/Makefile.am | 2
hw/kdrive/fbdev/fbdev.c | 167
hw/kdrive/fbdev/fbdev.h | 2
hw/kdrive/linux/Makefile.am | 2
hw/kdrive/linux/evdev.c | 2
hw/kdrive/linux/linux.c | 2
hw/kdrive/linux/mouse.c | 12
hw/kdrive/linux/ps2.c | 2
hw/kdrive/src/Makefile.am | 2
hw/kdrive/src/kdrive.c | 12
hw/kdrive/src/kdrive.h | 14
hw/kdrive/src/kinput.c | 40
hw/kdrive/src/kxv.c | 2
hw/xfree86/Makefile.am | 43
hw/xfree86/common/Makefile.am | 2
hw/xfree86/common/compiler.h | 2
hw/xfree86/common/xf86.h | 25
hw/xfree86/common/xf86AutoConfig.c | 17
hw/xfree86/common/xf86Config.c | 3
hw/xfree86/common/xf86Configure.c | 2
hw/xfree86/common/xf86Cursor.c | 3
hw/xfree86/common/xf86DPMS.c | 9
hw/xfree86/common/xf86Events.c | 32
hw/xfree86/common/xf86Helper.c | 7
hw/xfree86/common/xf86Mode.c | 17
hw/xfree86/common/xf86Module.h | 6
hw/xfree86/common/xf86Option.c | 2
hw/xfree86/common/xf86RandR.c | 16
hw/xfree86/common/xf86fbman.c | 12
hw/xfree86/common/xf86sbusBus.c | 6
hw/xfree86/common/xf86xvmc.c | 4
hw/xfree86/ddc/Makefile.am | 2
hw/xfree86/ddc/ddc.c | 7
hw/xfree86/ddc/xf86DDC.h | 2
hw/xfree86/dixmods/Makefile.am | 4
hw/xfree86/dixmods/glxmodule.c | 3
hw/xfree86/dri2/dri2.c | 19
hw/xfree86/dri2/dri2ext.c | 5
hw/xfree86/exa/Makefile.am | 2
hw/xfree86/fbdevhw/Makefile.am | 2
hw/xfree86/fbdevhw/fbdevhw.c | 1
hw/xfree86/i2c/Makefile.am | 2
hw/xfree86/int10/Makefile.am | 6
hw/xfree86/loader/Makefile.am | 2
hw/xfree86/man/xorg.conf.man | 18
hw/xfree86/modes/Makefile.am | 6
hw/xfree86/modes/xf86Crtc.c | 112
hw/xfree86/modes/xf86Crtc.h | 3
hw/xfree86/modes/xf86DisplayIDModes.c | 1
hw/xfree86/modes/xf86Modes.h | 6
hw/xfree86/modes/xf86RandR12.c | 1
hw/xfree86/modes/xf86RandR12.h | 3
hw/xfree86/modes/xf86Rename.h | 94
hw/xfree86/modes/xf86Rotate.c | 6
hw/xfree86/os-support/bsd/Makefile.am | 2
hw/xfree86/os-support/bus/Makefile.am | 2
hw/xfree86/os-support/bus/Sbus.c | 8
hw/xfree86/os-support/hurd/Makefile.am | 2
hw/xfree86/os-support/hurd/hurd_init.c | 1
hw/xfree86/os-support/hurd/hurd_mmap.c | 1
hw/xfree86/os-support/hurd/hurd_video.c | 1
hw/xfree86/os-support/linux/Makefile.am | 2
hw/xfree86/os-support/linux/lnx_platform.c | 14
hw/xfree86/os-support/linux/lnx_video.c | 3
hw/xfree86/os-support/misc/Makefile.am | 2
hw/xfree86/os-support/shared/vidmem.c | 13
hw/xfree86/os-support/solaris/Makefile.am | 2
hw/xfree86/os-support/stub/Makefile.am | 2
hw/xfree86/os-support/xf86OSpriv.h | 2
hw/xfree86/os-support/xf86_OSlib.h | 5
hw/xfree86/os-support/xf86_OSproc.h | 2
hw/xfree86/parser/Makefile.am | 2
hw/xfree86/ramdac/Makefile.am | 2
hw/xfree86/ramdac/xf86Cursor.c | 1
hw/xfree86/sdksyms.sh | 4
hw/xfree86/shadowfb/Makefile.am | 2
hw/xfree86/utils/cvt/Makefile.am | 3
hw/xfree86/utils/cvt/cvt.c | 1
hw/xfree86/vbe/Makefile.am | 3
hw/xfree86/vbe/vbe.c | 18
hw/xfree86/vgahw/Makefile.am | 2
hw/xfree86/x86emu/Makefile.am | 2
hw/xfree86/x86emu/decode.c | 10
hw/xfree86/x86emu/x86emu/regs.h | 9
hw/xfree86/x86emu/x86emu/x86emui.h | 12
hw/xnest/Args.h | 2
hw/xnest/GCOps.c | 13
hw/xnest/Pixmap.c | 15
hw/xnest/Screen.c | 1
hw/xnest/XNPixmap.h | 2
hw/xquartz/GL/glcontextmodes.c | 1
hw/xquartz/GL/indirect.c | 26
hw/xquartz/GL/visualConfigs.c | 6
hw/xquartz/Makefile.am | 5
hw/xquartz/X11Controller.m | 8
hw/xquartz/bundle/Info.plist.cpp | 4
hw/xquartz/pbproxy/x-selection.m | 3
hw/xquartz/pseudoramiX.c | 516
hw/xquartz/pseudoramiX.h | 10
hw/xquartz/xpr/Makefile.am | 1
hw/xquartz/xpr/xprCursor.c | 2
hw/xwin/InitInput.c | 1
hw/xwin/InitOutput.c | 40
hw/xwin/Makefile.am | 10
hw/xwin/XWin.exe.manifest | 2
hw/xwin/glx/Makefile.am | 34
hw/xwin/glx/gen_gl_wrappers.py | 766
hw/xwin/glx/glshim.c | 124
hw/xwin/glx/glthunk.c | 87
hw/xwin/glx/glwindows.h | 7
hw/xwin/glx/glwrap.c | 146
hw/xwin/glx/indirect.c | 45
hw/xwin/win.h | 29
hw/xwin/winauth.c | 7
hw/xwin/winclipboard.h | 4
hw/xwin/winclipboardthread.c | 16
hw/xwin/winclipboardwndproc.c | 11
hw/xwin/winclipboardwrappers.c | 2
hw/xwin/wincursor.c | 43
hw/xwin/windialogs.c | 74
hw/xwin/winfillsp.c | 2
hw/xwin/winglobals.c | 2
hw/xwin/winglobals.h | 5
hw/xwin/winkeybd.c | 64
hw/xwin/winmessages.h | 2
hw/xwin/winmouse.c | 50
hw/xwin/winmsgwindow.c | 180
hw/xwin/winmultiwindowclass.c | 31
hw/xwin/winmultiwindowclass.h | 2
hw/xwin/winmultiwindowicons.c | 6
hw/xwin/winmultiwindowwindow.c | 15
hw/xwin/winmultiwindowwm.c | 56
hw/xwin/winmultiwindowwndproc.c | 30
hw/xwin/winpfbdd.c | 13
hw/xwin/winprefs.c | 29
hw/xwin/winprefs.h | 10
hw/xwin/winscrinit.c | 6
hw/xwin/winsetsp.c | 52
hw/xwin/wintrayicon.c | 2
hw/xwin/winwin32rootless.c | 44
hw/xwin/winwin32rootlesswindow.c | 8
hw/xwin/winwin32rootlesswndproc.c | 27
hw/xwin/winwindow.c | 4
hw/xwin/winwindow.h | 1
hw/xwin/winwindowswm.c | 21
hw/xwin/winwndproc.c | 27
include/Makefile.am | 1
include/busfault.h | 48
include/callback.h | 1
include/cursorstr.h | 2
include/dix-config.h.in | 29
include/dixstruct.h | 23
include/extinit.h | 12
include/input.h | 17
include/inputstr.h | 2
include/list.h | 2
include/misc.h | 29
include/os.h | 10
include/privates.h | 1
include/protocol-versions.h | 12
include/regionstr.h | 2
include/registry.h | 2
include/servermd.h | 14
include/xkbsrv.h | 3
include/xorg-config.h.in | 3
include/xorg-server.h.in | 12
mi/mieq.c | 2
mi/miinitext.c | 11
mi/mipointer.c | 23
mi/mipointer.h | 12
mi/misprite.c | 10
mi/miwideline.c | 6
miext/damage/Makefile.am | 2
miext/damage/damage.c | 151
miext/damage/damage.h | 20
miext/damage/damagestr.h | 3
miext/rootless/rootlessWindow.c | 6
miext/shadow/Makefile.am | 5
miext/shadow/c2p_core.h | 187
miext/shadow/shadow.c | 2
miext/shadow/shadow.h | 12
miext/shadow/shafb4.c | 139
miext/shadow/shafb8.c | 143
miext/shadow/shiplan2p4.c | 136
miext/shadow/shiplan2p8.c | 137
miext/shadow/shpacked.c | 1
miext/sync/Makefile.am | 11
miext/sync/misync.c | 46
miext/sync/misync.h | 23
miext/sync/misyncfd.c | 99
miext/sync/misyncfd.h | 45
miext/sync/misyncshm.c | 186
miext/sync/misyncshm.h | 28
miext/sync/misyncstr.h | 15
os/Makefile.am | 10
os/WaitFor.c | 5
os/access.c | 8
os/backtrace.c | 80
os/busfault.c | 150
os/connection.c | 2
os/io.c | 96
os/log.c | 3
os/osinit.c | 18
os/utils.c | 53
os/xstrans.c | 2
present/Makefile.am | 17
present/present.c | 911
present/present.h | 127
present/present_event.c | 247
present/present_fake.c | 140
present/present_fence.c | 139
present/present_notify.c | 114
present/present_priv.h | 302
present/present_request.c | 331
present/present_screen.c | 236
present/presentext.h | 29
pseudoramiX/Makefile.am | 7
pseudoramiX/pseudoramiX.c | 516
pseudoramiX/pseudoramiX.h | 10
randr/randrstr.h | 4
randr/rrcrtc.c | 9
record/record.c | 4
test/.gitignore | 1
test/Makefile.am | 19
test/input.c | 2
test/xi2/Makefile.am | 2
xfixes/cursor.c | 10
xfixes/region.c | 26
xkb/xkb.c | 3
xkb/xkbActions.c | 149
xkb/xkbInit.c | 26
412 files changed, 22580 insertions(+), 52398 deletions(-)
New commits:
commit e72bcb71ffb4c58787f1bfe4aad0a63f1acbacbf
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Tue Feb 4 15:46:21 2014 +0000
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 92b5186..479a058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.0-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.15.0-1ubuntu1) trusty; urgency=low
* New upstream release.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
12:53:32 +0100
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 04 Feb 2014
15:45:00 +0000
xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
commit 9c9b89124180d8344e3b84f56d70d19c5eb4e143
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Tue Feb 4 11:49:57 2014 +0000
Remove mention of revert for building, already released.
diff --git a/debian/changelog b/debian/changelog
index e4c1abf..92b5186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
xorg-server (2:1.15.0-1ubuntu1) UNRELEASED; urgency=low
* New upstream release.
- * Add a workaround for a linker crash bug. (LP: #1266492)
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
12:53:32 +0100
commit 03f5cf60f42012a57c23e2b615a0cc545a682112
Author: Yaroslav Halchenko <deb...@onerussian.com>
Date: Tue Jan 7 00:58:30 2014 +0100
Add xorg-server-source binary package
Provides a tarball with original (patched, autoreconfed) sources of the
xserver for use by vnc implementations (closes: #730552)
diff --git a/debian/changelog b/debian/changelog
index 665527a..14a9f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Bump debhelper compat level to 7.
+ [ Yaroslav Halchenko ]
+ * Adding xorg-server-source binary package to provide a tarball with
+ original (patched, autoreconfed) sources of the xserver (Closes:
+ #730552)
+
-- Julien Cristau <jcris...@debian.org> Tue, 07 Jan 2014 00:51:53 +0100
xorg-server (2:1.15.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 94a88f7..aaad746 100644
--- a/debian/control
+++ b/debian/control
@@ -341,3 +341,17 @@ Recommends:
Replaces: xserver-xorg-core (<< 2:1.5.2)
Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
+
+Package: xorg-server-source
+Architecture: all
+Depends:
+ ${misc:Depends},
+Description: Xorg X server - source files
+ This package provides original Debian (with Debian patches already
+ applied, and autotools files updated) sources for the X.Org ('Xorg')
+ X server shipped in a tarball. This enables other projects re-using
+ X server codebase (e.g. VNC servers) to (re-)use officially
+ Debian-supported version of the X xserver for their builds.
+ .
+ Unless you are building a software product using X server sources,
+ you probably want xserver-xorg and/or xserver-xorg-core instead.
diff --git a/debian/rules b/debian/rules
index c81c554..bf5f14b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,6 +192,16 @@ $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir
$(QUILT_STAMPFN)
autoreconf -vfi
>$@
+$(STAMP_DIR)/build-source: $(STAMP_DIR)/autoreconf
+ mkdir -p build-source
+ tar \
+ --owner=0 --group=0 \
+ --transform 's,^,xorg-server/,' \
+ --exclude=stampdir --exclude=debian \
+ --exclude=build-* --exclude=autom4te.cache \
+ -cf - * | xz > build-source/xorg-server.tar.xz
+ >$@
+
$(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
dh_testdir
mkdir -p build-$*
@@ -224,7 +234,7 @@ build: $(STAMP_DIR)/build-udeb
build: $(STAMP_DIR)/tests-udeb
endif
build-arch: build
-build-indep: build
+build-indep: $(STAMP_DIR)/build-source build
clean: unpatch
dh_testdir
@@ -357,7 +367,7 @@ endif
# Build architecture-independent files here
-binary-indep: build install
+binary-indep: build-indep install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i
dh_installdocs -i
diff --git a/debian/xorg-server-source.install
b/debian/xorg-server-source.install
new file mode 100644
index 0000000..712189c
--- /dev/null
+++ b/debian/xorg-server-source.install
@@ -0,0 +1 @@
+build-source/xorg-server.tar.* usr/src
commit cccd71746577278f6dc66572425b1728e4c1d4b2
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Jan 7 00:55:37 2014 +0100
Stop using dh_install --sourcedir=debian/tmp
No longer necessary in v7
diff --git a/debian/rules b/debian/rules
index 89c54aa..c81c554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -325,7 +325,7 @@ binary-arch: build install
dh_installdocs -s
dh_installchangelogs -s
- dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp
--list-missing
+ dh_install $(DH_INSTALL_OPTIONS) -s --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig
pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
@@ -359,7 +359,7 @@ endif
# Build architecture-independent files here
binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
- dh_install -i --sourcedir=debian/tmp
+ dh_install -i
dh_installdocs -i
dh_installchangelogs -i ChangeLog
commit a8d100ba5a22ef64a7ed5b7c1a7d85390310486e
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Jan 7 00:52:20 2014 +0100
Bump debhelper compat level to 7.
diff --git a/debian/changelog b/debian/changelog
index 089309f..665527a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
+
+ * Bump debhelper compat level to 7.
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 07 Jan 2014 00:51:53 +0100
+
xorg-server (2:1.15.0-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
commit 3c22ecd6c0e9d87c3f34836e6398e296628f191a
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jan 6 16:27:13 2014 +0100
Add a workaround for a linker crash bug. (LP: #1266492)
diff --git a/debian/changelog b/debian/changelog
index d9e3d96..289b736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.15.0-1ubuntu1) UNRELEASED; urgency=low
* New upstream release.
+ * Add a workaround for a linker crash bug. (LP: #1266492)
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
12:53:32 +0100
diff --git a/debian/rules b/debian/rules
index d16b68d..065d28e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,6 +97,9 @@ SUPPORT = For technical support please see
http://www.ubuntu.com/support
SOURCE_NAME := xorg-server
SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
+# Add a workaround for LP: #1266492
+confflags += lt_cv_prog_compiler_static_works=no
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
commit 03939d55b7e80ec35d0cfea0a218a56558945adc
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jan 6 13:05:23 2014 +0100
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 6114ab6..d9e3d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-1ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
12:53:32 +0100
+
xorg-server (2:1.15.0-1) experimental; urgency=low
* New upstream release.
commit 43b3af1ac76ecdd54bdbf83f540cb0e249cc4fd5
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jan 6 11:00:52 2014 +0100
release to experimental
diff --git a/debian/changelog b/debian/changelog
index f3a710c..089309f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.0-1) UNRELEASED; urgency=low
+xorg-server (2:1.15.0-1) experimental; urgency=low
* New upstream release.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
10:33:40 +0100
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
11:00:39 +0100
xorg-server (2:1.14.99.904-2) experimental; urgency=medium
commit 86cf6ed0966f415ff5e866a298610c681a188339
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Jan 6 11:00:36 2014 +0100
bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 6cbd031..109ce8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,251 @@
+commit 2ea973e12f5d954211e1d10085a4c74581b43aca
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri Dec 27 09:50:55 2013 -0800
+
+ Bump version to 1.15.0
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 2eb9915eea358f941702d3dad7434197991885c5
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Dec 12 15:48:08 2013 -0800
+
+ present: Set complete notify mode to Skip as needed
+
+ Skipped present pixmap calls were not setting the mode to
+ PresentCompleteModeSkip for skipped operations.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit e487babd525ef1bd016ec7b283fa08cf9e6c6f4f
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Dec 12 14:52:35 2013 -0800
+
+ present: Don't abandon presents which are already queued for flip
+
+ Presents which are not marked 'queued' and are in the window present
+ list are waiting for the flip event; discarding those won't work very
+ well (it'll end up trashing displayed content for the next frame), so
+ skip over those when looking for duplicate frame presents
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit ca3a5b2a8f9f627bbaa9883e16512a21c2a0b81d
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Dec 12 14:17:40 2013 -0800
+
+ present: Handle PresentOptionAsync for copy mode
+
+ Check for Async flag and execute immediately if set, otherwise wait
+ for the next appropriate vblank before copying.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit a68df147421da21528b5be2d34678383922fa352
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Dec 19 14:31:07 2013 -0800
+
+ Bump version to 1.14.99.905 (1.15 RC5)
+
+ Another week, another RC. This should be the last before 1.15 final
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0
+Merge: 4d62646 929795d
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Dec 19 14:14:59 2013 -0800
+
+ Merge remote-tracking branch 'whot/for-keith'
+
+commit 4d62646142718024b0981eb4f1fd0131e829161f
+Merge: f4bfb14 81ba89d
+Author: Keith Packard <kei...@keithp.com>
+Date: Mon Dec 16 09:27:57 2013 -0800
+
+ Merge remote-tracking branch 'jeremyhu/master'
+
+commit f4bfb14f53a939574da1f5995f0dad949898b86a
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu Dec 12 10:57:40 2013 -0500
+
+ configure: Fix a typo near dri3/shmfence detection
+
+ " is not the mate of ].
+
+ Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 8248b4af31ef71ac03158871b77f20eb456dbe38
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 13 15:07:48 2013 -0500
+
+ glx: Add null pointer protection to __glGetProcAddress
+
+ This can't happen when GLX is the backing window system, but can
+ elsewhere. We may as well protect against it at a high level.
+
+ Reviewed-by: Eric Anholt <e...@anholt.net>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 128449dd6498a2f74c3770f89a9dae0f70e2b351
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 13 11:39:16 2013 -0500
+
+ present: Don't use the major/minor version from the protocol headers
+
+ We want to advertise the version we implement, not the version the
+ protocol headers happen to describe.
+
+ Reviewed-by: Jasper St. Pierre <<jstpie...@mecheye.net>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit ec6087bf070131bc3a26848fb9fb840f09b0e19d
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 13 11:36:38 2013 -0500
+
+ dri3: Don't use the major/minor version from the protocol headers
+
+ We want to advertise the version we implement, not the version the
+ protocol headers happen to describe.
+
+ Reviewed-by: Jasper St. Pierre <<jstpie...@mecheye.net>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit e6fafd3de70d315130fb6e5732cfd02a5901b788
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Dec 13 11:28:59 2013 -0500
+
+ dri3: Guard against buggy clients
+
+ There's nothing to stop a client from sending these requests to screens
+ without DRI3 support, and if they do, we'll crash. Let's not do that.
+
+ Reviewed-by: Jasper St. Pierre <<jstpie...@mecheye.net>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 81ba89d6703a22178a153aa39478ba2d4bde262b
+Author: Jeremy Huddleston Sequoia <jerem...@apple.com>
+Date: Fri Dec 13 01:39:44 2013 -0800
+
+ configure.ac: Add PRESENT_LIB to XQUARTZ_LIBS
+
+ Undefined symbols for architecture x86_64:
+ "_present_extension_init", referenced from:
+ _staticExtensions in libXquartz.a(miinitext.o)
+ "_present_register_complete_notify", referenced from:
+ ___glXregisterPresentCompleteNotify in libglx.a(glxcmds.o)
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit d7c9235ee261b0f780320985233e00dec5e2689c
+Author: Jeremy Huddleston Sequoia <jerem...@apple.com>
+Date: Sat Dec 7 01:36:33 2013 -0800
+
+ XQuartz: Use asl_log_descriptor to log stdout/stderr of child processes
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit ad8111d7c971ce448905c733d65ba0cfc72bdca4
+Author: Jeremy Huddleston Sequoia <jerem...@apple.com>
+Date: Sat Dec 7 01:14:37 2013 -0800
+
+ darwin: Don't leave stdin/stdout closed
+
+ <rdar://problem/15609419>
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
+
+commit 929795d50d788358d6269ce423f72c6cc40e334b
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 3 10:14:51 2013 +1000
+
+ dix: fix check for grab type
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 23394c7fea0f5c33333198c87ecfecc9f6c6a791
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 3 08:36:45 2013 +1000
+
+ Xi: ungrab device when releasing a passive grab without ButtonReleaseMask
(#71878)
+
+ If an touch triggers an async button grab and that grab does not have the
+ ButtonReleaseMask set, the TouchEnd is never delivered, deliveries is 0
and
+ the grab is never deactivated.
+
+ If the grab is pointer async and keyboard sync, the keyboard events are
stuck
+ in EnqueueEvent until some other pointer event terminates the grab.
+
+ Change this to check for the number of listeners. If we're about to
deliver a
+ TouchEnd to a passive pointer grab, the number of listeners is already 1 -
+ pointer grabs always accept so other listeners were removed.
+
+ X.Org Bug 71878 <http://bugs.freedesktop.org/show_bug.cgi?id=71878>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit c1d30b5bd7f90e68bc38404fd0cc32578d6d3018
+Author: Ben Gamari <bgamari.f...@gmail.com>
+Date: Thu Nov 21 21:24:20 2013 -0500
+
+ Xi: Don't ActivateEarlyAccept POINTER_REGULAR listeners
+
+ Bug #71878 describes a bug resulting in the server ceasing to respond to
+ keyboard input after a touch event. The problem might be the following:
+
+ DeliverTouchBeginEvent tries to deliver an event to a listener of type
+ LISTENER_POINTER_REGULAR, taking the following if branch,
+
+ if (listener->type == LISTENER_POINTER_REGULAR ||
+ listener->type == LISTENER_POINTER_GRAB) {
+ rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
+ grab, xi2mask);
+ if (rc == Success) {
+ listener->state = LISTENER_IS_OWNER;
+ /* async grabs cannot replay, so automatically accept this
touch */
+ if (dev->deviceGrab.grab &&
+ dev->deviceGrab.fromPassiveGrab &&
+ dev->deviceGrab.grab->pointerMode == GrabModeAsync)
+ ActivateEarlyAccept(dev, ti);
+ }
+ goto out;
+ }
+
+ DeliverTouchEmulatedEvent succeeds. The deviceGrab meets all
+ three of the conditions of the inner if, enters
+ ActivateEarlyAccept which then fails due to,
+
+ BUG_RETURN(ti->listeners[0].type != LISTENER_GRAB &&
+ ti->listeners[0].type != LISTENER_POINTER_GRAB);
+
+ That is, despite listener->type == LISTENER_POINTER_REGULAR. With my
+ non-existent knowledge of XINPUT, it seems like the solution here
+ might be to only ActivateEarlyAccept when listener->type ==
+ LISTENER_POINTER_GRAB.
+
+ Signed-off-by: Ben Gamari <bgamari.f...@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit fe07ec19e212a68076560d243a2a935c54589068
+Author: Keith Packard <kei...@keithp.com>
+Date: Tue Dec 10 11:27:47 2013 -0800
+
+ present: recursively set window pixmaps on flip
+
+ Newly created windows inherit the pixmap of their parent, similarly,
+ reparenting a tree inherits the pixmap of the destination tree.
+
+ Making present preserve the invariant that unredirected windows always
+ have the same pixmap as their parent ensures that the above cases work
+ correctly.
+
+ v2: name the recursive function to 'set_tree_pixmap' instead of
'set_window_pixmap'
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+
commit b3533d0b212b6747a8f9a01931253d6bdb648ee2
Author: Keith Packard <kei...@keithp.com>
Date: Tue Dec 10 10:29:11 2013 -0800
diff --git a/debian/changelog b/debian/changelog
index 0809f1f..f3a710c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 06 Jan 2014
10:33:40 +0100
+
xorg-server (2:1.14.99.904-2) experimental; urgency=medium
* Pass VERBOSE=1 to make check to make debugging test failures possible.
commit 2ea973e12f5d954211e1d10085a4c74581b43aca
Author: Keith Packard <kei...@keithp.com>
Date: Fri Dec 27 09:50:55 2013 -0800
Bump version to 1.15.0
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/configure.ac b/configure.ac
index 7ec1997..8f82386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.99.905,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-12-19"
-RELEASE_NAME="Kraken"
+AC_INIT([xorg-server], 1.15.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-12-27"
+RELEASE_NAME="Egg Nog"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_USE_SYSTEM_EXTENSIONS
commit 2eb9915eea358f941702d3dad7434197991885c5
Author: Keith Packard <kei...@keithp.com>
Date: Thu Dec 12 15:48:08 2013 -0800
present: Set complete notify mode to Skip as needed
Skipped present pixmap calls were not setting the mode to
PresentCompleteModeSkip for skipped operations.
Signed-off-by: Keith Packard <kei...@keithp.com>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1wakhj-0005pt...@moszumanska.debian.org
