xorg-server: Changes to 'ubuntu'
ChangeLog | 3851 ++++++++--
Xext/panoramiX.c | 2
Xext/saver.c | 2
Xext/shm.c | 10
Xext/xace.c | 12
Xext/xf86bigfont.c | 16
Xext/xres.c | 2
Xext/xtest.c | 2
Xi/Makefile.am | 2
Xi/chgdctl.c | 8
Xi/exevents.c | 122
Xi/extinit.c | 47
Xi/gtmotion.c | 2
Xi/xibarriers.c | 916 ++
Xi/xibarriers.h | 48
Xi/xichangehierarchy.c | 16
Xi/xiproperty.c | 3
Xi/xiquerydevice.c | 4
Xi/xiquerypointer.c | 17
Xi/xiselectev.c | 80
autogen.sh | 4
configure.ac | 29
debian/changelog | 23
debian/control | 8
debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 85
debian/patches/02_hide_panoramix_symbol.diff | 13
debian/patches/04_int10-fix-pci_device_read_rom-usage.diff | 43
debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff | 49
debian/patches/series | 6
debian/rules | 2
debian/serverminver | 4
dix/colormap.c | 8
dix/devices.c | 12
dix/dispatch.c | 25
dix/dixfonts.c | 9
dix/enterleave.c | 5
dix/eventconvert.c | 49
dix/events.c | 74
dix/getevents.c | 147
dix/grabs.c | 7
dix/inpututils.c | 51
dix/touch.c | 65
dix/window.c | 131
doc/c-extensions | 19
exa/exa.c | 4
exa/exa_priv.h | 1
fb/fb.h | 4
fb/fbblt.c | 12
fb/fbbltone.c | 8
fb/fbgc.c | 4
fb/fbpict.c | 153
fb/fbscreen.c | 1
glx/glapi.c | 2
glx/glxdri.c | 2
glx/indirect_program.c | 2
glx/indirect_texture_compression.c | 4
glx/renderpixswap.c | 20
glx/singlepix.c | 18
glx/singlepixswap.c | 18
glx/xfont.c | 2
hw/dmx/config/Canvas.c | 4
hw/dmx/dmx.h | 2
hw/dmx/dmx_glxvisuals.c | 4
hw/dmx/dmxinit.c | 22
hw/dmx/dmxwindow.c | 2
hw/dmx/doc/dmx.xml | 12
hw/dmx/examples/xinput.c | 4
hw/dmx/glxProxy/glxcmds.c | 16
hw/dmx/glxProxy/glxcmdsswap.c | 2
hw/dmx/glxProxy/glxscreens.c | 4
hw/dmx/glxProxy/glxsingle.c | 6
hw/dmx/glxProxy/glxvendor.c | 4
hw/dmx/glxProxy/renderpixswap.c | 310
hw/kdrive/ephyr/XF86dri.c | 18
hw/kdrive/ephyr/ephyrdriext.c | 8
hw/kdrive/ephyr/ephyrglxext.c | 179
hw/kdrive/ephyr/ephyrhostglx.c | 131
hw/kdrive/ephyr/ephyrhostglx.h | 9
hw/kdrive/ephyr/ephyrhostproxy.c | 2
hw/kdrive/ephyr/ephyrhostvideo.c | 4
hw/kdrive/ephyr/ephyrvideo.c | 2
hw/kdrive/ephyr/hostx.c | 4
hw/kdrive/src/kdrive.h | 1
hw/kdrive/src/kinput.c | 2
hw/vfb/InitInput.c | 1
hw/vfb/InitOutput.c | 1
hw/xfree86/common/xf86.h | 1
hw/xfree86/common/xf86Bus.c | 15
hw/xfree86/common/xf86Configure.c | 27
hw/xfree86/common/xf86DGA.c | 2
hw/xfree86/common/xf86Events.c | 3
hw/xfree86/common/xf86Extensions.c | 2
hw/xfree86/common/xf86Init.c | 27
hw/xfree86/common/xf86Module.h | 2
hw/xfree86/common/xf86Opt.h | 2
hw/xfree86/common/xf86Option.c | 2
hw/xfree86/common/xf86Priv.h | 1
hw/xfree86/common/xf86cmap.c | 2
hw/xfree86/common/xf86str.h | 2
hw/xfree86/common/xf86vmode.c | 6
hw/xfree86/dixmods/glxmodule.c | 2
hw/xfree86/doc/ddxDesign.xml | 20
hw/xfree86/dri/dri.c | 7
hw/xfree86/dri/xf86dri.c | 8
hw/xfree86/dri2/dri2ext.c | 2
hw/xfree86/i2c/fi1236.c | 10
hw/xfree86/i2c/tda9850.c | 2
hw/xfree86/int10/generic.c | 3
hw/xfree86/modes/xf86Crtc.c | 15
hw/xfree86/os-support/bus/nobus.c | 2
hw/xfree86/os-support/linux/lnx_init.c | 33
hw/xfree86/os-support/linux/lnx_video.c | 89
hw/xfree86/os-support/shared/agp_noop.c | 2
hw/xfree86/os-support/shared/ioperm_noop.c | 4
hw/xfree86/os-support/stub/stub_init.c | 6
hw/xfree86/sdksyms.sh | 2
hw/xnest/Screen.c | 1
hw/xnest/Visual.c | 1
hw/xquartz/GL/visualConfigs.c | 214
hw/xquartz/applewm.c | 4
hw/xquartz/bundle/Info.plist.cpp | 2
hw/xquartz/darwin.c | 1
hw/xquartz/quartz.c | 2
hw/xquartz/xpr/appledri.c | 6
hw/xwin/InitOutput.c | 36
hw/xwin/Makefile.am | 11
hw/xwin/ddraw.h | 4
hw/xwin/glx/gen_gl_wrappers.py | 10
hw/xwin/glx/glwrap.c | 2
hw/xwin/glx/indirect.c | 38
hw/xwin/man/XWin.man | 12
hw/xwin/propertystore.h | 83
hw/xwin/win.h | 24
hw/xwin/winSetAppUserModelID.c | 109
hw/xwin/winallpriv.c | 2
hw/xwin/winblock.c | 9
hw/xwin/winclipboard.h | 3
hw/xwin/winclipboardtextconv.c | 10
hw/xwin/winclipboardthread.c | 8
hw/xwin/winclipboardwrappers.c | 9
hw/xwin/winclipboardxevents.c | 42
hw/xwin/wincursor.c | 9
hw/xwin/winengine.c | 8
hw/xwin/winerror.c | 36
hw/xwin/wingc.c | 9
hw/xwin/winglobals.c | 2
hw/xwin/winkeybd.c | 47
hw/xwin/winlayouts.h | 10
hw/xwin/winmonitors.c | 8
hw/xwin/winms.h | 5
hw/xwin/winmsg.c | 6
hw/xwin/winmsg.h | 30
hw/xwin/winmultiwindowicons.c | 2
hw/xwin/winmultiwindowshape.c | 2
hw/xwin/winmultiwindowwm.c | 65
hw/xwin/winmultiwindowwndproc.c | 4
hw/xwin/winpfbdd.c | 8
hw/xwin/winpixmap.c | 2
hw/xwin/winprefs.c | 23
hw/xwin/winprefslex.l | 7
hw/xwin/winprefsyacc.y | 10
hw/xwin/winprocarg.c | 10
hw/xwin/winregistry.c | 65
hw/xwin/winscrinit.c | 8
hw/xwin/winsetsp.c | 4
hw/xwin/winshaddd.c | 40
hw/xwin/winshadddnl.c | 88
hw/xwin/winshadgdi.c | 17
hw/xwin/wintaskbar.c | 92
hw/xwin/winvalargs.c | 2
hw/xwin/winwin32rootless.c | 8
hw/xwin/winwin32rootlesswndproc.c | 6
hw/xwin/winwindow.c | 6
hw/xwin/winwindow.h | 21
hw/xwin/winwindowswm.c | 9
hw/xwin/winwndproc.c | 9
include/Makefile.am | 2
include/dix-config.h.in | 6
include/dix.h | 12
include/dixfont.h | 39
include/dixfontstubs.h | 45
include/dixstruct.h | 37
include/eventconvert.h | 2
include/events.h | 1
include/eventstr.h | 24
include/extension.h | 2
include/extinit.h | 4
include/input.h | 13
include/inputstr.h | 4
include/inpututils.h | 1
include/os.h | 7
include/window.h | 3
include/windowstr.h | 4
include/xkbsrv.h | 17
include/xserver-properties.h | 3
mi/Makefile.am | 3
mi/mibitblt.c | 6
mi/mibstore.c | 43
mi/mibstore.h | 23
mi/mieq.c | 4
mi/miinitext.c | 2
mi/mipointer.c | 59
mi/mipointer.h | 3
mi/mispans.c | 4
miext/damage/damage.c | 30
os/access.c | 12
os/connection.c | 16
os/io.c | 22
os/osdep.h | 19
os/osinit.c | 9
os/utils.c | 39
os/xdmcp.c | 12
os/xsha1.c | 30
randr/randrstr.h | 8
render/picturestr.h | 8
test/fixes.c | 26
test/input.c | 2
test/xi2/protocol-eventconvert.c | 222
test/xi2/protocol-xiquerydevice.c | 2
test/xi2/protocol-xiselectevents.c | 12
test/xi2/xi2.c | 6
xfixes/cursor.c | 371
xfixes/xfixes.c | 2
xfixes/xfixes.h | 17
xkb/Makefile.am | 3
xkb/ddxList.c | 304
xkb/maprules.c | 1
xkb/xkb.c | 113
xkb/xkbAccessX.c | 30
xkb/xkbPrKeyEv.c | 4
xkb/xkbout.c | 2
xkb/xkbtext.c | 1
xkb/xkmread.c | 2
xorg-server.m4 | 6
234 files changed, 7212 insertions(+), 3153 deletions(-)
New commits:
commit 6efcd5b9edaf6d28e0ecf2b67b00526a71281aff
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 16:04:38 2013 +0100
disable pointer barrier patch
diff --git a/debian/patches/series b/debian/patches/series
index 3d6b83a..728fc48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,6 @@
## waiting for review by upstream
111_armel-drv-fallbacks.patch
-500_pointer_barrier_thresholds.diff
+#500_pointer_barrier_thresholds.diff
## from upstream, drop when rebasing to a new version
commit 21e5991de4970790b30dd7a5886d68da6d7eca54
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 17:32:58 2013 +0100
Add patch to fix build failure of xserver-xorg-core-udeb.
02_hide_panoramix_symbol.diff
diff --git a/debian/changelog b/debian/changelog
index 3d36524..510c85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
- 04_int10-fix-pci_device_read_rom-usage.diff
- 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
* Bump x11proto-input-dev and libpixman-1-dev minimum versions.
+ * Add patch to fix build failure of xserver-xorg-core-udeb.
+ - 02_hide_panoramix_symbol.diff
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 22 Aug 2012 11:12:17 -0400
diff --git a/debian/patches/02_hide_panoramix_symbol.diff b/debian/patches/02_hide_panoramix_symbol.diff
new file mode 100644
index 0000000..60c25ed
--- /dev/null
+++ b/debian/patches/02_hide_panoramix_symbol.diff
@@ -0,0 +1,13 @@
+diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
+index 334c71f..309954d 100644
+--- a/xfixes/xfixesint.h
++++ b/xfixes/xfixesint.h
+@@ -291,7 +291,7 @@ int
+ SProcXFixesDestroyPointerBarrier(ClientPtr client);
+
+ /* Xinerama */
+-extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
++_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
+ void PanoramiXFixesInit(void);
+ void PanoramiXFixesReset(void);
+
diff --git a/debian/patches/series b/debian/patches/series
index 3c8c1a3..810051d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
+02_hide_panoramix_symbol.diff
#13_debian_add_xkbpath_env_variable.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
commit 6d8bd2a39283a992d73a627b3c60915c557a1db8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 16:25:58 2013 +0100
fix sha1 implementation chosen with upstream patch
diff --git a/debian/rules b/debian/rules
index 3011a78..904a565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ confflags_udeb = \
--disable-kdrive \
--disable-xephyr \
--disable-xfbdev \
- --with-sha1=nettle \
+ --with-sha1=libnettle \
$(config_backend_udeb) \
$(void)
commit 53782a6a26ce1d59696b7f5e20de8c2bb2794843
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 16:17:11 2013 +0100
bump debian/serverminver
diff --git a/debian/serverminver b/debian/serverminver
index b6b99d6..b3cde97 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.12.99.901
-ABI_VIDEODRV_VERSION:13.1
+2:1.13.99.901
+ABI_VIDEODRV_VERSION:14.1
ABI_XINPUT_VERSION:18.0
commit ff5fb66e5b4e6ef1a5f130bb26abf92d8c985709
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 15:55:52 2013 +0100
Bump x11proto-input-dev and libpixman-1-dev minimum versions.
diff --git a/debian/changelog b/debian/changelog
index 3888ac2..3d36524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,11 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
* Drop 09_EXA-Track...diff, upstream.
[ Maarten Lankhorst ]
- * Remove 02_Add-libnettle-as-option-for-sha1.diff, upstreamed
+ * Remove upstreamed patches.
+ - 02_Add-libnettle-as-option-for-sha1.diff
+ - 04_int10-fix-pci_device_read_rom-usage.diff
+ - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
+ * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 22 Aug 2012 11:12:17 -0400
diff --git a/debian/control b/debian/control
index b2704b3..f3544da 100644
--- a/debian/control
+++ b/debian/control
@@ -39,12 +39,12 @@ Build-Depends:
x11proto-xf86vidmode-dev (>= 2.2.99.1),
xtrans-dev (>= 1.2.2),
libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.1.99.6),
+ x11proto-input-dev (>= 2.2.99.1),
x11proto-dri2-dev (>= 2.8),
libxdmcp-dev (>= 1:0.99.1),
libxfont-dev (>= 1:1.4.2),
libxkbfile-dev (>= 1:0.99.1),
- libpixman-1-dev (>= 0.21.8),
+ libpixman-1-dev (>= 0.27.2),
libpciaccess-dev (>= 0.12.901),
libgcrypt-dev,
nettle-dev,
@@ -158,9 +158,9 @@ Description: Xorg X server - core server
Package: xserver-xorg-dev
Architecture: any
Depends:
- libpixman-1-dev (>= 0.21.8),
+ libpixman-1-dev (>= 0.27.2),
x11proto-core-dev (>= 7.0.22),
- x11proto-input-dev (>= 2.1.99.6),
+ x11proto-input-dev (>= 2.2.99.1),
x11proto-xext-dev (>= 7.1.99),
x11proto-video-dev,
x11proto-randr-dev (>= 1.4.0),
commit c55e3eabbe45cdf5493521a5fa2d058f9b76de59
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 15:43:06 2013 +0100
Remove 07_Revert-kinput-allocate-enough-space-for-null-charact.diff, upstreamed
diff --git a/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff b/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff
deleted file mode 100644
index e842b7f..0000000
--- a/debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0f3ac13b3c23bc11a9b58d594aea9bb84523544f Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sun, 7 Oct 2012 18:34:21 +0200
-Subject: [PATCH] Revert "kinput: allocate enough space for null character."
-
-This reverts commit 531785dd746d64ef7f473a83ca73bb20e74b6fca.
-
-The above commit breaks Xephyr option parsing. Andrzej writes:
-
- Xephyr -retro -keybd evdev,,device=/dev/input/event2,xkbrules=evdev,xkbmodel=evdev,xkblayout=pl -mouse evdev,,device=/dev/input/event1 :3
-
- results in:
-
- <snip>
- Pointer option key (device=) of value (/dev/input/event1) not assigned!
- Kbd option key (device=) of value (/dev/input/event2) not assigned!
- Kbd option key (xkbrules=) of value (evdev) not assigned!
- Kbd option key (xkbmodel=) of value (evdev) not assigned!
- Kbd option key (xkblayout=) of value (pl) not assigned!
- <snip>
-
- The effect of the patch is that the "key=value" pairs are parsed in such
- a way that the key is added an "equals" sign to it and we end up with
- keys like "device=" instead of "device". This in turn has effect on
- KdParsePointerOptions and KdParseKbdOptions: the key does not match
- any choice presented in the "switch" statement, and so "Pointer/Kbd
- option key (...) of value (...) not assigned!" happens, making all
- "key=value" options inaccessible to the user. Reverting the patch makes
- them available again.
-
-Reference: http://bugs.debian.org/689246
-Reported-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Cc: Dave Airlie <airlied@redhat.com>
----
- hw/kdrive/src/kinput.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/hw/kdrive/src/kinput.c
-+++ b/hw/kdrive/src/kinput.c
-@@ -1034,7 +1034,7 @@ KdGetOptions(InputOption **options, char
-
- if (strchr(string, '=')) {
- tam_key = (strchr(string, '=') - string);
-- key = strndup(string, tam_key + 1);
-+ key = strndup(string, tam_key);
- if (!key)
- goto out;
-
diff --git a/debian/patches/series b/debian/patches/series
index 58341de..3c8c1a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
#13_debian_add_xkbpath_env_variable.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
-07_Revert-kinput-allocate-enough-space-for-null-charact.diff
08_xfree86_fix_ia64_inx_outx.diff
commit 69241738e40e5bc1997df1709cad1fb4df5ed6b0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 15:41:41 2013 +0100
Remove 04_int10-fix-pci_device_read_rom-usage.diff, upstreamed.
diff --git a/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff b/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff
deleted file mode 100644
index 91d6f08..0000000
--- a/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From ccef32b333cde427e728d30253c221d9d7aabb3a Mon Sep 17 00:00:00 2001
-From: Stephan Schreiber <info@fs-driver.org>
-Date: Wed, 29 Aug 2012 19:58:23 +0200
-Subject: [PATCH] int10: fix pci_device_read_rom usage
-
-I noticed that the build-in int10 driver always reports
-"Unable to retrieve all of segment 0x0C0000."
-even though the entire BIOS data is retrieved with success.
-
-The associated code is in hw/xfree86/int10/generic.c, in the function
-xf86ExtendedInitInt10():
-
- if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
- xf86DrvMsg(screen, X_WARNING,
- "Unable to retrieve all of segment 0x0C0000.\n");
- }
-
-The function pci_device_read_rom() is from libpciaccess; its return
-value is not a size but an error status code: 0 means success.
-If pci_device_read_rom() returns 0 for success, the warning is generated.
-
-The proposed patch corrects the evaluation of the return value of
-pci_device_read_rom() and of the supplied BIOS size.
-
-Debian bug#686153
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- hw/xfree86/int10/generic.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/hw/xfree86/int10/generic.c
-+++ b/hw/xfree86/int10/generic.c
-@@ -178,7 +178,8 @@
- */
- vbiosMem = (char *) base + V_BIOS;
- memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
-- if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
-+ if (pci_device_read_rom(pInt->dev, vbiosMem) != 0
-+ || pInt->dev->rom_size < V_BIOS_SIZE) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Unable to retrieve all of segment 0x0C0000.\n");
- }
diff --git a/debian/patches/series b/debian/patches/series
index 90e8c1d..58341de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
#13_debian_add_xkbpath_env_variable.diff
-04_int10-fix-pci_device_read_rom-usage.diff
05_Revert-Unload-submodules.diff
06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
07_Revert-kinput-allocate-enough-space-for-null-charact.diff
commit 9aeed0d119856fb84e41bf6c043a7e1ae0faf7f7
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 15:40:30 2013 +0100
Remove 02_Add-libnettle-as-option-for-sha1.diff, upstreamed
diff --git a/debian/changelog b/debian/changelog
index 2362e3b..3888ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
* Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
* Drop 09_EXA-Track...diff, upstream.
+ [ Maarten Lankhorst ]
+ * Remove 02_Add-libnettle-as-option-for-sha1.diff, upstreamed
+
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 22 Aug 2012 11:12:17 -0400
xorg-server (2:1.12.4-4) UNRELEASED; urgency=low
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
deleted file mode 100644
index 49ddcf3..0000000
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-From a6119f6cd7e47041044fcc9c15a6e3f9f189b3ed Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois <kibi@debian.org>
-Date: Sun, 14 Mar 2010 22:01:47 +0100
-Subject: [PATCH] Add libnettle as option for sha1.
-
-Signed-off-by: Cyril Brulebois <kibi@debian.org>
-
-[jcristau: forward-ported from 1.7 to 1.8]
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
---- a/configure.ac
-+++ b/configure.ac
-@@ -1361,7 +1361,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
-
- # SHA1 hashing
- AC_ARG_WITH([sha1],
-- [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
-+ [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI|nettle],
- [choose SHA1 implementation])])
- AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
- if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
-@@ -1457,6 +1457,16 @@ if test "x$with_sha1" = xlibcrypto; then
- SHA1_CFLAGS="$OPENSSL_CFLAGS"
- fi
- fi
-+AC_CHECK_LIB([nettle], [nettle_sha1_init], [HAVE_LIBNETTLE=yes])
-+if test "x$with_sha1" = x && test "x$HAVE_LIBNETTLE" = xyes; then
-+ with_sha1=nettle
-+fi
-+if test "x$with_sha1" = xnettle; then
-+ AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
-+ [Use libnettle SHA1 functions])
-+ # XXX hack for d-i: use the static lib
-+ SHA1_LIBS=-l:libnettle.a
-+fi
- AC_MSG_CHECKING([for SHA1 implementation])
- if test "x$with_sha1" = x; then
- AC_MSG_ERROR([No suitable SHA1 implementation found])
---- a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
-@@ -160,6 +160,9 @@
- /* Define to use libsha1 for SHA1 */
- #undef HAVE_SHA1_IN_LIBSHA1
-
-+/* Define to use libnettle SHA1 */
-+#undef HAVE_SHA1_IN_LIBNETTLE
-+
- /* Define to 1 if you have the `shmctl64' function. */
- #undef HAVE_SHMCTL64
-
---- a/os/xsha1.c
-+++ b/os/xsha1.c
-@@ -190,6 +190,32 @@ x_sha1_final(void *ctx, unsigned char re
- return 1;
- }
-
-+#elif defined(HAVE_SHA1_IN_LIBNETTLE)
-+
-+#include <nettle/sha.h>
-+
-+void *x_sha1_init(void)
-+{
-+ struct sha1_ctx *ctx = malloc(sizeof(*ctx));
-+ if (!ctx)
-+ return NULL;
-+ sha1_init(ctx);
-+ return ctx;
-+}
-+
-+int x_sha1_update(void *ctx, void *data, int size)
-+{
-+ sha1_update(ctx, size, data);
-+ return 1;
-+}
-+
-+int x_sha1_final(void *ctx, unsigned char result[20])
-+{
-+ sha1_digest(ctx, 20, result);
-+ free(ctx);
-+ return 1;
-+}
-+
- #else /* Use OpenSSL's libcrypto */
-
- #include <stddef.h> /* buggy openssl/sha.h wants size_t */
diff --git a/debian/patches/series b/debian/patches/series
index 592a3ab..90e8c1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
-02_Add-libnettle-as-option-for-sha1.diff
#13_debian_add_xkbpath_env_variable.diff
04_int10-fix-pci_device_read_rom-usage.diff
05_Revert-Unload-submodules.diff
commit 9b74a33f79857fe0d318232d820236078f8b2989
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jan 9 15:37:23 2013 +0100
bump changelogs
diff --git a/ChangeLog b/ChangeLog
index e455b54..3a69859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,58 +1,122 @@
-commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd
-Author: Matt Dew <marcoz@osource.org>
-Date: Thu Jan 3 23:36:00 2013 -0700
+commit 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jan 8 20:24:32 2013 -0800
- version bump for 1.13.1.901 (rc1)
+ hw/xfree86: Require only one working CRTC to start the server.
+
+ Instead of requiring every mode set to complete successfully, start up
+ as long as at least one CRTC is working. This avoids failures when one
+ or more CRTCs can't start due to mode setting conflicts.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
-commit 95780608df676473f501a6cd73248da9f7be82a0
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue Dec 18 00:41:08 2012 -0800
+commit 8b328d4ee3873bc0a7a34f2cb9d301827244b98c
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Dec 21 07:37:33 2012 -0800
- EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel
+ dix: Make small bitfields that store enums unsigned
- d785368e0e converted the other miinitext functions to use ARRAY_SIZE,
- and removed the sentinel, but missed EnableDisableExtensionError so
- passing an invalid extension name could cause the server to walk off
- the end off the list looking for a sentinel that wasn't there.
+ Commit 31bf81772e146af79b0c456aae2159eba8b0280f changed the clientState field
+ from a signed int to a signed int 2-bit bitfield. The ClientState enum that is
+ expected to be assigned to this field has four values: ClientStateInitial (0),
+ ClientStateRunning (1), ClientStateRetained (2), and ClientStateGone (3).
+ However, because this bitfield is signed, ClientStateRetained becomes -2 when
+ assigned, and ClientStateGone becomes -1. This causes warnings:
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ test.c:54:10: error: case label value exceeds maximum value for type [-Werror]
+ test.c:55:10: error: case label value exceeds maximum value for type [-Werror]
+
+ The code here is a switch statement:
+
+ 53 switch (client->clientState) {
+ 54 case ClientStateGone:
+ 55 case ClientStateRetained:
+ 56 [...]
+ 57 break;
+ 58
+ 59 default:
+ 60 [...]
+ 61 break;
+ 62 }
+
+ It also causes bizarre problems like this:
+
+ client->clientState = ClientStateGone;
+ assert(client->clientState == ClientStateGone); // this assert fails
+
+ Also change the signedness of nearby bitfields to match.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a
-Author: Dave Airlie <airlied@redhat.com>
-Date: Mon Dec 17 15:40:17 2012 +1000
+commit bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 19 12:47:35 2012 -0800
- glx/dri2: initialise api to avoid indirect rendering failing randomly
-
- Running glxinfo under indirect rendering would randomly fail against the
- intel driver, as it would create a context with no attribs, and then the
- api value would be passed to the driver uninitialised.
+ Update to version 1.13.99.901 (1.14 RC1)
- Signed-off-by: Dave Airlie <airlied@redhat.com>
- Reviewed-by: Keith Packard <keithp@keithp.com>
- Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b
-Author: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri Nov 16 19:51:58 2012 +0200
+commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b
+Merge: 0eb1559 ba4bb3b
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 19 12:26:00 2012 -0800
- vfb: Initialize the GLX extension again.
+ Merge remote-tracking branch 'jeremyhu/master'
+
+commit 0eb1559eb29d11e63c2b33e317590a88d86fe313
+Merge: 386e4d7 ea1d76d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 19 12:21:31 2012 -0800
+
+ Merge remote-tracking branch 'yselkowitz/master'
- This should fix a regression in the 1.13.0 release: commit
- 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86 removed a code path used by Xvfb
- and made it use the default one when initializing extensions. However, this
- meant the GLX extension was not initialized anymore since it is not part of
- the `staticExtensions' array.
+ I checked this patch with diff -w to check that it only affected
+ whitespace.
+
+commit 386e4d76baaffe226d2d561ff936509454eb0ac2
+Merge: 014a5c8 9ff2e83
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 19 12:17:59 2012 -0800
+
+ Merge remote-tracking branch 'alanc/master'
+
+commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e
+Merge: f793b5f 2eefa5d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 19 12:09:31 2012 -0800
+
+ Merge remote-tracking branch 'whot/barriers'
- Since it is not possible to just add it to that array after commit
- aad428b8e21c77397c623b78706eb64b1fea77c9, adopt an approach similar to
- xwin's and xquartz's and initialize the extension from vfb's `InitOutput'.
+ Conflicts:
+ Xi/xichangehierarchy.c
- Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Small conflict with the patch from
+
+ Xi: don't use devices after removing them
+
+ Was easily resolved by hand.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9ff2e831517875f96477862f979abff394e8d551
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Dec 18 00:41:08 2012 -0800
+
+ EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel
+
+ d785368e0e converted the other miinitext functions to use ARRAY_SIZE,
+ and removed the sentinel, but missed EnableDisableExtensionError so
+ passing an invalid extension name could cause the server to walk off
+ the end off the list looking for a sentinel that wasn't there.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit e348e4afc5323779b686ee8ff2f094359664c42e
+commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Dec 18 01:29:12 2012 -0800
@@ -61,582 +125,2976 @@ Date: Tue Dec 18 01:29:12 2012 -0800
Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847)
-commit 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba
+commit c298f9c42ec05486ac88fc91a84739d7c3e3ea9e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu Sep 20 21:11:21 2012 -0700
+Date: Tue Dec 18 01:28:02 2012 -0800
- XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced
+ XQuartz: Revert some unfortunate auto-indenting mishaps with our super-nested for-loops
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8)
-commit 06e2ecd0df9b81dd518ae6017ec42765520e2e93
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu Sep 20 21:49:40 2012 -0700
+commit 07a91fa6c6d535f3f05d4c3bd9c4d2b8c382c475
+Author: Rob Clark <robdclark@gmail.com>
+Date: Wed Dec 5 23:21:27 2012 +0000
- XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2
+ hw/dmx: fix build without GLX
- <rdar://problem/12338921>
- http://bugs.winehq.org/show_bug.cgi?id=31751
+ Fixes this compile break that showed up on arm recently:
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
-
-commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d
-Author: Matt Dew <marcoz@osource.org>
-Date: Thu Dec 13 21:05:24 2012 -0700
-
- No changes from 1.13.0.902 (rc2)
+ dmxinit.c:746:26: error: 'glxSupported' undeclared (first use in this function)
+ dmxinit.c:746:26: note: each undeclared identifier is reported only once for each function it appears in
- Bump version to 1.13.1
+ Signed-off-by: Rob Clark <robdclark@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-commit ede07c1af35926c77c4e766cc02c00333b498460
-Author: Matt Dew <marcoz@osource.org>
-Date: Thu Dec 6 22:46:46 2012 -0700
+commit 5692a1e8f5befd3698134b1a5516a4dadda00115
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 6 16:15:50 2012 -0800
- Bump version
+ Support compilers with alternate spellings of typeof
+
+ The AC_C_TYPEOF adds a #undef typeof to its autogenerated config.h.in
+ template, but b8ab93dfbc7f292 didn't copy that to dix-config.h.in
+ when HAVE_TYPEOF was, so the macro could claim typeof support but not
+ make it work, when used with compilers like Solaris Studio 12.1 which
+ only recognize it as __typeof__.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit e2369dd404024415853108848c8d052e73e95461
-Merge: d71a17c 79220f4
-Author: Matt Dew <marcoz@osource.org>
-Date: Thu Dec 6 21:53:42 2012 -0700
+commit f793b5fd3eb16a2ada130367c2ffebeede69a322
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Dec 11 13:36:02 2012 +1000
- Merge branch 'server-1.13-branch' of git://people.freedesktop.org/~whot/xserver into server-1.13-branch
+ dix: don't copy the wrong event mask when activating a passive grab
+
+ GrabMask is a union of core, XI1 and XI2 masks. If a XI2 grab is activated,
+ the value is a random pointer value, using it as mask has unpredictable
+ effects.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
-commit 79220f4390127d9971cbcf378530bf36172ef35a
-Author: Daniel Martin <consume.noise@gmail.com>
-Date: Wed Nov 7 11:31:01 2012 +0100
+commit dd3242c87a0a58cba055eb99c0c3fcf03153e4b8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Dec 14 11:34:15 2012 +1000
- Xi: Fix modifier swapping in XIPassiveGrabDevice
+ dix: don't allow overriding a grab with a different type of grab (#58255)
- XIPassiveGrabDevice uses a list of uint32_t as modifier sets.
+ If a client has a core grab, don't allow re-grabbing with type XI2, etc.
+ This was the intent of the original commit
+ xorg-server-1.5.99.1-782-g09f9a86, but ineffective.
- The ModifierInfo struct represents the current modifier states and is
- therefor used in XIQueryPointer and various events.
+ X.Org Bug 58255 <http://bugs.freedesktop.org/show_bug.cgi?id=58255>
- Signed-off-by: Daniel Martin <consume.noise@gmail.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87)
+ Reviewed-by: Keith Packard <keithp@keithp.com>
-commit 521f3fb566e67330a486874928a21ce201dba02b
-Author: Sybren van Elderen <sowmestno@msn.com>
-Date: Tue Nov 27 19:27:10 2012 +0100
+commit 2eefa5d6e870c57ac6a5930883d8cfe3a3882a43
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 13 14:42:32 2012 +1000
- hw/dmx: add update_desktop_dimensions() call
-
- The Xdmx server did not update the desktop dimensions when computing screen
- origins.
+ Xi: if a MD is removed, send a barrier leave event (if applicable)
- Signed-off-by: Sybren van Elderen <sowmestno@msn.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 6e18599d691036eca6ff082c17727d9ffb926984)
+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
-commit 73bd33b4d4e3df4a8097826695a8dbdc2fb5c920
+commit e2423b627ef7e4d08ea0685af5e771ddd2b511ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Jun 26 10:30:35 2012 +1000
+Date: Thu Dec 13 14:04:13 2012 +1000
- xkb: fill in keycode and event type for slow keys enablement
-
- eventType is set for the type that triggered a XkbControlsNotify event.
- Technically, SlowKeys is triggered by a timer which doesn't have a matching
- core event type. So we used to use 0 here.
-
- Practically, the timer is triggered by a key press + hold and cancelled when
- the key is released before the timeout expires. So we might as well set
- KeyPress (keycode) in the ControlsNotify to give clients a chance to differ
- between timer-triggered SlowKeys and client-triggered ones.
+ Xi: don't store the window pointer in barriers, store the window ID
- This is a chance in behaviour, though I suspect with little impact.
+ When a client shuts down and resources are being freed, the window may have
+ been freed already, so accessing it to get the window ID is bad. Plus, we
+ never care about the window anyway other than for stuffing it into the
+ event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Acked-by: Daniel Stone <daniel@fooishbar.org>
- (cherry picked from commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384)
+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
-commit 2def985466683cf3746c03f9ac318e5941d22f86
-Author: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Tue Nov 20 14:50:41 2012 -0500
+commit f71c2f895c9e2f9d0d42feaac2a3e1d2deb71f67
Reply to: