diff --git a/0001-Check-harder-for-primary-PCI-device.patch b/0001-Check-harder-for-primary-PCI-device.patch index a66f5b5..49b89e4 100644 --- a/0001-Check-harder-for-primary-PCI-device.patch +++ b/0001-Check-harder-for-primary-PCI-device.patch @@ -9,15 +9,10 @@ If there should be more than one device for which this is true 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 @@ index 25b553b..18b9782 100644 } } } --- -1.6.4.2 - diff --git a/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch b/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch index e594792..b31c391 100644 --- a/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch +++ b/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch @@ -6,8 +6,8 @@ Subject: [PATCH] Fix segfault when killing X with ctrl-alt-backspace. 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; diff --git a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch b/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch index be035ea..a039dc0 100644 --- a/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch +++ b/0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch @@ -6,15 +6,10 @@ Subject: [PATCH] Xinput: Catch missing configlayout when deleting device. 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); diff --git a/autoconfig_fallback_fbdev_first.diff b/autoconfig_fallback_fbdev_first.diff index 1ee022a..23ce94f 100644 --- a/autoconfig_fallback_fbdev_first.diff +++ b/autoconfig_fallback_fbdev_first.diff @@ -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 @@ Index: hw/xfree86/common/xf86AutoConfig.c #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 diff --git a/bitmap_always_unscaled.diff b/bitmap_always_unscaled.diff index 481861c..60a5c71 100644 --- a/bitmap_always_unscaled.diff +++ b/bitmap_always_unscaled.diff @@ -17,22 +17,15 @@ bitmap fonts will not have any new side-effects. 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'], diff --git a/bug-197858_dpms.diff b/bug-197858_dpms.diff index 8449446..e0c4570 100644 --- a/bug-197858_dpms.diff +++ b/bug-197858_dpms.diff @@ -10,7 +10,7 @@ Index: hw/xfree86/common/xf86Events.c 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 @@ Index: hw/xfree86/common/xf86Events.c 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 @@ Index: hw/xfree86/common/xf86Events.c xf86UnblockSIGIO(prevSIGIO); -@@ -556,8 +565,12 @@ +@@ -549,8 +558,12 @@ pInfo = pInfo->next; } @@ -55,7 +55,7 @@ Index: hw/xfree86/common/xf86Events.c xf86UnblockSIGIO(prevSIGIO); } -@@ -594,8 +607,10 @@ +@@ -587,8 +600,10 @@ { IHPtr ih = addInputHandler(fd, proc, data); diff --git a/bug474071-fix1.diff b/bug474071-fix1.diff index 5232474..828f200 100644 --- a/bug474071-fix1.diff +++ b/bug474071-fix1.diff @@ -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 @@ Index: linuxPci.c }; 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 @@ Index: linuxPci.c 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 */ diff --git a/bug534768-prefer_local_symbols.patch b/bug534768-prefer_local_symbols.patch index c98a95c..7a8a81c 100644 --- a/bug534768-prefer_local_symbols.patch +++ b/bug534768-prefer_local_symbols.patch @@ -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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c 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) diff --git a/cache-xkbcomp-output-for-fast-start-up.patch b/cache-xkbcomp-output-for-fast-start-up.patch index bc0fa42..2e917a4 100644 --- a/cache-xkbcomp-output-for-fast-start-up.patch +++ b/cache-xkbcomp-output-for-fast-start-up.patch @@ -9,9 +9,9 @@ names. This saves boot time for around 1s on commodity netbooks. Signed-off-by: Yan Li ================================================================================ ---- 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 @@ Signed-off-by: Yan Li 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 @@ Signed-off-by: Yan Li 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 @@ Signed-off-by: Yan Li 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 - #endif +#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ +# include @@ -64,7 +64,7 @@ Signed-off-by: Yan Li #include #include #include -@@ -45,24 +51,13 @@ +@@ -43,24 +49,13 @@ #define XKBSRV_NEED_FILE_FUNCS #include #include @@ -90,7 +90,7 @@ Signed-off-by: Yan Li #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 @@ Signed-off-by: Yan Li XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, unsigned want, -@@ -185,7 +219,11 @@ +@@ -183,7 +217,11 @@ int nameRtrnLen) { FILE * out; @@ -149,7 +149,7 @@ Signed-off-by: Yan Li 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 @@ Signed-off-by: Yan Li + 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 @@ Signed-off-by: Yan Li #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 @@ Signed-off-by: Yan Li + /* 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 @@ Signed-off-by: Yan Li + 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 @@ Signed-off-by: Yan Li #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 @@ Signed-off-by: Yan Li #ifndef WIN32 out= Popen(buf,"w"); #else -@@ -247,31 +351,43 @@ +@@ -245,31 +349,42 @@ #endif if (out!=NULL) { @@ -265,75 +265,76 @@ Signed-off-by: Yan Li - 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)); + -+ result = True; -+ goto _ret; ++ /* in case of error, don't unlink tmpXkmFile, leave it ++ for debugging */ ++ ++ result = FALSE; ++ 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); diff --git a/commit-c941479.diff b/commit-c941479.diff deleted file mode 100644 index 571f279..0000000 --- a/commit-c941479.diff +++ /dev/null @@ -1,86 +0,0 @@ -commit c941479ecc2dead9c3deaee2620c9b9518c3da9a -Author: Rémi Cardona -Date: Mon Jul 27 12:07:51 2009 +0200 - - config: add HAL error checks - - This patch simplifies error handling in the HAL code and fixes a - segfault if libhal_find_device_by_capability() failed. - - Fixes http://bugs.gentoo.org/278760 - - Based on a patch by Martin von Gagern - - Signed-off-by: Rémi Cardona - Acked-by: Peter Hutterer - (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c) - -diff --git a/config/hal.c b/config/hal.c -index 731d9b8..59bff66 100644 ---- a/config/hal.c -+++ b/config/hal.c -@@ -474,13 +474,13 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) - char **devices; - int num_devices, i; - -+ if (info->hal_ctx) -+ return TRUE; /* already registered, pretend we did something */ -+ - info->system_bus = connection; - - dbus_error_init(&error); - -- if (info->hal_ctx) -- return TRUE; /* already registered, pretend we did something */ -- - info->hal_ctx = libhal_ctx_new(); - if (!info->hal_ctx) { - LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n"); -@@ -501,7 +501,7 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) - LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n", - error.name ? error.name : "unknown error", - error.message ? error.message : "null"); -- goto out_ctx2; -+ goto out_ctx; - } - libhal_ctx_set_device_added(info->hal_ctx, device_added); - libhal_ctx_set_device_removed(info->hal_ctx, device_removed); -@@ -509,6 +509,12 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) - devices = libhal_find_device_by_capability(info->hal_ctx, "input", - &num_devices, &error); - /* FIXME: Get default devices if error is set. */ -+ if (dbus_error_is_set(&error)) { -+ LogMessage(X_ERROR, "config/hal: couldn't find input device: %s (%s)\n", -+ error.name ? error.name : "unknown error", -+ error.message ? error.message : "null"); -+ goto out_ctx; -+ } - for (i = 0; i < num_devices; i++) - device_added(info->hal_ctx, devices[i]); - libhal_free_string_array(devices); -@@ -517,13 +523,19 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info) - - return TRUE; - --out_ctx2: -- if (!libhal_ctx_shutdown(info->hal_ctx, &error)) -- LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", -- error.name ? error.name : "unknown error", -- error.message ? error.message : "null"); - out_ctx: -- libhal_ctx_free(info->hal_ctx); -+ dbus_error_free(&error); -+ -+ if (info->hal_ctx) { -+ if (!libhal_ctx_shutdown(info->hal_ctx, &error)) { -+ LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", -+ error.name ? error.name : "unknown error", -+ error.message ? error.message : "null"); -+ dbus_error_free(&error); -+ } -+ libhal_ctx_free(info->hal_ctx); -+ } -+ - out_err: - dbus_error_free(&error); - diff --git a/confine_to_shape.diff b/confine_to_shape.diff index ace3987..1ced12e 100644 --- a/confine_to_shape.diff +++ b/confine_to_shape.diff @@ -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; diff --git a/disable-fbblt-opt.diff b/disable-fbblt-opt.diff index 77597be..7a6d8b9 100644 --- a/disable-fbblt-opt.diff +++ b/disable-fbblt-opt.diff @@ -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 @@ Index: fb/fbblt.c 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; } diff --git a/dpms_screensaver.diff b/dpms_screensaver.diff index b656754..0bb6a67 100644 --- a/dpms_screensaver.diff +++ b/dpms_screensaver.diff @@ -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; diff --git a/driver-autoconfig.diff b/driver-autoconfig.diff index 5a14e93..4c8d692 100644 --- a/driver-autoconfig.diff +++ b/driver-autoconfig.diff @@ -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) diff --git a/edit_data_sanity_check.diff b/edit_data_sanity_check.diff index 2ae651f..1116844 100644 --- a/edit_data_sanity_check.diff +++ b/edit_data_sanity_check.diff @@ -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; diff --git a/exa-greedy.diff b/exa-greedy.diff deleted file mode 100644 index 0164f77..0000000 --- a/exa-greedy.diff +++ /dev/null @@ -1,30 +0,0 @@ -Index: xorg-server-1.6.3.901/exa/exa_migration.c -=================================================================== ---- xorg-server-1.6.3.901.orig/exa/exa_migration.c -+++ xorg-server-1.6.3.901/exa/exa_migration.c -@@ -463,7 +463,11 @@ exaMigrateTowardFb (ExaMigrationPtr migr - exaDoMoveInPixmap(migrate); - } - -- ExaOffscreenMarkUsed (pPixmap); -+ if (exaPixmapIsOffscreen(pPixmap)) { -+ exaCopyDirtyToFb (migrate); -+ ExaOffscreenMarkUsed (pPixmap); -+ } else -+ exaCopyDirtyToSys (migrate); - } - - /** -@@ -496,6 +500,12 @@ exaMigrateTowardSys (ExaMigrationPtr mig - - if (pExaPixmap->score <= EXA_PIXMAP_SCORE_MOVE_OUT && pExaPixmap->area) - exaDoMoveOutPixmap(migrate); -+ -+ if (exaPixmapIsOffscreen(pPixmap)) { -+ exaCopyDirtyToFb (migrate); -+ ExaOffscreenMarkUsed (pPixmap); -+ } else -+ exaCopyDirtyToSys (migrate); - } - - /** diff --git a/fbdevhw.diff b/fbdevhw.diff index 076ad55..0b432ba 100644 --- a/fbdevhw.diff +++ b/fbdevhw.diff @@ -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 @@ Index: hw/xfree86/fbdevhw/fbdevhw.c } Bool -@@ -982,9 +983,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int +@@ -975,9 +976,10 @@ unblank = xf86IsUnblank(mode); diff --git a/fix-dpi-values.diff b/fix-dpi-values.diff index 03bcbb2..52e69c4 100644 --- a/fix-dpi-values.diff +++ b/fix-dpi-values.diff @@ -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 @@ Index: hw/xfree86/common/xf86Helper.c } 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) { diff --git a/fixed-SYNC-extension-trigger-BlockHandler-test.diff b/fixed-SYNC-extension-trigger-BlockHandler-test.diff index 8040a19..d341af9 100644 --- a/fixed-SYNC-extension-trigger-BlockHandler-test.diff +++ b/fixed-SYNC-extension-trigger-BlockHandler-test.diff @@ -26,8 +26,8 @@ Subject: [PATCH] Fixed SYNC extension trigger BlockHandler test. 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 @@ Index: xorg-server-1.6.3.901/Xext/sync.c } /* end for each trigger */ if (pnewgtval || pnewltval) -@@ -2273,11 +2269,17 @@ +@@ -2277,11 +2273,17 @@ } static void @@ -211,7 +211,7 @@ Index: xorg-server-1.6.3.901/Xext/sync.c 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. diff --git a/fpic.diff b/fpic.diff index d172808..5473523 100644 --- a/fpic.diff +++ b/fpic.diff @@ -2,7 +2,7 @@ Index: hw/xfree86/parser/Makefile.am ================================================================================ --- 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) diff --git a/ia64linuxPciInit.diff b/ia64linuxPciInit.diff deleted file mode 100644 index be9b469..0000000 --- a/ia64linuxPciInit.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- hw/xfree86/os-support/bus/linuxPci.c -+++ hw/xfree86/os-support/bus/linuxPci.c -@@ -999,7 +999,10 @@ ia64linuxPciInit() - struct stat st; - - linuxPciInit(); -- -+ -+ /* Need space for fake devices. */ -+ xf86MaxPciDevs = MAX_PCI_DEVICES; -+ - if (!stat("/proc/sgi_sn/licenseID", &st) && pciNumBuses) { - /* Be a little paranoid here and only use this code for Altix systems. - * It is generic, so it should work on any system, but depends on diff --git a/libdrm.diff b/libdrm.diff index 4c912a0..3294f06 100644 --- a/libdrm.diff +++ b/libdrm.diff @@ -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); diff --git a/missing_font_paths.diff b/missing_font_paths.diff index f5fca10..e293aec 100644 --- a/missing_font_paths.diff +++ b/missing_font_paths.diff @@ -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'], diff --git a/moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch b/moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch deleted file mode 100644 index d5327f1..0000000 --- a/moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6f59a8160042ea145514fdcb410f17f33fd437c2 Mon Sep 17 00:00:00 2001 -From: Benjamin Defnet -Date: Mon, 8 Jun 2009 21:45:42 -0700 -Subject: hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major - -This moves code out of each implementation of set_mode_major and back into -the X server. The real feature here is that the transform is now available -in the crtc for use by either xf86CrtcRotate or whatever the driver wants to -do. Without this change, the transform was lost for drivers providing the -set_mode_major interface. - -Note that users of this API will want to stop smashing the transformPresent -field, and could also stop setting mode/x/y/rotation for new enough X servers, -but there's no reason to make that change as it will break things when -running against older X servers. - -Signed-off-by: Keith Packard -Acked-by: Daniel Stone ---- - hw/xfree86/modes/xf86Crtc.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index b40e096..585f84d 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -266,9 +266,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati - RRTransformRec saved_transform; - Bool saved_transform_present; - -- if (crtc->funcs->set_mode_major) -- return crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); -- - crtc->enabled = xf86CrtcInUse (crtc); - - /* We only hit this if someone explicitly sends a "disabled" modeset. */ -@@ -306,6 +303,11 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati - } else - crtc->transformPresent = FALSE; - -+ if (crtc->funcs->set_mode_major) { -+ ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y); -+ goto done; -+ } -+ - /* Pass our mode to the outputs and the CRTC to give them a chance to - * adjust it according to limitations or output properties, and also - * a chance to reject the mode entirely. --- -1.6.1.3 - diff --git a/moblin-randr-fix-operation-order-so-that-rotation-transfor.patch b/moblin-randr-fix-operation-order-so-that-rotation-transfor.patch deleted file mode 100644 index 3738d61..0000000 --- a/moblin-randr-fix-operation-order-so-that-rotation-transfor.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b2bf67b61c564a4b92a429ca9ad455403161f33a Mon Sep 17 00:00:00 2001 -From: Benjamin Defnet -Date: Wed, 10 Jun 2009 21:35:48 -0700 -Subject: randr: fix operation order so that rotation+transform works - -The matrix multiply to combine rotation and projective transforms was being -done in the wrong order. - -Signed-off-by: Keith Packard -Signed-off-by: root ---- - randr/rrtransform.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/randr/rrtransform.c b/randr/rrtransform.c -index 8bdff5a..06f6298 100644 ---- a/randr/rrtransform.c -+++ b/randr/rrtransform.c -@@ -251,10 +251,10 @@ RRTransformCompute (int x, - #ifdef RANDR_12_INTERFACE - if (rr_transform) - { -- if (!pixman_transform_multiply (transform, transform, &rr_transform->transform)) -+ if (!pixman_transform_multiply (transform, &rr_transform->transform, transform)) - overflow = TRUE; -- pixman_f_transform_multiply (f_transform, f_transform, &rr_transform->f_transform); -- pixman_f_transform_multiply (f_inverse, &rr_transform->f_inverse, f_inverse); -+ pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform); -+ pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse); - } - #endif - /* --- -1.6.1.3 - diff --git a/moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch b/moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch deleted file mode 100644 index 0ad9c06..0000000 --- a/moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0de58c88aba7ddd69b04f24ab5b2967c359aa69e Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 11 Jun 2009 14:21:53 +1000 -Subject: xfree86: move didLock assignment down to where the function pointer is valid. - -crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so -it's actually defined before we use it. - -Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2. - -Tested-by: Peter Hutterer ---- - hw/xfree86/modes/xf86Crtc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 585f84d..51fe115 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -278,7 +278,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati - - adjusted_mode = xf86DuplicateMode(mode); - -- didLock = crtc->funcs->lock (crtc); - - saved_mode = crtc->mode; - saved_x = crtc->x; -@@ -308,6 +307,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati - goto done; - } - -+ didLock = crtc->funcs->lock (crtc); - /* Pass our mode to the outputs and the CRTC to give them a chance to - * adjust it according to limitations or output properties, and also - * a chance to reject the mode entirely. --- -1.6.1.3 - diff --git a/moblin-xorg-x11-nonroot-vesa.patch b/moblin-xorg-x11-nonroot-vesa.patch index 4f4fb5f..9d831f1 100644 --- a/moblin-xorg-x11-nonroot-vesa.patch +++ b/moblin-xorg-x11-nonroot-vesa.patch @@ -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 diff --git a/mouse.diff b/mouse.diff index bbbd7b4..00da937 100644 --- a/mouse.diff +++ b/mouse.diff @@ -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) diff --git a/p_bug96328.diff b/p_bug96328.diff index a77c134..8281bb0 100644 --- a/p_bug96328.diff +++ b/p_bug96328.diff @@ -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 @@ Index: hw/xfree86/common/xf86Configure.c - 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; diff --git a/p_default-module-path.diff b/p_default-module-path.diff index 01b58cf..45e7451 100644 --- a/p_default-module-path.diff +++ b/p_default-module-path.diff @@ -2,10 +2,10 @@ Index: hw/xfree86/common/xf86Globals.c ================================================================================ --- 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; diff --git a/p_ia64-console.diff b/p_ia64-console.diff deleted file mode 100644 index b2c2d76..0000000 --- a/p_ia64-console.diff +++ /dev/null @@ -1,70 +0,0 @@ -Index: linux/lnx_init.c -================================================================================ ---- linux/lnx_init.c -+++ linux/lnx_init.c -@@ -230,9 +230,6 @@ - { - struct termios nTty; - --#if defined(DO_OS_FONTRESTORE) -- lnx_savefont(); --#endif - /* - * now get the VT. This _must_ succeed, or else fail completely. - */ -@@ -244,6 +241,10 @@ - FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n", - strerror(errno)); - -+#if defined(DO_OS_FONTRESTORE) -+ lnx_savefont(); -+#endif -+ - if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) - FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", - strerror(errno)); -@@ -353,6 +354,11 @@ - - if (VTSwitch) - { -+#if defined(DO_OS_FONTRESTORE) -+ if (xf86Info.vtno == vtno) /* check if we are active */ -+ lnx_restorefont(); -+ lnx_freefontdata(); -+#endif - /* - * Perform a switch back to the active VT when we were started - */ -@@ -367,11 +373,6 @@ - activeVT = -1; - } - --#if defined(DO_OS_FONTRESTORE) -- if (xf86Info.vtno == vtno) /* check if we are active */ -- lnx_restorefont(); -- lnx_freefontdata(); --#endif - } - close(xf86Info.consoleFd); /* make the vt-manager happy */ - ---- shared/VTsw_usl.c -+++ shared/VTsw_usl.c -@@ -62,15 +62,15 @@ - xf86VTSwitchAway(void) - { - xf86Info.vtRequestsPending = FALSE; -+#ifdef OSSWITCHAWAY -+ OSSWITCHAWAY; -+#endif - if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) - { - return(FALSE); - } - else - { --#ifdef OSSWITCHAWAY -- OSSWITCHAWAY; --#endif - return(TRUE); - } - } diff --git a/p_pci-off-by-one.diff.ia64 b/p_pci-off-by-one.diff.ia64 deleted file mode 100644 index e78ae91..0000000 --- a/p_pci-off-by-one.diff.ia64 +++ /dev/null @@ -1,64 +0,0 @@ ---- hw/xfree86/os-support/bus/linuxPci.c -+++ hw/xfree86/os-support/bus/linuxPci.c -@@ -547,10 +547,10 @@ xf86GetPciDomain(PCITAG Tag) - pPCI = xf86GetPciHostConfigFromTag(Tag); - - if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum))) -- return result + 1; -+ return result; - - if (!pPCI || pPCI->fakeDevice) -- return 1; /* Domain 0 is reserved */ -+ return 0; - - if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) - return 0; -@@ -558,7 +558,7 @@ xf86GetPciDomain(PCITAG Tag) - if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0) - return 0; - -- return result + 1; /* Domain 0 is reserved */ -+ return result; - } - - static pointer -@@ -629,7 +629,7 @@ linuxMapPci(int ScreenNum, int Flags, PC - return NULL; - } - --#define MAX_DOMAINS 257 -+#define MAX_DOMAINS 256 - static pointer DomainMmappedIO[MAX_DOMAINS]; - - static int -@@ -650,11 +650,10 @@ linuxOpenLegacy(PCITAG Tag, char *name) - domain = xf86GetPciDomain(Tag); - bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); - -- /* Domain 0 is reserved -- see xf86GetPciDomain() */ -- if ((domain <= 0) || (domain >= MAX_DOMAINS)) -+ if ((domain < 0) || (domain >= MAX_DOMAINS)) - FatalError("linuxOpenLegacy(): domain out of range\n"); - -- sprintf(path, PREFIX, domain - 1, bus, name); -+ sprintf(path, PREFIX, domain, bus, name); - fd = open(path, O_RDWR); - if (fd >= 0) { - xfree(path); -@@ -686,7 +685,6 @@ _X_EXPORT pointer - xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, - ADDRESS Base, unsigned long Size) - { -- int domain = xf86GetPciDomain(Tag); - int fd = -1; - pointer addr; - -@@ -734,7 +732,7 @@ xf86MapDomainIO(int ScreenNum, int Flags - int domain = xf86GetPciDomain(Tag); - int fd; - -- if ((domain <= 0) || (domain >= MAX_DOMAINS)) -+ if ((domain < 0) || (domain >= MAX_DOMAINS)) - FatalError("xf86MapDomainIO(): domain out of range\n"); - - if (DomainMmappedIO[domain]) diff --git a/p_xkills_wrong_client.diff b/p_xkills_wrong_client.diff index 7db0bf9..a980975 100644 --- a/p_xkills_wrong_client.diff +++ b/p_xkills_wrong_client.diff @@ -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)); diff --git a/p_xnest-ignore-getimage-errors.diff b/p_xnest-ignore-getimage-errors.diff index 13acf0d..a396bed 100644 --- a/p_xnest-ignore-getimage-errors.diff +++ b/p_xnest-ignore-getimage-errors.diff @@ -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 @@ Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c 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; diff --git a/p_xorg_acpi.diff b/p_xorg_acpi.diff index 3099f96..c81a87a 100644 --- a/p_xorg_acpi.diff +++ b/p_xorg_acpi.diff @@ -104,7 +104,7 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c #endif #ifdef HAVE_APM -@@ -150,6 +151,14 @@ +@@ -149,6 +150,14 @@ ret = lnxAPMOpen(); #endif diff --git a/pci-legacy-mem-fallback.diff b/pci-legacy-mem-fallback.diff index 41ba608..a40a813 100644 --- a/pci-legacy-mem-fallback.diff +++ b/pci-legacy-mem-fallback.diff @@ -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 @@ Index: hw/xfree86/os-support/bus/linuxPci.c 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) { diff --git a/pixman.diff b/pixman.diff index cc512d0..b3ea68e 100644 --- a/pixman.diff +++ b/pixman.diff @@ -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 diff --git a/pu_fixes.diff b/pu_fixes.diff index 8420ec1..b97bb14 100644 --- a/pu_fixes.diff +++ b/pu_fixes.diff @@ -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); diff --git a/randr1_1-sig11.diff b/randr1_1-sig11.diff index ac9e940..8f4644d 100644 --- a/randr1_1-sig11.diff +++ b/randr1_1-sig11.diff @@ -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; diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/vidmode-sig11.diff b/vidmode-sig11.diff index cc3a03b..74744b2 100644 --- a/vidmode-sig11.diff +++ b/vidmode-sig11.diff @@ -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); diff --git a/xephyr.diff b/xephyr.diff index 2075e91..0eda01e 100644 --- a/xephyr.diff +++ b/xephyr.diff @@ -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 @@ Index: hw/kdrive/Makefile.am endif if XFAKESERVER -@@ -21,8 +21,7 @@ endif +@@ -16,8 +16,7 @@ + SERVER_SUBDIRS = \ - $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) diff --git a/xorg-detect-psb.patch b/xorg-detect-psb.patch index f2320b6..5cacaf5 100644 --- a/xorg-detect-psb.patch +++ b/xorg-detect-psb.patch @@ -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; diff --git a/xorg-docs.diff b/xorg-docs.diff index 282eeab..0c895e8 100644 --- a/xorg-docs.diff +++ b/xorg-docs.diff @@ -1,6 +1,6 @@ Index: Makefile.am -=================================================================== ---- Makefile.am.orig +================================================================================ +--- Makefile.am +++ Makefile.am @@ -20,11 +20,9 @@ # @@ -15,9 +15,7 @@ Index: Makefile.am 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) diff --git a/xorg-server-1.7.5.tar.bz2 b/xorg-server-1.7.5.tar.bz2 deleted file mode 100644 index aeef338..0000000 --- a/xorg-server-1.7.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa -size 4926990 diff --git a/xorg-server-1.7.99.tar.bz2 b/xorg-server-1.7.99.tar.bz2 new file mode 100644 index 0000000..aadd2be --- /dev/null +++ b/xorg-server-1.7.99.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5af02b98917a5a793c03a50fd68ffc51454e92c49b40b830ddaa1f6dd050429f +size 85859353 diff --git a/xorg-server-xf4vnc-TranslateNone.diff b/xorg-server-xf4vnc-TranslateNone.diff index ef3d91a..c14752d 100644 --- a/xorg-server-xf4vnc-TranslateNone.diff +++ b/xorg-server-xf4vnc-TranslateNone.diff @@ -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]; diff --git a/xorg-server-xf4vnc-abi-version.diff b/xorg-server-xf4vnc-abi-version.diff index 9ee70a2..246ee01 100644 --- a/xorg-server-xf4vnc-abi-version.diff +++ b/xorg-server-xf4vnc-abi-version.diff @@ -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 @@ Index: hw/xfree86/vnc/vncInit.c #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 diff --git a/xorg-server-xf4vnc-busyloop.diff b/xorg-server-xf4vnc-busyloop.diff index 576c7bf..484b3a4 100644 --- a/xorg-server-xf4vnc-busyloop.diff +++ b/xorg-server-xf4vnc-busyloop.diff @@ -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 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c int totalTimeWaited = 0; #endif -@@ -470,7 +470,7 @@ WriteExact(sock, buf, len) +@@ -470,7 +470,7 @@ return n; } @@ -20,7 +20,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c /* 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); diff --git a/xorg-server-xf4vnc-clientTimeout.diff b/xorg-server-xf4vnc-clientTimeout.diff index ceec80c..9f41acb 100644 --- a/xorg-server-xf4vnc-clientTimeout.diff +++ b/xorg-server-xf4vnc-clientTimeout.diff @@ -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) { diff --git a/xorg-server-xf4vnc-cutpaste.diff b/xorg-server-xf4vnc-cutpaste.diff index 8d62a9e..3b84ae3 100644 --- a/xorg-server-xf4vnc-cutpaste.diff +++ b/xorg-server-xf4vnc-cutpaste.diff @@ -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); diff --git a/xorg-server-xf4vnc-fix.diff b/xorg-server-xf4vnc-fix.diff index a6439ad..ce721cd 100644 --- a/xorg-server-xf4vnc-fix.diff +++ b/xorg-server-xf4vnc-fix.diff @@ -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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c #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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 #include @@ -320,8 +320,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c #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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 #endif @@ -403,8 +403,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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 @@ -424,8 +424,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c } #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 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c /* 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 #include @@ -594,8 +594,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c 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" diff --git a/xorg-server-xf4vnc-fixes_1_8.diff b/xorg-server-xf4vnc-fixes_1_8.diff new file mode 100644 index 0000000..6f837d0 --- /dev/null +++ b/xorg-server-xf4vnc-fixes_1_8.diff @@ -0,0 +1,43 @@ +--- 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; + } diff --git a/xorg-server-xf4vnc.patch b/xorg-server-xf4vnc.patch index 74befda..d967178 100644 --- a/xorg-server-xf4vnc.patch +++ b/xorg-server-xf4vnc.patch @@ -1,7 +1,7 @@ Index: xorg-server-1.6.3.901/Makefile.am ================================================================================ ---- xorg-server-1.7.4/Makefile.am -+++ xorg-server-1.7.4/Makefile.am +--- xorg-server-1.7.99/Makefile.am ++++ xorg-server-1.7.99/Makefile.am @@ -17,6 +17,10 @@ RECORD_DIR=record endif @@ -21,9 +21,9 @@ Index: xorg-server-1.6.3.901/Makefile.am exa \ config \ hw \ ---- xorg-server-1.7.4/configure.ac -+++ xorg-server-1.7.4/configure.ac -@@ -611,6 +611,8 @@ +--- xorg-server-1.7.99/configure.ac ++++ xorg-server-1.7.99/configure.ac +@@ -634,6 +634,8 @@ dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) @@ -32,7 +32,7 @@ Index: xorg-server-1.6.3.901/Makefile.am AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto]) AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes]) AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) -@@ -1091,6 +1093,20 @@ +@@ -1131,6 +1133,20 @@ AM_CONDITIONAL(VBE, test "x$VBE" = xyes) AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes) @@ -53,7 +53,7 @@ Index: xorg-server-1.6.3.901/Makefile.am AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) -@@ -1373,6 +1389,40 @@ +@@ -1470,6 +1486,40 @@ dnl DDX section. dnl --------------------------------------------------------------------------- @@ -94,7 +94,7 @@ Index: xorg-server-1.6.3.901/Makefile.am dnl Xvfb DDX AC_MSG_CHECKING([whether to build Xvfb DDX]) -@@ -2065,6 +2115,7 @@ +@@ -2160,6 +2210,7 @@ Xi/Makefile xfixes/Makefile exa/Makefile @@ -102,7 +102,7 @@ Index: xorg-server-1.6.3.901/Makefile.am hw/Makefile hw/xfree86/Makefile hw/xfree86/common/Makefile -@@ -2098,6 +2149,7 @@ +@@ -2193,6 +2244,7 @@ hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile @@ -110,7 +110,7 @@ Index: xorg-server-1.6.3.901/Makefile.am hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf8_16bpp/Makefile -@@ -2109,8 +2161,10 @@ +@@ -2204,8 +2256,10 @@ hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile @@ -121,8 +121,8 @@ Index: xorg-server-1.6.3.901/Makefile.am hw/xnest/Makefile hw/xwin/Makefile hw/xquartz/Makefile ---- xorg-server-1.7.4/hw/Makefile.am -+++ xorg-server-1.7.4/hw/Makefile.am +--- xorg-server-1.7.99/hw/Makefile.am ++++ xorg-server-1.7.99/hw/Makefile.am @@ -22,6 +22,10 @@ KDRIVE_SUBDIRS = kdrive endif @@ -147,8 +147,8 @@ Index: xorg-server-1.6.3.901/Makefile.am relink: for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done ---- xorg-server-1.7.4/hw/dmx/Makefile.am -+++ xorg-server-1.7.4/hw/dmx/Makefile.am +--- xorg-server-1.7.99/hw/dmx/Makefile.am ++++ xorg-server-1.7.99/hw/dmx/Makefile.am @@ -1,6 +1,6 @@ -DIST_SUBDIRS = input config glxProxy examples doc +DIST_SUBDIRS = input vnc config glxProxy examples doc @@ -158,8 +158,8 @@ Index: xorg-server-1.6.3.901/Makefile.am bin_PROGRAMS = Xdmx if XINERAMA ---- xorg-server-1.7.4/hw/dmx/dmx-config.h -+++ xorg-server-1.7.4/hw/dmx/dmx-config.h +--- xorg-server-1.7.99/hw/dmx/dmx-config.h ++++ xorg-server-1.7.99/hw/dmx/dmx-config.h @@ -72,4 +72,7 @@ /* Enable the DMX extension */ #define DMXEXT @@ -168,8 +168,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +#define DMXVNC 1 + #endif /* DMX_CONFIG_H */ ---- xorg-server-1.7.4/hw/dmx/dmxinit.c -+++ xorg-server-1.7.4/hw/dmx/dmxinit.c +--- xorg-server-1.7.99/hw/dmx/dmxinit.c ++++ xorg-server-1.7.99/hw/dmx/dmxinit.c @@ -79,6 +79,10 @@ ); #endif /* GLXEXT */ @@ -191,7 +191,7 @@ Index: xorg-server-1.6.3.901/Makefile.am } /* RATS: Assuming the fp string (which comes from the command-line argv -@@ -1033,3 +1040,14 @@ +@@ -1039,3 +1046,14 @@ ErrorF(" Ctrl-Alt-q Quit (core devices only)\n"); ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n"); } @@ -206,8 +206,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return tp.tv_sec * 1000 + tp.tv_usec / 1000; +} +#endif ---- xorg-server-1.7.4/hw/dmx/dmxsync.c -+++ xorg-server-1.7.4/hw/dmx/dmxsync.c +--- xorg-server-1.7.99/hw/dmx/dmxsync.c ++++ xorg-server-1.7.99/hw/dmx/dmxsync.c @@ -99,9 +99,16 @@ TimerForce(dmxSyncTimer); } @@ -225,8 +225,8 @@ Index: xorg-server-1.6.3.901/Makefile.am } /** Request the XSync() batching optimization with the specified \a ---- xorg-server-1.7.4/hw/dmx/input/Makefile.am -+++ xorg-server-1.7.4/hw/dmx/input/Makefile.am +--- xorg-server-1.7.99/hw/dmx/input/Makefile.am ++++ xorg-server-1.7.99/hw/dmx/input/Makefile.am @@ -61,6 +61,7 @@ AM_CFLAGS = $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ @@ -235,8 +235,8 @@ Index: xorg-server-1.6.3.901/Makefile.am $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ ---- xorg-server-1.7.4/hw/dmx/input/dmxcommon.c -+++ xorg-server-1.7.4/hw/dmx/input/dmxcommon.c +--- xorg-server-1.7.99/hw/dmx/input/dmxcommon.c ++++ xorg-server-1.7.99/hw/dmx/input/dmxcommon.c @@ -648,7 +648,6 @@ dmxLogInput(dmxInput, "Keyboard busy, waiting\n"); else @@ -245,8 +245,8 @@ Index: xorg-server-1.6.3.901/Makefile.am /* Don't generate X11 protocol for a bit */ for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) { usleep(250); /* This ends up sleeping only until ---- xorg-server-1.7.4/hw/dmx/input/dmxinputinit.c -+++ xorg-server-1.7.4/hw/dmx/input/dmxinputinit.c +--- xorg-server-1.7.99/hw/dmx/input/dmxinputinit.c ++++ xorg-server-1.7.99/hw/dmx/input/dmxinputinit.c @@ -372,6 +372,11 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) { @@ -280,8 +280,8 @@ Index: xorg-server-1.6.3.901/Makefile.am } if (info.focusClass) InitFocusClassDeviceStruct(pDevice); if (info.proximityClass) InitProximityClassDeviceStruct(pDevice); ---- xorg-server-1.7.4/hw/dmx/input/dmxinputinit.h -+++ xorg-server-1.7.4/hw/dmx/input/dmxinputinit.h +--- xorg-server-1.7.99/hw/dmx/input/dmxinputinit.h ++++ xorg-server-1.7.99/hw/dmx/input/dmxinputinit.h @@ -288,4 +288,9 @@ extern int dmxInputAttachBackend(int physicalScreen, int isCore, int *id); @@ -292,8 +292,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +#endif + #endif ---- xorg-server-1.7.4/hw/dmx/vnc/.gitignore -+++ xorg-server-1.7.4/hw/dmx/vnc/.gitignore +--- xorg-server-1.7.99/hw/dmx/vnc/.gitignore ++++ xorg-server-1.7.99/hw/dmx/vnc/.gitignore @@ -0,0 +1,36 @@ +auth.c +cmap.c @@ -331,8 +331,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +vncext.c +xistubs.c +zlib.c ---- xorg-server-1.7.4/hw/dmx/vnc/Makefile.am -+++ xorg-server-1.7.4/hw/dmx/vnc/Makefile.am +--- xorg-server-1.7.99/hw/dmx/vnc/Makefile.am ++++ xorg-server-1.7.99/hw/dmx/vnc/Makefile.am @@ -0,0 +1,43 @@ +noinst_LIBRARIES = libdmxvnc.a + @@ -377,8 +377,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + @DMXMODULES_CFLAGS@ + +###EXTRA_DIST = dmxdetach.c ---- xorg-server-1.7.4/hw/dmx/vnc/vncInit.c -+++ xorg-server-1.7.4/hw/dmx/vnc/vncInit.c +--- xorg-server-1.7.99/hw/dmx/vnc/vncInit.c ++++ xorg-server-1.7.99/hw/dmx/vnc/vncInit.c @@ -0,0 +1,453 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -833,8 +833,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + rfbCheckFds(pScreen); + httpCheckFds(pScreen); +} ---- xorg-server-1.7.4/hw/dmx/vnc/vncint.h -+++ xorg-server-1.7.4/hw/dmx/vnc/vncint.h +--- xorg-server-1.7.99/hw/dmx/vnc/vncint.h ++++ xorg-server-1.7.99/hw/dmx/vnc/vncint.h @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -989,8 +989,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +#endif /* _VNCINT_H_ */ + ---- xorg-server-1.7.4/hw/vnc/LICENCE.TXT -+++ xorg-server-1.7.4/hw/vnc/LICENCE.TXT +--- xorg-server-1.7.99/hw/vnc/LICENCE.TXT ++++ xorg-server-1.7.99/hw/vnc/LICENCE.TXT @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 @@ -1332,8 +1332,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. ---- xorg-server-1.7.4/hw/vnc/Makefile.am -+++ xorg-server-1.7.4/hw/vnc/Makefile.am +--- xorg-server-1.7.99/hw/vnc/Makefile.am ++++ xorg-server-1.7.99/hw/vnc/Makefile.am @@ -0,0 +1,54 @@ +# XXX This Makefile.am probably needs some work. + @@ -1389,8 +1389,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +relink: + rm -f Xvnc && $(MAKE) Xvnc ---- xorg-server-1.7.4/hw/vnc/README -+++ xorg-server-1.7.4/hw/vnc/README +--- xorg-server-1.7.99/hw/vnc/README ++++ xorg-server-1.7.99/hw/vnc/README @@ -0,0 +1,14 @@ + +This is the directory containing the code specific to the TightVNC X server (Xvnc). @@ -1406,8 +1406,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +Moved to X.org modular tree by Brian Paul. + ---- xorg-server-1.7.4/hw/vnc/auth.c -+++ xorg-server-1.7.4/hw/vnc/auth.c +--- xorg-server-1.7.99/hw/vnc/auth.c ++++ xorg-server-1.7.99/hw/vnc/auth.c @@ -0,0 +1,566 @@ +/* + * auth.c - deal with authentication. @@ -1975,8 +1975,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return pVNC->rfbAuthTooManyTries; +} + ---- xorg-server-1.7.4/hw/vnc/cmap.c -+++ xorg-server-1.7.4/hw/vnc/cmap.c +--- xorg-server-1.7.99/hw/vnc/cmap.c ++++ xorg-server-1.7.99/hw/vnc/cmap.c @@ -0,0 +1,166 @@ +/* + * cmap.c @@ -2144,8 +2144,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + pmap->pScreen->StoreColors = rfbStoreColors; +#endif +} ---- xorg-server-1.7.4/hw/vnc/corre.c -+++ xorg-server-1.7.4/hw/vnc/corre.c +--- xorg-server-1.7.99/hw/vnc/corre.c ++++ xorg-server-1.7.99/hw/vnc/corre.c @@ -0,0 +1,353 @@ +/* + * corre.c @@ -2500,8 +2500,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + + return maxclr; +} ---- 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 @@ -0,0 +1,407 @@ +/* + * cursor.c - support for cursor shape updates. @@ -2910,8 +2910,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +DEFINE_RICH_ENCODE(16) +DEFINE_RICH_ENCODE(32) + ---- 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 @@ -0,0 +1,87 @@ +/* + * cutpaste.c - routines to deal with cut & paste buffers / selection. @@ -3000,8 +3000,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + if (!inSetXCutText) + rfbSendServerCutText(str, len); +} ---- xorg-server-1.7.4/hw/vnc/d3des.c -+++ xorg-server-1.7.4/hw/vnc/d3des.c +--- xorg-server-1.7.99/hw/vnc/d3des.c ++++ xorg-server-1.7.99/hw/vnc/d3des.c @@ -0,0 +1,437 @@ +/* + * This is D3DES (V5.09) by Richard Outerbridge with the double and @@ -3440,8 +3440,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + * + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery + **********************************************************************/ ---- xorg-server-1.7.4/hw/vnc/d3des.h -+++ xorg-server-1.7.4/hw/vnc/d3des.h +--- xorg-server-1.7.99/hw/vnc/d3des.h ++++ xorg-server-1.7.99/hw/vnc/d3des.h @@ -0,0 +1,51 @@ +/* + * This is D3DES (V5.09) by Richard Outerbridge with the double and @@ -3494,8 +3494,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery + ********************************************************************/ ---- 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 @@ -0,0 +1,792 @@ +/* + * dispcur.c @@ -4289,8 +4289,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + 0, 0, w, h, x, y); + return TRUE; +} ---- xorg-server-1.7.4/hw/vnc/dpmsstubs.c -+++ xorg-server-1.7.4/hw/vnc/dpmsstubs.c +--- xorg-server-1.7.99/hw/vnc/dpmsstubs.c ++++ xorg-server-1.7.99/hw/vnc/dpmsstubs.c @@ -0,0 +1,52 @@ +/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ +/***************************************************************** @@ -4344,8 +4344,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +{ + return FALSE; +} ---- xorg-server-1.7.4/hw/vnc/draw.c -+++ xorg-server-1.7.4/hw/vnc/draw.c +--- xorg-server-1.7.99/hw/vnc/draw.c ++++ xorg-server-1.7.99/hw/vnc/draw.c @@ -0,0 +1,2021 @@ +/* + * draw.c - drawing routines for the RFB X server. This is a set of @@ -6368,8 +6368,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + VNCSCREENPTR(pScreen); + SCHEDULE_FB_UPDATE(pScreen, pVNC); +} ---- xorg-server-1.7.4/hw/vnc/hextile.c -+++ xorg-server-1.7.4/hw/vnc/hextile.c +--- xorg-server-1.7.99/hw/vnc/hextile.c ++++ xorg-server-1.7.99/hw/vnc/hextile.c @@ -0,0 +1,350 @@ +/* + * hextile.c @@ -6721,8 +6721,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +DEFINE_SEND_HEXTILES(8) +DEFINE_SEND_HEXTILES(16) +DEFINE_SEND_HEXTILES(32) ---- xorg-server-1.7.4/hw/vnc/httpd.c -+++ xorg-server-1.7.4/hw/vnc/httpd.c +--- xorg-server-1.7.99/hw/vnc/httpd.c ++++ xorg-server-1.7.99/hw/vnc/httpd.c @@ -0,0 +1,519 @@ +/* + * httpd.c - a simple HTTP server @@ -7243,8 +7243,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return TRUE; +} + ---- 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 @@ -0,0 +1,1078 @@ +/* + * init.c @@ -8324,8 +8324,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + rfbLog(""); + perror(str); +} ---- 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 @@ -0,0 +1,458 @@ +/* + * kbdptr.c - deal with keyboard and pointer device over TCP & UDP. @@ -8785,8 +8785,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + break; + } +} ---- xorg-server-1.7.4/hw/vnc/keyboard.h -+++ xorg-server-1.7.4/hw/vnc/keyboard.h +--- xorg-server-1.7.99/hw/vnc/keyboard.h ++++ xorg-server-1.7.99/hw/vnc/keyboard.h @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -8955,8 +8955,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +}; + +#define N_PREDEFINED_KEYS (sizeof(map) / (sizeof(KeySym) * GLYPHS_PER_KEY)) ---- xorg-server-1.7.4/hw/vnc/loginauth.c -+++ xorg-server-1.7.4/hw/vnc/loginauth.c +--- xorg-server-1.7.99/hw/vnc/loginauth.c ++++ xorg-server-1.7.99/hw/vnc/loginauth.c @@ -0,0 +1,143 @@ +/* + * loginauth.c - deal with login-style Unix authentication. @@ -9101,8 +9101,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + cl->state = RFB_INITIALISATION; +} + ---- 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 @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2004 Alan Hourihane. All Rights Reserved. @@ -9251,8 +9251,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + rdpNewClient(pScreen, sock); + } +} ---- xorg-server-1.7.4/hw/vnc/rfb.h -+++ xorg-server-1.7.4/hw/vnc/rfb.h +--- xorg-server-1.7.99/hw/vnc/rfb.h ++++ xorg-server-1.7.99/hw/vnc/rfb.h @@ -0,0 +1,751 @@ +/* + * rfb.h - header file for RFB DDX implementation. @@ -10005,8 +10005,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + + +#endif /* RFB_H_INCLUDED */ ---- 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 @@ -0,0 +1,405 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -10413,8 +10413,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +#endif /* XFree86LOADER */ +#endif ---- 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 @@ -0,0 +1,260 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -10676,8 +10676,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +#endif /* XFree86LOADER */ +#endif ---- xorg-server-1.7.4/hw/vnc/rfbproto.h -+++ xorg-server-1.7.4/hw/vnc/rfbproto.h +--- xorg-server-1.7.99/hw/vnc/rfbproto.h ++++ xorg-server-1.7.99/hw/vnc/rfbproto.h @@ -0,0 +1,1362 @@ +/* + * Copyright (C) 2000-2004 Constantin Kaplinsky. All Rights Reserved. @@ -12041,8 +12041,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + rfbChromiumStopMsg csd; + rfbChromiumExposeMsg cse; +} rfbClientToServerMsg; ---- 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 @@ -0,0 +1,2308 @@ +/* + * rfbserver.c - deal with server-side of the RFB protocol. @@ -14352,8 +14352,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + rfbDisconnectUDPSock(pScreen); + } +} ---- xorg-server-1.7.4/hw/vnc/rre.c -+++ xorg-server-1.7.4/hw/vnc/rre.c +--- xorg-server-1.7.99/hw/vnc/rre.c ++++ xorg-server-1.7.99/hw/vnc/rre.c @@ -0,0 +1,324 @@ +/* + * rre.c @@ -14679,8 +14679,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + + return maxclr; +} ---- xorg-server-1.7.4/hw/vnc/sockets.c -+++ xorg-server-1.7.4/hw/vnc/sockets.c +--- xorg-server-1.7.99/hw/vnc/sockets.c ++++ xorg-server-1.7.99/hw/vnc/sockets.c @@ -0,0 +1,656 @@ +/* + * sockets.c - deal with TCP & UDP sockets. @@ -15338,8 +15338,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return TRUE; +} +#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 @@ -0,0 +1,2279 @@ +/* + * sprite.c @@ -17620,8 +17620,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + *py = pScreenPriv->y; +} + ---- xorg-server-1.7.4/hw/vnc/sprite.h -+++ xorg-server-1.7.4/hw/vnc/sprite.h +--- xorg-server-1.7.99/hw/vnc/sprite.h ++++ xorg-server-1.7.99/hw/vnc/sprite.h @@ -0,0 +1,141 @@ +/* + * sprite.h @@ -17764,8 +17764,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + int * /*py*/ +#endif +); ---- xorg-server-1.7.4/hw/vnc/spritest.h -+++ xorg-server-1.7.4/hw/vnc/spritest.h +--- xorg-server-1.7.99/hw/vnc/spritest.h ++++ xorg-server-1.7.99/hw/vnc/spritest.h @@ -0,0 +1,138 @@ +/* + * spritest.h @@ -17905,8 +17905,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +#define LINE_OVERLAP(pCbox,x1,y1,x2,y2,lw2) \ + BOX_OVERLAP((pCbox), (x1)-(lw2), (y1)-(lw2), (x2)+(lw2), (y2)+(lw2)) ---- xorg-server-1.7.4/hw/vnc/stats.c -+++ xorg-server-1.7.4/hw/vnc/stats.c +--- xorg-server-1.7.99/hw/vnc/stats.c ++++ xorg-server-1.7.99/hw/vnc/stats.c @@ -0,0 +1,117 @@ +/* + * stats.c @@ -18025,8 +18025,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + cl->rfbLastRectBytesSent)); + } +} ---- xorg-server-1.7.4/hw/vnc/symlink-vnc.sh -+++ xorg-server-1.7.4/hw/vnc/symlink-vnc.sh +--- xorg-server-1.7.99/hw/vnc/symlink-vnc.sh ++++ xorg-server-1.7.99/hw/vnc/symlink-vnc.sh @@ -0,0 +1,198 @@ +#!/bin/sh + @@ -18226,8 +18226,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +} + +main $1 $2 ---- xorg-server-1.7.4/hw/vnc/tableinitcmtemplate.c -+++ xorg-server-1.7.4/hw/vnc/tableinitcmtemplate.c +--- xorg-server-1.7.99/hw/vnc/tableinitcmtemplate.c ++++ xorg-server-1.7.99/hw/vnc/tableinitcmtemplate.c @@ -0,0 +1,93 @@ +/* + * tableinitcmtemplate.c - template for initialising lookup tables for @@ -18322,8 +18322,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +#undef OUT_T +#undef SwapOUT +#undef rfbInitColourMapSingleTableOUT ---- xorg-server-1.7.4/hw/vnc/tableinittctemplate.c -+++ xorg-server-1.7.4/hw/vnc/tableinittctemplate.c +--- xorg-server-1.7.99/hw/vnc/tableinittctemplate.c ++++ xorg-server-1.7.99/hw/vnc/tableinittctemplate.c @@ -0,0 +1,146 @@ +/* + * tableinittctemplate.c - template for initialising lookup tables for @@ -18471,8 +18471,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +#undef rfbInitTrueColourSingleTableOUT +#undef rfbInitTrueColourRGBTablesOUT +#undef rfbInitOneRGBTableOUT ---- xorg-server-1.7.4/hw/vnc/tabletranstemplate.c -+++ xorg-server-1.7.4/hw/vnc/tabletranstemplate.c +--- xorg-server-1.7.99/hw/vnc/tabletranstemplate.c ++++ xorg-server-1.7.99/hw/vnc/tabletranstemplate.c @@ -0,0 +1,135 @@ +/* + * tabletranstemplate.c - template for translation using lookup tables. @@ -18609,8 +18609,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +#undef OUT_T +#undef rfbTranslateWithSingleTableINtoOUT +#undef rfbTranslateWithRGBTablesINtoOUT ---- xorg-server-1.7.4/hw/vnc/tight.c -+++ xorg-server-1.7.4/hw/vnc/tight.c +--- xorg-server-1.7.99/hw/vnc/tight.c ++++ xorg-server-1.7.99/hw/vnc/tight.c @@ -0,0 +1,1827 @@ +/* + * tight.c @@ -20439,8 +20439,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + cinfo->dest = &jpegDstManager; +} + ---- xorg-server-1.7.4/hw/vnc/translate.c -+++ xorg-server-1.7.4/hw/vnc/translate.c +--- xorg-server-1.7.99/hw/vnc/translate.c ++++ xorg-server-1.7.99/hw/vnc/translate.c @@ -0,0 +1,502 @@ +/* + * translate.c - translate between different pixel formats @@ -20944,8 +20944,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + } + } +} ---- xorg-server-1.7.4/hw/vnc/vncauth.c -+++ xorg-server-1.7.4/hw/vnc/vncauth.c +--- xorg-server-1.7.99/hw/vnc/vncauth.c ++++ xorg-server-1.7.99/hw/vnc/vncauth.c @@ -0,0 +1,252 @@ +/* + * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. @@ -21199,8 +21199,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + des(bytes+i, bytes+i); + } +} ---- xorg-server-1.7.4/hw/vnc/vncauth.h -+++ xorg-server-1.7.4/hw/vnc/vncauth.h +--- xorg-server-1.7.99/hw/vnc/vncauth.h ++++ xorg-server-1.7.99/hw/vnc/vncauth.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. @@ -21235,8 +21235,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname); +extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly); + ---- 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 @@ -0,0 +1,800 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -22038,8 +22038,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + (EventSwapPtr)SwapVncChromiumConnectedEvent; +#endif +} /* VncExtensionInit */ ---- xorg-server-1.7.4/hw/vnc/xistubs.c -+++ xorg-server-1.7.4/hw/vnc/xistubs.c +--- xorg-server-1.7.99/hw/vnc/xistubs.c ++++ xorg-server-1.7.99/hw/vnc/xistubs.c @@ -0,0 +1,323 @@ +/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ + @@ -22364,8 +22364,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return (BadMatch); + } + } ---- xorg-server-1.7.4/hw/vnc/zlib.c -+++ xorg-server-1.7.4/hw/vnc/zlib.c +--- xorg-server-1.7.99/hw/vnc/zlib.c ++++ xorg-server-1.7.99/hw/vnc/zlib.c @@ -0,0 +1,310 @@ +/* + * zlib.c @@ -22677,8 +22677,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +} + + ---- xorg-server-1.7.4/hw/xfree86/Makefile.am -+++ xorg-server-1.7.4/hw/xfree86/Makefile.am +--- xorg-server-1.7.99/hw/xfree86/Makefile.am ++++ xorg-server-1.7.99/hw/xfree86/Makefile.am @@ -4,6 +4,10 @@ DRI_SUBDIR = dri endif @@ -22706,8 +22706,8 @@ Index: xorg-server-1.6.3.901/Makefile.am bin_PROGRAMS = Xorg Xorg_SOURCES = xorg.c ---- xorg-server-1.7.4/hw/xfree86/dixmods/Makefile.am -+++ xorg-server-1.7.4/hw/xfree86/dixmods/Makefile.am +--- xorg-server-1.7.99/hw/xfree86/dixmods/Makefile.am ++++ xorg-server-1.7.99/hw/xfree86/dixmods/Makefile.am @@ -10,6 +10,10 @@ DBEMOD = libdbe.la endif @@ -22744,8 +22744,8 @@ Index: xorg-server-1.6.3.901/Makefile.am libfb_la_LDFLAGS = -avoid-version libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c ---- xorg-server-1.7.4/hw/xfree86/vnc/.gitignore -+++ xorg-server-1.7.4/hw/xfree86/vnc/.gitignore +--- xorg-server-1.7.99/hw/xfree86/vnc/.gitignore ++++ xorg-server-1.7.99/hw/xfree86/vnc/.gitignore @@ -0,0 +1,36 @@ +auth.c +cmap.c @@ -22783,8 +22783,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +vncext.c +xistubs.c +zlib.c ---- xorg-server-1.7.4/hw/xfree86/vnc/Makefile.am -+++ xorg-server-1.7.4/hw/xfree86/vnc/Makefile.am +--- xorg-server-1.7.99/hw/xfree86/vnc/Makefile.am ++++ xorg-server-1.7.99/hw/xfree86/vnc/Makefile.am @@ -0,0 +1,51 @@ +AM_CFLAGS = $(DIX_CFLAGS) + @@ -22837,12 +22837,12 @@ Index: xorg-server-1.6.3.901/Makefile.am + zlib.c + +#sdk_HEADERS = vncint.h ---- xorg-server-1.7.4/hw/xfree86/vnc/README -+++ xorg-server-1.7.4/hw/xfree86/vnc/README +--- xorg-server-1.7.99/hw/xfree86/vnc/README ++++ xorg-server-1.7.99/hw/xfree86/vnc/README @@ -0,0 +1 @@ +This directory contains the sources for building the vnc.so server extension module. ---- 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 @@ -0,0 +1,618 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -23462,8 +23462,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + return (pointer)TRUE; +} +#endif ---- xorg-server-1.7.4/hw/xfree86/vnc/vncint.h -+++ xorg-server-1.7.4/hw/xfree86/vnc/vncint.h +--- xorg-server-1.7.99/hw/xfree86/vnc/vncint.h ++++ xorg-server-1.7.99/hw/xfree86/vnc/vncint.h @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2002 Alan Hourihane. All Rights Reserved. @@ -23616,8 +23616,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + +#endif /* _VNC_H_ */ + ---- xorg-server-1.7.4/mi/miinitext.c -+++ xorg-server-1.7.4/mi/miinitext.c +--- xorg-server-1.7.99/mi/miinitext.c ++++ xorg-server-1.7.99/mi/miinitext.c @@ -90,6 +90,18 @@ #undef XF86VIDMODE #endif @@ -23637,8 +23637,8 @@ Index: xorg-server-1.6.3.901/Makefile.am #include "misc.h" #include "extension.h" #include "micmap.h" ---- xorg-server-1.7.4/xcliplist/Makefile.am -+++ xorg-server-1.7.4/xcliplist/Makefile.am +--- xorg-server-1.7.99/xcliplist/Makefile.am ++++ xorg-server-1.7.99/xcliplist/Makefile.am @@ -0,0 +1,18 @@ +#noinst_LTLIBRARIES = libxcliplist.la +libxcliplist_la_LTLIBRARIES = libxcliplist.la @@ -23658,8 +23658,8 @@ Index: xorg-server-1.6.3.901/Makefile.am +if XORG +sdk_HEADERS = +endif ---- xorg-server-1.7.4/xcliplist/cliplist.c -+++ xorg-server-1.7.4/xcliplist/cliplist.c +--- xorg-server-1.7.99/xcliplist/cliplist.c ++++ xorg-server-1.7.99/xcliplist/cliplist.c @@ -0,0 +1,128 @@ +/* + * Server-side code for the Xcliplist extension @@ -23789,8 +23789,8 @@ Index: xorg-server-1.6.3.901/Makefile.am + XClipListErrorBase = extEntry->errorBase; + } +} ---- xorg-server-1.7.4/xcliplist/cliplistmod.c -+++ xorg-server-1.7.4/xcliplist/cliplistmod.c +--- xorg-server-1.7.99/xcliplist/cliplistmod.c ++++ xorg-server-1.7.99/xcliplist/cliplistmod.c @@ -0,0 +1,46 @@ + +#include "../hw/xfree86/common/xf86Module.h" diff --git a/xorg-x11-server-1.2.99-unbreak-domain.patch b/xorg-x11-server-1.2.99-unbreak-domain.patch deleted file mode 100644 index 8e06811..0000000 --- a/xorg-x11-server-1.2.99-unbreak-domain.patch +++ /dev/null @@ -1,19 +0,0 @@ ->From freedesktop bug #7248, to "fix" domain support so X works on Pegasos and others. - ---- xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c~ 2006-11-16 18:01:25.000000000 +0000 -+++ xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c 2007-03-07 15:44:10.000000000 +0000 -@@ -158,7 +158,13 @@ linuxPciOpenFile(PCITAG tag, Bool write) - if (stat("/sys/bus/pci",&ignored) < 0) - is26 = 0; - else -- is26 = 1; -+ /* If we don't find the incompatible IA64 "domain support" in -+ /proc/bus/pci then we don't know domain numbers. This means -+ we ought to use /proc/bus/pci for accessing devices, instead -+ of /sys/bus/pci. So in that case we just pretend it's a 2.4 -+ kernel, and hope the kernel has set up disjoint bus numbers -+ for us, like it always used to. */ -+ is26 = domain_support; - } - - if (!domain_support && domain > 0) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index bf76016..5237202 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Wed Mar 17 06:20:25 CET 2010 - sndirsch@suse.de + +- update to 1.7.6 + * reintrocued record extension + * bugfixes + ------------------------------------------------------------------- Sat Feb 20 08:35:14 CET 2010 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 2043974..0831e53 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.4) +# spec file for package xorg-x11-server (Version 7.5_1.7.99) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,20 +20,20 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.7.5 +%define dirsuffix 1.7.99 %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-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 xorg-x11-fonts-devel +### udev support +BuildRequires: libudev-devel %if %vnc BuildRequires: libjpeg-devel %endif Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 -Version: 7.4 -Release: 67 +Version: 7.5_%{dirsuffix} +Release: 1 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -43,8 +43,8 @@ PreReq: %fillup_prereq 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 +69,9 @@ Patch8: p_bug96328.diff 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 @@ -86,20 +84,18 @@ Patch44: xorg-server-xf4vnc-cutpaste.diff 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 +104,12 @@ Patch129: bug474071-fix1.diff Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff Patch143: autoconfig_fallback_fbdev_first.diff Patch145: driver-autoconfig.diff -Patch148: commit-c941479.diff # 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 +187,9 @@ An X Window System server for Virtual Network Computing (VNC). %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 +200,21 @@ popd %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 +225,6 @@ popd %patch132 -p1 %patch143 -p0 %patch145 -p0 -### Bug #528397 -#%patch148 -p1 -R %patch162 -p1 %if %moblin %patch163 -p1 @@ -321,6 +302,7 @@ autoreconf -fi --disable-xprint \ --enable-record \ --enable-xcsecurity \ + --enable-config-udev \ --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \ diff --git a/zap_warning_xserver.diff b/zap_warning_xserver.diff index 38ba2b0..5f1f05a 100644 --- a/zap_warning_xserver.diff +++ b/zap_warning_xserver.diff @@ -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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c { 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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c .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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 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 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c __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