xorg-server: Changes to 'ubuntu'
COPYING | 2
Xext/geext.c | 2
Xext/security.c | 2
Xext/sync.c | 172
Xext/xf86bigfont.c | 2
Xi/exevents.c | 3
Xi/extinit.c | 1
Xi/xigrabdev.c | 2
Xi/xipassivegrab.c | 2
Xi/xiselectev.c | 15
Xi/xiwarppointer.c | 2
composite/compalloc.c | 40
composite/compext.c | 2
composite/compinit.c | 64
composite/compint.h | 7
composite/compoverlay.c | 2
composite/compwindow.c | 36
config/hal.c | 13
config/udev.c | 33
configure.ac | 25
cpprules.in | 49
debian/changelog | 8
debian/patches/165_man_xorg_conf_no_device_ident.patch | 4
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 57
debian/patches/series | 4
dix/Xserver-dtrace.h.in | 2
dix/Xserver.d | 2
dix/deprecated.c | 30
dix/devices.c | 17
dix/dispatch.c | 2
dix/dixfonts.c | 6
dix/events.c | 137
dix/getevents.c | 60
dix/inpututils.c | 8
dix/property.c | 3
dix/resource.c | 44
dix/window.c | 4
doc/man/Makefile.am | 16
doc/xml/Xserver-spec.xml | 7
exa/exa_accel.c | 2
exa/exa_mixed.c | 2
exa/exa_unaccel.c | 7
fb/fbcmap_mi.c | 2
glx/glxcmds.c | 169
glx/glxcmdsswap.c | 165
glx/glxdri2.c | 2
glx/unpack.h | 2
glx/xfont.c | 2
hw/dmx/Makefile.am | 32
hw/dmx/Xdmx.man | 741 --
hw/dmx/config/Makefile.am | 21
hw/dmx/config/dmxtodmx.man | 41
hw/dmx/config/man/Makefile.am | 2
hw/dmx/config/man/dmxtodmx.man | 41
hw/dmx/config/man/vdltodmx.man | 95
hw/dmx/config/man/xdmxconfig.man | 63
hw/dmx/config/vdltodmx.man | 95
hw/dmx/config/xdmxconfig.c | 2
hw/dmx/config/xdmxconfig.man | 63
hw/dmx/dmx.c | 10
hw/dmx/dmxextension.c | 32
hw/dmx/dmxgc.c | 7
hw/dmx/dmxgcops.c | 10
hw/dmx/dmxpict.c | 54
hw/dmx/dmxwindow.c | 10
hw/dmx/doc/Makefile.am | 2
hw/dmx/glxProxy/glxcmds.c | 182
hw/dmx/glxProxy/glxext.c | 6
hw/dmx/glxProxy/unpack.h | 2
hw/dmx/input/dmxinputinit.c | 40
hw/dmx/man/Makefile.am | 2
hw/dmx/man/Xdmx.man | 741 ++
hw/kdrive/ephyr/.gitignore | 2
hw/kdrive/ephyr/Makefile.am | 18
hw/kdrive/ephyr/Xephyr.man.pre | 89
hw/kdrive/ephyr/man/Makefile.am | 2
hw/kdrive/ephyr/man/Xephyr.man | 87
hw/vfb/.gitignore | 2
hw/vfb/Makefile.am | 21
hw/vfb/Xvfb.man.pre | 125
hw/vfb/man/Makefile.am | 2
hw/vfb/man/Xvfb.man | 125
hw/xfree86/.gitignore | 3
hw/xfree86/Makefile.am | 18
hw/xfree86/common/Makefile.am | 5
hw/xfree86/common/compiler.h | 13
hw/xfree86/common/scoasm.h | 142
hw/xfree86/common/xf86.h | 2
hw/xfree86/common/xf86AutoConfig.c | 6
hw/xfree86/common/xf86Bus.c | 35
hw/xfree86/common/xf86Config.c | 13
hw/xfree86/common/xf86Configure.c | 54
hw/xfree86/common/xf86Cursor.c | 6
hw/xfree86/common/xf86Events.c | 13
hw/xfree86/common/xf86Globals.c | 1
hw/xfree86/common/xf86Helper.c | 15
hw/xfree86/common/xf86Init.c | 28
hw/xfree86/common/xf86Module.h | 2
hw/xfree86/common/xf86Option.c | 7
hw/xfree86/common/xf86PM.c | 23
hw/xfree86/common/xf86Priv.h | 1
hw/xfree86/common/xf86ShowOpts.c | 10
hw/xfree86/common/xf86VGAarbiter.c | 5
hw/xfree86/common/xf86VGAarbiterPriv.h | 2
hw/xfree86/common/xf86Xinput.c | 23
hw/xfree86/common/xf86pciBus.c | 4
hw/xfree86/common/xf86sbusBus.c | 6
hw/xfree86/common/xf86str.h | 7
hw/xfree86/ddc/ddc.c | 11
hw/xfree86/dixmods/extmod/modinit.c | 5
hw/xfree86/dixmods/extmod/modinit.h | 4
hw/xfree86/doc/Makefile.am | 4
hw/xfree86/doc/man/.gitignore | 4
hw/xfree86/doc/man/Makefile.am | 27
hw/xfree86/doc/man/Xorg.man | 689 ++
hw/xfree86/doc/man/Xorg.man.pre | 689 --
hw/xfree86/doc/man/xorg.conf.d.man | 1
hw/xfree86/doc/man/xorg.conf.man | 2478 ++++++++++
hw/xfree86/doc/man/xorg.conf.man.pre | 2478 ----------
hw/xfree86/dri/dri.c | 9
hw/xfree86/dri2/dri2.c | 11
hw/xfree86/exa/.gitignore | 2
hw/xfree86/exa/Makefile.am | 14
hw/xfree86/exa/exa.man.pre | 42
hw/xfree86/exa/man/Makefile.am | 2
hw/xfree86/exa/man/exa.man | 42
hw/xfree86/fbdevhw/.gitignore | 2
hw/xfree86/fbdevhw/Makefile.am | 14
hw/xfree86/fbdevhw/fbdevhw.man.pre | 22
hw/xfree86/fbdevhw/man/Makefile.am | 2
hw/xfree86/fbdevhw/man/fbdevhw.man | 22
hw/xfree86/int10/helper_exec.c | 5
hw/xfree86/loader/loader.c | 20
hw/xfree86/loader/loadmod.c | 20
hw/xfree86/loader/os.c | 2
hw/xfree86/loader/sdksyms.sh | 7
hw/xfree86/modes/xf86Crtc.c | 8
hw/xfree86/modes/xf86EdidModes.c | 7
hw/xfree86/modes/xf86Modes.c | 37
hw/xfree86/modes/xf86cvt.c | 10
hw/xfree86/os-support/Makefile.am | 2
hw/xfree86/os-support/linux/lnx_agp.c | 2
hw/xfree86/os-support/linux/lnx_video.c | 2
hw/xfree86/os-support/sco/Makefile.am | 5
hw/xfree86/os-support/sco/VTsw_sco.c | 127
hw/xfree86/os-support/sco/sco_init.c | 294 -
hw/xfree86/os-support/sco/sco_iop.c | 90
hw/xfree86/os-support/sco/sco_video.c | 290 -
hw/xfree86/os-support/solaris/solaris-amd64.S | 2
hw/xfree86/os-support/solaris/solaris-ia32.S | 2
hw/xfree86/os-support/solaris/solaris-sparcv8plus.S | 2
hw/xfree86/os-support/solaris/sun_VTsw.c | 2
hw/xfree86/os-support/solaris/sun_agp.c | 2
hw/xfree86/os-support/solaris/sun_apm.c | 2
hw/xfree86/os-support/solaris/sun_bell.c | 2
hw/xfree86/os-support/solaris/sun_vid.c | 2
hw/xfree86/os-support/xf86_OSlib.h | 31
hw/xfree86/parser/Flags.c | 13
hw/xfree86/parser/Makefile.am | 1
hw/xfree86/parser/Pointer.c | 16
hw/xfree86/ramdac/Makefile.am | 4
hw/xfree86/utils/Makefile.am | 3
hw/xfree86/utils/cvt/.gitignore | 2
hw/xfree86/utils/cvt/Makefile.am | 15
hw/xfree86/utils/cvt/cvt.c | 18
hw/xfree86/utils/cvt/cvt.man.pre | 42
hw/xfree86/utils/gtf/.gitignore | 2
hw/xfree86/utils/gtf/Makefile.am | 19
hw/xfree86/utils/gtf/gtf.man.pre | 45
hw/xfree86/utils/man/Makefile.am | 2
hw/xfree86/utils/man/cvt.man | 42
hw/xfree86/utils/man/gtf.man | 45
hw/xfree86/vbe/vbeModes.c | 4
hw/xfree86/x86emu/ops.c | 63
hw/xfree86/xaa/Makefile.am | 52
hw/xfree86/xaa/xaaBitBlt.c | 6
hw/xfree86/xorgconf.cpp | 610 +-
hw/xnest/.gitignore | 2
hw/xnest/Makefile.am | 26
hw/xnest/Xnest.man.pre | 428 -
hw/xnest/man/Makefile.am | 2
hw/xnest/man/Xnest.man | 428 +
hw/xquartz/GL/Makefile.am | 2
hw/xquartz/Makefile.am | 6
hw/xquartz/X11Application.h | 1
hw/xquartz/X11Application.m | 2
hw/xquartz/X11Controller.h | 1
hw/xquartz/X11Controller.m | 4
hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib | 320 -
hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/cpprules.in | 22
hw/xquartz/doc/Makefile.am | 16
hw/xquartz/doc/Xquartz.man.pre | 162
hw/xquartz/man/Makefile.am | 2
hw/xquartz/man/Xquartz.man | 162
hw/xquartz/quartz.c | 11
hw/xquartz/quartz.h | 1
hw/xquartz/quartzAudio.c | 329 -
hw/xquartz/quartzAudio.h | 37
hw/xquartz/quartzKeyboard.c | 1
hw/xquartz/quartzStartup.c | 4
hw/xwin/.gitignore | 3
hw/xwin/InitOutput.c | 13
hw/xwin/Makefile.am | 28
hw/xwin/XWin.man.pre | 346 -
hw/xwin/XWinrc.man.pre | 253 -
hw/xwin/man/Makefile.am | 3
hw/xwin/man/XWin.man | 397 +
hw/xwin/man/XWinrc.man | 253 +
hw/xwin/win.h | 63
hw/xwin/wincreatewnd.c | 48
hw/xwin/windialogs.c | 18
hw/xwin/winerror.c | 24
hw/xwin/winmonitors.c | 92
hw/xwin/winmonitors.h | 14
hw/xwin/winnativegdi.c | 37
hw/xwin/winpfbdd.c | 108
hw/xwin/winprocarg.c | 131
hw/xwin/winrandr.c | 302 -
hw/xwin/winscrinit.c | 66
hw/xwin/winshaddd.c | 164
hw/xwin/winshadddnl.c | 152
hw/xwin/winshadgdi.c | 124
hw/xwin/winvalargs.c | 8
hw/xwin/winwindow.c | 1
hw/xwin/winwndproc.c | 307 -
include/Makefile.am | 1
include/Xprintf.h | 69
include/dix-config.h.in | 3
include/dix.h | 7
include/exevents.h | 2
include/input.h | 26
include/inputstr.h | 82
include/inpututils.h | 8
include/os.h | 13
include/resource.h | 2
include/scrnintstr.h | 7
include/windowstr.h | 3
manpages.am | 37
mi/micmap.c | 2
mi/micopy.c | 6
mi/miinitext.c | 2
mi/misprite.c | 122
miext/damage/damage.c | 20
miext/rootless/rootlessScreen.c | 5
miext/sync/misync.c | 1
os/WaitFor.c | 12
os/access.c | 36
os/connection.c | 1
os/log.c | 12
os/osdep.h | 4
os/osinit.c | 5
os/utils.c | 16
os/xprintf.c | 172
randr/rrscreen.c | 12
render/animcur.c | 26
render/mipict.c | 3
render/render.c | 14
test/input.c | 32
test/xi2/protocol-eventconvert.c | 12
test/xi2/protocol-xiselectevents.c | 18
xfixes/cursor.c | 2
xfixes/xfixes.c | 2
xfixes/xfixesint.h | 2
xkb/XKBMisc.c | 15
xkb/ddxList.c | 43
xkb/ddxLoad.c | 23
xkb/xkbUtils.c | 9
268 files changed, 9192 insertions(+), 9625 deletions(-)
New commits:
commit fbfe7a1ec506193b1ee28841049ca2f2fb817724
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 15:20:36 2011 +1100
Drop 204_fix-neg-sync-transition.patch; upstream
diff --git a/debian/changelog b/debian/changelog
index 33a9f1b..8c8506f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) UNRELEASED; urgency=low
- Add "-nr" as a synonym for "-background none" to ease the transition from
the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once
all the ?DM have been updated to use the new option.
+ * Drop 204_fix-neg-sync-transition.patch; upstream.
-- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 10 Jan 2011 15:53:23 -0600
diff --git a/debian/patches/series b/debian/patches/series
index 41e2d91..5ed8b4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,5 @@
#201_report-real-dpi.patch
#202_xf86CoordinationsToWindows.patch
#203_gestures-extension.patch
-204_fix-neg-sync-transition.patch
206_intel_8xx_default_to_fbdev.patch
209_add_legacy_bgnone_option.patch
commit 31d65e5d9ffcf69b6b431f466bbf70642e2dd903
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 15:19:38 2011 +1100
Temporarily unapply 202_xf86CoordinationsToWindows.patch; let Chase update it
diff --git a/debian/patches/series b/debian/patches/series
index 1c48f0c..41e2d91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,7 +25,7 @@
198_nohwaccess.patch
200_randr-null.patch
#201_report-real-dpi.patch
-202_xf86CoordinationsToWindows.patch
+#202_xf86CoordinationsToWindows.patch
#203_gestures-extension.patch
204_fix-neg-sync-transition.patch
206_intel_8xx_default_to_fbdev.patch
commit 17643eee66d2a1144371cd6d8eb434cbb0b39f82
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 15:18:38 2011 +1100
Refresh patches for new snapshot
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 1c63dbe..4cb531f 100644
--- a/debian/patches/165_man_xorg_conf_no_device_ident.patch
+++ b/debian/patches/165_man_xorg_conf_no_device_ident.patch
@@ -9,8 +9,8 @@ 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.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+--- 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:
.PP
The
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 e64554f..6cdf5c0 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-10 16:10:25.000000000 -0600
-+++ xorg-server/configure.ac 2011-01-10 16:13:48.893598689 -0600
+--- 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
@@ -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" ],
-@@ -1170,7 +1170,7 @@
+@@ -1165,7 +1165,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 2010-10-28 13:52:22.000000000 -0500
-+++ xorg-server/xkb/README.compiled 2011-01-10 16:13:48.893598689 -0600
+--- 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
@@ -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-10 15:38:10.000000000 -0600
-+++ xorg-server/xkb/ddxLoad.c 2011-01-10 16:22:55.000000000 -0600
+--- 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
@@ -30,6 +30,12 @@
#include <xkb-config.h>
@@ -64,17 +64,13 @@ Index: xorg-server/xkb/ddxLoad.c
#include <stdio.h>
#include <ctype.h>
#include <X11/X.h>
-@@ -43,24 +49,13 @@
+@@ -43,20 +49,9 @@
#define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h>
#include <X11/extensions/XI.h>
+#include <errno.h>
#include "xkb.h"
- #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
- #include <paths.h>
- #endif
-
- /*
- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
- * relative to the top-level XKB configuration directory.
@@ -90,7 +86,7 @@ Index: xorg-server/xkb/ddxLoad.c
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
#define ERROR_PREFIX "\"> \""
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -174,6 +169,47 @@
+@@ -170,6 +165,47 @@
}
}
@@ -138,7 +134,7 @@ Index: xorg-server/xkb/ddxLoad.c
static Bool
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
XkbComponentNamesPtr names,
-@@ -183,7 +219,11 @@
+@@ -179,7 +215,11 @@
int nameRtrnLen)
{
FILE * out;
@@ -151,7 +147,7 @@ Index: xorg-server/xkb/ddxLoad.c
const char *emptystring = "";
char *xkbbasedirflag = NULL;
-@@ -194,14 +234,67 @@
+@@ -190,14 +230,67 @@
/* WIN32 has no popen. The input must be stored in a file which is
used as input for xkbcomp. xkbcomp does not read from stdin. */
char tmpname[PATH_MAX];
@@ -222,7 +218,7 @@ Index: xorg-server/xkb/ddxLoad.c
#ifdef WIN32
strcpy(tmpname, Win32TempDir());
-@@ -225,14 +318,20 @@
+@@ -222,15 +315,21 @@
}
}
@@ -232,21 +228,22 @@ Index: xorg-server/xkb/ddxLoad.c
+ goto _ret;
+ }
+
- buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
+ if (asprintf(&buf,
+ "\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
+ "-em1 %s -emp %s -eml %s \"%s\"",
- xkbbindir, xkbbindirsep,
- ( (xkbDebugFlags < 2) ? 1 :
- ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
-- xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
-+ xkbbasedirflag ? xkbbasedirflag : "", xkbfile,
- PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
-- xkm_output_dir, keymap);
-+ tmpXkmFile);
+ xkbbindir, xkbbindirsep,
+ ((xkbDebugFlags < 2) ? 1 :
+ ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
+- xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
++ xkbbasedirflag ? xkbbasedirflag : "", xkbfile,
+ PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
+- xkm_output_dir, keymap) == -1)
++ tmpXkmFile) == -1)
+ buf = NULL;
free(xkbbasedirflag);
-
-@@ -241,6 +340,11 @@
+@@ -240,6 +339,11 @@
return FALSE;
}
@@ -258,7 +255,7 @@ Index: xorg-server/xkb/ddxLoad.c
#ifndef WIN32
out= Popen(buf,"w");
#else
-@@ -248,30 +352,42 @@
+@@ -247,30 +351,42 @@
#endif
if (out!=NULL) {
@@ -316,7 +313,7 @@ Index: xorg-server/xkb/ddxLoad.c
#ifdef WIN32
/* remove the temporary file */
unlink(tmpname);
-@@ -286,8 +402,17 @@
+@@ -285,8 +401,17 @@
}
if (nameRtrn)
nameRtrn[0]= '\0';
@@ -336,7 +333,7 @@ Index: xorg-server/xkb/ddxLoad.c
}
static FILE *
-@@ -371,7 +496,6 @@
+@@ -370,7 +495,6 @@
DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
}
fclose(file);
commit ebad7bd3b2328c31ed0e215707bbe48481f8b6e1
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 15:11:39 2011 +1100
Update version for post RC1 snapshot
diff --git a/debian/changelog b/debian/changelog
index a2005c9..33a9f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.901-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) UNRELEASED; urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- …
commit a5619ed3b2102aadac02eb92614b59d51e0d1e65
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 14:22:06 2011 +1100
Fix typo in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 04772f8..a2005c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ xorg-server (2:1.9.99.901-1ubuntu1) UNRELEASED; urgency=low
* Drop 207_dga_master_device.patch; upstream.
* Drop 208_switch_on_release.diff; upstream.
* debian/patches/209_add_legacy_bgnone_option.patch:
- + Add "-nr" as a synonym for "-background none" to ease the transition from
+ - Add "-nr" as a synonym for "-background none" to ease the transition from
the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once
all the ?DM have been updated to use the new option.
commit a32f31aaeb32a8cd55ee393ed0d5676ac3903fd4
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 31 13:39:10 2011 +1100
Drop xvfb-randr.patch; the server infrastructure this hooks into has gone away
diff --git a/debian/changelog b/debian/changelog
index afbb6a0..04772f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ xorg-server (2:1.9.99.901-1ubuntu1) UNRELEASED; urgency=low
* Refresh 121_only_switch_vt_when_active.diff for new upstream.
* Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
* Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
- * Refresh 197_xvfb-randr.patch for new upstream.
+ * Drop 197_xvfb-randr.patch:
+ - miRandR, which this used, has been removed from the server.
* Drop 207_dga_master_device.patch; upstream.
* Drop 208_switch_on_release.diff; upstream.
* debian/patches/209_add_legacy_bgnone_option.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 823a3b8..1c48f0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,6 @@
188_default_primary_to_first_busid.patch
190_cache-xkbcomp_output_for_fast_start_up.patch
191-Xorg-add-an-extra-module-path.patch
-197_xvfb-randr.patch
198_nohwaccess.patch
200_randr-null.patch
#201_report-real-dpi.patch
commit bbdf81a056be0ea645da17a642dad5eadef3a906
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 18 19:26:20 2011 -0800
Add xorg.conf.d shadow man page pointing to xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am
index fe330a7..80e22cb 100644
--- a/hw/xfree86/doc/man/Makefile.am
+++ b/hw/xfree86/doc/man/Makefile.am
@@ -1,3 +1,3 @@
include $(top_srcdir)/manpages.am
appman_PRE = Xorg.man
-fileman_PRE = xorg.conf.man
+fileman_PRE = xorg.conf.man xorg.conf.d.man
diff --git a/hw/xfree86/doc/man/xorg.conf.d.man b/hw/xfree86/doc/man/xorg.conf.d.man
new file mode 100644
index 0000000..6b3379e
--- /dev/null
+++ b/hw/xfree86/doc/man/xorg.conf.d.man
@@ -0,0 +1 @@
+.so man__filemansuffix__/xorg.conf.__filemansuffix__
commit a1d885fdd67503a442b348626d2eddf6d22419e8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 23 13:28:55 2010 -0400
resource: Fix indentation
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/dix/resource.c b/dix/resource.c
index f558ed2..26d2c72 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -881,21 +881,21 @@ LegalNewID(XID id, ClientPtr client)
#ifdef PANORAMIX
XID minid, maxid;
- if (!noPanoramiXExtension) {
- minid = client->clientAsMask | (client->index ?
- SERVER_BIT : SERVER_MINID);
- maxid = (clientTable[client->index].fakeID | RESOURCE_ID_MASK) + 1;
- if ((id >= minid) && (id <= maxid))
- return TRUE;
- }
+ if (!noPanoramiXExtension) {
+ minid = client->clientAsMask | (client->index ?
+ SERVER_BIT : SERVER_MINID);
+ maxid = (clientTable[client->index].fakeID | RESOURCE_ID_MASK) + 1;
+ if ((id >= minid) && (id <= maxid))
+ return TRUE;
+ }
#endif /* PANORAMIX */
- if (client->clientAsMask == (id & ~RESOURCE_ID_MASK))
- {
- rc = dixLookupResourceByClass(&val, id, RC_ANY, serverClient,
- DixGetAttrAccess);
- return rc == BadValue;
- }
- return FALSE;
+ if (client->clientAsMask == (id & ~RESOURCE_ID_MASK))
+ {
+ rc = dixLookupResourceByClass(&val, id, RC_ANY, serverClient,
+ DixGetAttrAccess);
+ return rc == BadValue;
+ }
+ return FALSE;
}
int
commit cb61cf5c99004ba3c76b504220c6728b5f2d2de6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 15 18:36:55 2010 -0400
resource: Remove expectID hack
This is clearly meant to short-circuit the (modestly) expensive resource
lookup in LegalNewID. The problem is that long-lived clients will
eventually run completely through their XID space and start asking
XC-MISC for IDs to reuse. Once that happens, the comparison against
expectID will always be true, and we'll no longer catch XID collisions
at all.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/dix/resource.c b/dix/resource.c
index 18ed682..f558ed2 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -175,7 +175,6 @@ typedef struct _ClientResource {
int hashsize; /* log(2)(buckets) */
XID fakeID;
XID endFakeID;
- XID expectID;
} ClientResourceRec;
RESTYPE lastResourceType;
@@ -322,7 +321,6 @@ InitClientResources(ClientPtr client)
clientTable[i].fakeID = client->clientAsMask |
(client->index ? SERVER_BIT : SERVER_MINID);
clientTable[i].endFakeID = (clientTable[i].fakeID | RESOURCE_ID_MASK) + 1;
- clientTable[i].expectID = client->clientAsMask;
for (j=0; j<INITBUCKETS; j++)
{
clientTable[i].resources[j] = NULL;
@@ -511,8 +509,6 @@ AddResource(XID id, RESTYPE type, pointer value)
res->value = value;
*head = res;
rrec->elements++;
- if (!(id & SERVER_BIT) && (id >= rrec->expectID))
- rrec->expectID = id + 1;
CallResourceStateCallback(ResourceStateAdding, res);
return TRUE;
}
@@ -895,9 +891,6 @@ LegalNewID(XID id, ClientPtr client)
#endif /* PANORAMIX */
if (client->clientAsMask == (id & ~RESOURCE_ID_MASK))
{
- if (clientTable[client->index].expectID <= id)
- return TRUE;
-
rc = dixLookupResourceByClass(&val, id, RC_ANY, serverClient,
DixGetAttrAccess);
return rc == BadValue;
commit 3282e3c627f97f079e3a9af756a6b13bd9a5f227
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 15 08:46:28 2010 -0400
resource: s/NullResource/NULL/g
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/dix/resource.c b/dix/resource.c
index 6bd2403..18ed682 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -167,7 +167,6 @@ typedef struct _Resource {
RESTYPE type;
pointer value;
} ResourceRec, *ResourcePtr;
-#define NullResource ((ResourcePtr)NULL)
typedef struct _ClientResource {
ResourcePtr *resources;
@@ -326,7 +325,7 @@ InitClientResources(ClientPtr client)
clientTable[i].expectID = client->clientAsMask;
for (j=0; j<INITBUCKETS; j++)
{
- clientTable[i].resources[j] = NullResource;
+ clientTable[i].resources[j] = NULL;
}
return TRUE;
}
@@ -543,7 +542,7 @@ RebuildTable(int client)
}
for (rptr = resources, tptr = tails; --j >= 0; rptr++, tptr++)
{
- *rptr = NullResource;
+ *rptr = NULL;
*tptr = rptr;
}
clientTable[client].hashsize++;
@@ -555,7 +554,7 @@ RebuildTable(int client)
for (res = *rptr; res; res = next)
{
next = res->next;
- res->next = NullResource;
+ res->next = NULL;
tptr = &tails[Hash(client, res->id)];
**tptr = res;
*tptr = &res->next;
commit f953ae7d8a578d135a6faaf69d9c06eae7c85ede
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 14 14:38:10 2009 -0500
os: Reduce smart scheduler setup calls
We can return from WaitForSomething with no clients ready for any number
of reasons. There's no reason to set up the scheduler timer when this
happens.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/os/WaitFor.c b/os/WaitFor.c
index e663004..867cb04 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -153,13 +153,17 @@ WaitForSomething(int *pClientsReady)
fd_set clientsWritable;
int curclient;
int selecterr;
- int nready;
+ static int nready;
fd_set devicesReadable;
CARD32 now = 0;
Bool someReady = FALSE;
FD_ZERO(&clientsReadable);
+ if (nready)
+ SmartScheduleStopTimer();
+ nready = 0;
+
/* We need a while loop here to handle
crashed connections and the screen saver timeout */
while (1)
@@ -211,7 +215,6 @@ WaitForSomething(int *pClientsReady)
}
XFD_COPYSET(&AllSockets, &LastSelectMask);
}
- SmartScheduleStopTimer ();
BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
if (NewOutputPending)
@@ -230,7 +233,6 @@ WaitForSomething(int *pClientsReady)
}
selecterr = GetErrno();
WakeupHandler(i, (pointer)&LastSelectMask);
- SmartScheduleStartTimer ();
if (i <= 0) /* An error or timeout occurred */
{
if (dispatchException)
@@ -388,6 +390,10 @@ WaitForSomething(int *pClientsReady)
#endif
}
}
+
+ if (nready)
+ SmartScheduleStartTimer();
+
return nready;
}
commit d127075da06239852c1cc745abfe63d0d180d984
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 19:03:33 2011 -0500
xdmxconfig: warning fix
xdmxconfig.c: In function ‘dmxConfigCanvasDraw’:
xdmxconfig.c:299:23: warning: ‘maxHeight’ may be used uninitialized in this function
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
index 033b525..c67077a 100644
--- a/hw/dmx/config/xdmxconfig.c
+++ b/hw/dmx/config/xdmxconfig.c
@@ -142,7 +142,7 @@ static void dmxConfigGetDims(int *maxWidth, int *maxHeight)
DMXConfigEntryPtr e;
*maxWidth = dmxConfigWallWidth = 0;
- *maxWidth = dmxConfigWallHeight = 0;
+ *maxHeight = dmxConfigWallHeight = 0;
if (!dmxConfigCurrent) return;
dmxConfigWallWidth = dmxConfigCurrent->width;
commit 7a08f9abef7219fabdab8d1d49e8d3afb042e36a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:59:39 2011 -0500
dmx: warning fixes
dmxinputinit.c: In function ‘dmxBlockHandler’:
dmxinputinit.c:610:44: warning: cast from pointer to integer of different size
dmxinputinit.c: In function ‘dmxWakeupHandler’:
dmxinputinit.c:637:41: warning: cast from pointer to integer of different size
dmxinputinit.c: In function ‘dmxInputInit’:
dmxinputinit.c:1041:36: warning: cast to pointer from integer of different size
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 6fc11cd..5cbd620 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -607,7 +607,7 @@ static void dmxCollectAll(DMXInputInfo *dmxInput)
static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,
pointer pReadMask)
{
- DMXInputInfo *dmxInput = &dmxInputs[(int)blockData];
+ DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
static unsigned long generation = 0;
if (generation != serverGeneration) {
@@ -634,7 +634,7 @@ static void dmxSwitchReturn(pointer p)
static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
{
- DMXInputInfo *dmxInput = &dmxInputs[(int)blockData];
+ DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
int i;
if (dmxInput->vt_switch_pending) {
@@ -1036,9 +1036,8 @@ void dmxInputInit(DMXInputInfo *dmxInput)
dmxInput->processInputEvents = dmxProcessInputEvents;
dmxInput->detached = False;
- RegisterBlockAndWakeupHandlers(dmxBlockHandler,
- dmxWakeupHandler,
- (void *)dmxInput->inputIdx);
+ RegisterBlockAndWakeupHandlers(dmxBlockHandler, dmxWakeupHandler,
+ (void *)(uintptr_t)dmxInput->inputIdx);
}
static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)
commit ffd323b7c0212ed9b348e51cd9b36363d7c4d1f2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:55:20 2011 -0500
dmx: warning fix
dmxinputinit.c: At top level:
dmxinputinit.c:135:29: warning: ‘DMXCommonOth’ defined but not used
DMXCommonOth is actually mentioned in a #if 0 block, so delete it and
the block that references it. If anyone needs it, git remembers.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 7cac86f..6fc11cd 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -132,14 +132,6 @@ static DMXLocalInputInfoRec DMXConsoleKbd = {
NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
};
-static DMXLocalInputInfoRec DMXCommonOth = {
- "common-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_COMMON, 1,
- dmxCommonCopyPrivate, NULL,
- NULL, NULL, NULL, dmxCommonOthGetInfo,
- dmxCommonOthOn, dmxCommonOthOff
-};
-
-
static DMXLocalInputInfoRec DMXLocalDevices[] = {
/* Dummy drivers that can compile on any OS */
#ifdef __linux__
@@ -897,29 +889,6 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
}
}
break;
-#if 0
- case IsXExtensionDevice:
- case IsXExtensionKeyboard:
- case IsXExtensionPointer:
- if (doXI) {
- if (!dmxInput->numDevs) {
- dmxLog(dmxWarning,
- "Cannot use remote (%s) XInput devices if"
- " not also using core devices\n",
- dmxInput->name);
- } else {
- dmxLocal = dmxInputCopyLocal(dmxInput,
- &DMXCommonOth);
- dmxLocal->isCore = FALSE;
- dmxLocal->sendsCore = FALSE;
- dmxLocal->deviceId = devices[i].id;
- dmxLocal->deviceName = (devices[i].name
- ? strdup(devices[i].name)
- : NULL);
- }
- }
- break;
-#endif
}
}
XFreeDeviceList(devices);
commit c1fe0b155d0567440228aa5d9e36036f37670e3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:52:57 2011 -0500
dmx: warning fix
dmxgc.c: In function ‘dmxChangeClip’:
dmxgc.c:386:5: warning: case label value exceeds maximum value for type
dmxgc.c:387:5: warning: case label value exceeds maximum value for type
dmxgc.c:388:5: warning: case label value exceeds maximum value for type
dmxgc.c:389:5: warning: case label value exceeds maximum value for type
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c
index 829200e..f10f9a0 100644
--- a/hw/dmx/dmxgc.c
+++ b/hw/dmx/dmxgc.c
@@ -383,12 +383,7 @@ void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
break;
case CT_PIXMAP:
- case CT_UNSORTED:
- case CT_YSORTED:
- case CT_YXSORTED:
- case CT_YXBANDED:
- /* These clip types are condensed down to either NONE or REGION
- in the mi code */
+ /* Condensed down to REGION in the mi code */
break;
}
Reply to: