xorg-server: Changes to 'ubuntu'
ChangeLog | 846 ++++++++++
Xext/geext.c | 2
Xext/xtest.c | 5
Xi/exevents.c | 10
Xi/extinit.c | 7
Xi/getprop.c | 2
Xi/getselev.c | 6
Xi/xichangehierarchy.c | 2
Xi/xiquerydevice.c | 7
configure.ac | 4
debian/changelog | 14
debian/patches/100_rethrow_signals.patch | 70
debian/patches/105_nvidia_fglrx_autodetect.patch | 27
debian/patches/111_armel-drv-fallbacks.patch | 9
debian/patches/121_only_switch_vt_when_active.diff | 4
debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 12
debian/patches/157_check_null_modes.patch | 6
debian/patches/162_null_crtc_in_rotation.patch | 8
debian/patches/165_man_xorg_conf_no_device_ident.patch | 8
debian/patches/166_nullptr_xinerama_keyrepeat.patch | 6
debian/patches/167_nullptr_xisbread.patch | 9
debian/patches/168_glibc_trace_to_stderr.patch | 8
debian/patches/172_cwgetbackingpicture_nullptr_check.patch | 18
debian/patches/188_default_primary_to_first_busid.patch | 10
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 14
debian/patches/191-Xorg-add-an-extra-module-path.patch | 40
debian/patches/198_nohwaccess.patch | 28
debian/patches/200_randr-null.patch | 9
debian/patches/206_intel_8xx_default_to_fbdev.patch | 6
debian/patches/208_switch_on_release.diff | 16
debian/patches/209_add_legacy_bgnone_option.patch | 8
debian/patches/210_pixman_null_ptr_check.patch | 10
debian/patches/213_xichangehierarchy-check-oom.patch | 13
debian/patches/214_glx_dri_searchdirs.patch | 26
debian/patches/215_glx_drawable_refcounting.diff | 41
debian/patches/217_revert_bgnonevisitwindow.patch | 10
debian/patches/218_getValuatorEvents_cleanup.patch | 49
debian/patches/219_xi1_handle_noncontinuous_valuator_data.patch | 59
debian/patches/500_xi2.1.patch | 448 +++--
debian/patches/501_xf86CoordinatesToWindow.patch | 40
debian/patches/502_gestures-extension.patch | 218 +-
debian/patches/series | 3
dix/colormap.c | 2
dix/devices.c | 42
dix/dixfonts.c | 18
dix/eventconvert.c | 23
dix/events.c | 7
dix/extension.c | 5
dix/getevents.c | 4
fb/fboverlay.c | 8
fb/fbscreen.c | 4
hw/xfree86/common/xf86Config.c | 32
hw/xfree86/common/xf86Helper.c | 1
hw/xfree86/common/xf86Init.c | 4
hw/xfree86/common/xf86Option.c | 77
hw/xfree86/doc/man/xorg.conf.man | 13
hw/xfree86/dri2/dri2.c | 9
hw/xfree86/loader/loadmod.c | 6
hw/xquartz/bundle/Info.plist.cpp | 4
mi/micmap.c | 2
mi/midispcur.c | 10
mi/mipointer.c | 1
mi/mispans.c | 2
mi/mizerline.c | 6
os/utils.c | 21
render/render.c | 25
xfixes/region.c | 2
xkb/XKBGAlloc.c | 4
xkb/ddxList.c | 4
69 files changed, 1676 insertions(+), 798 deletions(-)
New commits:
commit 3695e2386de16c465c65eafeaf4206cbd91e5e0a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sat Apr 9 10:53:23 2011 +0300
Removed patches included upstream
and refresh the rest.
diff --git a/debian/changelog b/debian/changelog
index 15cbd54..96156d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xorg-server (2:1.10.0.902-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian experimental.
- - drop 216_fix_sdksyms_build.diff, included upstream.
+ - dropped patches, included upstream:
+ 213_xichangehierarchy-check-oom.patch
+ 216_fix_sdksyms_build.diff, included upstream.
+ 218_getValuatorEvents_cleanup.patch
+ 219_xi1_handle_noncontinuous_valuator_data.patch
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 06 Apr 2011 18:16:11 +0300
diff --git a/debian/patches/100_rethrow_signals.patch b/debian/patches/100_rethrow_signals.patch
index 187310d..95b9108 100644
--- a/debian/patches/100_rethrow_signals.patch
+++ b/debian/patches/100_rethrow_signals.patch
@@ -1,8 +1,8 @@
Index: xorg-server/hw/dmx/dmxinit.c
===================================================================
---- xorg-server.orig/hw/dmx/dmxinit.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/dmx/dmxinit.c 2010-07-14 14:02:26.161453002 +1000
-@@ -830,7 +830,7 @@
+--- xorg-server.orig/hw/dmx/dmxinit.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/dmx/dmxinit.c 2011-04-09 10:38:10.000000000 +0300
+@@ -821,7 +821,7 @@
/** This function is called in Xserver/os/utils.c from \a AbortServer().
* We must ensure that backend and console state is restored in the
* event the server shutdown wasn't clean. */
@@ -11,7 +11,7 @@ Index: xorg-server/hw/dmx/dmxinit.c
{
int i;
-@@ -848,6 +848,11 @@
+@@ -839,6 +839,11 @@
}
#endif
@@ -25,8 +25,8 @@ Index: xorg-server/hw/dmx/dmxinit.c
* main loop without an interruption. */
Index: xorg-server/hw/kdrive/src/kdrive.c
===================================================================
---- xorg-server.orig/hw/kdrive/src/kdrive.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/kdrive/src/kdrive.c 2010-07-14 14:02:26.161453002 +1000
+--- xorg-server.orig/hw/kdrive/src/kdrive.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/kdrive/src/kdrive.c 2011-04-09 10:38:10.000000000 +0300
@@ -321,7 +321,7 @@
}
@@ -51,8 +51,8 @@ Index: xorg-server/hw/kdrive/src/kdrive.c
AbortDDX ();
Index: xorg-server/hw/vfb/InitOutput.c
===================================================================
---- xorg-server.orig/hw/vfb/InitOutput.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/vfb/InitOutput.c 2010-07-14 14:02:26.161453002 +1000
+--- xorg-server.orig/hw/vfb/InitOutput.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/vfb/InitOutput.c 2011-04-09 10:38:10.000000000 +0300
@@ -201,11 +201,17 @@
}
@@ -74,8 +74,8 @@ Index: xorg-server/hw/vfb/InitOutput.c
DarwinHandleGUI(int argc, char *argv[])
Index: xorg-server/hw/xfree86/common/xf86Events.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Events.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/xfree86/common/xf86Events.c 2010-07-14 14:02:26.171453002 +1000
+--- xorg-server.orig/hw/xfree86/common/xf86Events.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Events.c 2011-04-09 10:38:10.000000000 +0300
@@ -348,6 +348,8 @@
int
xf86SigWrapper(int signo)
@@ -87,9 +87,9 @@ Index: xorg-server/hw/xfree86/common/xf86Events.c
return 0; /* continue */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2010-07-14 14:02:26.171453002 +1000
-@@ -899,14 +899,17 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Init.c 2011-04-09 10:44:50.000000000 +0300
+@@ -874,14 +874,17 @@
}
/*
@@ -109,7 +109,7 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
{
int i;
-@@ -933,24 +936,45 @@
+@@ -908,24 +911,45 @@
if (xorgHWOpenConsole)
xf86CloseConsole();
@@ -159,7 +159,7 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
{
int i;
-@@ -983,7 +1007,20 @@
+@@ -958,7 +982,20 @@
* This is needed for an abnormal server exit, since the normal exit stuff
* MUST also be performed (i.e. the vt must be left in a defined state)
*/
@@ -183,8 +183,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
void
Index: xorg-server/hw/xnest/Init.c
===================================================================
---- xorg-server.orig/hw/xnest/Init.c 2010-07-05 15:56:19.000000000 +1000
-+++ xorg-server/hw/xnest/Init.c 2010-07-14 14:02:26.171453002 +1000
+--- xorg-server.orig/hw/xnest/Init.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xnest/Init.c 2011-04-09 10:38:10.000000000 +0300
@@ -117,12 +117,17 @@
/*
* DDX - specific abort routine. Called by AbortServer().
@@ -206,9 +206,9 @@ Index: xorg-server/hw/xnest/Init.c
{
Index: xorg-server/hw/xquartz/darwin.c
===================================================================
---- xorg-server.orig/hw/xquartz/darwin.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/xquartz/darwin.c 2010-07-14 14:02:26.171453002 +1000
-@@ -765,17 +765,22 @@
+--- xorg-server.orig/hw/xquartz/darwin.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xquartz/darwin.c 2011-04-09 10:38:10.000000000 +0300
+@@ -758,17 +758,22 @@
/*
@@ -235,9 +235,9 @@ Index: xorg-server/hw/xquartz/darwin.c
#include "scrnintstr.h" // for struct _Screen
Index: xorg-server/hw/xwin/InitOutput.c
===================================================================
---- xorg-server.orig/hw/xwin/InitOutput.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/hw/xwin/InitOutput.c 2010-07-14 14:02:26.171453002 +1000
-@@ -288,7 +288,7 @@
+--- xorg-server.orig/hw/xwin/InitOutput.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xwin/InitOutput.c 2011-04-09 10:38:10.000000000 +0300
+@@ -258,7 +258,7 @@
/* See Porting Layer Definition - p. 57 */
void
@@ -246,7 +246,7 @@ Index: xorg-server/hw/xwin/InitOutput.c
{
#if CYGDEBUG
winDebug ("AbortDDX\n");
-@@ -296,6 +296,12 @@
+@@ -266,6 +266,12 @@
ddxGiveUp ();
}
@@ -261,9 +261,9 @@ Index: xorg-server/hw/xwin/InitOutput.c
static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
Index: xorg-server/include/os.h
===================================================================
---- xorg-server.orig/include/os.h 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/include/os.h 2010-07-14 14:02:26.171453002 +1000
-@@ -477,7 +477,9 @@
+--- xorg-server.orig/include/os.h 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/include/os.h 2011-04-09 10:38:10.000000000 +0300
+@@ -459,7 +459,9 @@
/* stuff for FlushCallback */
extern _X_EXPORT CallbackListPtr FlushCallback;
@@ -275,9 +275,9 @@ Index: xorg-server/include/os.h
Index: xorg-server/os/log.c
===================================================================
---- xorg-server.orig/os/log.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/os/log.c 2010-07-14 14:06:06.531453001 +1000
-@@ -411,9 +411,11 @@
+--- xorg-server.orig/os/log.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/os/log.c 2011-04-09 10:38:10.000000000 +0300
+@@ -397,9 +397,11 @@
void
AbortServer(void) _X_NORETURN;
@@ -290,7 +290,7 @@ Index: xorg-server/os/log.c
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
-@@ -421,11 +423,21 @@
+@@ -407,11 +409,21 @@
CloseWellKnownConnections();
OsCleanup(TRUE);
CloseDownDevices();
@@ -316,7 +316,7 @@ Index: xorg-server/os/log.c
}
#define AUDIT_PREFIX "AUDIT: %s: %ld: "
-@@ -528,6 +540,27 @@
+@@ -512,6 +524,27 @@
}
void
@@ -346,9 +346,9 @@ Index: xorg-server/os/log.c
va_list args;
Index: xorg-server/os/osinit.c
===================================================================
---- xorg-server.orig/os/osinit.c 2010-07-14 13:21:02.000000000 +1000
-+++ xorg-server/os/osinit.c 2010-07-14 14:02:26.181453002 +1000
-@@ -148,13 +148,13 @@
+--- xorg-server.orig/os/osinit.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/os/osinit.c 2011-04-09 10:38:10.000000000 +0300
+@@ -145,13 +145,13 @@
case SIGBUS:
case SIGILL:
case SIGFPE:
diff --git a/debian/patches/105_nvidia_fglrx_autodetect.patch b/debian/patches/105_nvidia_fglrx_autodetect.patch
index b72ed0b..1820d3c 100644
--- a/debian/patches/105_nvidia_fglrx_autodetect.patch
+++ b/debian/patches/105_nvidia_fglrx_autodetect.patch
@@ -9,11 +9,11 @@ Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
hw/xfree86/common/xf86pciBus.c | 14 +++++++++-----
2 files changed, 20 insertions(+), 6 deletions(-)
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 8ef602d..a8f04b9 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -81,6 +81,13 @@
+Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:45:07.000000000 +0300
+@@ -75,6 +75,13 @@
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
"EndSection\n\n"
@@ -27,7 +27,7 @@ index 8ef602d..a8f04b9 100644
#define BUILTIN_LAYOUT_SECTION_PRE \
"Section \"ServerLayout\"\n" \
"\tIdentifier\t\"Builtin Default Layout\"\n"
-@@ -159,7 +166,10 @@ xf86AutoConfig(void)
+@@ -153,7 +160,10 @@
for (p = deviceList; *p; p++) {
snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
AppendToConfig(buf);
@@ -39,11 +39,11 @@ index 8ef602d..a8f04b9 100644
AppendToConfig(buf);
}
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 930ed83..a6aa4f4 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1102,7 +1102,10 @@ videoPtrToDriverList(struct pci_device *dev,
+Index: xorg-server/hw/xfree86/common/xf86pciBus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:44:46.000000000 +0300
+@@ -1107,7 +1107,10 @@
case 0x1142: driverList[0] = "apm"; break;
case 0xedd8: driverList[0] = "ark"; break;
case 0x1a03: driverList[0] = "ast"; break;
@@ -55,7 +55,7 @@ index 930ed83..a6aa4f4 100644
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
case 0x3d3d: driverList[0] = "glint"; break;
-@@ -1119,20 +1122,21 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -1124,20 +1127,21 @@
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
case 0x10de: case 0x12d2:
@@ -81,6 +81,3 @@ index 930ed83..a6aa4f4 100644
break;
}
break;
---
-1.7.2
-
diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index 31c9333..17bbb94 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -4,8 +4,8 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2010-08-05 11:18:59.709693301 +1000
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2010-08-05 11:21:21.854896555 +1000
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
@@ -44,6 +44,12 @@
# include "xf86sbusBus.h"
#endif
@@ -19,7 +19,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
#ifdef sun
# include <sys/visual_io.h>
# include <ctype.h>
-@@ -188,6 +194,28 @@
+@@ -198,6 +204,28 @@
return ret == CONFIG_OK;
}
@@ -48,7 +48,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -272,7 +300,15 @@
+@@ -282,6 +310,14 @@
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
#else
@@ -63,4 +63,3 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
matches[i++] = xnfstrdup("fbdev");
#endif
}
- }
diff --git a/debian/patches/121_only_switch_vt_when_active.diff b/debian/patches/121_only_switch_vt_when_active.diff
index 499e169..14c06e5 100644
--- a/debian/patches/121_only_switch_vt_when_active.diff
+++ b/debian/patches/121_only_switch_vt_when_active.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
===================================================================
---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-01-10 15:38:09.000000000 -0600
-+++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-01-10 16:06:26.000000000 -0600
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09 10:44:31.000000000 +0300
@@ -273,11 +273,26 @@
if (VTSwitch)
diff --git a/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch b/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
index ad8287a..6c97ab2 100644
--- a/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
+++ b/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
@@ -10,11 +10,11 @@ Origin: http://patchwork.freedesktop.org/patch/242/
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27134
Bug-Ubuntu: https://launchpad.net/bugs/519049
-diff --git a/Xext/security.c b/Xext/security.c
-index af8d205..e81e560 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -279,10 +279,10 @@ SecurityComputeAuthorizationTimeout(
+Index: xorg-server/Xext/security.c
+===================================================================
+--- xorg-server.orig/Xext/security.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/Xext/security.c 2011-04-09 10:38:10.000000000 +0300
+@@ -271,10 +271,10 @@
/* maxSecs is the number of full seconds that can be expressed in
* 32 bits worth of milliseconds
*/
@@ -27,7 +27,7 @@ index af8d205..e81e560 100644
pAuth->secondsRemaining = seconds - maxSecs;
return maxSecs * MILLI_PER_SECOND;
}
-@@ -320,8 +320,6 @@ SecurityAuthorizationExpired(
+@@ -312,8 +312,6 @@
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)pval;
diff --git a/debian/patches/157_check_null_modes.patch b/debian/patches/157_check_null_modes.patch
index 7a63fa5..e9c2193 100644
--- a/debian/patches/157_check_null_modes.patch
+++ b/debian/patches/157_check_null_modes.patch
@@ -1,8 +1,8 @@
Index: xorg-server/hw/xfree86/common/xf86VidMode.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86VidMode.c 2009-12-02 23:06:16.000000000 +0200
-+++ xorg-server/hw/xfree86/common/xf86VidMode.c 2009-12-02 23:06:21.000000000 +0200
-@@ -220,6 +220,9 @@
+--- xorg-server.orig/hw/xfree86/common/xf86VidMode.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86VidMode.c 2011-04-09 10:38:10.000000000 +0300
+@@ -222,6 +222,9 @@
pScrn = xf86Screens[scrnIndex];
pVidMode = VMPTR(pScrn->pScreen);
diff --git a/debian/patches/162_null_crtc_in_rotation.patch b/debian/patches/162_null_crtc_in_rotation.patch
index 7f07226..3d1df54 100644
--- a/debian/patches/162_null_crtc_in_rotation.patch
+++ b/debian/patches/162_null_crtc_in_rotation.patch
@@ -1,6 +1,8 @@
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -946,7 +946,8 @@ xf86RandR12SetRotations (ScreenPtr pScre
+Index: xorg-server/hw/xfree86/modes/xf86RandR12.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/modes/xf86RandR12.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/modes/xf86RandR12.c 2011-04-09 10:38:10.000000000 +0300
+@@ -930,7 +930,8 @@
for (c = 0; c < config->num_crtc; c++) {
xf86CrtcPtr crtc = config->crtc[c];
diff --git a/debian/patches/165_man_xorg_conf_no_device_ident.patch b/debian/patches/165_man_xorg_conf_no_device_ident.patch
index 4cb531f..ca50676 100644
--- a/debian/patches/165_man_xorg_conf_no_device_ident.patch
+++ b/debian/patches/165_man_xorg_conf_no_device_ident.patch
@@ -9,9 +9,11 @@ Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
hw/xfree86/doc/man/xorg.conf.man.pre | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---- a/hw/xfree86/doc/man/xorg.conf.man
-+++ b/hw/xfree86/doc/man/xorg.conf.man
-@@ -1760,9 +1760,7 @@ sections have the following format:
+Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man
+===================================================================
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man 2011-04-09 10:38:10.000000000 +0300
+@@ -1816,9 +1816,7 @@
.PP
The
.B Identifier
diff --git a/debian/patches/166_nullptr_xinerama_keyrepeat.patch b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
index b0e3699..2a56051 100644
--- a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
+++ b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
@@ -12,9 +12,9 @@ Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
Index: xorg-server/mi/mipointer.c
===================================================================
---- xorg-server.orig/mi/mipointer.c 2009-12-02 23:07:03.000000000 +0200
-+++ xorg-server/mi/mipointer.c 2009-12-02 23:08:42.000000000 +0200
-@@ -306,6 +306,10 @@
+--- xorg-server.orig/mi/mipointer.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/mi/mipointer.c 2011-04-09 10:38:10.000000000 +0300
+@@ -300,6 +300,10 @@
SetupScreen (pScreen);
pPointer = MIPOINTER(pDev);
diff --git a/debian/patches/167_nullptr_xisbread.patch b/debian/patches/167_nullptr_xisbread.patch
index 38921dd..e14fecc 100644
--- a/debian/patches/167_nullptr_xisbread.patch
+++ b/debian/patches/167_nullptr_xisbread.patch
@@ -1,7 +1,8 @@
-diff -Nurp patched/hw/xfree86/common/xisb.c working/hw/xfree86/common/xisb.c
---- patched/hw/xfree86/common/xisb.c 2009-02-02 21:53:58.000000000 +0100
-+++ working/hw/xfree86/common/xisb.c 2009-02-02 21:55:09.000000000 +0100
-@@ -98,6 +98,9 @@ XisbRead (XISBuffer *b)
+Index: xorg-server/hw/xfree86/common/xisb.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xisb.c 2011-04-09 10:36:57.000000000 +0300
++++ xorg-server/hw/xfree86/common/xisb.c 2011-04-09 10:38:10.000000000 +0300
+@@ -98,6 +98,9 @@
{
int ret;
diff --git a/debian/patches/168_glibc_trace_to_stderr.patch b/debian/patches/168_glibc_trace_to_stderr.patch
index cc1199c..099c270 100644
--- a/debian/patches/168_glibc_trace_to_stderr.patch
+++ b/debian/patches/168_glibc_trace_to_stderr.patch
@@ -1,9 +1,11 @@
Report abort traces to stderr instead of terminal. This enables apport
to catch the error so it can file a bug report about the crash.
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -1167,6 +1167,9 @@ OsVendorInit(void)
+Index: xorg-server/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Init.c 2011-04-09 10:38:10.000000000 +0300
+@@ -844,6 +844,9 @@
if (!beenHere) {
umask(022);
diff --git a/debian/patches/172_cwgetbackingpicture_nullptr_check.patch b/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
index 9a91113..0b90324 100644
--- a/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
+++ b/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
@@ -10,22 +10,21 @@ Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
miext/cw/cw_render.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
-diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c
-index 6e0c727..fe8cba7 100644
---- a/miext/cw/cw_render.c
-+++ b/miext/cw/cw_render.c
-@@ -125,10 +125,15 @@ cwGetBackingPicture (PicturePtr pPicture, int *x_off, int *y_off)
+Index: xorg-server/miext/cw/cw_render.c
+===================================================================
+--- xorg-server.orig/miext/cw/cw_render.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/miext/cw/cw_render.c 2011-04-09 10:38:10.000000000 +0300
+@@ -123,10 +123,15 @@
WindowPtr pWindow = (WindowPtr) pDrawable;
PixmapPtr pPixmap = getCwPixmap (pWindow);
- *x_off = pDrawable->x - pPixmap->screen_x;
- *y_off = pDrawable->y - pPixmap->screen_y;
--
-- return pPicturePrivate->pBackingPicture;
+ if (pDrawable && pPixmap) {
+ *x_off = pDrawable->x - pPixmap->screen_x;
+ *y_off = pDrawable->y - pPixmap->screen_y;
-+
+
+- return pPicturePrivate->pBackingPicture;
+ return pPicturePrivate->pBackingPicture;
+ } else {
+ *x_off = *y_off = 0;
@@ -34,6 +33,3 @@ index 6e0c727..fe8cba7 100644
}
else
{
---
-1.6.0.4
-
diff --git a/debian/patches/188_default_primary_to_first_busid.patch b/debian/patches/188_default_primary_to_first_busid.patch
index 4dd4ec9..f50b1cc 100644
--- a/debian/patches/188_default_primary_to_first_busid.patch
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -3,11 +3,11 @@ pick the first device and carry on (LP 459512)
signed-off-by: Bryce Harrington <bryce@canonical.com>
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index ac018e7..c00391c 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -141,8 +141,8 @@ xf86PciProbe(void)
+Index: xorg-server/hw/xfree86/common/xf86pciBus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:44:27.000000000 +0300
+@@ -147,8 +147,8 @@
primaryBus.id.pci = info;
} else {
xf86Msg(X_NOTICE,
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index 6cdf5c0..e7e111d 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -5,8 +5,8 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2011-01-31 15:12:21.000000000 +1100
-+++ xorg-server/configure.ac 2011-01-31 15:13:26.563659152 +1100
+--- xorg-server.orig/configure.ac 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/configure.ac 2011-04-09 10:44:34.000000000 +0300
@@ -537,9 +537,9 @@
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
@@ -19,7 +19,7 @@ Index: xorg-server/configure.ac
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
[Keyboard ruleset (default: base/evdev)]),
[ XKB_DFLT_RULES="$withval" ],
-@@ -1165,7 +1165,7 @@
+@@ -1173,7 +1173,7 @@
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -30,8 +30,8 @@ Index: xorg-server/configure.ac
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
Index: xorg-server/xkb/README.compiled
===================================================================
---- xorg-server.orig/xkb/README.compiled 2011-01-28 12:31:51.000000000 +1100
-+++ xorg-server/xkb/README.compiled 2011-01-31 15:13:26.563659152 +1100
+--- xorg-server.orig/xkb/README.compiled 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/xkb/README.compiled 2011-04-09 10:38:10.000000000 +0300
@@ -4,10 +4,10 @@
or some other tool might destroy or replace the files in this directory,
so it is not a safe place to store compiled keymaps for long periods of
@@ -49,8 +49,8 @@ Index: xorg-server/xkb/README.compiled
different hosts could cause problems.
Index: xorg-server/xkb/ddxLoad.c
===================================================================
---- xorg-server.orig/xkb/ddxLoad.c 2011-01-31 14:28:22.000000000 +1100
-+++ xorg-server/xkb/ddxLoad.c 2011-01-31 15:17:50.814046721 +1100
+--- xorg-server.orig/xkb/ddxLoad.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/xkb/ddxLoad.c 2011-04-09 10:38:10.000000000 +0300
@@ -30,6 +30,12 @@
#include <xkb-config.h>
diff --git a/debian/patches/191-Xorg-add-an-extra-module-path.patch b/debian/patches/191-Xorg-add-an-extra-module-path.patch
index 6c7e13c..d10f418 100644
--- a/debian/patches/191-Xorg-add-an-extra-module-path.patch
+++ b/debian/patches/191-Xorg-add-an-extra-module-path.patch
@@ -8,9 +8,11 @@ module path will be searched first in the extra module path and then in
the default module path. This should simplify the alternatives system
used on Mandriva's fglrx package.
---
---- a/configure.ac
-+++ b/configure.ac
-@@ -492,6 +492,10 @@ AC_ARG_WITH(module-dir, AS_HELP_STR
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/configure.ac 2011-04-09 10:42:59.000000000 +0300
+@@ -489,6 +489,10 @@
[Directory where modules are installed (default: $libdir/xorg/modules)]),
[ moduledir="$withval" ],
[ moduledir="${libdir}/xorg/modules" ])
@@ -21,7 +23,7 @@ used on Mandriva's fglrx package.
AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR],
[Directory where log files are kept (default: $localstatedir/log)]),
[ logdir="$withval" ],
-@@ -1805,6 +1809,7 @@ if test "x$XORG" = xyes; then
+@@ -1815,6 +1819,7 @@
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
@@ -29,9 +31,11 @@ used on Mandriva's fglrx package.
AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -653,11 +653,21 @@ configFiles(XF86ConfFilesPtr fileconf)
+Index: xorg-server/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Config.c 2011-04-09 10:38:10.000000000 +0300
+@@ -628,11 +628,21 @@
/* ModulePath */
@@ -55,9 +59,11 @@ used on Mandriva's fglrx package.
}
xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -145,6 +145,7 @@ xf86InfoRec xf86Info = {
+Index: xorg-server/hw/xfree86/common/xf86Globals.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Globals.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Globals.c 2011-04-09 10:38:10.000000000 +0300
+@@ -139,6 +139,7 @@
const char *xf86ConfigFile = NULL;
const char *xf86ConfigDir = NULL;
const char *xf86ModulePath = DEFAULT_MODULE_PATH;
@@ -65,9 +71,11 @@ used on Mandriva's fglrx package.
MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGPREFIX;
MessageType xf86LogFileFrom = X_DEFAULT;
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -78,6 +78,7 @@ extern _X_EXPORT struct pci_slot_match
+Index: xorg-server/hw/xfree86/common/xf86Priv.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Priv.h 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86Priv.h 2011-04-09 10:38:10.000000000 +0300
+@@ -75,6 +75,7 @@
extern _X_EXPORT xf86InfoRec xf86Info;
extern _X_EXPORT const char *xf86ModulePath;
@@ -75,8 +83,10 @@ used on Mandriva's fglrx package.
extern _X_EXPORT MessageType xf86ModPathFrom;
extern _X_EXPORT const char *xf86LogFile;
extern _X_EXPORT MessageType xf86LogFileFrom;
---- a/include/xorg-config.h.in
-+++ b/include/xorg-config.h.in
+Index: xorg-server/include/xorg-config.h.in
+===================================================================
+--- xorg-server.orig/include/xorg-config.h.in 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/include/xorg-config.h.in 2011-04-09 10:38:10.000000000 +0300
@@ -42,6 +42,9 @@
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
diff --git a/debian/patches/198_nohwaccess.patch b/debian/patches/198_nohwaccess.patch
index 8073770..bfa387e 100644
--- a/debian/patches/198_nohwaccess.patch
+++ b/debian/patches/198_nohwaccess.patch
@@ -1,19 +1,21 @@
Two chunks of jbarne's nohwaccess patch got taken upstream; this patch
contains just the remainder, which implements a -nohwaccess option.
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -42,6 +42,7 @@ static Bool KeepTty = FALSE;
- static int VTnum = -1;
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09 10:38:10.000000000 +0300
+@@ -41,6 +41,7 @@
+ static Bool KeepTty = FALSE;
static Bool VTSwitch = TRUE;
static Bool ShareVTs = FALSE;
+Bool NoHwAccess = FALSE;
static int activeVT = -1;
- static int vtPermSave[4];
-@@ -392,6 +393,11 @@ xf86ProcessArgument(int argc, char *argv
+ static char vtname[11];
+@@ -321,6 +322,11 @@
ShareVTs = TRUE;
- return(1);
+ return 1;
}
+ if (!strcmp(argv[i], "-nohwaccess"))
+ {
@@ -22,15 +24,17 @@ contains just the remainder, which implements a -nohwaccess option.
+ }
if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
{
- if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
-@@ -413,4 +419,5 @@ xf86UseMsg(void)
+ if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0)
+@@ -342,4 +348,5 @@
ErrorF("don't detach controlling tty (for debugging only)\n");
ErrorF("-novtswitch don't immediately switch to new VT\n");
ErrorF("-sharevts share VTs with another X server\n");
+ ErrorF("-nohwaccess don't access hardware ports directly\n");
}
---- a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
+Index: xorg-server/hw/xfree86/os-support/linux/lnx_video.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/hw/xfree86/os-support/linux/lnx_video.c 2011-04-09 10:38:10.000000000 +0300
@@ -50,6 +50,7 @@
#define MAP_FAILED ((void *)-1)
#endif
@@ -39,7 +43,7 @@ contains just the remainder, which implements a -nohwaccess option.
static Bool ExtendedEnabled = FALSE;
#ifdef __ia64__
-@@ -496,6 +497,9 @@ xf86EnableIO(void)
+@@ -497,6 +498,9 @@
int fd;
unsigned int ioBase_phys;
#endif
diff --git a/debian/patches/200_randr-null.patch b/debian/patches/200_randr-null.patch
index 63a875b..8d8a3fa 100644
--- a/debian/patches/200_randr-null.patch
+++ b/debian/patches/200_randr-null.patch
@@ -1,7 +1,9 @@
=== modified file 'randr/randr.c'
---- a/randr/randr.c 2009-12-19 01:44:12 +0000
-+++ b/randr/randr.c 2010-02-02 16:28:26 +0000
-@@ -234,7 +234,7 @@
+Index: xorg-server/randr/randr.c
+===================================================================
+--- xorg-server.orig/randr/randr.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/randr/randr.c 2011-04-09 10:38:10.000000000 +0300
+@@ -235,7 +235,7 @@
/*
* Calling function best set these function vectors
*/
@@ -10,4 +12,3 @@
pScrPriv->maxWidth = pScrPriv->minWidth = pScreen->width;
pScrPriv->maxHeight = pScrPriv->minHeight = pScreen->height;
-
diff --git a/debian/patches/206_intel_8xx_default_to_fbdev.patch b/debian/patches/206_intel_8xx_default_to_fbdev.patch
index c6a0d44..1de14eb 100644
--- a/debian/patches/206_intel_8xx_default_to_fbdev.patch
+++ b/debian/patches/206_intel_8xx_default_to_fbdev.patch
@@ -5,9 +5,9 @@ Author: Christopher James Halse Rogers <christohper.halse.rogers@canonical.com>
Index: xorg-server/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2010-09-13 19:54:39.330148002 +1000
-+++ xorg-server/hw/xfree86/common/xf86pciBus.c 2010-09-13 20:54:08.000000000 +1000
-@@ -1112,6 +1112,12 @@
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:38:10.000000000 +0300
+@@ -1120,6 +1120,12 @@
driverList[0] = "i740";
} else if (dev->device_id == 0x8108) {
break; /* "hooray" for poulsbo */
diff --git a/debian/patches/208_switch_on_release.diff b/debian/patches/208_switch_on_release.diff
index 86a7f5c..093b18f 100644
--- a/debian/patches/208_switch_on_release.diff
+++ b/debian/patches/208_switch_on_release.diff
@@ -1,8 +1,8 @@
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 2cdb6fc..3ed6263 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -325,24 +325,83 @@ _XkbFilterLatchState( XkbSrvInfoPtr xkbi,
+Index: xorg-server/xkb/xkbActions.c
+===================================================================
+--- xorg-server.orig/xkb/xkbActions.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/xkb/xkbActions.c 2011-04-09 10:38:10.000000000 +0300
+@@ -328,24 +328,83 @@
return 1;
}
@@ -66,13 +66,13 @@ index 2cdb6fc..3ed6263 100644
+ sendEvent = _XkbFilterSetState(xkbi,filter,keycode,&act);
+ }
+ }
- }
++ }
+ else {
+ /* do nothing if some button else is pressed */
+ if (!pAction)
+ xkbUpdateLockedGroup(xkbi, &filter->upAction);
+ filter->active = 0;
-+ }
+ }
+
+ return sendEvent;
+}
@@ -93,7 +93,7 @@ index 2cdb6fc..3ed6263 100644
filter->upAction = *pAction;
xkbi->state.locked_mods^= pAction->mods.mask;
xkbi->setMods = pAction->mods.mask;
-@@ -1104,9 +1163,12 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
+@@ -1115,9 +1174,12 @@
sendEvent=_XkbFilterLatchState(xkbi,filter,key,&act);
break;
case XkbSA_LockMods:
diff --git a/debian/patches/209_add_legacy_bgnone_option.patch b/debian/patches/209_add_legacy_bgnone_option.patch
index 2dd2d09..e9df40b 100644
--- a/debian/patches/209_add_legacy_bgnone_option.patch
+++ b/debian/patches/209_add_legacy_bgnone_option.patch
@@ -1,8 +1,8 @@
Index: xorg-server/os/utils.c
===================================================================
---- xorg-server.orig/os/utils.c 2011-01-10 17:10:56.190132573 -0600
-+++ xorg-server/os/utils.c 2011-01-10 17:14:10.000000000 -0600
-@@ -499,6 +499,7 @@
+--- xorg-server.orig/os/utils.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/os/utils.c 2011-04-09 10:42:43.000000000 +0300
+@@ -513,6 +513,7 @@
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
ErrorF("-background [none] create root window with no background\n");
@@ -10,7 +10,7 @@ Index: xorg-server/os/utils.c
ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n");
-@@ -837,6 +838,8 @@
+@@ -851,6 +852,8 @@
UseMsg();
}
}
diff --git a/debian/patches/210_pixman_null_ptr_check.patch b/debian/patches/210_pixman_null_ptr_check.patch
index 9123bc7..1045966 100644
--- a/debian/patches/210_pixman_null_ptr_check.patch
+++ b/debian/patches/210_pixman_null_ptr_check.patch
@@ -1,8 +1,8 @@
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 7636040..2798e24 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -163,7 +163,19 @@ create_bits_picture (PicturePtr pict,
+Index: xorg-server/fb/fbpict.c
+===================================================================
+--- xorg-server.orig/fb/fbpict.c 2011-04-09 10:36:56.000000000 +0300
++++ xorg-server/fb/fbpict.c 2011-04-09 10:38:11.000000000 +0300
+@@ -163,7 +163,19 @@
pict->format,
pixmap->drawable.width, pixmap->drawable.height,
(uint32_t *)bits, stride * sizeof (FbStride));
diff --git a/debian/patches/213_xichangehierarchy-check-oom.patch b/debian/patches/213_xichangehierarchy-check-oom.patch
deleted file mode 100644
index d836233..0000000
--- a/debian/patches/213_xichangehierarchy-check-oom.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
-index b9cdedf..21c74ed 100644
---- a/Xi/xichangehierarchy.c
-+++ b/Xi/xichangehierarchy.c
-@@ -70,6 +70,8 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
-
- ev = calloc(1, sizeof(xXIHierarchyEvent) +
- MAXDEVICES * sizeof(xXIHierarchyInfo));
-+ if (!ev)
-+ return;
- ev->type = GenericEvent;
- ev->extension = IReqCode;
- ev->evtype = XI_HierarchyChanged;
diff --git a/debian/patches/214_glx_dri_searchdirs.patch b/debian/patches/214_glx_dri_searchdirs.patch
index ce2a291..66d18b8 100644
--- a/debian/patches/214_glx_dri_searchdirs.patch
+++ b/debian/patches/214_glx_dri_searchdirs.patch
@@ -1,7 +1,7 @@
Index: xorg-server/glx/glxdri.c
===================================================================
---- xorg-server.orig/glx/glxdri.c 2011-02-22 09:34:13.115682466 +1100
-+++ xorg-server/glx/glxdri.c 2011-02-22 09:34:15.855686483 +1100
+--- xorg-server.orig/glx/glxdri.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/glx/glxdri.c 2011-04-09 10:39:42.000000000 +0300
@@ -858,8 +858,6 @@
@@ -126,8 +126,8 @@ Index: xorg-server/glx/glxdri.c
Index: xorg-server/glx/glxdri2.c
===================================================================
---- xorg-server.orig/glx/glxdri2.c 2011-02-22 09:34:13.155682524 +1100
-+++ xorg-server/glx/glxdri2.c 2011-02-22 09:34:15.855686483 +1100
+--- xorg-server.orig/glx/glxdri2.c 2011-04-09 10:38:10.000000000 +0300
++++ xorg-server/glx/glxdri2.c 2011-04-09 10:39:42.000000000 +0300
@@ -599,8 +599,6 @@
NULL
};
@@ -245,8 +245,8 @@ Index: xorg-server/glx/glxdri2.c
}
Index: xorg-server/glx/glxdricommon.c
===================================================================
---- xorg-server.orig/glx/glxdricommon.c 2011-02-22 09:29:22.105255652 +1100
-+++ xorg-server/glx/glxdricommon.c 2011-02-22 09:39:11.016119400 +1100
+--- xorg-server.orig/glx/glxdricommon.c 2011-04-06 18:25:24.000000000 +0300
++++ xorg-server/glx/glxdricommon.c 2011-04-09 10:39:42.000000000 +0300
@@ -29,6 +29,7 @@
#include <stdint.h>
@@ -346,8 +346,8 @@ Index: xorg-server/glx/glxdricommon.c
+}
Index: xorg-server/glx/glxdricommon.h
===================================================================
---- xorg-server.orig/glx/glxdricommon.h 2011-02-22 09:29:22.175255757 +1100
-+++ xorg-server/glx/glxdricommon.h 2011-02-22 09:34:15.875686524 +1100
+--- xorg-server.orig/glx/glxdricommon.h 2011-04-06 18:25:24.000000000 +0300
++++ xorg-server/glx/glxdricommon.h 2011-04-09 10:39:42.000000000 +0300
@@ -38,4 +38,9 @@
extern const __DRIsystemTimeExtension systemTimeExtension;
@@ -360,8 +360,8 @@ Index: xorg-server/glx/glxdricommon.h
#endif
Index: xorg-server/glx/glxdriswrast.c
===================================================================
---- xorg-server.orig/glx/glxdriswrast.c 2011-02-22 09:29:22.125255677 +1100
-+++ xorg-server/glx/glxdriswrast.c 2011-02-22 09:34:15.875686524 +1100
+--- xorg-server.orig/glx/glxdriswrast.c 2011-04-06 18:25:24.000000000 +0300
++++ xorg-server/glx/glxdriswrast.c 2011-04-09 10:39:42.000000000 +0300
@@ -427,17 +427,13 @@
}
}
@@ -438,9 +438,9 @@ Index: xorg-server/glx/glxdriswrast.c
Reply to: