xorg-server: Changes to 'debian-experimental'
ChangeLog |162271 ----------------------
Xext/Makefile.am | 7
Xext/geext.c | 22
Xext/panoramiXprocs.c | 4
Xext/saver.c | 2
Xext/security.c | 2
Xext/shape.c | 1
Xext/shm.c | 25
Xext/sleepuntil.c | 17
Xext/sync.c | 45
Xext/vidmode.c | 2151
Xext/xace.c | 38
Xext/xace.h | 12
Xext/xf86bigfont.c | 10
Xext/xres.c | 96
Xext/xselinux_hooks.c | 18
Xext/xvdisp.c | 3
Xext/xvmain.c | 11
Xext/xvmc.c | 17
Xi/exevents.c | 11
Xi/extinit.c | 17
Xi/xiproperty.c | 8
Xi/xiquerypointer.c | 4
autogen.sh | 3
composite/compalloc.c | 4
composite/compext.c | 29
config/config.c | 4
config/dbus-core.c | 18
config/hal.c | 4
config/udev.c | 57
config/wscons.c | 2
configure.ac | 190
damageext/damageext.c | 23
debian/changelog | 100
debian/control | 19
debian/local/xvfb-run.1 | 2
debian/patches/02_kbsd-input-devd.diff | 60
debian/patches/03_static-nettle.diff | 8
debian/patches/05_Revert-Unload-submodules.diff | 8
debian/patches/06_use-intel-only-on-pre-gen4.diff | 30
debian/patches/08_xfree86_fix_ia64_inx_outx.diff | 66
debian/patches/add_support_new_libsystemd.patch | 11
debian/patches/series | 3
debian/rules | 2
debian/serverminver | 6
debian/watch | 2
debian/xserver-xorg-core.NEWS | 14
debian/xserver-xorg-core.bug.script | 4
debian/xserver-xorg-legacy.config | 2
debian/xserver-xorg-legacy.postinst | 2
debian/xserver-xorg-legacy.postrm | 2
dix/cursor.c | 23
dix/devices.c | 49
dix/dispatch.c | 210
dix/dixfonts.c | 326
dix/dixutils.c | 67
dix/enterleave.c | 20
dix/events.c | 17
dix/getevents.c | 29
dix/inpututils.c | 4
dix/main.c | 19
dix/pixmap.c | 28
dix/privates.c | 9
dix/property.c | 14
dix/ptrveloc.c | 52
dix/selection.c | 3
dix/touch.c | 92
dix/window.c | 158
doc/Xinput.xml | 8
doc/Xserver-spec.xml | 59
dri3/dri3_request.c | 12
dri3/dri3int.h | 26
exa/exa.c | 10
exa/exa_glyphs.c | 8
exa/exa_render.c | 3
glamor/Makefile.am | 6
glamor/glamor.c | 131
glamor/glamor.h | 45
glamor/glamor_composite_glyphs.c | 31
glamor/glamor_compositerects.c | 18
glamor/glamor_copy.c | 66
glamor/glamor_core.c | 190
glamor/glamor_dash.c | 9
glamor/glamor_egl.c | 327
glamor/glamor_egl_stubs.c | 11
glamor/glamor_fbo.c | 281
glamor/glamor_font.c | 41
glamor/glamor_font.h | 2
glamor/glamor_glyphblt.c | 12
glamor/glamor_gradient.c | 33
glamor/glamor_lines.c | 6
glamor/glamor_picture.c | 979
glamor/glamor_points.c | 7
glamor/glamor_priv.h | 134
glamor/glamor_program.c | 57
glamor/glamor_program.h | 1
glamor/glamor_rects.c | 7
glamor/glamor_render.c | 540
glamor/glamor_segs.c | 6
glamor/glamor_spans.c | 26
glamor/glamor_text.c | 31
glamor/glamor_transfer.c | 21
glamor/glamor_transform.c | 35
glamor/glamor_transform.h | 19
glamor/glamor_utils.h | 63
glamor/glamor_vbo.c | 25
glamor/glamor_xv.c | 224
glx/createcontext.c | 39
glx/extension_string.c | 8
glx/extension_string.h | 4
glx/glxcmds.c | 104
glx/glxcontext.h | 5
glx/glxdrawable.h | 3
glx/glxdri2.c | 190
glx/glxdricommon.c | 62
glx/glxdricommon.h | 3
glx/glxdriswrast.c | 96
glx/glxext.c | 28
glx/glxscreens.c | 44
glx/glxscreens.h | 17
glx/single2.c | 4
glx/single2swap.c | 4
glx/singlepix.c | 1
glx/singlepixswap.c | 1
hw/dmx/config/dmxcompat.c | 2
hw/dmx/config/dmxconfig.c | 2
hw/dmx/config/dmxparse.h | 2
hw/dmx/config/dmxtodmx.c | 1
hw/dmx/config/parser.y | 1
hw/dmx/config/scanner.l | 6
hw/dmx/config/xdmxconfig.c | 1
hw/dmx/dmxfont.c | 9
hw/dmx/dmxinput.h | 18
hw/dmx/dmxscrinit.c | 4
hw/dmx/dmxsync.c | 4
hw/dmx/doc/dmx.xml | 11
hw/dmx/doxygen/doxygen.conf.in | 2429
hw/dmx/glxProxy/glxcmds.c | 5
hw/dmx/glxProxy/glxsingle.c | 5
hw/dmx/glxProxy/render2swap.c | 34
hw/dmx/glxProxy/renderpixswap.c | 3
hw/dmx/input/Makefile.am | 2
hw/dmx/input/dmxcommon.c | 17
hw/dmx/input/dmxevents.c | 29
hw/dmx/input/dmxinputinit.c | 13
hw/dmx/input/dmxsigio.c | 234
hw/dmx/input/dmxsigio.h | 43
hw/dmx/input/lnx-keyboard.c | 7
hw/dmx/input/lnx-ms.c | 21
hw/dmx/input/lnx-ps2.c | 14
hw/dmx/input/usb-common.c | 2
hw/dmx/input/usb-keyboard.c | 2
hw/kdrive/ephyr/Makefile.am | 14
hw/kdrive/ephyr/ephyr.c | 216
hw/kdrive/ephyr/ephyr.h | 6
hw/kdrive/ephyr/ephyr_glamor_glx.c | 122
hw/kdrive/ephyr/ephyrdri.c | 356
hw/kdrive/ephyr/ephyrdri.h | 70
hw/kdrive/ephyr/ephyrdriext.c | 1376
hw/kdrive/ephyr/ephyrdriext.h | 40
hw/kdrive/ephyr/ephyrglxext.c | 854
hw/kdrive/ephyr/ephyrglxext.h | 34
hw/kdrive/ephyr/ephyrhostglx.c | 490
hw/kdrive/ephyr/ephyrhostglx.h | 75
hw/kdrive/ephyr/ephyrinit.c | 58
hw/kdrive/ephyr/hostx.c | 269
hw/kdrive/ephyr/hostx.h | 30
hw/kdrive/ephyr/os.c | 1
hw/kdrive/fake/mouse.c | 1
hw/kdrive/linux/evdev.c | 31
hw/kdrive/linux/keyboard.c | 441
hw/kdrive/linux/linux.c | 80
hw/kdrive/linux/mouse.c | 34
hw/kdrive/linux/ms.c | 13
hw/kdrive/linux/ps2.c | 13
hw/kdrive/linux/tslib.c | 1
hw/kdrive/src/Makefile.am | 8
hw/kdrive/src/kdrive.c | 100
hw/kdrive/src/kdrive.h | 6
hw/kdrive/src/kinfo.c | 4
hw/kdrive/src/kinput.c | 387
hw/vfb/InitOutput.c | 127
hw/vfb/Makefile.am | 1
hw/xfree86/Makefile.am | 4
hw/xfree86/common/Makefile.am | 5
hw/xfree86/common/vidmodeproc.h | 83
hw/xfree86/common/xf86.h | 13
hw/xfree86/common/xf86AutoConfig.c | 13
hw/xfree86/common/xf86Bus.c | 3
hw/xfree86/common/xf86Config.c | 102
hw/xfree86/common/xf86Configure.c | 2
hw/xfree86/common/xf86Cursor.c | 8
hw/xfree86/common/xf86Events.c | 114
hw/xfree86/common/xf86Extensions.c | 3
hw/xfree86/common/xf86Globals.c | 3
hw/xfree86/common/xf86Helper.c | 98
hw/xfree86/common/xf86Init.c | 271
hw/xfree86/common/xf86Module.h | 9
hw/xfree86/common/xf86PM.c | 8
hw/xfree86/common/xf86Priv.h | 6
hw/xfree86/common/xf86Privstr.h | 26
hw/xfree86/common/xf86VGAarbiter.c | 12
hw/xfree86/common/xf86VGAarbiterPriv.h | 6
hw/xfree86/common/xf86VidMode.c | 582
hw/xfree86/common/xf86Xinput.c | 98
hw/xfree86/common/xf86cmap.c | 62
hw/xfree86/common/xf86str.h | 94
hw/xfree86/common/xf86vmode.c | 1955
hw/xfree86/ddc/ddcProperty.c | 55
hw/xfree86/ddc/edid.h | 1
hw/xfree86/dixmods/xkbPrivate.c | 2
hw/xfree86/doc/Makefile.am | 1
hw/xfree86/doc/README.DRIcomp | 551
hw/xfree86/doc/ddxDesign.xml | 18
hw/xfree86/dri/dri.c | 157
hw/xfree86/dri/dri.h | 16
hw/xfree86/dri2/dri2.c | 138
hw/xfree86/dri2/pci_ids/Makefile.am | 1
hw/xfree86/dri2/pci_ids/i915_pci_ids.h | 4
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 56
hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 7
hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 10
hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h | 2
hw/xfree86/drivers/modesetting/Makefile.am | 3
hw/xfree86/drivers/modesetting/dri2.c | 327
hw/xfree86/drivers/modesetting/driver.c | 658
hw/xfree86/drivers/modesetting/driver.h | 29
hw/xfree86/drivers/modesetting/drmmode_display.c | 633
hw/xfree86/drivers/modesetting/drmmode_display.h | 57
hw/xfree86/drivers/modesetting/pageflip.c | 344
hw/xfree86/drivers/modesetting/present.c | 342
hw/xfree86/drivers/modesetting/sh3224.c | 140
hw/xfree86/drivers/modesetting/sh3224.h | 7
hw/xfree86/drivers/modesetting/vblank.c | 74
hw/xfree86/int10/xf86x86emu.c | 2
hw/xfree86/loader/loader.c | 1
hw/xfree86/loader/loadmod.c | 38
hw/xfree86/loader/os.c | 2
hw/xfree86/man/xorg.conf.man | 36
hw/xfree86/modes/xf86Crtc.c | 128
hw/xfree86/modes/xf86Crtc.h | 53
hw/xfree86/modes/xf86Cursors.c | 186
hw/xfree86/modes/xf86RandR12.c | 337
hw/xfree86/modes/xf86RandR12.h | 5
hw/xfree86/modes/xf86Rotate.c | 9
hw/xfree86/os-support/bsd/bsd_init.c | 2
hw/xfree86/os-support/bus/Sbus.c | 4
hw/xfree86/os-support/linux/lnx_init.c | 12
hw/xfree86/os-support/linux/systemd-logind.c | 3
hw/xfree86/os-support/shared/VTsw_usl.c | 2
hw/xfree86/os-support/shared/posix_tty.c | 33
hw/xfree86/os-support/shared/sigio.c | 121
hw/xfree86/os-support/shared/sigiostubs.c | 23
hw/xfree86/os-support/solaris/sun_bell.c | 4
hw/xfree86/os-support/xf86_OSlib.h | 22
hw/xfree86/os-support/xf86_OSproc.h | 4
hw/xfree86/parser/DRI.c | 2
hw/xfree86/parser/Device.c | 3
hw/xfree86/parser/Extensions.c | 2
hw/xfree86/parser/Files.c | 2
hw/xfree86/parser/Flags.c | 2
hw/xfree86/parser/Input.c | 3
hw/xfree86/parser/InputClass.c | 95
hw/xfree86/parser/Layout.c | 4
hw/xfree86/parser/Module.c | 4
hw/xfree86/parser/Monitor.c | 8
hw/xfree86/parser/OutputClass.c | 3
hw/xfree86/parser/Pointer.c | 4
hw/xfree86/parser/Screen.c | 4
hw/xfree86/parser/Vendor.c | 4
hw/xfree86/parser/Video.c | 4
hw/xfree86/parser/configProcs.h | 6
hw/xfree86/parser/read.c | 2
hw/xfree86/parser/scan.c | 42
hw/xfree86/parser/write.c | 36
hw/xfree86/parser/xf86Parser.h | 2
hw/xfree86/parser/xf86tokens.h | 13
hw/xfree86/ramdac/xf86Cursor.c | 47
hw/xfree86/ramdac/xf86Cursor.h | 2
hw/xfree86/ramdac/xf86CursorPriv.h | 1
hw/xfree86/ramdac/xf86HWCurs.c | 90
hw/xfree86/sdksyms.sh | 1
hw/xfree86/vbe/vbe.c | 2
hw/xfree86/x86emu/ops.c | 192
hw/xfree86/x86emu/x86emu/regs.h | 8
hw/xfree86/xorg-wrapper.c | 1
hw/xnest/Font.c | 7
hw/xnest/Handlers.c | 4
hw/xnest/Handlers.h | 5
hw/xnest/Init.c | 12
hw/xnest/Keyboard.c | 5
hw/xquartz/GL/glcontextmodes.c | 1
hw/xquartz/GL/indirect.c | 40
hw/xquartz/GL/visualConfigs.c | 1
hw/xquartz/X11Application.m | 9
hw/xquartz/bundle/Info.plist.cpp | 23
hw/xquartz/bundle/Makefile.am | 6
hw/xquartz/darwin.c | 17
hw/xquartz/darwinEvents.c | 2
hw/xquartz/pbproxy/Makefile.am | 5
hw/xquartz/quartz.c | 4
hw/xquartz/quartz.h | 2
hw/xquartz/quartzCocoa.m | 8
hw/xquartz/quartzCommon.h | 5
hw/xwayland/Makefile.am | 11
hw/xwayland/xwayland-cursor.c | 17
hw/xwayland/xwayland-cvt.c | 4
hw/xwayland/xwayland-glamor-xv.c | 412
hw/xwayland/xwayland-glamor.c | 41
hw/xwayland/xwayland-input.c | 184
hw/xwayland/xwayland-output.c | 122
hw/xwayland/xwayland-shm.c | 18
hw/xwayland/xwayland-vidmode.c | 419
hw/xwayland/xwayland.c | 109
hw/xwayland/xwayland.h | 21
hw/xwin/InitInput.c | 14
hw/xwin/InitOutput.c | 112
hw/xwin/Makefile.am | 16
hw/xwin/dri/Makefile.am | 9
hw/xwin/dri/windowsdri.c | 274
hw/xwin/dri/windowsdri.h | 30
hw/xwin/glx/Makefile.am | 7
hw/xwin/glx/dri_helpers.c | 120
hw/xwin/glx/dri_helpers.h | 38
hw/xwin/glx/indirect.c | 494
hw/xwin/glx/indirect.h | 95
hw/xwin/glx/winpriv.c | 7
hw/xwin/glx/winpriv.h | 1
hw/xwin/man/XWin.man | 10
hw/xwin/win.h | 39
hw/xwin/winallpriv.c | 7
hw/xwin/winauth.c | 42
hw/xwin/winblock.c | 5
hw/xwin/winclipboard/internal.h | 8
hw/xwin/winclipboard/thread.c | 9
hw/xwin/winclipboard/wndproc.c | 109
hw/xwin/winconfig.c | 79
hw/xwin/wincreatewnd.c | 6
hw/xwin/winengine.c | 2
hw/xwin/winerror.c | 2
hw/xwin/winglobals.c | 1
hw/xwin/winglobals.h | 1
hw/xwin/winkeybd.c | 2
hw/xwin/winlayouts.h | 5
hw/xwin/winmsg.c | 33
hw/xwin/winmsg.h | 17
hw/xwin/winmultiwindowclass.h | 28
hw/xwin/winmultiwindowicons.c | 151
hw/xwin/winmultiwindowicons.h | 4
hw/xwin/winmultiwindowwindow.c | 86
hw/xwin/winmultiwindowwm.c | 1447
hw/xwin/winmultiwindowwndproc.c | 2
hw/xwin/winprefs.c | 30
hw/xwin/winprefs.h | 9
hw/xwin/winprocarg.c | 21
hw/xwin/winrandr.c | 96
hw/xwin/winscrinit.c | 10
hw/xwin/winshadddnl.c | 6
hw/xwin/winshadgdi.c | 12
hw/xwin/wintaskbar.c | 2
hw/xwin/winvalargs.c | 19
hw/xwin/winwakeup.c | 3
hw/xwin/winwin32rootless.c | 68
hw/xwin/winwin32rootlesswindow.c | 15
hw/xwin/winwin32rootlesswndproc.c | 239
hw/xwin/winwindow.h | 26
hw/xwin/winwindowswm.c | 2
hw/xwin/winwndproc.c | 52
include/Makefile.am | 5
include/displaymode.h | 102
include/dix-config.h.in | 21
include/dix.h | 36
include/dixfont.h | 18
include/dixfontstr.h | 1
include/dixfontstubs.h | 43
include/dixstruct.h | 41
include/eventstr.h | 10
include/globals.h | 2
include/input.h | 19
include/inpututils.h | 4
include/list.h | 8
include/misc.h | 3
include/os.h | 45
include/pixmap.h | 3
include/privates.h | 3
include/property.h | 9
include/protocol-versions.h | 5
include/scrnintstr.h | 73
include/vidmodestr.h | 142
include/window.h | 9
include/xkbsrv.h | 10
include/xorg-config.h.in | 6
include/xserver_poll.h | 55
m4/ax_pthread.m4 | 337
mi/mieq.c | 141
mi/miglblt.c | 6
mi/mipointer.c | 36
mi/mipointer.h | 6
mi/mipointrst.h | 14
mi/misprite.c | 8
miext/damage/damage.c | 125
miext/rootless/rootlessScreen.c | 4
miext/shadow/shadow.c | 20
miext/shadow/shadow.h | 1
os/Makefile.am | 10
os/WaitFor.c | 432
os/access.c | 69
os/backtrace.c | 2
os/connection.c | 559
os/inputthread.c | 546
os/io.c | 142
os/log.c | 126
os/osdep.h | 75
os/osinit.c | 26
os/ospoll.c | 473
os/ospoll.h | 142
os/rpcauth.c | 2
os/utils.c | 161
os/xdmauth.c | 2
os/xdmcp.c | 159
os/xserver_poll.c | 277
present/present.c | 172
present/present_event.c | 29
present/present_fake.c | 3
present/present_priv.h | 8
present/present_request.c | 2
present/present_screen.c | 6
randr/randr.c | 56
randr/randrstr.h | 25
randr/rrcrtc.c | 279
randr/rrmonitor.c | 32
randr/rroutput.c | 10
randr/rrprovider.c | 109
randr/rrscreen.c | 15
record/record.c | 1
render/animcur.c | 57
render/picture.c | 3
render/picture.h | 2
render/render.c | 13
test/Makefile.am | 29
test/os.c | 166
test/scripts/xinit-piglit-session.sh | 47
test/scripts/xvfb-piglit.sh | 66
test/touch.c | 31
test/xi2/protocol-xiquerypointer.c | 1
xfixes/cursor.c | 5
xfixes/select.c | 1
xfixes/xfixes.c | 21
xkb/maprules.c | 2
xkb/xkb.c | 5
xkb/xkbAccessX.c | 11
xkb/xkbActions.c | 175
xkb/xkbEvents.c | 2
xkb/xkbInit.c | 2
xkb/xkbLEDs.c | 2
455 files changed, 18837 insertions(+), 180279 deletions(-)
New commits:
commit 6be7335b64f1fbdfc8fec38b1f14be76dc348b34
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 16:36:38 2016 +0300
watch: Fix a typo.
diff --git a/debian/changelog b/debian/changelog
index 31cedd4..0374207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
- glamor-Declare-pos-in-the-composite-glyph.diff dropped, upstream
* control: Add libxcb-xkb-dev to build-depends.
* serverminver: Bumped.
+ * watch: Fix a typo.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 13:47:51 +0300
diff --git a/debian/watch b/debian/watch
index 71765a5..630adbe 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/xserver
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-https://xorg.freedesktop.orgreleases/individual/xserver/ xorg-server-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/xserver/ xorg-server-(.*)\.tar\.gz
commit e00f861b2f9eb6d4c21795e4f7455699d5ad863c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 16:35:13 2016 +0300
serverminver: Bumped.
diff --git a/debian/changelog b/debian/changelog
index 21cbd63..31cedd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
- refreshed
- glamor-Declare-pos-in-the-composite-glyph.diff dropped, upstream
* control: Add libxcb-xkb-dev to build-depends.
+ * serverminver: Bumped.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 13:47:51 +0300
diff --git a/debian/serverminver b/debian/serverminver
index 3c1d506..008f20d 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.17.99.902
-ABI_VIDEODRV_VERSION:20.0
-ABI_XINPUT_VERSION:22.1
+2:1.18.99.901
+ABI_VIDEODRV_VERSION:23.0
+ABI_XINPUT_VERSION:24.1
commit d9d9ff058c139c8714c3ba925883c670503e34f3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 16:32:18 2016 +0300
control: Add libxcb-xkb-dev to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 75b9c97..21cbd63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
* patches:
- refreshed
- glamor-Declare-pos-in-the-composite-glyph.diff dropped, upstream
+ * control: Add libxcb-xkb-dev to build-depends.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 13:47:51 +0300
diff --git a/debian/control b/debian/control
index 9892ea3..4e80924 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,7 @@ Build-Depends:
libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
# XCB bits for Xephyr
libxcb1-dev,
+ libxcb-xkb-dev,
libxcb-shape0-dev,
libxcb-render0-dev,
libxcb-render-util0-dev,
commit 8f756baa7826730cd1b6a4e0dfb21498b6af0835
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 16:11:57 2016 +0300
drop upstream patch, refresh others
diff --git a/debian/changelog b/debian/changelog
index 77ac00b..75b9c97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* control: Bump libxfont-dev build-dependency.
+ * patches:
+ - refreshed
+ - glamor-Declare-pos-in-the-composite-glyph.diff dropped, upstream
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 13:47:51 +0300
diff --git a/debian/patches/02_kbsd-input-devd.diff b/debian/patches/02_kbsd-input-devd.diff
index 5256224..5f91666 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -19,10 +19,8 @@ Signed-off-by: Robert Millan <rmh@freebsd.org>
8 files changed, 427 insertions(+), 3 deletions(-)
create mode 100644 config/devd.c
-Index: xorg-server/config/Makefile.am
-===================================================================
---- xorg-server.orig/config/Makefile.am
-+++ xorg-server/config/Makefile.am
+--- a/config/Makefile.am
++++ b/config/Makefile.am
@@ -34,6 +34,10 @@ if CONFIG_WSCONS
libconfig_la_SOURCES += wscons.c
endif # CONFIG_WSCONS
@@ -34,10 +32,8 @@ Index: xorg-server/config/Makefile.am
endif # !CONFIG_HAL
endif # !CONFIG_UDEV
-Index: xorg-server/config/config-backends.h
-===================================================================
---- xorg-server.orig/config/config-backends.h
-+++ xorg-server/config/config-backends.h
+--- a/config/config-backends.h
++++ b/config/config-backends.h
@@ -44,3 +44,8 @@ void config_hal_fini(void);
int config_wscons_init(void);
void config_wscons_fini(void);
@@ -47,10 +43,8 @@ Index: xorg-server/config/config-backends.h
+int config_devd_init(void);
+void config_devd_fini(void);
+#endif
-Index: xorg-server/config/config.c
-===================================================================
---- xorg-server.orig/config/config.c
-+++ xorg-server/config/config.c
+--- a/config/config.c
++++ b/config/config.c
@@ -55,6 +55,9 @@ config_init(void)
#elif defined(CONFIG_WSCONS)
if (!config_wscons_init())
@@ -70,10 +64,8 @@ Index: xorg-server/config/config.c
#endif
}
-Index: xorg-server/config/devd.c
-===================================================================
--- /dev/null
-+++ xorg-server/config/devd.c
++++ b/config/devd.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright © 2012 Baptiste Daroussin
@@ -462,11 +454,9 @@ Index: xorg-server/config/devd.c
+ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
+ close(sock_devd);
+}
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -606,6 +606,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST
+--- a/configure.ac
++++ b/configure.ac
+@@ -631,6 +631,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 +464,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])
-@@ -953,6 +954,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
+@@ -1021,6 +1022,21 @@ if test "x$CONFIG_WSCONS" = xyes; then
AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration])
fi
@@ -493,10 +483,10 @@ Index: xorg-server/configure.ac
+ AC_DEFINE(CONFIG_DEVD, 1, [Use devd for input auto configuration])
+fi
+
- if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
- USE_SIGIO_BY_DEFAULT_VALUE=TRUE
- else
-@@ -2507,7 +2523,7 @@ AC_SUBST([prefix])
+
+ AC_MSG_CHECKING([for glibc...])
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+@@ -2598,7 +2614,7 @@ AC_SUBST([prefix])
AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep])
@@ -505,10 +495,8 @@ Index: xorg-server/configure.ac
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
-+++ xorg-server/hw/xfree86/common/xf86Config.c
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
@@ -1384,15 +1384,18 @@ checkCoreInputDevices(serverLayoutPtr se
}
@@ -530,10 +518,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
#endif
xf86Msg(X_INFO, "The server relies on %s to provide the list of "
"input devices.\n\tIf no devices become available, "
-Index: xorg-server/hw/xfree86/common/xf86Globals.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server/hw/xfree86/common/xf86Globals.c
+--- a/hw/xfree86/common/xf86Globals.c
++++ b/hw/xfree86/common/xf86Globals.c
@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = {
.pmFlag = TRUE,
.disableRandR = FALSE,
@@ -544,11 +530,9 @@ Index: xorg-server/hw/xfree86/common/xf86Globals.c
.forceInputDevices = FALSE,
.autoAddDevices = TRUE,
.autoEnableDevices = TRUE,
-Index: xorg-server/include/dix-config.h.in
-===================================================================
---- xorg-server.orig/include/dix-config.h.in
-+++ xorg-server/include/dix-config.h.in
-@@ -439,6 +439,9 @@
+--- a/include/dix-config.h.in
++++ b/include/dix-config.h.in
+@@ -445,6 +445,9 @@
/* Enable systemd-logind integration */
#undef SYSTEMD_LOGIND 1
diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff
index c4bc7d4..c4031a0 100644
--- a/debian/patches/03_static-nettle.diff
+++ b/debian/patches/03_static-nettle.diff
@@ -2,11 +2,9 @@ Link against static libnettle
There's no libnettle udeb.
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -1656,7 +1656,7 @@ fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -1725,7 +1725,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/05_Revert-Unload-submodules.diff b/debian/patches/05_Revert-Unload-submodules.diff
index 970c500..07f39e6 100644
--- a/debian/patches/05_Revert-Unload-submodules.diff
+++ b/debian/patches/05_Revert-Unload-submodules.diff
@@ -10,11 +10,9 @@ This doesn't seem to work quite well. See Debian bug#686152.
hw/xfree86/common/xf86Helper.c | 6 ++++++
1 file changed, 6 insertions(+)
-Index: xorg-server/hw/xfree86/common/xf86Helper.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Helper.c
-+++ xorg-server/hw/xfree86/common/xf86Helper.c
-@@ -1636,7 +1636,13 @@ xf86LoadOneModule(const char *name, void
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1625,7 +1625,13 @@ xf86LoadOneModule(const char *name, void
void
xf86UnloadSubModule(void *mod)
{
diff --git a/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff b/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff
deleted file mode 100644
index 73eac9b..0000000
--- a/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-commit be334f42a198a25e817e6dab43dd0e30aa1cd4f8
-Author: Michel Dänzer <michel.daenzer@amd.com>
-Date: Thu Aug 18 09:40:34 2016 +0900
-
- glamor: Declare "pos" in the composite glyph GLSL 1.20 vertex shader
-
- Fixes shader compile failure:
-
- Failed to compile VS: 0:13(43): error: `pos' undeclared
- 0:13(14): error: operands to arithmetic operators must be numeric
- 0:13(13): error: operands to arithmetic operators must be numeric
-
- Program source:
- #define ATLAS_DIM_INV 0.000976562500000000
- attribute vec2 primitive;
- attribute vec2 source;
- varying vec2 glyph_pos;
- uniform vec2 fill_offset;
- uniform vec2 fill_size_inv;
- varying vec2 fill_pos;
- uniform vec4 v_matrix;
- void main() {
- gl_Position.xy = primitive.xy * v_matrix.xz + v_matrix.yw;
- gl_Position.zw = vec2(0.0,1.0);
- glyph_pos = source.xy * ATLAS_DIM_INV;
- fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;
- }
- (EE) Fatal server error:
- (EE) GLSL compile failure
-
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97300
- Reviewed-by: Keith Packard <keithp@keithp.com>
-
-diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
-index cc0aa6f..b651274 100644
---- a/glamor/glamor_composite_glyphs.c
-+++ b/glamor/glamor_composite_glyphs.c
-@@ -199,7 +199,8 @@ static const glamor_facet glamor_facet_composite_glyphs_120 = {
- .vs_vars = ("attribute vec2 primitive;\n"
- "attribute vec2 source;\n"
- "varying vec2 glyph_pos;\n"),
-- .vs_exec = (GLAMOR_POS(gl_Position, primitive)
-+ .vs_exec = (" vec2 pos = vec2(0,0);\n"
-+ GLAMOR_POS(gl_Position, primitive.xy)
- " glyph_pos = source.xy * ATLAS_DIM_INV;\n"),
- .fs_vars = ("varying vec2 glyph_pos;\n"),
- .fs_exec = (" vec4 mask = texture2D(atlas, glyph_pos);\n"),
diff --git a/debian/patches/series b/debian/patches/series
index a4114c3..55da92c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
06_use-intel-only-on-pre-gen4.diff
-glamor-Declare-pos-in-the-composite-glyph.diff
commit aa6c8eb7580fc3b4b20a5a66914a9023d0322552
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 15:22:22 2016 +0300
control: Bump libxfont-dev build-dependency.
diff --git a/debian/changelog b/debian/changelog
index abca307..77ac00b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * control: Bump libxfont-dev build-dependency.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 28 Sep 2016 13:47:51 +0300
diff --git a/debian/control b/debian/control
index d1f74d9..9892ea3 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
x11proto-input-dev (>= 2.3),
x11proto-dri2-dev (>= 2.8),
libxdmcp-dev (>= 1:0.99.1),
- libxfont-dev (>= 1:1.4.2),
+ libxfont-dev (>= 1:2.0.1),
libxkbfile-dev (>= 1:0.99.1),
libpixman-1-dev (>= 0.27.2),
libpciaccess-dev (>= 0.12.901),
commit a6e1997bbb26e5df537b37c2751e644ba9c1a34e
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 28 15:20:51 2016 +0300
update changelog, remove upstream ChangeLog, cgit is close enough
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e37f173..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,162271 +0,0 @@
-commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
-Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Nov 9 16:00:26 2015 -0500
-
- xserver 1.18.0
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 2203735887ab548b3ee004400d1b89149aae412c
-Author: Axel Davy <axel.davy@ens.fr>
-Date: Wed Nov 4 18:42:42 2015 +0100
-
- present: Fix Async swap logic
-
- According to the spec, PresentOptionAsync should only
- trigger a different behaviour when the target msc has been reached.
-
- In this case if the driver is able to do async swaps, we use
- them to avoid a screen copy.
-
- When the target msc hasn't been reached yet, we want to use sync swaps.
-
- v2: Fix indentation and simplify checks for Async flips
-
- Signed-off-by: Axel Davy <axel.davy@ens.fr>
- Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-
-commit 3f35909acba117dc8934920d788c7ce612bce444
-Author: Jammy Zhou <Jammy.Zhou@amd.com>
-Date: Wed Oct 28 18:39:10 2015 +0800
-
- present: Execute right away if target_msc equals current_msc
-
- It is according to the protocol:
-
- "If 'options' contains PresentOptionAsync, and the 'target-msc'
- is less than or equal to the current msc for 'window', then
- the operation will be performed as soon as possible, not
- necessarily waiting for the next vertical blank interval."
-
- Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
- Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- Reviewed-by: Axel Davy <axel.davy@ens.fr>
-
-commit 7d1e4783853f9830344d101ceab087feb19995be
-Author: Daniel Martin <consume.noise@gmail.com>
-Date: Thu Oct 29 14:58:11 2015 +0100
-
- modesetting: Remove XF86_CRTC_VERSION checks
-
- The ifdef checks for XF86_CRTC_VERSION >= 3/5 are remnants from the
- out-of-tree driver. Within the tree, we can rely on:
- xf86Crtc.h:#define XF86_CRTC_VERSION 6
-
- Signed-off-by: Daniel Martin <consume.noise@gmail.com>
- Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
- Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-
-commit 45c83a266d18eb515313aa3f1a4d7ff6af53be5d
-Author: Daniel Martin <consume.noise@gmail.com>
-Date: Thu Oct 29 14:58:10 2015 +0100
-
- modesetting: Free output_ids in drmmode_set_mode_major()
-
- We calloc() output_ids. Let's free() it, too.
-
- Signed-off-by: Daniel Martin <consume.noise@gmail.com>
- Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
- Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-
-commit 2674d424020bd71d4f99b8d8de8b0b21aa490d54
-Author: Daniel Martin <consume.noise@gmail.com>
-Date: Thu Oct 29 14:58:09 2015 +0100
-
- modesetting: Handle failures in setting a CRTC to a DRM mode properly
-
- This fixes a bug where running the card out of PPLL's when hotplugging
- another monitor would result in all of the displays going blank and
- failing to work properly until X was restarted or the user switched to
- another VT.
-
- [Michel Dänzer: Pass errno instead of -ret to strerror()]
- [Daniel Martin: Add \n to log message]
-
- Picked from xf86-video-ati
- 7186a87 Handle failures in setting a CRTC to a DRM mode properly
-
- Signed-off-by: Daniel Martin <consume.noise@gmail.com>
- Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
- Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-
-commit 250666586e2b6f3ed1371340452dc2be2d094d40
-Author: Adam Jackson <ajax@redhat.com>
-Date: Thu Oct 29 10:08:17 2015 -0400
-
- vidmode: Drop the unused event code
-
- As the code says, this is "far from complete". So far, in fact, that
- it's been basically untouched for twenty years (XFree86 3.1!). As far
- as I can tell it was never enabled in any XFree86 build, and certainly
- has never been enabled since Xorg 7.0.
-
- Also, K&R.
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
- Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-
-commit 478efe285a440c33b053bdf0bfbfdd482f429f01
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue Oct 27 19:44:28 2015 -0700
-
- Xserver.man: document more transports for -nolisten & -listen options
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-
-commit 8fc295bde9a736f3c8c047031a6698d140d5266f
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue Oct 27 19:44:27 2015 -0700
-
- Xorg.man: update to reflect -nolisten tcp becoming default
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-
-commit 75157b7dbf4ed4db0492328a44e4e67dda83f769
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue Oct 27 19:44:26 2015 -0700
-
- Xorg.man: move XLOCAL details to X(7) man page instead
-
- These settings affect clients, not server, so belong there, next to
- the information about how to set $DISPLAY.
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-
-commit 50c167164700e8ead9b7ccf9f9eafc7541baac75
-Author: Martin Peres <martin.peres@linux.intel.com>
-Date: Mon Jul 20 10:37:30 2015 +0300
-
- os: make sure the clientsWritable fd_set is initialized before use
-
- In WaitForSomething(), the fd_set clientsWritable may be used
- unitialized when the boolean AnyClientsWriteBlocked is set in the
- WakeupHandler(). This leads to a crash in FlushAllOutput() after
- x11proto's commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7.
-
- The problem did not manifest before because both the XFD_SIZE and the
- maximum number of clients were set to 256. As the connectionTranslation
- table was initalized for the 256 clients to 0, the test on the index not
- being 0 was aborting before dereferencing the client #0.
Reply to: