commit xorg-x11-server for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Fri Mar 26 01:27:44 CET 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-03-17 06:22:05.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2010-03-24 17:06:51.000000000 +0100 @@ -1,0 +2,58 @@ +Wed Mar 24 17:05:53 CET 2010 - sndirsch@suse.de + +- disabled udev support for openSUSE <= 11.2 (bnc #589997) + +------------------------------------------------------------------- +Wed Mar 24 02:37:56 CET 2010 - ro@suse.de + +- re-do xorg-server-walk_drivers.diff again, different approach + create screen sections for each possible drivers + now it is really using the first driver as in full autoconfig + +------------------------------------------------------------------- +Tue Mar 23 14:10:59 CET 2010 - sndirsch@suse.de + +- update to 1.7.99.902 +- fixed font path ("--with-fontrootdir") + +------------------------------------------------------------------- +Tue Mar 23 00:07:28 CET 2010 - ro@suse.de + +- xserver-1.6.1-nouveau.patch (from fedora) + Also, don't treat DRI setup failure as an error for nouveau. + +------------------------------------------------------------------- +Mon Mar 22 17:48:04 CET 2010 - ro@suse.de + +- rework xorg-server-walk_drivers.diff + +------------------------------------------------------------------- +Mon Mar 22 00:23:22 CET 2010 - ro@suse.de + +- re-implement walking list of possible drivers to find a working + one + +------------------------------------------------------------------- +Thu Mar 18 02:29:25 CET 2010 - ro@suse.de + +- update to 1.7.99 to get rid of hal + - refresh patches + - drop p_ia64-console.diff +- remove hal-devel from buildrequires +- add libudev-devel to buildrequires +- add --enable-config-udev to configure + +------------------------------------------------------------------- +Wed Mar 17 15:56:31 CET 2010 - ro@suse.de + +- drop un-applied patches + p_pci-off-by-one.diff.ia64 + xorg-x11-server-1.2.99-unbreak-domain.patch + ia64linuxPciInit.diff + exa-greedy.diff + commit-c941479.diff + moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch + moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch + moblin-randr-fix-operation-order-so-that-rotation-transfor.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- commit-c941479.diff exa-greedy.diff ia64linuxPciInit.diff moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch moblin-randr-fix-operation-order-so-that-rotation-transfor.patch moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch p_ia64-console.diff p_pci-off-by-one.diff.ia64 xorg-server-1.7.6.tar.bz2 xorg-x11-server-1.2.99-unbreak-domain.patch New: ---- xorg-server-1.7.99.902.tar.bz2 xorg-server-walk_drivers.diff xorg-server-xf4vnc-fixes_1_8.diff xserver-1.6.1-nouveau.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.5_1.7.6) +# spec file for package xorg-x11-server (Version 7.5_1.7.99.902) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,15 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.7.6 +%define dirsuffix 1.7.99.902 %define fglrx_driver_hack 0 ### FIXME %define vnc 1 -BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel -### HAL/evdev support -BuildRequires: hal-devel +BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel +### udev support (broken on openSUSE 11.2, see also bnc #589997) +%if %suse_version > 1120 +BuildRequires: libudev-devel +%endif %if %vnc BuildRequires: libjpeg-devel %endif @@ -43,8 +45,8 @@ Requires: pkgconfig xorg-x11-fonts-core xorg-x11 %if %suse_version > 1010 %ifnarch s390 s390x -Provides: VIDEO_ABI_VERSION = 6 -Provides: INPUT_ABI_VERSION = 7 +Provides: VIDEO_ABI_VERSION = 7 +Provides: INPUT_ABI_VERSION = 9 Requires: libpixman-1-0 >= 0.15.2 %endif %endif @@ -69,11 +71,9 @@ Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff -Patch18: p_ia64-console.diff Patch23: disable-fbblt-opt.diff Patch27: mouse.diff Patch29: xephyr.diff -Patch34: p_pci-off-by-one.diff.ia64 Patch36: libdrm.diff %if %vnc ### Dan Nicholson <dbn.lists@gmail.com> @@ -86,20 +86,18 @@ Patch46: xorg-server-xf4vnc-busyloop.diff Patch47: xorg-server-xf4vnc-clientTimeout.diff Patch48: xorg-server-xf4vnc-fix.diff +Patch49: xorg-server-xf4vnc-fixes_1_8.diff %endif Patch45: bug-197858_dpms.diff -Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch Patch67: xorg-docs.diff Patch77: fbdevhw.diff Patch79: edit_data_sanity_check.diff -Patch83: ia64linuxPciInit.diff Patch93: pixman.diff Patch101: zap_warning_xserver.diff Patch103: confine_to_shape.diff Patch104: bitmap_always_unscaled.diff Patch106: randr1_1-sig11.diff Patch112: fix-dpi-values.diff -Patch118: exa-greedy.diff Patch123: vidmode-sig11.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch127: dpms_screensaver.diff @@ -108,16 +106,14 @@ Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff Patch143: autoconfig_fallback_fbdev_first.diff Patch145: driver-autoconfig.diff -Patch148: commit-c941479.diff +Patch146: xorg-server-walk_drivers.diff +Patch147: xserver-1.6.1-nouveau.patch # Moblin Patch162: cache-xkbcomp-output-for-fast-start-up.patch %if %moblin Patch163: xserver-1.5.0-bg-none-root.patch %endif Patch164: xorg-detect-psb.patch -Patch165: moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch -Patch166: moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch -Patch167: moblin-randr-fix-operation-order-so-that-rotation-transfor.patch %if %moblin Patch168: moblin-xserver-no-root-2.patch %endif @@ -195,14 +191,9 @@ %patch13 %patch14 %patch16 -p2 -pushd hw/xfree86/os-support -%patch18 -popd %patch23 %patch27 %patch29 -### FIXME -#%patch34 -p0 %patch36 -p0 %if %vnc %patch39 -p1 @@ -213,25 +204,21 @@ %patch46 -p1 %patch47 -p1 %patch48 -p1 +%patch49 -p0 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch45 -p0 -### FIXME -#%patch63 -p1 pushd xorg-docs-* %patch67 popd %patch77 %patch79 -p1 -### FIXME -#%patch83 %patch93 %patch101 -p1 %patch103 %patch104 -p1 %patch106 -p1 %patch112 -p0 -#patch118 -p1 %patch123 -p0 %patch125 -p1 %patch127 -p1 @@ -242,8 +229,8 @@ %patch132 -p1 %patch143 -p0 %patch145 -p0 -### Bug #528397 -#%patch148 -p1 -R +%patch146 -p0 +%patch147 -p1 %patch162 -p1 %if %moblin %patch163 -p1 @@ -321,10 +308,13 @@ --disable-xprint \ --enable-record \ --enable-xcsecurity \ +%if %suse_version > 1120 + --enable-config-udev \ +%endif --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \ - --with-fontdir="/usr/share/fonts" \ + --with-fontrootdir="/usr/share/fonts" \ --with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-output="/var/lib/xkb/compiled" #make %{?jobs:-j %jobs} ++++++ 0001-Check-harder-for-primary-PCI-device.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -9,15 +9,10 @@ redo the check and also check if IO resoures are also enabled, if this still doesn't turn up a unique result also check for the presence of a BIOS rom. ---- - hw/xfree86/common/xf86pciBus.c | 46 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 43 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 25b553b..18b9782 100644 ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -390,9 +390,49 @@ xf86PciProbe(void) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c +@@ -140,9 +140,49 @@ primaryBus.type = BUS_PCI; primaryBus.id.pci = info; } else { @@ -70,6 +65,3 @@ } } } --- -1.6.4.2 - ++++++ 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -6,8 +6,8 @@ The damage structure for the cursor is not deregistered before deallocation, causing a subsequent DamageUnregister () to segfault. ================================================================================ ---- xorg-server-1.7.4/mi/misprite.c -+++ xorg-server-1.7.4/mi/misprite.c +--- xorg-server-1.7.99/mi/misprite.c ++++ xorg-server-1.7.99/mi/misprite.c @@ -384,6 +384,7 @@ pScreen->InstallColormap = pScreenPriv->InstallColormap; pScreen->StoreColors = pScreenPriv->StoreColors; ++++++ 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -6,15 +6,10 @@ In DeleteInputDeviceRequest (xf86Xinput.c), we access idev members even if idev is null. This takes down the xserver hard in some cases (kernel SIGABRT), and segfaults on other cases. ---- - hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++---------- - 1 files changed, 13 insertions(+), 10 deletions(-) - -Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Xinput.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c -@@ -679,17 +679,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c +@@ -870,17 +870,20 @@ else xf86DeleteInput(pInfo, 0); ++++++ autoconfig_fallback_fbdev_first.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- hw/xfree86/common/xf86AutoConfig.c.orig +================================================================================ +--- hw/xfree86/common/xf86AutoConfig.c +++ hw/xfree86/common/xf86AutoConfig.c -@@ -513,7 +513,7 @@ listPossibleVideoDrivers(char *matches[] +@@ -506,7 +506,7 @@ /* Fallback to platform default hardware */ if (i < (nmatches - 1)) { #if defined(__i386__) || defined(__amd64__) || defined(__hurd__) @@ -11,7 +11,7 @@ #elif defined(__sparc__) && !defined(sun) matches[i++] = xnfstrdup("sunffb"); #endif -@@ -524,7 +524,7 @@ listPossibleVideoDrivers(char *matches[] +@@ -517,7 +517,7 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else ++++++ bitmap_always_unscaled.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -17,22 +17,15 @@ Reported by Mike Fabian, debugged and fixed with the help of Mike Fabian and Stefan Dirsch. ---- - configure.ac | 2 +- - hw/xfree86/Makefile.am | 6 +++--- - hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +--- - 3 files changed, 5 insertions(+), 7 deletions(-) - -Index: xorg-server-1.6.3.901/configure.ac -=================================================================== ---- xorg-server-1.6.3.901.orig/configure.ac -+++ xorg-server-1.6.3.901/configure.ac -@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring, AS_HELP_STR - AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), - [ FONTDIR="$withval" ], - [ FONTDIR="${libdir}/X11/fonts" ]) --DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" -+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac +================================================================================ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -509,7 +509,7 @@ + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. +-DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" ++DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" + if test "$cross_compiling" != yes; then + AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], + [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], ++++++ bug-197858_dpms.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -10,7 +10,7 @@ struct x_IHRec * next; } IHRec, *IHPtr; -@@ -456,8 +457,12 @@ +@@ -449,8 +450,12 @@ * Keep the order: Disable Device > LeaveVT * EnterVT > EnableDevice */ @@ -25,7 +25,7 @@ for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) { if (pInfo->dev) { xf86ReleaseKeys(pInfo->dev); -@@ -499,8 +504,12 @@ +@@ -492,8 +497,12 @@ EnableDevice(pInfo->dev, TRUE); pInfo = pInfo->next; } @@ -40,7 +40,7 @@ xf86UnblockSIGIO(prevSIGIO); -@@ -556,8 +565,12 @@ +@@ -549,8 +558,12 @@ pInfo = pInfo->next; } @@ -55,7 +55,7 @@ xf86UnblockSIGIO(prevSIGIO); } -@@ -594,8 +607,10 @@ +@@ -587,8 +600,10 @@ { IHPtr ih = addInputHandler(fd, proc, data); ++++++ bug474071-fix1.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: linuxPci.c -=================================================================== ---- linuxPci.c.orig +================================================================================ +--- linuxPci.c +++ linuxPci.c -@@ -274,7 +274,7 @@ get_parent_bridge(struct pci_device *dev +@@ -195,7 +195,7 @@ struct pci_id_match bridge_match = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8), @@ -11,7 +11,7 @@ }; struct pci_device *bridge; struct pci_device_iterator *iter; -@@ -512,7 +512,6 @@ IOADDRESS +@@ -433,7 +433,6 @@ xf86MapLegacyIO(struct pci_device *dev) { const int domain = dev->domain; @@ -19,7 +19,7 @@ int fd; if (domain >= MAX_DOMAINS) -@@ -520,9 +519,11 @@ xf86MapLegacyIO(struct pci_device *dev) +@@ -441,9 +440,11 @@ if (DomainMmappedIO[domain] == NULL) { /* Permanently map all of I/O space */ ++++++ bug534768-prefer_local_symbols.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/loader/dlloader.c -+++ xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c -@@ -120,7 +120,7 @@ DLFindSymbol(const char *name) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/loader/dlloader.c ++++ xorg-server-1.7.99/hw/xfree86/loader/dlloader.c +@@ -120,7 +120,7 @@ } if (!global_scope) @@ -11,7 +11,7 @@ if (global_scope) return DLFindSymbolLocal(global_scope, name); -@@ -136,9 +136,9 @@ DLLoadModule(loaderPtr modrec, int flags +@@ -136,9 +136,9 @@ int dlopen_flags; if (flags & LD_FLAG_GLOBAL) ++++++ cache-xkbcomp-output-for-fast-start-up.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:57.000000000 +0100 @@ -9,9 +9,9 @@ Signed-off-by: Yan Li <yan.i.li@intel.com> ================================================================================ ---- xorg-server-1.7.4/configure.ac -+++ xorg-server-1.7.4/configure.ac -@@ -502,9 +502,9 @@ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -527,9 +527,9 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), [ XKBPATH="$withval" ], [ XKBPATH="${datadir}/X11/xkb" ]) @@ -23,7 +23,7 @@ AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], [Keyboard ruleset (default: base/evdev)]), [ XKB_DFLT_RULES="$withval" ], -@@ -1120,7 +1120,7 @@ +@@ -1160,7 +1160,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 @@ -32,8 +32,8 @@ fi dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed ---- xorg-server-1.7.4/xkb/README.compiled -+++ xorg-server-1.7.4/xkb/README.compiled +--- xorg-server-1.7.99/xkb/README.compiled ++++ xorg-server-1.7.99/xkb/README.compiled @@ -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,11 +49,11 @@ Unless the X server is modified, sharing this directory between servers on different hosts could cause problems. ---- xorg-server-1.7.4/xkb/ddxLoad.c -+++ xorg-server-1.7.4/xkb/ddxLoad.c -@@ -32,6 +32,12 @@ +--- xorg-server-1.7.99/xkb/ddxLoad.c ++++ xorg-server-1.7.99/xkb/ddxLoad.c +@@ -30,6 +30,12 @@ + #include <xkb-config.h> - #endif +#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ +# include <sha1.h> @@ -64,7 +64,7 @@ #include <stdio.h> #include <ctype.h> #include <X11/X.h> -@@ -45,24 +51,13 @@ +@@ -43,24 +49,13 @@ #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> #include <X11/extensions/XI.h> @@ -90,7 +90,7 @@ #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\"" -@@ -177,6 +172,45 @@ +@@ -175,6 +170,45 @@ } static Bool @@ -136,7 +136,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, unsigned want, -@@ -185,7 +219,11 @@ +@@ -183,7 +217,11 @@ int nameRtrnLen) { FILE * out; @@ -149,7 +149,7 @@ const char *emptystring = ""; const char *xkbbasedirflag = emptystring; -@@ -196,15 +234,70 @@ +@@ -194,15 +232,70 @@ /* 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]; @@ -166,13 +166,13 @@ + out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w"); + if (NULL == out) { + ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n"); -+ return False; ++ return FALSE; + } + ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need); + if (fclose(out) !=0) + { + ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n"); -+ return False; ++ return FALSE; + } +#ifdef DEBUG + if (xkbDebugFlags) { @@ -182,7 +182,7 @@ #endif + if (!ret) { + ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n"); -+ return False; ++ return FALSE; + } - snprintf(keymap, sizeof(keymap), "server-%s", display); @@ -201,7 +201,7 @@ + /* set nameRtrn, fail if it's too small */ + if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) { + ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return False; ++ return FALSE; + } + strncpy(nameRtrn, xkmfile, nameRtrnLen); + @@ -210,7 +210,7 @@ + if (access(canonicalXkmFileName, R_OK) == 0) { + /* yes, we can reuse the old xkm file */ + LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = True; ++ result = TRUE; + goto _ret; + } + LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); @@ -223,13 +223,13 @@ #ifdef WIN32 strcpy(tmpname, Win32TempDir()); strcat(tmpname, "\\xkb_XXXXXX"); -@@ -227,19 +320,30 @@ +@@ -225,19 +318,30 @@ } } + if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { + ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = False; ++ result = FALSE; + goto _ret; + } + @@ -257,7 +257,7 @@ #ifndef WIN32 out= Popen(buf,"w"); #else -@@ -247,31 +351,43 @@ +@@ -245,31 +349,42 @@ #endif if (out!=NULL) { @@ -265,75 +265,76 @@ - if (xkbDebugFlags) { - ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); - XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = False; -+ goto _ret; - } +- } -#endif - XkbWriteXKBKeymapForNames(out,names,xkb,want,need); ++ /* write XKBKeyMapBuf to xkbcomp */ ++ if (EOF==fputs(xkbKeyMapBuf, out)) ++ { ++ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); ++ result = FALSE; ++ goto _ret; ++ } #ifndef WIN32 if (Pclose(out)==0) #else if (fclose(out)==0 && System(buf) >= 0) #endif { -+ /* xkbcomp success */ ++ /* xkbcomp success */ if (xkbDebugFlags) DebugF("[xkb] xkb executes: %s\n",buf); - if (nameRtrn) { - strncpy(nameRtrn,keymap,nameRtrnLen); - nameRtrn[nameRtrnLen-1]= '\0'; -+ -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = False; -+ goto _ret; - } +- } - if (buf != NULL) - xfree (buf); -- return True; +- return TRUE; ++ /* if canonicalXkmFileName already exists now, we simply ++ overwrite it, this is OK */ ++ ret = rename(tmpXkmFile, canonicalXkmFileName); ++ if (0 != ret) { ++ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", ++ tmpXkmFile, canonicalXkmFileName, ++ strerror(errno)); ++ ++ /* in case of error, don't unlink tmpXkmFile, leave it ++ for debugging */ ++ ++ result = FALSE; ++ goto _ret; ++ } + -+ result = True; -+ goto _ret; ++ result = TRUE; ++ goto _ret; } else - LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); ++ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); #ifdef WIN32 /* remove the temporary file */ unlink(tmpname); -@@ -286,9 +402,17 @@ - } - if (nameRtrn) +@@ -286,7 +401,17 @@ nameRtrn[0]= '\0'; -+ result = False; + if (buf != NULL) + xfree (buf); +- return FALSE; ++ result = FALSE; + +_ret: + if (tmpXkmFile) -+ free(tmpXkmFile); ++ free(tmpXkmFile); + if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - if (buf != NULL) - xfree (buf); -- return False; ++ xfree(canonicalXkmFileName); ++ if (buf != NULL) ++ xfree (buf); + + return result; } static FILE * -@@ -372,7 +496,6 @@ +@@ -370,7 +495,6 @@ DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); } fclose(file); ++++++ confine_to_shape.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: dix/events.c -=================================================================== ---- dix/events.c.orig +================================================================================ +--- dix/events.c +++ dix/events.c -@@ -803,37 +803,80 @@ ConfineToShape(DeviceIntPtr pDev, Region +@@ -661,37 +661,80 @@ { BoxRec box; int x = *px, y = *py; ++++++ disable-fbblt-opt.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: fb/fbblt.c -=================================================================== ---- fb/fbblt.c.orig +================================================================================ +--- fb/fbblt.c +++ fb/fbblt.c -@@ -76,6 +76,11 @@ fbBlt (FbBits *srcLine, +@@ -76,6 +76,11 @@ } #endif @@ -14,7 +14,7 @@ if (alu == GXcopy && pm == FB_ALLONES && !reverse && !(srcX & 7) && !(dstX & 7) && !(width & 7)) { int i; -@@ -97,6 +102,7 @@ fbBlt (FbBits *srcLine, +@@ -97,6 +102,7 @@ return; } ++++++ dpms_screensaver.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86DPMS.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c -@@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level) +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c +@@ -156,7 +156,8 @@ rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); if (rc != Success) return rc; ++++++ driver-autoconfig.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -19,7 +19,7 @@ case 0x10c8: driverList[0] = "neomagic"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break; - case 0x1106: driverList[0] = "openchrome"; break; -+ case 0x12d2: driverList[0] = "nv"; break; ++ case 0x12d2: driverList[0] = "nv"; break; + case 0x10de: + driverList[0] = "nvidia"; + driverList[1] = "nouveau"; @@ -33,6 +33,6 @@ + driverList[1] = "openchrome"; + driverList[2] = "unichrome"; + break; + case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; case 0x5333: - switch (dev->device_id) ++++++ edit_data_sanity_check.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,19 +1,21 @@ Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86Crtc.c -+++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c -@@ -2800,7 +2800,13 @@ xf86OutputSetEDID (xf86OutputPtr output, - for (i = 0; i < 4; i++) { - if (edid_mon->det_mon[i].type == DT && - edid_mon->det_mon[i].section.d_timings.h_size != 0 && -- edid_mon->det_mon[i].section.d_timings.v_size != 0) -+ edid_mon->det_mon[i].section.d_timings.v_size != 0 && -+ /* some sanity checking for aspect ration */ -+ ((edid_mon->det_mon[i].section.d_timings.h_size / -+ edid_mon->det_mon[i].section.d_timings.v_size) < 2) && -+ ((edid_mon->det_mon[i].section.d_timings.v_size / -+ edid_mon->det_mon[i].section.d_timings.h_size) < 2) -+ ) - { - output->mm_width = edid_mon->det_mon[i].section.d_timings.h_size; - output->mm_height = edid_mon->det_mon[i].section.d_timings.v_size; +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c ++++ xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c +@@ -2916,8 +2916,14 @@ + p->output->MonInfo->features.vsize); + if (det_mon->type == DT && + det_mon->section.d_timings.h_size != 0 && +- det_mon->section.d_timings.v_size != 0) { +- ++ det_mon->section.d_timings.v_size != 0 && ++ det_mon->section.d_timings.v_size != 0 && ++ /* some sanity checking for aspect ration */ ++ ((det_mon->section.d_timings.h_size / ++ det_mon->section.d_timings.v_size) < 2) && ++ ((det_mon->section.d_timings.v_size / ++ det_mon->section.d_timings.h_size) < 2) ++ ) { + p->output->mm_width = det_mon->section.d_timings.h_size; + p->output->mm_height = det_mon->section.d_timings.v_size; + p->ret = TRUE; ++++++ fbdevhw.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/fbdevhw/fbdevhw.c -=================================================================== ---- hw/xfree86/fbdevhw/fbdevhw.c.orig +================================================================================ +--- hw/xfree86/fbdevhw/fbdevhw.c +++ hw/xfree86/fbdevhw/fbdevhw.c -@@ -964,9 +964,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo +@@ -957,9 +957,10 @@ return; } @@ -15,7 +15,7 @@ } Bool -@@ -982,9 +983,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int +@@ -975,9 +976,10 @@ unblank = xf86IsUnblank(mode); ++++++ fix-dpi-values.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Helper.c -=================================================================== ---- hw/xfree86/common/xf86Helper.c.orig +================================================================================ +--- hw/xfree86/common/xf86Helper.c +++ hw/xfree86/common/xf86Helper.c -@@ -997,12 +997,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int +@@ -974,12 +974,22 @@ } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) { from = X_CONFIG; if (pScrn->widthmm > 0) { @@ -29,7 +29,7 @@ } if (pScrn->xDpi > 0 && pScrn->yDpi <= 0) pScrn->yDpi = pScrn->xDpi; -@@ -1037,12 +1047,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int +@@ -1014,12 +1024,22 @@ pScrn->widthmm = ddcWidthmm; pScrn->heightmm = ddcHeightmm; if (pScrn->widthmm > 0) { ++++++ fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -26,8 +26,8 @@ expires unnoticed. Index: xorg-server-1.6.3.901/Xext/sync.c ================================================================================ ---- xorg-server-1.7.4/Xext/sync.c -+++ xorg-server-1.7.4/Xext/sync.c +--- xorg-server-1.7.99/Xext/sync.c ++++ xorg-server-1.7.99/Xext/sync.c @@ -94,7 +94,7 @@ #define XSyncCAAllTrigger \ (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) @@ -188,7 +188,7 @@ } /* end for each trigger */ if (pnewgtval || pnewltval) -@@ -2273,11 +2269,17 @@ +@@ -2277,11 +2273,17 @@ } static void @@ -211,7 +211,7 @@ if (!pIdleTimeValueLess && !pIdleTimeValueGreater) return; -@@ -2295,46 +2297,57 @@ +@@ -2299,46 +2301,57 @@ * want level or edge trigger. Check the trigger list against the * current idle time, and if any succeed, bomb out of select() * immediately so we can reschedule. ++++++ fpic.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -2,7 +2,7 @@ ================================================================================ --- hw/xfree86/parser/Makefile.am +++ hw/xfree86/parser/Makefile.am -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ $(INTERNAL_SOURCES) libxf86config_a_CFLAGS = $(AM_CFLAGS) ++++++ libdrm.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Helper.c -=================================================================== ---- hw/xfree86/common/xf86Helper.c.orig +================================================================================ +--- hw/xfree86/common/xf86Helper.c +++ hw/xfree86/common/xf86Helper.c -@@ -2251,6 +2251,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con +@@ -2183,6 +2183,13 @@ &errmaj, &errmin); if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); ++++++ missing_font_paths.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,11 +1,17 @@ --- configure.ac +++ configure.ac -@@ -491,7 +491,7 @@ - AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), - [ FONTDIR="$withval" ], - [ FONTDIR="${libdir}/X11/fonts" ]) --DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" -+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic" - case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; - esac +@@ -505,11 +505,13 @@ + XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1) + XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi) + XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) ++XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW) ++XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic) + + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross + dnl compiling, assume default font path uses standard FONTROOTDIR directories. +-DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" ++DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/,${FONTURWDIR}/,${FONTCYRILLICDIR}/" + if test "$cross_compiling" != yes; then + AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], + [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], ++++++ moblin-xorg-x11-nonroot-vesa.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c -@@ -545,7 +545,8 @@ listPossibleVideoDrivers(char *matches[] +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c +@@ -535,7 +535,8 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else ++++++ mouse.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86Configure.c -=================================================================== ---- hw/xfree86/common/xf86Configure.c.orig +================================================================================ +--- hw/xfree86/common/xf86Configure.c +++ hw/xfree86/common/xf86Configure.c -@@ -80,8 +80,8 @@ static char *DFLT_MOUSE_DEV = "/dev/mous +@@ -64,8 +64,8 @@ static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; static char *DFLT_MOUSE_PROTO = "auto"; #elif defined(linux) ++++++ p_bug96328.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,31 +1,30 @@ Index: hw/xfree86/common/xf86Configure.c -=================================================================== ---- hw/xfree86/common/xf86Configure.c.orig +================================================================================ +--- hw/xfree86/common/xf86Configure.c +++ hw/xfree86/common/xf86Configure.c -@@ -237,23 +237,36 @@ configureInputSection (void) +@@ -250,23 +250,35 @@ /* Crude mechanism to auto-detect mouse (os dependent) */ { - int fd; + int fd = -1; -+ #ifdef WSCONS_SUPPORT - fd = open("/dev/wsmouse", 0); -- if (fd > 0) { +- if (fd >= 0) { - DFLT_MOUSE_DEV = "/dev/wsmouse"; - DFLT_MOUSE_PROTO = "wsmouse"; - close(fd); - } else { - ErrorF("cannot open /dev/wsmouse\n"); -+ if (fd == -1) { -+ fd = open("/dev/wsmouse", 0); -+ if (fd != -1) { -+ DFLT_MOUSE_DEV = "/dev/wsmouse"; -+ DFLT_MOUSE_PROTO = "wsmouse"; -+ close(fd); -+ } else { -+ ErrorF("cannot open /dev/wsmouse\n"); -+ } ++ if (fd == -1) { ++ fd = open("/dev/wsmouse", 0); ++ if (fd != -1) { ++ DFLT_MOUSE_DEV = "/dev/wsmouse"; ++ DFLT_MOUSE_PROTO = "wsmouse"; ++ close(fd); ++ } else { ++ ErrorF("cannot open /dev/wsmouse\n"); ++ } } #endif @@ -34,20 +33,20 @@ - if (fd != -1) { - foundMouse = TRUE; - close(fd); -+ if (fd == -1) { -+ fd = open(DFLT_MOUSE_DEV, 0); ++ if (fd == -1) { ++ fd = open(DFLT_MOUSE_DEV, 0); +# ifdef linux -+ if (fd == -1) { -+ char *name = "/dev/input/mice"; -+ fd = open(name, 0); -+ if (fd != -1) -+ DFLT_MOUSE_DEV = name; -+ } ++ if (fd == -1) { ++ char *name = "/dev/input/mice"; ++ fd = open(name, 0); ++ if (fd != -1) ++ DFLT_MOUSE_DEV = name; ++ } +# endif -+ if (fd != -1) { -+ foundMouse = TRUE; -+ close(fd); -+ } ++ if (fd != -1) { ++ foundMouse = TRUE; ++ close(fd); ++ } } #else foundMouse = TRUE; ++++++ p_default-module-path.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -2,10 +2,10 @@ ================================================================================ --- hw/xfree86/common/xf86Globals.c +++ hw/xfree86/common/xf86Globals.c -@@ -143,7 +143,7 @@ - #endif +@@ -144,7 +144,7 @@ }; const char *xf86ConfigFile = NULL; + const char *xf86ConfigDir = NULL; -const char *xf86ModulePath = DEFAULT_MODULE_PATH; +const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; ++++++ p_xkills_wrong_client.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: os/connection.c -=================================================================== ---- os/connection.c.orig +================================================================================ +--- os/connection.c +++ os/connection.c -@@ -1009,7 +1009,7 @@ CheckConnections(void) +@@ -999,7 +999,7 @@ do { r = Select (curclient + 1, &tmask, NULL, NULL, ¬ime); } while (r < 0 && (errno == EINTR || errno == EAGAIN)); ++++++ p_xnest-ignore-getimage-errors.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c -=================================================================== ---- build-GucBkyZ/xorg-server-1.6.3.901.orig/hw/xnest/GCOps.c -+++ build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c -@@ -94,6 +94,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP +================================================================================ +--- BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c ++++ BUILD/xorg-server-1.7.99/hw/xnest/GCOps.c +@@ -94,6 +94,13 @@ } } @@ -16,7 +16,7 @@ void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, unsigned int format, unsigned long planeMask, -@@ -101,9 +108,13 @@ xnestGetImage(DrawablePtr pDrawable, int +@@ -101,9 +108,13 @@ { XImage *ximage; int length; ++++++ p_xorg_acpi.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -104,7 +104,7 @@ #endif #ifdef HAVE_APM -@@ -150,6 +151,14 @@ +@@ -149,6 +150,14 @@ ret = lnxAPMOpen(); #endif ++++++ pci-legacy-mem-fallback.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/os-support/bus/linuxPci.c -=================================================================== ---- hw/xfree86/os-support/bus/linuxPci.c.orig +================================================================================ +--- hw/xfree86/os-support/bus/linuxPci.c +++ hw/xfree86/os-support/bus/linuxPci.c -@@ -476,6 +476,7 @@ xf86MapDomainMemory(int ScreenNum, int F +@@ -397,6 +397,7 @@ * legacy_mem interface is unavailable. */ if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) @@ -10,7 +10,7 @@ return linuxMapPci(ScreenNum, Flags, dev, Base, Size, PCIIOC_MMAP_IS_MEM); else -@@ -484,6 +485,8 @@ xf86MapDomainMemory(int ScreenNum, int F +@@ -405,6 +406,8 @@ if (fd >= 0) close(fd); if (addr == NULL || addr == MAP_FAILED) { ++++++ pixman.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: include/miscstruct.h -=================================================================== ---- include/miscstruct.h.orig +================================================================================ +--- include/miscstruct.h +++ include/miscstruct.h -@@ -50,7 +50,7 @@ SOFTWARE. +@@ -50,7 +50,7 @@ #include "misc.h" #include <X11/Xprotostr.h> ++++++ pu_fixes.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/xaa/xaaImage.c -=================================================================== ---- hw/xfree86/xaa/xaaImage.c.orig +================================================================================ +--- hw/xfree86/xaa/xaaImage.c +++ hw/xfree86/xaa/xaaImage.c -@@ -238,12 +238,16 @@ BAD_ALIGNMENT: +@@ -238,12 +238,16 @@ (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth); (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft); ++++++ randr1_1-sig11.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86RandR.c -+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c -@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, +================================================================================ +--- xorg-server-1.7.99/hw/xfree86/common/xf86RandR.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86RandR.c +@@ -247,6 +247,9 @@ Bool useVirtual = FALSE; Rotation oldRotation = randrp->rotation; ++++++ vidmode-sig11.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/common/xf86VidMode.c -=================================================================== ---- hw/xfree86/common/xf86VidMode.c.orig +================================================================================ +--- hw/xfree86/common/xf86VidMode.c +++ hw/xfree86/common/xf86VidMode.c -@@ -226,6 +226,8 @@ VidModeGetFirstModeline(int scrnIndex, p +@@ -220,6 +220,8 @@ pScrn = xf86Screens[scrnIndex]; pVidMode = VMPTR(pScrn->pScreen); ++++++ xephyr.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,6 +1,6 @@ Index: hw/kdrive/Makefile.am -=================================================================== ---- hw/kdrive/Makefile.am.orig +================================================================================ +--- hw/kdrive/Makefile.am +++ hw/kdrive/Makefile.am @@ -1,5 +1,5 @@ if BUILD_KDRIVEFBDEVLIB @@ -9,9 +9,9 @@ endif if XFAKESERVER -@@ -21,8 +21,7 @@ endif +@@ -16,8 +16,7 @@ + SERVER_SUBDIRS = \ - $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) ++++++ xorg-detect-psb.patch ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,7 +1,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c ================================================================================ ---- xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86AutoConfig.c @@ -186,12 +186,14 @@ case 0x3d3d: driverList[0] = "glint"; break; case 0x105d: driverList[0] = "i128"; break; ++++++ xorg-docs.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:19:58.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:19:58.000000000 +0100 @@ -1,6 +1,6 @@ Index: Makefile.am -=================================================================== ---- Makefile.am.orig +================================================================================ +--- Makefile.am +++ Makefile.am @@ -20,11 +20,9 @@ # @@ -15,9 +15,7 @@ EXTRA_DIST = \ MAINTAINERS \ misc/xlogo.epsi \ -Index: man/general/Makefile.am -=================================================================== ---- man/general/Makefile.am.orig +--- man/general/Makefile.am +++ man/general/Makefile.am @@ -23,13 +23,8 @@ miscmandir = $(MISC_MAN_DIR) ++++++ xorg-server-1.7.6.tar.bz2 -> xorg-server-1.7.99.902.tar.bz2 ++++++ ++++ 208449 lines of diff (skipped) ++++++ xorg-server-walk_drivers.diff ++++++ --- hw/xfree86/common/xf86AutoConfig.c +++ hw/xfree86/common/xf86AutoConfig.c @@ -539,34 +541,13 @@ } } -static char* -chooseVideoDriver(void) -{ - char *chosen_driver = NULL; - int i; - char *matches[20]; /* If we have more than 20 drivers we're in trouble */ - - listPossibleVideoDrivers(matches, 20); - - /* TODO Handle multiple drivers claiming to support the same PCI ID */ - chosen_driver = matches[0]; - - xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", - chosen_driver); - - for (i = 0; matches[i] ; i++) { - if (matches[i] != chosen_driver) { - xfree(matches[i]); - } - } - - return chosen_driver; -} - GDevPtr autoConfigDevice(GDevPtr preconf_device) { - GDevPtr ptr = NULL; + GDevPtr ptr = NULL, cptr = NULL; + char *matches[20]; /* If we have more than 20 drivers we're in trouble */ + int num_matches = 0, num_screens = 0, i; + screenLayoutPtr slp; if (!xf86configptr) { return NULL; @@ -589,14 +571,49 @@ ptr->driver = NULL; } if (!ptr->driver) { - ptr->driver = chooseVideoDriver(); + listPossibleVideoDrivers(matches, 20); + for (; matches[num_matches] ; num_matches++); + slp = xf86ConfigLayout.screens; + if (slp) { + for (; slp[num_screens].screen ; num_screens++); + xf86ConfigLayout.screens = xnfcalloc(1,(num_screens+num_matches+1) * sizeof(screenLayoutRec)); + xf86ConfigLayout.screens[0] = slp[0]; + } + for (i=0; i<num_matches;i++) { + if (i==0) { + ptr->driver = matches[0]; + if (slp && !xf86ConfigLayout.screens[0].screen->device) { + xf86ConfigLayout.screens[0].screen->device = ptr; + ptr->myScreenSection = xf86ConfigLayout.screens[0].screen; + } + } else { + if (slp) { + xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec)); + if(!xf86ConfigLayout.screens[i].screen) + return NULL; + memcpy(xf86ConfigLayout.screens[i].screen, slp[0].screen, sizeof(confScreenRec)); + } + cptr = xcalloc(1, sizeof(GDevRec)); + if (!cptr) + return NULL; + memcpy(cptr, ptr, sizeof(GDevRec)); + cptr->identifier = xnfcalloc(1,strlen("Autoconfigured Video Device ")+strlen(matches[i])+1); + sprintf(cptr->identifier, "Autoconfigured Video Device %s", matches[i]); + cptr->driver = matches[i]; + if (slp) { + xf86ConfigLayout.screens[i].screen->device = cptr; + cptr->myScreenSection = xf86ConfigLayout.screens[i].screen; + } + } + } + for (i=1;i<num_screens;i++) { + xf86ConfigLayout.screens[i+num_matches] = slp[i]; + } + xf86ConfigLayout.screens[num_screens+num_matches].screen = NULL; + xfree(slp); } - /* TODO Handle multiple screen sections */ - if (xf86ConfigLayout.screens && !xf86ConfigLayout.screens->screen->device) { - xf86ConfigLayout.screens->screen->device = ptr; - ptr->myScreenSection = xf86ConfigLayout.screens->screen; - } + /* TODO Handle rest of multiple screen sections */ xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n"); return ptr; ++++++ xorg-server-xf4vnc-TranslateNone.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/translate.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/translate.c -+++ xorg-server-1.6.3.901/hw/vnc/translate.c -@@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char +================================================================================ +--- xorg-server-1.7.99/hw/vnc/translate.c ++++ xorg-server-1.7.99/hw/vnc/translate.c +@@ -168,17 +168,17 @@ { VNCSCREENPTR(pScreen); DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum]; ++++++ xorg-server-xf4vnc-abi-version.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/xfree86/vnc/vncInit.c -=================================================================== ---- hw/xfree86/vnc/vncInit.c.orig +================================================================================ +--- hw/xfree86/vnc/vncInit.c +++ hw/xfree86/vnc/vncInit.c -@@ -573,8 +573,8 @@ static XF86ModuleVersionInfo vncVersRec +@@ -573,8 +573,8 @@ #if 0 ABI_EXTENSION_VERSION, #else @@ -13,11 +13,9 @@ #endif MOD_CLASS_EXTENSION, {0,0,0,0} -Index: xcliplist/cliplistmod.c -=================================================================== ---- xcliplist/cliplistmod.c.orig +--- xcliplist/cliplistmod.c +++ xcliplist/cliplistmod.c -@@ -26,8 +26,8 @@ static XF86ModuleVersionInfo VersRec = { +@@ -26,8 +26,8 @@ #if 0 ABI_EXTENSION_VERSION, #else ++++++ xorg-server-xf4vnc-busyloop.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c -+++ xorg-server-1.6.3.901/hw/vnc/sockets.c -@@ -448,7 +448,7 @@ WriteExact(sock, buf, len) +================================================================================ +--- xorg-server-1.7.99/hw/vnc/sockets.c ++++ xorg-server-1.7.99/hw/vnc/sockets.c +@@ -448,7 +448,7 @@ int n; fd_set fds; struct timeval tv; @@ -11,7 +11,7 @@ int totalTimeWaited = 0; #endif -@@ -470,7 +470,7 @@ WriteExact(sock, buf, len) +@@ -470,7 +470,7 @@ return n; } @@ -20,7 +20,7 @@ /* Retry every 5 seconds until we exceed rfbMaxClientWait. We need to do this because select doesn't necessarily return immediately when the other end has gone away */ -@@ -488,7 +488,7 @@ WriteExact(sock, buf, len) +@@ -488,7 +488,7 @@ tv.tv_usec = 0; #endif n = select(sock+1, NULL, &fds, NULL, &tv); ++++++ xorg-server-xf4vnc-clientTimeout.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c -=================================================================== ---- xorg-server-1.6.3.901.orig/hw/vnc/sockets.c -+++ xorg-server-1.6.3.901/hw/vnc/sockets.c -@@ -490,8 +490,10 @@ WriteExact(sock, buf, len) +================================================================================ +--- xorg-server-1.7.99/hw/vnc/sockets.c ++++ xorg-server-1.7.99/hw/vnc/sockets.c +@@ -490,8 +490,10 @@ n = select(sock+1, NULL, &fds, NULL, &tv); #if 1 if (n < 0) { ++++++ xorg-server-xf4vnc-cutpaste.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: hw/vnc/cutpaste.c -=================================================================== ---- hw/vnc/cutpaste.c.orig +================================================================================ +--- hw/vnc/cutpaste.c +++ hw/vnc/cutpaste.c -@@ -58,7 +58,7 @@ rfbSetXCutText(char *str, int len) +@@ -58,7 +58,7 @@ 8, PropModeReplace, len, (pointer)str, TRUE); ++++++ xorg-server-xf4vnc-fix.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c ================================================================================ ---- xorg-server-1.7.4/configure.ac -+++ xorg-server-1.7.4/configure.ac -@@ -1407,7 +1407,7 @@ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -1504,7 +1504,7 @@ XVNC_CFLAGS="-DVNCSERVER -DHAVE_XVNC_CONFIG_H" AC_SUBST([XVNC_CFLAGS]) VNC_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" @@ -11,8 +11,8 @@ AC_SUBST([XVNC_LIBS]) if test "x$GLX" = xyes; then ---- xorg-server-1.7.4/hw/vnc/cursor.c -+++ xorg-server-1.7.4/hw/vnc/cursor.c +--- xorg-server-1.7.99/hw/vnc/cursor.c ++++ xorg-server-1.7.99/hw/vnc/cursor.c @@ -33,6 +33,7 @@ #include "sprite.h" #include "cursorstr.h" @@ -30,8 +30,8 @@ #else rfbSpriteGetCursorPos(pScreen, &x, &y); #endif ---- xorg-server-1.7.4/hw/vnc/cutpaste.c -+++ xorg-server-1.7.4/hw/vnc/cutpaste.c +--- xorg-server-1.7.99/hw/vnc/cutpaste.c ++++ xorg-server-1.7.99/hw/vnc/cutpaste.c @@ -66,7 +66,7 @@ event.u.selectionClear.time = GetTimeInMillis(); event.u.selectionClear.window = pSel->window; @@ -41,8 +41,8 @@ NoEventMask, NoEventMask /* CantBeFiltered */, NullGrab); } ---- xorg-server-1.7.4/hw/vnc/dispcur.c -+++ xorg-server-1.7.4/hw/vnc/dispcur.c +--- xorg-server-1.7.99/hw/vnc/dispcur.c ++++ xorg-server-1.7.99/hw/vnc/dispcur.c @@ -74,7 +74,10 @@ /* per-screen private data */ @@ -118,8 +118,8 @@ if (!pPriv) { pPriv = rfbDCRealize(pScreen, pCursor); ---- xorg-server-1.7.4/hw/vnc/init.c -+++ xorg-server-1.7.4/hw/vnc/init.c +--- xorg-server-1.7.99/hw/vnc/init.c ++++ xorg-server-1.7.99/hw/vnc/init.c @@ -90,6 +90,7 @@ #include "dix.h" #include "micmap.h" @@ -186,8 +186,8 @@ vncSetPointerDevice(pDevice); break; ---- xorg-server-1.7.4/hw/vnc/kbdptr.c -+++ xorg-server-1.7.4/hw/vnc/kbdptr.c +--- xorg-server-1.7.99/hw/vnc/kbdptr.c ++++ xorg-server-1.7.99/hw/vnc/kbdptr.c @@ -39,6 +39,7 @@ #include "mi.h" #include "mipointer.h" @@ -310,8 +310,8 @@ if (KEY_IS_PRESSED(SHIFT_L_KEY_CODE)) { fakeShiftLRelease = TRUE; EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE); ---- xorg-server-1.7.4/hw/vnc/rdp.c -+++ xorg-server-1.7.4/hw/vnc/rdp.c +--- xorg-server-1.7.99/hw/vnc/rdp.c ++++ xorg-server-1.7.99/hw/vnc/rdp.c @@ -27,6 +27,7 @@ #include <errno.h> #include <netinet/in.h> @@ -320,8 +320,8 @@ #include "rfb.h" typedef struct rdpClientRec { ---- xorg-server-1.7.4/hw/vnc/rfbkeyb.c -+++ xorg-server-1.7.4/hw/vnc/rfbkeyb.c +--- xorg-server-1.7.99/hw/vnc/rfbkeyb.c ++++ xorg-server-1.7.99/hw/vnc/rfbkeyb.c @@ -147,7 +147,7 @@ #ifdef XKB if (noXkbExtension) { @@ -340,8 +340,8 @@ 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, ---- xorg-server-1.7.4/hw/vnc/rfbmouse.c -+++ xorg-server-1.7.4/hw/vnc/rfbmouse.c +--- xorg-server-1.7.99/hw/vnc/rfbmouse.c ++++ xorg-server-1.7.99/hw/vnc/rfbmouse.c @@ -51,7 +51,7 @@ #include <mipointer.h> #endif @@ -403,8 +403,8 @@ 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, ---- xorg-server-1.7.4/hw/vnc/rfbserver.c -+++ xorg-server-1.7.4/hw/vnc/rfbserver.c +--- xorg-server-1.7.99/hw/vnc/rfbserver.c ++++ xorg-server-1.7.99/hw/vnc/rfbserver.c @@ -53,6 +53,7 @@ #include "propertyst.h" #include <X11/Xatom.h> @@ -424,8 +424,8 @@ } #endif ---- xorg-server-1.7.4/hw/vnc/sprite.c -+++ xorg-server-1.7.4/hw/vnc/sprite.c +--- xorg-server-1.7.99/hw/vnc/sprite.c ++++ xorg-server-1.7.99/hw/vnc/sprite.c @@ -112,7 +112,8 @@ static RegionPtr rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed); static void rfbSpriteComputeSaved(ScreenPtr pScreen); @@ -553,8 +553,8 @@ /* send new cursor shape to interested viewers */ for (cl = rfbClientHead; cl ; cl = cl->next) { ---- xorg-server-1.7.4/hw/vnc/vncext.c -+++ xorg-server-1.7.4/hw/vnc/vncext.c +--- xorg-server-1.7.99/hw/vnc/vncext.c ++++ xorg-server-1.7.99/hw/vnc/vncext.c @@ -36,8 +36,9 @@ #include <arpa/inet.h> #include <netdb.h> @@ -594,8 +594,8 @@ NoEventMask, NullGrab); } pn = pn->next; ---- xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c -+++ xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c +--- xorg-server-1.7.99/hw/xfree86/vnc/vncInit.c ++++ xorg-server-1.7.99/hw/xfree86/vnc/vncInit.c @@ -34,8 +34,7 @@ #include "xf86.h" ++++++ xorg-server-xf4vnc-fixes_1_8.diff ++++++ --- hw/vnc/vncext.c +++ hw/vnc/vncext.c @@ -140,7 +140,7 @@ if (rec) { rec->client = client; rec->fakeID = FakeClientID(client->index); - rec->res = CreateNewResourceType(VncDestroyClientResourceCallback); + rec->res = CreateNewResourceType(VncDestroyClientResourceCallback,"DestroyClientResourceCallback"); if (!AddResource(rec->fakeID, rec->res, rec)) { xfree(rec); } @@ -689,7 +689,7 @@ VncResourceGeneration = serverGeneration; - if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList))) { + if (!(VncNotifyList = CreateNewResourceType(VncDestroyNotifyList,"DestroyNotifyList"))) { ErrorF("CreateResourceTypes: failed to allocate vnc notify list resource.\n"); return FALSE; } --- hw/vnc/init.c +++ hw/vnc/init.c @@ -984,6 +984,11 @@ } void +CloseInput() +{ +} + +void OsVendorInit() { } @@ -1047,7 +1052,7 @@ } int -NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) +NewInputDeviceRequest(InputOption *options, InputAttributes *attrs, DeviceIntPtr *pdev) { return BadValue; } ++++++ xorg-server-xf4vnc.patch ++++++ ++++ 800 lines (skipped) ++++ between xorg-x11-server/xorg-server-xf4vnc.patch ++++ and xorg-x11-server/xorg-server-xf4vnc.patch ++++++ xserver-1.6.1-nouveau.patch ++++++ Also, don't treat DRI setup failure as an error for nouveau. --- diff --git a/glx/glxdri.c b/glx/glxdri.c index 21e44d1..30b820c 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIconfig **driConfigs; const __DRIextension **extensions; int i; + int from = X_ERROR; if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || @@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { - LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", + if (!strcmp(driverName, "nouveau")) + from = X_INFO; + LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", filename, dlerror()); goto handle_error; } @@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) xfree(screen); - LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); + LogMessage(from, "AIGLX: reverting to software rendering\n"); return NULL; } diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 0f998de..a244809 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIextension **extensions; const __DRIconfig **driConfigs; int i; + int from = X_ERROR; screen = xcalloc(1, sizeof *screen); if (screen == NULL) @@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { - LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", + if (!strcmp(driverName, "nouveau")) + from = X_INFO; + LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", filename, dlerror()); goto handle_error; } @@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) xfree(screen); - LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); + LogMessage(from, "AIGLX: reverting to software rendering\n"); return NULL; } ++++++ zap_warning_xserver.diff ++++++ --- /var/tmp/diff_new_pack.r2plQG/_old 2010-03-26 01:20:01.000000000 +0100 +++ /var/tmp/diff_new_pack.r2plQG/_new 2010-03-26 01:20:01.000000000 +0100 @@ -1,8 +1,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c ================================================================================ ---- xorg-server-1.7.4/hw/xfree86/common/xf86Config.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Config.c -@@ -679,6 +679,7 @@ +--- xorg-server-1.7.99/hw/xfree86/common/xf86Config.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Config.c +@@ -696,6 +696,7 @@ FLAG_NOTRAPSIGNALS, FLAG_DONTVTSWITCH, FLAG_DONTZAP, @@ -10,7 +10,7 @@ FLAG_DONTZOOM, FLAG_DISABLEVIDMODE, FLAG_ALLOWNONLOCAL, -@@ -717,6 +718,8 @@ +@@ -734,6 +735,8 @@ {0}, FALSE }, { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, {0}, FALSE }, @@ -19,7 +19,7 @@ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, {0}, FALSE }, { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, -@@ -823,6 +826,7 @@ +@@ -840,6 +843,7 @@ xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); @@ -27,8 +27,8 @@ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); ---- xorg-server-1.7.4/hw/xfree86/common/xf86Events.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Events.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86Events.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Events.c @@ -180,12 +180,26 @@ DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg); switch (action) { @@ -60,8 +60,8 @@ break; case ACTION_NEXT_MODE: if (!xf86Info.dontZoom) ---- xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c +--- xorg-server-1.7.99/hw/xfree86/common/xf86Globals.c ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Globals.c @@ -109,6 +109,7 @@ #endif .dontVTSwitch = FALSE, @@ -70,8 +70,8 @@ .dontZoom = FALSE, .notrapSignals = FALSE, .caughtSignal = FALSE, ---- xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h -+++ xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h +--- xorg-server-1.7.99/hw/xfree86/common/xf86Privstr.h ++++ xorg-server-1.7.99/hw/xfree86/common/xf86Privstr.h @@ -67,6 +67,7 @@ #endif Bool dontVTSwitch; @@ -80,9 +80,9 @@ Bool dontZoom; Bool notrapSignals; /* don't exit cleanly - die at fault */ Bool caughtSignal; ---- xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre -+++ xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre -@@ -431,7 +431,7 @@ +--- xorg-server-1.7.99/hw/xfree86/doc/man/Xorg.man.pre ++++ xorg-server-1.7.99/hw/xfree86/doc/man/Xorg.man.pre +@@ -438,7 +438,7 @@ .B Ctrl+Alt+Backspace Immediately kills the server -- no questions asked. It can be disabled by setting the @@ -91,9 +91,9 @@ __xconfigfile__(__filemansuffix__) file option to a TRUE value. .TP 8 .B Ctrl+Alt+Keypad-Plus ---- xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre -+++ xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -479,6 +479,13 @@ +--- xorg-server-1.7.99/hw/xfree86/doc/man/xorg.conf.man.pre ++++ xorg-server-1.7.99/hw/xfree86/doc/man/xorg.conf.man.pre +@@ -507,6 +507,13 @@ When this option is enabled, the action has no effect. Default: off. .TP 7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de