Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Fri Aug 28 20:30:17 CEST 2009.
--------
--- xorg-x11-server/xorg-x11-server.changes 2009-08-14 02:35:03.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2009-08-27 19:57:34.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 27 18:26:05 CEST 2009 - eich@suse.de
+
+- Update to 1.6.4 RC1, adapted patches.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
xorg-server-1.6.3.tar.bz2
New:
----
xorg-server-1.6.3.901.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.6.3
+%define dirsuffix 1.6.3.901
%define fglrx_driver_hack 0
### FIXME
%define vnc 1
@@ -33,7 +33,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
-Release: 50
+Release: 51
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -117,7 +117,6 @@
Patch145: driver-autoconfig.diff
Patch147: truetype_fontpath.diff
Patch148: commit-c941479.diff
-Patch149: 0001-config-don-t-shutdown-the-libhal-ctx-if-it-failed-to.patch
# Moblin
Patch161: libdri_noPanoramiXExtension_symbol.patch
Patch162: cache-xkbcomp-output-for-fast-start-up.patch
@@ -260,7 +259,6 @@
%patch147 -p0
### Bug #528397
#%patch148 -p1 -R
-%patch149 -p1
%patch161 -p1
%patch162 -p1
%if %moblin
++++++ 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -12,10 +12,10 @@
hw/xfree86/common/xf86pciBus.c | 19 +++++++++++++++++++
3 files changed, 22 insertions(+), 1 deletions(-)
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86.h
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
@@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void);
Bool xf86CheckPciSlot( const struct pci_device * );
int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,
@@ -24,11 +24,11 @@
Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
int *func);
Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Init.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
-@@ -525,7 +525,8 @@ probe_devices_from_device_sections(Drive
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Init.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
+@@ -514,7 +514,8 @@ probe_devices_from_device_sections(Drive
if ((*drvp->PciProbe)(drvp, entry, pPci,
devices[j].match_data)) {
foundScreen = TRUE;
@@ -38,10 +38,10 @@
}
break;
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86pciBus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86pciBus.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
@@ -753,6 +753,25 @@ xf86ClaimPciSlot(struct pci_device * d,
}
++++++ 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -10,10 +10,10 @@
hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Xinput.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Xinput.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Xinput.c
-+++ xorg-server-1.6.3/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
else
xf86DeleteInput(pInfo, 0);
++++++ acpi_events.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
+Index: xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/os-support/linux/lnx_apm.c
-+++ xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/os-support/linux/lnx_apm.c
++++ xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
@@ -189,7 +189,7 @@ lnxAPMOpen(void)
close(pfd);
xf86PMGetEventFromOs = lnxPMGetEventFromOs;
++++++ bitmap_always_unscaled.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -23,10 +23,10 @@
hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +---
3 files changed, 5 insertions(+), 7 deletions(-)
-Index: xorg-server-1.6.3/configure.ac
+Index: xorg-server-1.6.3.901/configure.ac
===================================================================
---- xorg-server-1.6.3.orig/configure.ac
-+++ xorg-server-1.6.3/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" ],
@@ -36,10 +36,10 @@
case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
esac
-Index: xorg-server-1.6.3/hw/xfree86/Makefile.am
+Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/Makefile.am
-+++ xorg-server-1.6.3/hw/xfree86/Makefile.am
+--- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
++++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
@@ -100,11 +100,11 @@ dist_options_DATA = Options
CPP_FILES_FLAGS = \
++++++ bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
+Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86RandR12.c
++++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
@@ -55,6 +55,13 @@ typedef struct _xf86RandR12Info {
int pointerY;
Rotation rotation; /* current mode */
++++++ cache-xkbcomp-output-for-fast-start-up.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -14,10 +14,10 @@
xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 164 insertions(+), 42 deletions(-)
-Index: xorg-server-1.6.3/configure.ac
+Index: xorg-server-1.6.3.901/configure.ac
===================================================================
---- xorg-server-1.6.3.orig/configure.ac
-+++ xorg-server-1.6.3/configure.ac
+--- xorg-server-1.6.3.901.orig/configure.ac
++++ xorg-server-1.6.3.901/configure.ac
@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_S
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
@@ -39,10 +39,10 @@
fi
# XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.6.3/xkb/README.compiled
+Index: xorg-server-1.6.3.901/xkb/README.compiled
===================================================================
---- xorg-server-1.6.3.orig/xkb/README.compiled
-+++ xorg-server-1.6.3/xkb/README.compiled
+--- xorg-server-1.6.3.901.orig/xkb/README.compiled
++++ xorg-server-1.6.3.901/xkb/README.compiled
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymap
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
@@ -58,10 +58,10 @@
Unless the X server is modified, sharing this directory between servers on
different hosts could cause problems.
-Index: xorg-server-1.6.3/xkb/ddxLoad.c
+Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
===================================================================
---- xorg-server-1.6.3.orig/xkb/ddxLoad.c
-+++ xorg-server-1.6.3/xkb/ddxLoad.c
+--- xorg-server-1.6.3.901.orig/xkb/ddxLoad.c
++++ xorg-server-1.6.3.901/xkb/ddxLoad.c
@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include
#endif
++++++ dpms_screensaver.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86DPMS.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86DPMS.c
-+++ xorg-server-1.6.3/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)
rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
if (rc != Success)
++++++ edit_data_sanity_check.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
+Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86Crtc.c
-+++ xorg-server-1.6.3/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 &&
++++++ events.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
@@ -518,22 +518,26 @@ xf86VTSwitch()
* Keep the order: Disable Device > LeaveVT
* EnterVT > EnableDevice
++++++ exa-greedy.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/exa/exa_migration.c
+Index: xorg-server-1.6.3.901/exa/exa_migration.c
===================================================================
---- xorg-server-1.6.3.orig/exa/exa_migration.c
-+++ xorg-server-1.6.3/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);
}
++++++ fbdev_fallback_fail_fix.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Bus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Bus.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
@@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex)
EntityInfoPtr pEnt;
int i;
@@ -32,10 +32,10 @@
/*
* xf86PostProbe() -- Allocate all non conflicting resources
* This function gets called by xf86Init().
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Priv.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Priv.h
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
@@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPro
/* xf86Bus.c */
@@ -44,10 +44,10 @@
void xf86BusProbe(void);
void xf86ChangeBusIndex(int oldIndex, int newIndex);
void xf86AccessInit(void);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86fbBus.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86fbBus.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
@@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chip
{
EntityPtr p;
++++++ fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:04.000000000 +0200
@@ -24,10 +24,10 @@
idle counter to trigger.
This fixes a problem introduced with commit 1f4fb022 where an idle counter
expires unnoticed.
-Index: xorg-server-1.6.3/Xext/sync.c
+Index: xorg-server-1.6.3.901/Xext/sync.c
===================================================================
---- xorg-server-1.6.3.orig/Xext/sync.c
-+++ xorg-server-1.6.3/Xext/sync.c
+--- xorg-server-1.6.3.901.orig/Xext/sync.c
++++ xorg-server-1.6.3.901/Xext/sync.c
@@ -222,8 +222,7 @@ SyncCreateCounter(
);
@@ -93,7 +93,7 @@
{
SyncTriggerList *pCur;
SyncTrigger *pTrigger;
-@@ -1136,60 +1135,51 @@ SyncComputeBracketValues(pCounter, start
+@@ -1136,58 +1135,53 @@ SyncComputeBracketValues(pCounter, start
if (ct == XSyncCounterNeverChanges)
return;
@@ -132,11 +132,12 @@
- pnewltval = &psci->bracket_less;
- }
- }
-- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+- else if (pTrigger->test_type == XSyncNegativeTransition &&
- ct != XSyncCounterNeverIncreases)
-- ||
-- (pTrigger->test_type == XSyncNegativeTransition &&
-- ct != XSyncCounterNeverDecreases)
+- {
+- if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+- XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+- {
+
+ if ( ( (pTrigger->test_type == XSyncPositiveComparison)
+ && ( XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)
@@ -150,28 +151,13 @@
+ || ( ct != XSyncCounterNeverIncreases
+ && XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+ )
- )
-- {
-- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
-- {
-- if (XSyncValueLessThan(pTrigger->test_value,
-- psci->bracket_greater))
-- {
-- psci->bracket_greater = pTrigger->test_value;
-- pnewgtval = &psci->bracket_greater;
-- }
-- else
-- if (XSyncValueGreaterThan(pTrigger->test_value,
-- psci->bracket_less))
-- {
-- psci->bracket_less = pTrigger->test_value;
-- pnewltval = &psci->bracket_less;
++ )
+ ) {
+ if (XSyncValueLessThan(pTrigger->test_value,
+ psci->bracket_greater)) {
+ psci->bracket_greater = pTrigger->test_value;
+ pnewgtval = &psci->bracket_greater;
- }
++ }
+ } else if ( ( (pTrigger->test_type == XSyncNegativeComparison)
+ && ( XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value)
+ || (ct != XSyncCounterNeverDecreases
@@ -188,12 +174,24 @@
+ ) {
+ if (XSyncValueGreaterThan(pTrigger->test_value,
+ psci->bracket_less)) {
-+ psci->bracket_less = pTrigger->test_value;
-+ pnewltval = &psci->bracket_less;
+ psci->bracket_less = pTrigger->test_value;
+ pnewltval = &psci->bracket_less;
}
}
+- else if (pTrigger->test_type == XSyncPositiveTransition &&
+- ct != XSyncCounterNeverDecreases)
+- {
+- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+- XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
+- {
+- psci->bracket_greater = pTrigger->test_value;
+- pnewgtval = &psci->bracket_greater;
+- }
+- }
} /* end for each trigger */
-@@ -2545,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA
+
+ if (pnewgtval || pnewltval)
+@@ -2541,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA
}
static void
@@ -216,7 +214,7 @@
if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
return;
-@@ -2567,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct
+@@ -2563,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct
* 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.
++++++ keyrelease-1.5.2.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/xkb/xkbPrKeyEv.c
+Index: xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
===================================================================
---- xorg-server-1.6.3.orig/xkb/xkbPrKeyEv.c
-+++ xorg-server-1.6.3/xkb/xkbPrKeyEv.c
+--- xorg-server-1.6.3.901.orig/xkb/xkbPrKeyEv.c
++++ xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
@@ -95,17 +95,6 @@ int xiEvent;
else if ((xE->u.u.type==KeyRelease ||
xE->u.u.type == DeviceKeyRelease) &&
++++++ libdri_noPanoramiXExtension_symbol.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/dri/dri.c
+Index: xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.6.3/hw/xfree86/dri/dri.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/dri/dri.c
++++ xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
@@ -75,7 +75,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
++++++ loadmod-bug197195.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
+Index: xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/loader/loadmod.c
-+++ xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/loader/loadmod.c
++++ xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
@@ -401,8 +401,8 @@ FindModuleInSubdir(const char *dirpath,
while ((direntry = readdir(dir))) {
if (direntry->d_name[0] == '.')
++++++ moblin-xorg-x11-nonroot-vesa.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.6.3/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[]
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
++++++ p_xnest-ignore-getimage-errors.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: build-3Jvc9fE/xorg-server-1.6.3/hw/xnest/GCOps.c
+Index: build-GucBkyZ/xorg-server-1.6.3.901/hw/xnest/GCOps.c
===================================================================
---- build-3Jvc9fE/xorg-server-1.6.3.orig/hw/xnest/GCOps.c
-+++ build-3Jvc9fE/xorg-server-1.6.3/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
}
}
++++++ randr1_1-sig11.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86RandR.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86RandR.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86RandR.c
-+++ xorg-server-1.6.3/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,
Bool useVirtual = FALSE;
Rotation oldRotation = randrp->rotation;
++++++ xorg-detect-psb.patch ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:05.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.6.3/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
@@ -175,6 +175,9 @@ videoPtrToDriverList(struct pci_device *
case 0x8086:
if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
++++++ xorg-server-1.6.3.tar.bz2 -> xorg-server-1.6.3.901.tar.bz2 ++++++
++++ 55666 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/ChangeLog new/xorg-server-1.6.3.901/ChangeLog
--- old/xorg-server-1.6.3/ChangeLog 2009-08-01 08:34:30.000000000 +0200
+++ new/xorg-server-1.6.3.901/ChangeLog 2009-08-26 07:38:10.000000000 +0200
@@ -1,3 +1,185 @@
+commit 3044711412d0a08ba65a491bd2441c0c8980f5e2
+Author: Keith Packard
+Date: Tue Aug 25 22:37:16 2009 -0700
+
+ Bump version to 1.6.3.901 (1.6.4 RC1)
+
+ Signed-off-by: Keith Packard
+
+commit d8e48deb212767c4dfce982e6cb9d1b1fce63b96
+Author: Keith Packard
+Date: Tue Aug 25 22:29:25 2009 -0700
+
+ Block signals while delivering XTest events (fixes bug 23100)
+
+ XTest uses the same event list as all input devices, and input devices
+ use it at SIGIO time. This causes mass confusion when a SIGIO event
+ occurs in the middle of XTest event processing.
+
+ The master branch has a much different fix, using a separate input
+ queue which reduces latency that may be caused by XTest event queuing;
+ it's a 'nicer' fix in some ways, but this simple fix should solve the
+ problem.
+
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Keith Packard
+
+commit 76a1839b0a7dcb82e46c43533d252288677c6dbb
+Author: Keith Packard
+Date: Tue Aug 25 18:07:00 2009 -0700
+
+ Ensure that rotation updates happen frequently
+
+ The smart scheduler is designed to minimize scheduler overhead by
+ increasing the interval between WaitForSomething calls when a single
+ client is running. However, the software rotation code depends on
+ its BlockHandler being invoked for screen updates; the long delays
+ caused by the smart scheduler optimizations means that screen updates
+ can be delayed a long time as well.
+
+ The change is simple -- prevent the smart scheduler from increasing
+ the scheduling interval while any screen is using software rotation.
+ (cherry picked from commit e7dd1efef408effe52d0bd3d3aa0b5d4ee10ed90)
+
+ Signed-off-by: Keith Packard
+
+commit 31dc4fe0be57da4e9458ee490811fbd92598b7a7
+Author: Keith Packard
+Date: Tue Aug 25 16:58:07 2009 -0700
+
+ Perform rotation redisplay before calling driver block handler (which may flush rendering)
+
+ The rotation block handler uses regular driver rendering functions to
+ repaint the screen, if those functions queue commands in the driver,
+ it's important that the driver block handler be invoked after the
+ rotated image is drawn.
+
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 1740cda7a37abc7d0a169ab4555b446adaa62211)
+
+commit cebc0a7aa7a368b2ade3a808195d2e738fda83e9
+Author: Keith Packard
+Date: Tue Aug 25 16:54:16 2009 -0700
+
+ xf86_reload_cursors: fix cursor position to eliminate jumping after mode set
+
+ xf86_reload_cursors restores the cursor to the correct position, but
+ that must adjust for cursor hot spot and frame before calling down to
+ the hardware function, otherwise the cursor jumps to the wrong
+ position until it is repositioned by the user.
+
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 4aab05e3b3231f1ec9795a66a075d17a722634a7)
+
+commit 5848fca11f3c5b65bb6634816c0df6aeb6eda87d
+Author: Michel Dänzer
+Date: Tue Jun 23 16:45:40 2009 +0200
+
+ glx: Clean up more thoroughly if the drawable of a current context goes away.
+
+ Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
+ (cherry picked from commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3)
+
+commit fad2de1cca057586a88fb20ebf9a9964f8e3e298
+Author: Michel Dänzer
+Date: Thu May 14 11:46:41 2009 +0200
+
+ glx: If a destroyed window is bound to the current context, make it not current.
+
+ Avoids subsequent crashes due to stale pointers to the DrawableRec, see
+ https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments.
+
+ Signed-off-by: Michel Dänzer
+ (cherry picked from commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5)
+
+commit a32d717ac64b21e15a5736ae4981cdd32f2da56b
+Author: Richard Hughes
+Date: Mon Aug 17 09:15:32 2009 +0100
+
+ Do not reset lastDeviceEventTime when we do dixSaveScreens
+
+ When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
+ event time else session clients using IDLETIME will be reset.
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066)
+
+commit 32115e690f43fde619234722aa674ff1ae1b44ae
+Author: Peter Hutterer
+Date: Fri Aug 14 11:48:54 2009 +1000
+
+ dix: update the sprite trace for all masters && floating slaves (#23257)
+
+ When the windows are restructured, CheckMotion needs to be called for all
+ masters and floating slaves to update the spriteTrace.
+
+ X.Org Bug 23257 http://bugs.freedesktop.org/show_bug.cgi?id=23257
+ (cherry picked from commit 6c292d17053eb2a7e7054e51210f423dbc0cb7e8)
+
+ Tested-by: Thomas Jaeger
+ Signed-off-by: Peter Hutterer
+ Signed-off-by: Keith Packard
+
+commit af7e62a913c3c5b9639b4557b31537853f3f58bb
+Author: Dan Nicholson
+Date: Sun Aug 16 18:07:49 2009 -0700
+
+ xfree86: Link libselinux with Xorg system libraries
+
+ Put the reference to -lselinux in XORG_SYS_LIBS so it isn't added as a
+ make dependency for libxorg.la. Otherwise, make goes looking for a file
+ -lselinux in the current directory, which it obviously won't find.
+
+ Signed-off-by: Dan Nicholson
+ Tested-by: Justin P. Mattock
+ (cherry picked from commit c73cd3b265c301b8a54ffe484d6c696f2abefb46)
+
+commit 397f7c42cd775f1dbfced58bc1dfaead48e86440
+Author: Peter Hutterer
+Date: Fri Aug 14 09:48:45 2009 +1000
+
+ config: don't shutdown the libhal ctx if it failed to initialize (#23213)
+
+ Regression introduced by b1c3dc6ae226db178420e3b5f297b94afc87c94c.
+ Shutting down the libhal_ctx if the init failed may cause an abort.
+ This can happen if hald is not yet running at server startup.
+
+ X.Org Bug 23213 http://bugs.freedesktop.org/show_bug.cgi?id=23213
+
+ Tested-by: Stefan Dirsch
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 49046088f10cceaea7da97401d742d3fb59371f5)
+
+commit 55c26d8e4d110b689aea9d806e9d4fa7bbbdd32a
+Author: Peter Hutterer
+Date: Thu Aug 13 16:37:00 2009 +1000
+
+ Xext: fix up wrong conditions for negative sync transitions.
+
+ If the counter had a value higher than the trigger value for a negative
+ transition, the trigger value did not get set.
+
+ The correct sequence of checks is:
+ if (positive transition)
+ if (counter value < trigger value)
+ set up trigger
+ if (negative transition)
+ if (counter value > trigger value)
+ set up trigger
+
+ Red Hat Bug 501601 https://bugzilla.redhat.com/show_bug.cgi?id=501601
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit db568f9eabf3450d8a023597ff007df355b13ea8)
+
+commit f274e595ed56722450f6ecebad70500c92e50c58
+Author: Keith Packard
+Date: Fri Jul 31 23:37:53 2009 -0700
+
+ Bump release number to 1.6.3
+
+ Signed-off-by: Keith Packard
+
commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff
Author: Alan Coopersmith
Date: Tue Jul 28 15:02:37 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/Xext/sync.c new/xorg-server-1.6.3.901/Xext/sync.c
--- old/xorg-server-1.6.3/Xext/sync.c 2009-07-26 22:56:57.000000000 +0200
+++ new/xorg-server-1.6.3.901/Xext/sync.c 2009-08-26 04:45:35.000000000 +0200
@@ -1168,28 +1168,24 @@
pnewltval = &psci->bracket_less;
}
}
- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+ else if (pTrigger->test_type == XSyncNegativeTransition &&
ct != XSyncCounterNeverIncreases)
- ||
- (pTrigger->test_type == XSyncNegativeTransition &&
+ {
+ if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+ {
+ psci->bracket_less = pTrigger->test_value;
+ pnewltval = &psci->bracket_less;
+ }
+ }
+ else if (pTrigger->test_type == XSyncPositiveTransition &&
ct != XSyncCounterNeverDecreases)
- )
{
- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+ if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
{
- if (XSyncValueLessThan(pTrigger->test_value,
- psci->bracket_greater))
- {
- psci->bracket_greater = pTrigger->test_value;
- pnewgtval = &psci->bracket_greater;
- }
- else
- if (XSyncValueGreaterThan(pTrigger->test_value,
- psci->bracket_less))
- {
- psci->bracket_less = pTrigger->test_value;
- pnewltval = &psci->bracket_less;
- }
+ psci->bracket_greater = pTrigger->test_value;
+ pnewgtval = &psci->bracket_greater;
}
}
} /* end for each trigger */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/Xext/xtest.c new/xorg-server-1.6.3.901/Xext/xtest.c
--- old/xorg-server-1.6.3/Xext/xtest.c 2009-07-26 22:56:57.000000000 +0200
+++ new/xorg-server-1.6.3.901/Xext/xtest.c 2009-08-26 05:49:09.000000000 +0200
@@ -384,6 +384,7 @@
if (screenIsSaved == SCREEN_SAVER_ON)
dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+ OsBlockSignals();
GetEventList(&events);
switch(type) {
case MotionNotify:
@@ -402,7 +403,6 @@
break;
}
- OsBlockSignals();
for (i = 0; i < nevents; i++)
mieqEnqueue(dev, (events+i)->event);
OsReleaseSignals();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/config/hal.c new/xorg-server-1.6.3.901/config/hal.c
--- old/xorg-server-1.6.3/config/hal.c 2009-07-30 00:49:36.000000000 +0200
+++ new/xorg-server-1.6.3.901/config/hal.c 2009-08-26 04:46:15.000000000 +0200
@@ -489,13 +489,13 @@
if (!libhal_ctx_set_dbus_connection(info->hal_ctx, info->system_bus)) {
LogMessage(X_ERROR, "config/hal: couldn't associate HAL context with bus\n");
- goto out_ctx;
+ goto out_err;
}
if (!libhal_ctx_init(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
error.name ? error.name : "unknown error",
error.message ? error.message : "null");
- goto out_ctx;
+ goto out_err;
}
if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
@@ -526,19 +526,20 @@
out_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);
+ 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);
}
out_err:
dbus_error_free(&error);
+ if (info->hal_ctx) {
+ libhal_ctx_free(info->hal_ctx);
+ }
+
info->hal_ctx = NULL;
info->system_bus = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/configure.ac new/xorg-server-1.6.3.901/configure.ac
--- old/xorg-server-1.6.3/configure.ac 2009-08-01 08:33:54.000000000 +0200
+++ new/xorg-server-1.6.3.901/configure.ac 2009-08-26 07:36:40.000000000 +0200
@@ -26,12 +26,12 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
-RELEASE_DATE="2009-7-31"
+RELEASE_DATE="2009-8-25"
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
@@ -1239,7 +1239,7 @@
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
- XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $SELINUX_LIB"
+ XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
SAVE_LIBS=$LIBS
@@ -1250,7 +1250,7 @@
AC_CHECK_FUNCS([pci_device_enable])
LIBS=$SAVE_LIBS
CFLAGS=$SAVE_CFLAGS
- XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
+ XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
case $host_os in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/dix/dispatch.c new/xorg-server-1.6.3.901/dix/dispatch.c
--- old/xorg-server-1.6.3/dix/dispatch.c 2009-07-26 22:56:57.000000000 +0200
+++ new/xorg-server-1.6.3.901/dix/dispatch.c 2009-08-26 05:12:17.000000000 +0200
@@ -247,6 +247,7 @@
long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
long SmartScheduleTime;
+int SmartScheduleLatencyLimited = 0;
static ClientPtr SmartLastClient;
static int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
@@ -317,7 +318,7 @@
/*
* Adjust slice
*/
- if (nready == 1)
+ if (nready == 1 && SmartScheduleLatencyLimited == 0)
{
/*
* If it's been a long time since another client
@@ -337,6 +338,23 @@
return best;
}
+void
+EnableLimitedSchedulingLatency(void)
+{
+ ++SmartScheduleLatencyLimited;
+ SmartScheduleSlice = SmartScheduleInterval;
+}
+
+void
+DisableLimitedSchedulingLatency(void)
+{
+ --SmartScheduleLatencyLimited;
+
+ /* protect against bugs */
+ if (SmartScheduleLatencyLimited < 0)
+ SmartScheduleLatencyLimited = 0;
+}
+
#define MAJOROP ((xReq *)client->requestBuffer)->reqType
void
@@ -356,6 +374,7 @@
if (!clientReady)
return;
+ SmartScheduleSlice = SmartScheduleInterval;
while (!dispatchException)
{
if (*icheck[0] != *icheck[1])
@@ -466,6 +485,7 @@
KillAllClients();
xfree(clientReady);
dispatchException &= ~DE_RESET;
+ SmartScheduleLatencyLimited = 0;
}
#undef MAJOROP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/dix/events.c new/xorg-server-1.6.3.901/dix/events.c
--- old/xorg-server-1.6.3/dix/events.c 2009-07-26 22:56:57.000000000 +0200
+++ new/xorg-server-1.6.3.901/dix/events.c 2009-08-26 05:12:02.000000000 +0200
@@ -2661,8 +2661,8 @@
DeviceIntPtr pDev = inputInfo.devices;
while(pDev)
{
- if (DevHasCursor(pDev))
- CheckMotion((xEvent *)NULL, pDev);
+ if (pDev->isMaster || !pDev->u.master)
+ CheckMotion(NULL, pDev);
pDev = pDev->next;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/dix/window.c new/xorg-server-1.6.3.901/dix/window.c
--- old/xorg-server-1.6.3/dix/window.c 2009-07-26 22:56:57.000000000 +0200
+++ new/xorg-server-1.6.3.901/dix/window.c 2009-08-26 05:12:16.000000000 +0200
@@ -3169,8 +3169,6 @@
if (on == SCREEN_SAVER_FORCER)
{
- UpdateCurrentTimeIf();
- lastDeviceEventTime = currentTime;
if (mode == ScreenSaverReset)
what = SCREEN_SAVER_OFF;
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/glx/glxext.c new/xorg-server-1.6.3.901/glx/glxext.c
--- old/xorg-server-1.6.3/glx/glxext.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3.901/glx/glxext.c 2009-08-26 05:12:17.000000000 +0200
@@ -127,6 +127,33 @@
__GLXcontext *c;
for (c = glxAllContexts; c; c = c->next) {
+ if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+ int i;
+
+ (*c->loseCurrent)(c);
+ c->isCurrent = GL_FALSE;
+ if (c == __glXLastContext)
+ __glXFlushContextCache();
+
+ for (i = 1; i < currentMaxClients; i++) {
+ if (clients[i]) {
+ __GLXclientState *cl = glxGetClient(clients[i]);
+
+ if (cl->inUse) {
+ int j;
+
+ for (j = 0; j < cl->numCurrentContexts; j++) {
+ if (cl->currentContexts[j] == c)
+ cl->currentContexts[j] = NULL;
+ }
+ }
+ }
+ }
+
+ if (!c->idExists) {
+ __glXFreeContext(c);
+ }
+ }
if (c->drawPriv == glxPriv)
c->drawPriv = NULL;
if (c->readPriv == glxPriv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/hw/xfree86/modes/xf86Cursors.c new/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Cursors.c
--- old/xorg-server-1.6.3/hw/xfree86/modes/xf86Cursors.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Cursors.c 2009-08-26 05:12:17.000000000 +0200
@@ -640,9 +640,11 @@
(*cursor_info->LoadCursorARGB) (scrn, cursor);
else if (src)
#endif
- (*cursor_info->LoadCursorImage)(cursor_info->pScrn, src);
+ (*cursor_info->LoadCursorImage)(scrn, src);
- (*cursor_info->SetCursorPosition)(cursor_info->pScrn, x, y);
+ x += scrn->frameX0 + cursor_screen_priv->HotX;
+ y += scrn->frameY0 + cursor_screen_priv->HotY;
+ (*cursor_info->SetCursorPosition)(scrn, x, y);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/hw/xfree86/modes/xf86Rotate.c new/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Rotate.c
--- old/xorg-server-1.6.3/hw/xfree86/modes/xf86Rotate.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Rotate.c 2009-08-26 05:12:17.000000000 +0200
@@ -198,6 +198,7 @@
DamageRegister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
xf86_config->rotation_damage);
xf86_config->rotation_damage_registered = TRUE;
+ EnableLimitedSchedulingLatency();
}
xf86CrtcDamageShadow (crtc);
@@ -263,11 +264,12 @@
ScreenPtr pScreen = screenInfo.screens[screenNum];
ScrnInfoPtr pScrn = xf86Screens[screenNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ Bool rotation_active;
+ rotation_active = xf86RotateRedisplay(pScreen);
pScreen->BlockHandler = xf86_config->BlockHandler;
(*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
- if (xf86RotateRedisplay(pScreen))
- {
+ if (rotation_active) {
/* Re-wrap if rotation is still happening */
xf86_config->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = xf86RotateBlockHandler;
@@ -307,6 +309,7 @@
DamageUnregister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
xf86_config->rotation_damage);
xf86_config->rotation_damage_registered = FALSE;
+ DisableLimitedSchedulingLatency();
}
DamageDestroy (xf86_config->rotation_damage);
xf86_config->rotation_damage = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/include/dix.h new/xorg-server-1.6.3.901/include/dix.h
--- old/xorg-server-1.6.3/include/dix.h 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3.901/include/dix.h 2009-08-26 05:12:17.000000000 +0200
@@ -229,6 +229,12 @@
int /*result*/,
pointer /*pReadmask*/);
+void
+EnableLimitedSchedulingLatency(void);
+
+void
+DisableLimitedSchedulingLatency(void);
+
typedef void (* WakeupHandlerProcPtr)(
pointer /* blockData */,
int /* result */,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/include/do-not-use-config.h.in new/xorg-server-1.6.3.901/include/do-not-use-config.h.in
--- old/xorg-server-1.6.3/include/do-not-use-config.h.in 2009-08-01 08:34:30.000000000 +0200
+++ new/xorg-server-1.6.3.901/include/do-not-use-config.h.in 2009-08-26 07:38:10.000000000 +0200
@@ -433,6 +433,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/missing new/xorg-server-1.6.3.901/missing
--- old/xorg-server-1.6.3/missing 2009-07-07 19:56:18.000000000 +0200
+++ new/xorg-server-1.6.3.901/missing 2009-08-26 04:25:49.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.6.3/ylwrap new/xorg-server-1.6.3.901/ylwrap
--- old/xorg-server-1.6.3/ylwrap 2009-07-07 19:56:28.000000000 +0200
+++ new/xorg-server-1.6.3.901/ylwrap 2009-08-26 04:26:05.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2007-11-22.22
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007 Free Software Foundation, Inc.
+# 2007, 2009 Free Software Foundation, Inc.
#
# Written by Tom Tromey .
#
@@ -19,9 +19,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -219,5 +217,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++ xorg-server-xf4vnc-TranslateNone.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:16.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:16.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/translate.c
+Index: xorg-server-1.6.3.901/hw/vnc/translate.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/translate.c
-+++ xorg-server-1.6.3/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
{
VNCSCREENPTR(pScreen);
++++++ xorg-server-xf4vnc-busyloop.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:16.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:16.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/sockets.c
+Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/sockets.c
-+++ xorg-server-1.6.3/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)
int n;
fd_set fds;
++++++ xorg-server-xf4vnc-clientTimeout.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:16.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:16.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/sockets.c
+Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/sockets.c
-+++ xorg-server-1.6.3/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)
n = select(sock+1, NULL, &fds, NULL, &tv);
#if 1
++++++ xorg-server-xf4vnc-fix.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:16.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:16.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/vnc/cursor.c
+Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/cursor.c
-+++ xorg-server-1.6.3/hw/vnc/cursor.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/cursor.c
++++ xorg-server-1.6.3.901/hw/vnc/cursor.c
@@ -262,7 +262,7 @@ rfbSendCursorPos(cl, pScreen)
#if XFREE86VNC
@@ -11,10 +11,10 @@
#else
rfbSpriteGetCursorPos(pScreen, &x, &y);
#endif
-Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
+Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/cutpaste.c
-+++ xorg-server-1.6.3/hw/vnc/cutpaste.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/cutpaste.c
++++ xorg-server-1.6.3.901/hw/vnc/cutpaste.c
@@ -66,7 +66,7 @@ rfbSetXCutText(char *str, int len)
event.u.selectionClear.time = GetTimeInMillis();
event.u.selectionClear.window = pSel->window;
@@ -24,10 +24,10 @@
NoEventMask, NoEventMask /* CantBeFiltered */,
NullGrab);
}
-Index: xorg-server-1.6.3/hw/vnc/dispcur.c
+Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/dispcur.c
-+++ xorg-server-1.6.3/hw/vnc/dispcur.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/dispcur.c
++++ xorg-server-1.6.3.901/hw/vnc/dispcur.c
@@ -74,7 +74,10 @@ in this Software without prior written a
/* per-screen private data */
@@ -103,10 +103,10 @@
if (!pPriv)
{
pPriv = rfbDCRealize(pScreen, pCursor);
-Index: xorg-server-1.6.3/hw/vnc/init.c
+Index: xorg-server-1.6.3.901/hw/vnc/init.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/init.c
-+++ xorg-server-1.6.3/hw/vnc/init.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/init.c
++++ xorg-server-1.6.3.901/hw/vnc/init.c
@@ -138,7 +138,7 @@ static void rfbCrossScreen(ScreenPtr pSc
@@ -135,10 +135,10 @@
PtrDeviceControl,
GetMaximumEventsNum(), 2 /* numAxes */);
vncSetPointerDevice(pDevice);
-Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
+Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/kbdptr.c
-+++ xorg-server-1.6.3/hw/vnc/kbdptr.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/kbdptr.c
++++ xorg-server-1.6.3.901/hw/vnc/kbdptr.c
@@ -74,19 +74,26 @@ vncSetPointerDevice(DeviceIntPtr ptr)
static void
EnqueueMotion(DeviceIntPtr ptrDev, int x, int y)
@@ -229,10 +229,10 @@
ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n",
(int)keySym, keyCode);
-Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/rfbkeyb.c
-+++ xorg-server-1.6.3/hw/vnc/rfbkeyb.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbkeyb.c
++++ xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
@@ -388,7 +388,7 @@ static XF86ModuleVersionInfo xf86rfbKeyb
"xf4vnc Project, see http://xf4vnc.sf.net",
MODINFOSTRING1,
@@ -242,10 +242,10 @@
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/rfbmouse.c
-+++ xorg-server-1.6.3/hw/vnc/rfbmouse.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbmouse.c
++++ xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
@@ -98,10 +98,12 @@ xf86rfbMouseControlProc(DeviceIntPtr dev
void *func1;
int (*func2)(void);
@@ -278,10 +278,10 @@
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
+Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/rfbserver.c
-+++ xorg-server-1.6.3/hw/vnc/rfbserver.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/rfbserver.c
++++ xorg-server-1.6.3.901/hw/vnc/rfbserver.c
@@ -1122,8 +1122,8 @@ rfbProcessClientNormalMessage(cl)
{
@@ -293,10 +293,10 @@
}
#endif
-Index: xorg-server-1.6.3/hw/vnc/sprite.c
+Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/sprite.c
-+++ xorg-server-1.6.3/hw/vnc/sprite.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/sprite.c
++++ xorg-server-1.6.3.901/hw/vnc/sprite.c
@@ -112,7 +112,8 @@ static void rfbSpriteSaveDoomedAreas
static RegionPtr rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed);
static void rfbSpriteComputeSaved(ScreenPtr pScreen);
@@ -424,10 +424,10 @@
/* send new cursor shape to interested viewers */
for (cl = rfbClientHead; cl ; cl = cl->next) {
-Index: xorg-server-1.6.3/hw/vnc/vncext.c
+Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
===================================================================
---- xorg-server-1.6.3.orig/hw/vnc/vncext.c
-+++ xorg-server-1.6.3/hw/vnc/vncext.c
+--- xorg-server-1.6.3.901.orig/hw/vnc/vncext.c
++++ xorg-server-1.6.3.901/hw/vnc/vncext.c
@@ -36,8 +36,9 @@
#include
#include
@@ -467,10 +467,10 @@
NoEventMask, NullGrab);
}
pn = pn->next;
-Index: xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/vnc/vncInit.c
-+++ xorg-server-1.6.3/hw/xfree86/vnc/vncInit.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/vnc/vncInit.c
++++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
@@ -35,7 +35,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
++++++ xorg-server-xf4vnc.patch ++++++
++++ 892 lines (skipped)
++++ between xorg-x11-server/xorg-server-xf4vnc.patch
++++ and xorg-x11-server/xorg-server-xf4vnc.patch
++++++ zap_warning_xserver.diff ++++++
--- /var/tmp/diff_new_pack.tuLm8K/_old 2009-08-28 20:27:17.000000000 +0200
+++ /var/tmp/diff_new_pack.tuLm8K/_new 2009-08-28 20:27:17.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Config.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
@@ -706,6 +706,7 @@ typedef enum {
FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
@@ -27,10 +27,10 @@
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
@@ -191,12 +191,26 @@ xf86ProcessActionEvent(ActionEvent actio
#endif
switch (action) {
@@ -62,10 +62,10 @@
break;
case ACTION_NEXT_MODE:
if (!xf86Info.dontZoom)
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Globals.c
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
.vtRequestsPending = FALSE,
.dontVTSwitch = FALSE,
@@ -74,10 +74,10 @@
.dontZoom = FALSE,
.notrapSignals = FALSE,
.caughtSignal = FALSE,
-Index: xorg-server-1.6.3/hw/xfree86/common/xf86Privstr.h
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Privstr.h
-+++ xorg-server-1.6.3/hw/xfree86/common/xf86Privstr.h
+--- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Privstr.h
++++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
@@ -72,6 +72,7 @@ typedef struct {
Bool vtRequestsPending;
Bool dontVTSwitch;
@@ -86,10 +86,10 @@
Bool dontZoom;
Bool notrapSignals; /* don't exit cleanly - die at fault */
Bool caughtSignal;
-Index: xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
+Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/doc/man/Xorg.man.pre
-+++ xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
+--- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/Xorg.man.pre
++++ xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
@@ -452,8 +452,8 @@ are:
Immediately kills the server -- no questions asked. This is disabled by
default. It can be enabled with the -retro command line flag or by setting
@@ -101,10 +101,10 @@
.TP 8
.B Ctrl+Alt+Keypad-Plus
Change video mode to next one specified in the configuration file.
-Index: xorg-server-1.6.3/hw/xfree86/doc/man/xorg.conf.man.pre
+Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server-1.6.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ xorg-server-1.6.3/hw/xfree86/doc/man/xorg.conf.man.pre
+--- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -470,6 +470,13 @@ This action is normally used to terminat
When this option is enabled, the action has no effect.
Default: off.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org