rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=135

Browse Source
This commit is contained in:
OBS User unknown 2009-08-04 19:52:16 +00:00 committed by Git OBS Bridge
parent 156f5bd77c
commit f874ff78d2
61 changed files with 1412 additions and 1129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
View File

@ -12,10 +12,10 @@ available. Later on VESA cannot claim the device.
hw/xfree86/common/xf86pciBus.c | 19 +++++++++++++++++++ hw/xfree86/common/xf86pciBus.c | 19 +++++++++++++++++++
3 files changed, 22 insertions(+), 1 deletions(-) 3 files changed, 22 insertions(+), 1 deletions(-)
Index: xorg-server-1.6.1/hw/xfree86/common/xf86.h Index: xorg-server-1.6.3/hw/xfree86/common/xf86.h
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/xfree86/common/xf86.h --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86.h
+++ xorg-server-1.6.1/hw/xfree86/common/xf86.h +++ xorg-server-1.6.3/hw/xfree86/common/xf86.h
@@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void); @@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void);
Bool xf86CheckPciSlot( const struct pci_device * ); Bool xf86CheckPciSlot( const struct pci_device * );
int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp, int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,
@ -24,11 +24,11 @@ Index: xorg-server-1.6.1/hw/xfree86/common/xf86.h
Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
int *func); int *func);
Bool xf86ComparePciBusString(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.1/hw/xfree86/common/xf86Init.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/xfree86/common/xf86Init.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Init.c
+++ xorg-server-1.6.1/hw/xfree86/common/xf86Init.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
@@ -514,7 +514,8 @@ probe_devices_from_device_sections(Drive @@ -525,7 +525,8 @@ probe_devices_from_device_sections(Drive
if ((*drvp->PciProbe)(drvp, entry, pPci, if ((*drvp->PciProbe)(drvp, entry, pPci,
devices[j].match_data)) { devices[j].match_data)) {
foundScreen = TRUE; foundScreen = TRUE;
@ -38,11 +38,11 @@ Index: xorg-server-1.6.1/hw/xfree86/common/xf86Init.c
} }
break; break;
Index: xorg-server-1.6.1/hw/xfree86/common/xf86pciBus.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/xfree86/common/xf86pciBus.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86pciBus.c
+++ xorg-server-1.6.1/hw/xfree86/common/xf86pciBus.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86pciBus.c
@@ -755,6 +755,25 @@ xf86ClaimPciSlot(struct pci_device * d, @@ -753,6 +753,25 @@ xf86ClaimPciSlot(struct pci_device * d,
} }
/* /*

8
0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
View File

@ -10,9 +10,11 @@ even if idev is null. This takes down the xserver hard in some cases
hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++---------- hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-) 1 files changed, 13 insertions(+), 10 deletions(-)
--- xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c.orig 2009-02-25 20:12:11.000000000 +0100 Index: xorg-server-1.6.3/hw/xfree86/common/xf86Xinput.c
+++ xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c 2009-02-27 17:26:35.000000000 +0100 ===================================================================
@@ -675,17 +675,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Xinput.c
+++ xorg-server-1.6.3/hw/xfree86/common/xf86Xinput.c
@@ -679,17 +679,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD
else else
xf86DeleteInput(pInfo, 0); xf86DeleteInput(pInfo, 0);

4
acpi-warning.diff
View File

@ -1,4 +1,6 @@
--- hw/xfree86/os-support/linux/lnx_acpi.c Index: hw/xfree86/os-support/linux/lnx_acpi.c
===================================================================
--- hw/xfree86/os-support/linux/lnx_acpi.c.orig
+++ hw/xfree86/os-support/linux/lnx_acpi.c +++ hw/xfree86/os-support/linux/lnx_acpi.c
@@ -163,8 +163,6 @@ doLnxACPIOpen(void) @@ -163,8 +163,6 @@ doLnxACPIOpen(void)
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;

9
acpi_events.diff
View File

@ -1,7 +1,8 @@
diff -urp xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c Index: xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
--- xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c 2006-10-12 00:42:19.000000000 +0200 ===================================================================
+++ ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c 2006-11-20 11:50:46.000000000 +0100 --- xorg-server-1.6.3.orig/hw/xfree86/os-support/linux/lnx_apm.c
@@ -180,7 +180,7 @@ lnxAPMOpen(void) +++ xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_apm.c
@@ -189,7 +189,7 @@ lnxAPMOpen(void)
close(pfd); close(pfd);
xf86PMGetEventFromOs = lnxPMGetEventFromOs; xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs; xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;

10
autoconfig_fallback_fbdev_first.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/common/xf86AutoConfig.c.orig 2009-06-04 15:36:33.000000000 +0000 Index: hw/xfree86/common/xf86AutoConfig.c
+++ hw/xfree86/common/xf86AutoConfig.c 2009-06-04 15:38:22.000000000 +0000 ===================================================================
@@ -521,7 +524,7 @@ listPossibleVideoDrivers(char *matches[] --- hw/xfree86/common/xf86AutoConfig.c.orig
+++ hw/xfree86/common/xf86AutoConfig.c
@@ -513,7 +513,7 @@ listPossibleVideoDrivers(char *matches[]
/* Fallback to platform default hardware */ /* Fallback to platform default hardware */
if (i < (nmatches - 1)) { if (i < (nmatches - 1)) {
#if defined(__i386__) || defined(__amd64__) || defined(__hurd__) #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
@ -9,7 +11,7 @@
#elif defined(__sparc__) && !defined(sun) #elif defined(__sparc__) && !defined(sun)
matches[i++] = xnfstrdup("sunffb"); matches[i++] = xnfstrdup("sunffb");
#endif #endif
@@ -532,7 +535,7 @@ listPossibleVideoDrivers(char *matches[] @@ -524,7 +524,7 @@ listPossibleVideoDrivers(char *matches[]
#if !defined(__linux__) && defined(__sparc__) #if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb"); matches[i++] = xnfstrdup("wsfb");
#else #else

34
bitmap_always_unscaled.diff
View File

@ -23,11 +23,24 @@ Fabian and Stefan Dirsch.
hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +--- hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +---
3 files changed, 5 insertions(+), 7 deletions(-) 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am Index: xorg-server-1.6.3/configure.ac
index 03c2c3a..843efb7 100644 ===================================================================
--- a/hw/xfree86/Makefile.am --- xorg-server-1.6.3.orig/configure.ac
+++ b/hw/xfree86/Makefile.am +++ xorg-server-1.6.3/configure.ac
@@ -105,11 +105,11 @@ dist_options_DATA = Options @@ -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
Index: xorg-server-1.6.3/hw/xfree86/Makefile.am
===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/Makefile.am
+++ xorg-server-1.6.3/hw/xfree86/Makefile.am
@@ -100,11 +100,11 @@ dist_options_DATA = Options
CPP_FILES_FLAGS = \ CPP_FILES_FLAGS = \
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
@ -42,14 +55,3 @@ index 03c2c3a..843efb7 100644
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink: relink:
--- xorg-server-1.4.99.902/configure.ac.orig 2008-06-16 19:17:48.000000000 +0200
+++ xorg-server-1.4.99.902/configure.ac 2008-06-16 19:24:06.000000000 +0200
@@ -466,7 +466,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/,${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

90
bug-197858_dpms.diff
View File

@ -1,42 +1,8 @@
--- os/WaitFor.c.orig 2007-08-23 21:04:55.000000000 +0200 Index: hw/xfree86/common/xf86Events.c
+++ os/WaitFor.c 2007-09-29 17:25:11.868664250 +0200 ===================================================================
@@ -141,6 +141,7 @@ static OsTimerPtr timers = NULL; --- hw/xfree86/common/xf86Events.c.orig
* For more info on ClientsWithInput, see ReadRequestFromClient(). +++ hw/xfree86/common/xf86Events.c
* pClientsReady is an array to store ready client->index values into. @@ -124,6 +124,7 @@ typedef struct x_IHRec {
*****************/
+volatile fd_set tmp_set;
int
WaitForSomething(int *pClientsReady)
@@ -295,10 +296,9 @@ WaitForSomething(int *pClientsReady)
if (expired)
return 0;
}
- }
+ }
else
- {
- fd_set tmp_set;
+ {
if (*checkForInput[0] == *checkForInput[1]) {
if (timers)
@@ -335,6 +335,12 @@ WaitForSomething(int *pClientsReady)
QueueWorkProc(EstablishNewConnections, NULL,
(pointer)&LastSelectMask);
+#ifdef DPMSExtension
+ XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
+ if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
+ DPMSSet(serverClient, DPMSModeOn);
+#endif
+
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
break;
#ifdef WIN32
--- hw/xfree86/common/xf86Events.c.orig 2007-09-05 23:59:13.000000000 +0200
+++ hw/xfree86/common/xf86Events.c 2007-09-29 17:29:22.620335250 +0200
@@ -143,6 +143,7 @@ typedef struct x_IHRec {
InputHandlerProc ihproc; InputHandlerProc ihproc;
pointer data; pointer data;
Bool enabled; Bool enabled;
@ -44,7 +10,7 @@
struct x_IHRec * next; struct x_IHRec * next;
} IHRec, *IHPtr; } IHRec, *IHPtr;
@@ -877,8 +878,12 @@ xf86VTSwitch() @@ -513,8 +514,12 @@ xf86VTSwitch()
for (i = 0; i < xf86NumScreens; i++) for (i = 0; i < xf86NumScreens; i++)
xf86Screens[i]->LeaveVT(i, 0); xf86Screens[i]->LeaveVT(i, 0);
@ -59,7 +25,7 @@
xf86AccessLeave(); /* We need this here, otherwise */ xf86AccessLeave(); /* We need this here, otherwise */
xf86AccessLeaveState(); /* console won't be restored */ xf86AccessLeaveState(); /* console won't be restored */
@@ -916,9 +921,12 @@ xf86VTSwitch() @@ -552,9 +557,12 @@ xf86VTSwitch()
} }
/* XXX HACK */ /* XXX HACK */
xf86ReleaseKeys(inputInfo.keyboard); xf86ReleaseKeys(inputInfo.keyboard);
@ -75,7 +41,7 @@
xf86UnblockSIGIO(prevSIGIO); xf86UnblockSIGIO(prevSIGIO);
} else { } else {
@@ -981,8 +989,12 @@ xf86VTSwitch() @@ -617,8 +625,12 @@ xf86VTSwitch()
/* XXX HACK */ /* XXX HACK */
xf86ReleaseKeys(inputInfo.keyboard); xf86ReleaseKeys(inputInfo.keyboard);
@ -90,7 +56,7 @@
xf86UnblockSIGIO(prevSIGIO); xf86UnblockSIGIO(prevSIGIO);
} }
@@ -1019,8 +1031,10 @@ xf86AddInputHandler(int fd, InputHandler @@ -655,8 +667,10 @@ xf86AddInputHandler(int fd, InputHandler
{ {
IHPtr ih = addInputHandler(fd, proc, data); IHPtr ih = addInputHandler(fd, proc, data);
@ -102,3 +68,41 @@
return ih; return ih;
} }
Index: os/WaitFor.c
===================================================================
--- os/WaitFor.c.orig
+++ os/WaitFor.c
@@ -141,6 +141,7 @@ static OsTimerPtr timers = NULL;
* For more info on ClientsWithInput, see ReadRequestFromClient().
* pClientsReady is an array to store ready client->index values into.
*****************/
+volatile fd_set tmp_set;
int
WaitForSomething(int *pClientsReady)
@@ -278,10 +279,9 @@ WaitForSomething(int *pClientsReady)
if (expired)
return 0;
}
- }
+ }
else
- {
- fd_set tmp_set;
+ {
if (*checkForInput[0] == *checkForInput[1]) {
if (timers)
@@ -316,6 +316,12 @@ WaitForSomething(int *pClientsReady)
QueueWorkProc(EstablishNewConnections, NULL,
(pointer)&LastSelectMask);
+#ifdef DPMSExtension
+ XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
+ if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
+ DPMSSet(serverClient, DPMSModeOn);
+#endif
+
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
break;
/* check here for DDXes that queue events during Block/Wakeup */

12
bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
View File

@ -1,7 +1,7 @@
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c Index: xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
index 6f93a0d..01310e6 100644 ===================================================================
--- a/hw/xfree86/modes/xf86RandR12.c --- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c +++ xorg-server-1.6.3/hw/xfree86/modes/xf86RandR12.c
@@ -55,6 +55,13 @@ typedef struct _xf86RandR12Info { @@ -55,6 +55,13 @@ typedef struct _xf86RandR12Info {
int pointerY; int pointerY;
Rotation rotation; /* current mode */ Rotation rotation; /* current mode */
@ -16,7 +16,7 @@ index 6f93a0d..01310e6 100644
} XF86RandRInfoRec, *XF86RandRInfoPtr; } XF86RandRInfoRec, *XF86RandRInfoPtr;
#ifdef RANDR_12_INTERFACE #ifdef RANDR_12_INTERFACE
@@ -1646,10 +1653,25 @@ xf86RandR13SetPanning (ScreenPtr pScreen, @@ -1648,10 +1655,25 @@ xf86RandR13SetPanning (ScreenPtr
} }
static Bool static Bool
@ -42,7 +42,7 @@ index 6f93a0d..01310e6 100644
rp->rrGetInfo = xf86RandR12GetInfo12; rp->rrGetInfo = xf86RandR12GetInfo12;
rp->rrScreenSetSize = xf86RandR12ScreenSetSize; rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
@@ -1665,6 +1687,10 @@ xf86RandR12Init12 (ScreenPtr pScreen) @@ -1667,6 +1689,10 @@ xf86RandR12Init12 (ScreenPtr pScreen)
rp->rrModeDestroy = xf86RandR12ModeDestroy; rp->rrModeDestroy = xf86RandR12ModeDestroy;
rp->rrSetConfig = NULL; rp->rrSetConfig = NULL;
pScrn->PointerMoved = xf86RandR12PointerMoved; pScrn->PointerMoved = xf86RandR12PointerMoved;

12
bug474071-fix1.diff
View File

@ -1,6 +1,8 @@
--- linuxPci.c.orig 2009-02-19 16:50:50.169751885 +0100 Index: linuxPci.c
+++ linuxPci.c 2009-02-19 16:55:59.991516595 +0100 ===================================================================
@@ -291,7 +291,7 @@ --- linuxPci.c.orig
+++ linuxPci.c
@@ -274,7 +274,7 @@ get_parent_bridge(struct pci_device *dev
struct pci_id_match bridge_match = { struct pci_id_match bridge_match = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
(PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8), (PCI_CLASS_BRIDGE << 16) | (PCI_SUBCLASS_BRIDGE_PCI << 8),
@ -9,7 +11,7 @@
}; };
struct pci_device *bridge; struct pci_device *bridge;
struct pci_device_iterator *iter; struct pci_device_iterator *iter;
@@ -526,7 +526,6 @@ @@ -512,7 +512,6 @@ IOADDRESS
xf86MapLegacyIO(struct pci_device *dev) xf86MapLegacyIO(struct pci_device *dev)
{ {
const int domain = dev->domain; const int domain = dev->domain;
@ -17,7 +19,7 @@
int fd; int fd;
if (domain >= MAX_DOMAINS) if (domain >= MAX_DOMAINS)
@@ -534,9 +533,11 @@ @@ -520,9 +519,11 @@ xf86MapLegacyIO(struct pci_device *dev)
if (DomainMmappedIO[domain] == NULL) { if (DomainMmappedIO[domain] == NULL) {
/* Permanently map all of I/O space */ /* Permanently map all of I/O space */

53
cache-xkbcomp-output-for-fast-start-up.patch
View File

@ -14,11 +14,11 @@ Signed-off-by: Yan Li <yan.i.li@intel.com>
xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++--------- xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 164 insertions(+), 42 deletions(-) 3 files changed, 164 insertions(+), 42 deletions(-)
diff --git a/configure.ac b/configure.ac Index: xorg-server-1.6.3/configure.ac
index 4c4c797..7a5020a 100644 ===================================================================
--- a/configure.ac --- xorg-server-1.6.3.orig/configure.ac
+++ b/configure.ac +++ xorg-server-1.6.3/configure.ac
@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [ @@ -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)]), AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ], [ XKBPATH="$withval" ],
[ XKBPATH="${datadir}/X11/xkb" ]) [ XKBPATH="${datadir}/X11/xkb" ])
@ -30,7 +30,7 @@ index 4c4c797..7a5020a 100644
AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
[Directory where ancillary server config files are installed (default: ${libdir}/xorg)]), [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
[ SERVERCONFIG="$withval" ], [ SERVERCONFIG="$withval" ],
@@ -1757,7 +1757,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir]) @@ -1807,7 +1807,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir,
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
@ -39,11 +39,11 @@ index 4c4c797..7a5020a 100644
fi fi
# XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
diff --git a/xkb/README.compiled b/xkb/README.compiled Index: xorg-server-1.6.3/xkb/README.compiled
index 71caa2f..a4a2ae0 100644 ===================================================================
--- a/xkb/README.compiled --- xorg-server-1.6.3.orig/xkb/README.compiled
+++ b/xkb/README.compiled +++ xorg-server-1.6.3/xkb/README.compiled
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server @@ -4,10 +4,10 @@ current keymap and/or any scratch keymap
or some other tool might destroy or replace the files in this directory, 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 so it is not a safe place to store compiled keymaps for long periods of
time. The default keymap for any server is usually stored in: time. The default keymap for any server is usually stored in:
@ -58,10 +58,10 @@ index 71caa2f..a4a2ae0 100644
Unless the X server is modified, sharing this directory between servers on Unless the X server is modified, sharing this directory between servers on
different hosts could cause problems. different hosts could cause problems.
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c Index: xorg-server-1.6.3/xkb/ddxLoad.c
index 4d5dfb6..60a68af 100644 ===================================================================
--- a/xkb/ddxLoad.c --- xorg-server-1.6.3.orig/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c +++ xorg-server-1.6.3/xkb/ddxLoad.c
@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkb-config.h> #include <xkb-config.h>
#endif #endif
@ -147,7 +147,7 @@ index 4d5dfb6..60a68af 100644
XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
XkbComponentNamesPtr names, XkbComponentNamesPtr names,
unsigned want, unsigned want,
@@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, @@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr
int nameRtrnLen) int nameRtrnLen)
{ {
FILE * out; FILE * out;
@ -160,7 +160,7 @@ index 4d5dfb6..60a68af 100644
const char *emptystring = ""; const char *emptystring = "";
const char *xkbbasedirflag = emptystring; const char *xkbbasedirflag = emptystring;
@@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, @@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames( XkbDescPtr
/* WIN32 has no popen. The input must be stored in a file which is /* 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. */ used as input for xkbcomp. xkbcomp does not read from stdin. */
char tmpname[PATH_MAX]; char tmpname[PATH_MAX];
@ -169,9 +169,8 @@ index 4d5dfb6..60a68af 100644
#else #else
- const char *xkmfile = "-"; - const char *xkmfile = "-";
+ const char *xkbfile = "-"; + const char *xkbfile = "-";
#endif +#endif
+
- snprintf(keymap, sizeof(keymap), "server-%s", display);
+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf', + /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
+ of which SHA1 is generated and used as result xkm file name */ + of which SHA1 is generated and used as result xkm file name */
+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf)); + memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
@ -191,12 +190,13 @@ index 4d5dfb6..60a68af 100644
+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); + ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
+ fputs(xkbKeyMapBuf, stderr); + fputs(xkbKeyMapBuf, stderr);
+ } + }
+#endif #endif
+ if (!ret) { + if (!ret) {
+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n"); + ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
+ return False; + return False;
+ } + }
+
- snprintf(keymap, sizeof(keymap), "server-%s", display);
+ DebugF("[xkb] computing SHA1 of keymap\n"); + DebugF("[xkb] computing SHA1 of keymap\n");
+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) { + if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc); + snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
@ -235,7 +235,7 @@ index 4d5dfb6..60a68af 100644
#ifdef WIN32 #ifdef WIN32
strcpy(tmpname, Win32TempDir()); strcpy(tmpname, Win32TempDir());
strcat(tmpname, "\\xkb_XXXXXX"); strcat(tmpname, "\\xkb_XXXXXX");
@@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, @@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr
} }
} }
@ -269,7 +269,7 @@ index 4d5dfb6..60a68af 100644
#ifndef WIN32 #ifndef WIN32
out= Popen(buf,"w"); out= Popen(buf,"w");
#else #else
@@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, @@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames( XkbDescPtr
#endif #endif
if (out!=NULL) { if (out!=NULL) {
@ -326,7 +326,7 @@ index 4d5dfb6..60a68af 100644
#ifdef WIN32 #ifdef WIN32
/* remove the temporary file */ /* remove the temporary file */
unlink(tmpname); unlink(tmpname);
@@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, @@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames( XkbDescPtr
} }
if (nameRtrn) if (nameRtrn)
nameRtrn[0]= '\0'; nameRtrn[0]= '\0';
@ -353,6 +353,3 @@ index 4d5dfb6..60a68af 100644
return (need|want)&(~missing); return (need|want)&(~missing);
} }
--
1.5.6.5

8
confine_to_shape.diff
View File

@ -1,6 +1,8 @@
--- dix/events.c.orig 2009-02-25 20:12:10.000000000 +0100 Index: dix/events.c
+++ dix/events.c 2009-02-27 16:53:47.000000000 +0100 ===================================================================
@@ -786,37 +786,80 @@ ConfineToShape(DeviceIntPtr pDev, Region --- dix/events.c.orig
+++ dix/events.c
@@ -803,37 +803,80 @@ ConfineToShape(DeviceIntPtr pDev, Region
{ {
BoxRec box; BoxRec box;
int x = *px, y = *py; int x = *px, y = *py;

10
disable-fbblt-opt.diff
View File

@ -1,6 +1,8 @@
--- fb/fbblt.c.orig 2006-09-13 15:01:32.000000000 +0200 Index: fb/fbblt.c
+++ fb/fbblt.c 2006-09-13 15:05:14.000000000 +0200 ===================================================================
@@ -78,6 +78,11 @@ fbBlt (FbBits *srcLine, --- fb/fbblt.c.orig
+++ fb/fbblt.c
@@ -76,6 +76,11 @@ fbBlt (FbBits *srcLine,
} }
#endif #endif
@ -12,7 +14,7 @@
if (alu == GXcopy && pm == FB_ALLONES && !reverse && if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) { !(srcX & 7) && !(dstX & 7) && !(width & 7)) {
int i; int i;
@@ -99,6 +104,7 @@ fbBlt (FbBits *srcLine, @@ -97,6 +102,7 @@ fbBlt (FbBits *srcLine,
return; return;
} }

8
dpms_screensaver.diff
View File

@ -1,7 +1,7 @@
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86DPMS.c
index 5ee5e24..889e05d 100644 ===================================================================
--- a/hw/xfree86/common/xf86DPMS.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86DPMS.c
@@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level) @@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level)
rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
if (rc != Success) if (rc != Success)

12
driver-autoconfig.diff
View File

@ -1,5 +1,7 @@
--- hw/xfree86/common/xf86AutoConfig.c.old 2009-06-05 20:48:39.000000000 +0000 Index: hw/xfree86/common/xf86AutoConfig.c
+++ hw/xfree86/common/xf86AutoConfig.c 2009-06-05 21:38:15.000000000 +0000 ===================================================================
--- hw/xfree86/common/xf86AutoConfig.c.orig
+++ hw/xfree86/common/xf86AutoConfig.c
@@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device * @@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device *
case 0x1142: driverList[0] = "apm"; break; case 0x1142: driverList[0] = "apm"; break;
case 0xedd8: driverList[0] = "ark"; break; case 0xedd8: driverList[0] = "ark"; break;
@ -13,7 +15,7 @@
case 0x102c: driverList[0] = "chips"; break; case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break; case 0x1013: driverList[0] = "cirrus"; break;
case 0x8086: case 0x8086:
@@ -182,7 +186,12 @@ videoPtrToDriverList(struct pci_device * @@ -179,7 +183,12 @@ videoPtrToDriverList(struct pci_device *
case 0x102b: driverList[0] = "mga"; break; case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break; case 0x10c8: driverList[0] = "neomagic"; break;
case 0x105d: driverList[0] = "i128"; break; case 0x105d: driverList[0] = "i128"; break;
@ -27,7 +29,7 @@
case 0x1163: driverList[0] = "rendition"; break; case 0x1163: driverList[0] = "rendition"; break;
case 0x5333: case 0x5333:
switch (dev->device_id) switch (dev->device_id)
@@ -208,7 +217,11 @@ videoPtrToDriverList(struct pci_device * @@ -205,7 +214,11 @@ videoPtrToDriverList(struct pci_device *
case 0x3d3d: driverList[0] = "glint"; break; case 0x3d3d: driverList[0] = "glint"; break;
case 0x1023: driverList[0] = "trident"; break; case 0x1023: driverList[0] = "trident"; break;
case 0x100c: driverList[0] = "tseng"; break; case 0x100c: driverList[0] = "tseng"; break;
@ -40,7 +42,7 @@
case 0x15ad: driverList[0] = "vmware"; break; case 0x15ad: driverList[0] = "vmware"; break;
case 0x18ca: case 0x18ca:
if (dev->device_id == 0x47) if (dev->device_id == 0x47)
@@ -216,6 +229,11 @@ videoPtrToDriverList(struct pci_device * @@ -213,6 +226,11 @@ videoPtrToDriverList(struct pci_device *
else else
driverList[0] = "xgi"; driverList[0] = "xgi";
break; break;

10
edit_data_sanity_check.diff
View File

@ -1,8 +1,8 @@
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c Index: xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
index d375da8..aead061 100644 ===================================================================
--- a/hw/xfree86/modes/xf86Crtc.c --- xorg-server-1.6.3.orig/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c +++ xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
@@ -2097,7 +2097,13 @@ xf86OutputSetEDID (xf86OutputPtr output, @@ -2800,7 +2800,13 @@ xf86OutputSetEDID (xf86OutputPtr output,
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (edid_mon->det_mon[i].type == DT && 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.h_size != 0 &&

14
events.diff
View File

@ -1,6 +1,8 @@
--- xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c.orig 2008-04-21 19:26:30.000000000 +0000 Index: xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c 2008-04-21 19:47:54.000000000 +0000 ===================================================================
@@ -884,22 +884,26 @@ --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Events.c
+++ xorg-server-1.6.3/hw/xfree86/common/xf86Events.c
@@ -518,22 +518,26 @@ xf86VTSwitch()
* Keep the order: Disable Device > LeaveVT * Keep the order: Disable Device > LeaveVT
* EnterVT > EnableDevice * EnterVT > EnableDevice
*/ */
@ -35,7 +37,7 @@
xf86AccessLeave(); /* We need this here, otherwise */ xf86AccessLeave(); /* We need this here, otherwise */
xf86AccessLeaveState(); /* console won't be restored */ xf86AccessLeaveState(); /* console won't be restored */
@@ -929,14 +933,10 @@ @@ -563,14 +567,10 @@ xf86VTSwitch()
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
@ -51,7 +53,7 @@
for (ih = InputHandlers; ih; ih = ih->next) { for (ih = InputHandlers; ih; ih = ih->next) {
if (ih->is_input) if (ih->is_input)
xf86EnableInputHandler(ih); xf86EnableInputHandler(ih);
@@ -946,6 +946,17 @@ @@ -580,6 +580,17 @@ xf86VTSwitch()
xf86UnblockSIGIO(prevSIGIO); xf86UnblockSIGIO(prevSIGIO);
} else { } else {
@ -69,7 +71,7 @@
#ifdef XF86PM #ifdef XF86PM
if (xf86OSPMClose) if (xf86OSPMClose)
xf86OSPMClose(); xf86OSPMClose();
@@ -996,14 +1007,10 @@ @@ -630,14 +641,10 @@ xf86VTSwitch()
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {

12
exa-greedy.diff
View File

@ -1,8 +1,8 @@
diff --git a/exa/exa_migration.c b/exa/exa_migration.c Index: xorg-server-1.6.3/exa/exa_migration.c
index 3c79f68..1332f42 100644 ===================================================================
--- a/exa/exa_migration.c --- xorg-server-1.6.3.orig/exa/exa_migration.c
+++ b/exa/exa_migration.c +++ xorg-server-1.6.3/exa/exa_migration.c
@@ -468,7 +503,11 @@ exaMigrateTowardFb (ExaMigrationPtr migrate) @@ -463,7 +463,11 @@ exaMigrateTowardFb (ExaMigrationPtr migr
exaDoMoveInPixmap(migrate); exaDoMoveInPixmap(migrate);
} }
@ -15,7 +15,7 @@ index 3c79f68..1332f42 100644
} }
/** /**
@@ -501,6 +540,12 @@ exaMigrateTowardSys (ExaMigrationPtr migrate) @@ -496,6 +500,12 @@ exaMigrateTowardSys (ExaMigrationPtr mig
if (pExaPixmap->score <= EXA_PIXMAP_SCORE_MOVE_OUT && pExaPixmap->area) if (pExaPixmap->score <= EXA_PIXMAP_SCORE_MOVE_OUT && pExaPixmap->area)
exaDoMoveOutPixmap(migrate); exaDoMoveOutPixmap(migrate);

28
fbdev_fallback_fail_fix.diff
View File

@ -1,7 +1,7 @@
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
index b94d500..e624a17 100644 ===================================================================
--- a/hw/xfree86/common/xf86Bus.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86Bus.c
@@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex) @@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex)
EntityInfoPtr pEnt; EntityInfoPtr pEnt;
int i; int i;
@ -32,11 +32,11 @@ index b94d500..e624a17 100644
/* /*
* xf86PostProbe() -- Allocate all non conflicting resources * xf86PostProbe() -- Allocate all non conflicting resources
* This function gets called by xf86Init(). * This function gets called by xf86Init().
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h Index: xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
index 41ca8f5..80d4d00 100644 ===================================================================
--- a/hw/xfree86/common/xf86Priv.h --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h +++ xorg-server-1.6.3/hw/xfree86/common/xf86Priv.h
@@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable; @@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPro
/* xf86Bus.c */ /* xf86Bus.c */
@ -44,11 +44,11 @@ index 41ca8f5..80d4d00 100644
void xf86BusProbe(void); void xf86BusProbe(void);
void xf86ChangeBusIndex(int oldIndex, int newIndex); void xf86ChangeBusIndex(int oldIndex, int newIndex);
void xf86AccessInit(void); void xf86AccessInit(void);
diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
index 102f6b1..1c99175 100644 ===================================================================
--- a/hw/xfree86/common/xf86fbBus.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86fbBus.c
+++ b/hw/xfree86/common/xf86fbBus.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86fbBus.c
@@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) @@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chip
{ {
EntityPtr p; EntityPtr p;
int num; int num;

10
fbdevhw.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/fbdevhw/fbdevhw.c.orig 2008-04-20 03:06:32.000000000 +0000 Index: hw/xfree86/fbdevhw/fbdevhw.c
+++ hw/xfree86/fbdevhw/fbdevhw.c 2008-04-20 03:30:00.000000000 +0000 ===================================================================
@@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo --- hw/xfree86/fbdevhw/fbdevhw.c.orig
+++ hw/xfree86/fbdevhw/fbdevhw.c
@@ -964,9 +964,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo
return; return;
} }
@ -13,7 +15,7 @@
} }
Bool Bool
@@ -941,9 +942,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int @@ -982,9 +983,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int
unblank = xf86IsUnblank(mode); unblank = xf86IsUnblank(mode);

11
fix-dpi-values.diff
View File

@ -1,7 +1,8 @@
diff -u -p ../../../../xorg-server-1.4.0.90.orig/hw/xfree86/common//xf86Helper.c ./xf86Helper.c Index: hw/xfree86/common/xf86Helper.c
--- ../../../../xorg-server-1.4.0.90.orig/hw/xfree86/common//xf86Helper.c 2008-05-26 16:53:50.000000000 +0000 ===================================================================
+++ hw/xfree86/common/xf86Helper.c 2008-05-26 17:09:52.000000000 +0000 --- hw/xfree86/common/xf86Helper.c.orig
@@ -1017,12 +1017,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int +++ hw/xfree86/common/xf86Helper.c
@@ -997,12 +997,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int
} else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) { } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {
from = X_CONFIG; from = X_CONFIG;
if (pScrn->widthmm > 0) { if (pScrn->widthmm > 0) {
@ -28,7 +29,7 @@ diff -u -p ../../../../xorg-server-1.4.0.90.orig/hw/xfree86/common//xf86Helper.c
} }
if (pScrn->xDpi > 0 && pScrn->yDpi <= 0) if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
pScrn->yDpi = pScrn->xDpi; pScrn->yDpi = pScrn->xDpi;
@@ -1057,12 +1067,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int @@ -1037,12 +1047,22 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int
pScrn->widthmm = ddcWidthmm; pScrn->widthmm = ddcWidthmm;
pScrn->heightmm = ddcHeightmm; pScrn->heightmm = ddcHeightmm;
if (pScrn->widthmm > 0) { if (pScrn->widthmm > 0) {

6
fixed-SYNC-extension-trigger-BlockHandler-test.diff
View File

@ -24,8 +24,10 @@ Subject: [PATCH] Fixed SYNC extension trigger BlockHandler test.
idle counter to trigger. idle counter to trigger.
This fixes a problem introduced with commit 1f4fb022 where an idle counter This fixes a problem introduced with commit 1f4fb022 where an idle counter
expires unnoticed. expires unnoticed.
--- xorg-server-1.6.0/Xext/sync.c.orig 2009-02-25 20:12:10.000000000 +0100 Index: xorg-server-1.6.3/Xext/sync.c
+++ xorg-server-1.6.0/Xext/sync.c 2009-03-23 17:17:13.000000000 +0100 ===================================================================
--- xorg-server-1.6.3.orig/Xext/sync.c
+++ xorg-server-1.6.3/Xext/sync.c
@@ -222,8 +222,7 @@ SyncCreateCounter( @@ -222,8 +222,7 @@ SyncCreateCounter(
); );

8
fpic.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/parser/Makefile.am.orig 2006-06-30 21:15:50.231016743 +0200 Index: hw/xfree86/parser/Makefile.am
+++ hw/xfree86/parser/Makefile.am 2006-06-30 21:16:12.207190774 +0200 ===================================================================
@@ -23,7 +23,7 @@ --- hw/xfree86/parser/Makefile.am.orig
+++ hw/xfree86/parser/Makefile.am
@@ -22,7 +22,7 @@ libxf86config_a_SOURCES = \
DRI.c \ DRI.c \
Extensions.c Extensions.c

8
keyrelease-1.5.2.diff
View File

@ -1,8 +1,8 @@
Index: xorg-server-1.5.2/xkb/xkbPrKeyEv.c Index: xorg-server-1.6.3/xkb/xkbPrKeyEv.c
=================================================================== ===================================================================
--- xorg-server-1.5.2.orig/xkb/xkbPrKeyEv.c --- xorg-server-1.6.3.orig/xkb/xkbPrKeyEv.c
+++ xorg-server-1.5.2/xkb/xkbPrKeyEv.c +++ xorg-server-1.6.3/xkb/xkbPrKeyEv.c
@@ -96,17 +96,6 @@ int xiEvent; @@ -95,17 +95,6 @@ int xiEvent;
else if ((xE->u.u.type==KeyRelease || else if ((xE->u.u.type==KeyRelease ||
xE->u.u.type == DeviceKeyRelease) && xE->u.u.type == DeviceKeyRelease) &&
(!(keyc->down[key>>3]&(1<<(key&7))))) { (!(keyc->down[key>>3]&(1<<(key&7))))) {

9
libdri_noPanoramiXExtension_symbol.patch
View File

@ -1,7 +1,8 @@
diff -urN xorg-server-1.5.99.3/hw/xfree86/dri/dri.c xorg-server-1.5.99.3.new/hw/xfree86/dri/dri.c Index: xorg-server-1.6.3/hw/xfree86/dri/dri.c
--- xorg-server-1.5.99.3/hw/xfree86/dri/dri.c 2008-12-03 15:07:38.000000000 +0800 ===================================================================
+++ xorg-server-1.5.99.3.new/hw/xfree86/dri/dri.c 2008-12-15 15:51:17.000000000 +0800 --- xorg-server-1.6.3.orig/hw/xfree86/dri/dri.c
@@ -75,7 +75,7 @@ +++ xorg-server-1.6.3/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) #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
#if !defined(PANORAMIX) #if !defined(PANORAMIX)

8
libdrm.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000 +0100 Index: hw/xfree86/common/xf86Helper.c
+++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100 ===================================================================
@@ -2394,6 +2394,13 @@ --- hw/xfree86/common/xf86Helper.c.orig
+++ hw/xfree86/common/xf86Helper.c
@@ -2251,6 +2251,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con
&errmaj, &errmin); &errmaj, &errmin);
if (!ret) if (!ret)
LoaderErrorMsg(pScrn->name, name, errmaj, errmin); LoaderErrorMsg(pScrn->name, name, errmaj, errmin);

10
loadmod-bug197195.diff
View File

@ -1,8 +1,8 @@
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c Index: xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
index 12f5dc9..c84529f 100644 ===================================================================
--- a/hw/xfree86/loader/loadmod.c --- xorg-server-1.6.3.orig/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c +++ xorg-server-1.6.3/hw/xfree86/loader/loadmod.c
@@ -408,8 +408,8 @@ FindModuleInSubdir(const char *dirpath, @@ -401,8 +401,8 @@ FindModuleInSubdir(const char *dirpath,
while ((direntry = readdir(dir))) { while ((direntry = readdir(dir))) {
if (direntry->d_name[0] == '.') if (direntry->d_name[0] == '.')
continue; continue;

51
moblin-hw-xf86-modes-Set-crtc-mode-rotation-transform-befo.patch Normal file
View File

@ -0,0 +1,51 @@
From 6f59a8160042ea145514fdcb410f17f33fd437c2 Mon Sep 17 00:00:00 2001
From: Benjamin Defnet <benjamin.r.defnet@intel.com>
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 <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
---
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

35
moblin-randr-fix-operation-order-so-that-rotation-transfor.patch Normal file
View File

@ -0,0 +1,35 @@
From b2bf67b61c564a4b92a429ca9ad455403161f33a Mon Sep 17 00:00:00 2001
From: Benjamin Defnet <benjamin.r.defnet@intel.com>
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 <keithp@keithp.com>
Signed-off-by: root <root@localhost.localdomain>
---
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

38
moblin-xfree86-move-didLock-assignment-down-to-where-the-f.patch Normal file
View File

@ -0,0 +1,38 @@
From 0de58c88aba7ddd69b04f24ab5b2967c359aa69e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
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 <peter.hutterer@who-t.net>
---
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

14
moblin-xorg-x11-nonroot-vesa.patch Normal file
View File

@ -0,0 +1,14 @@
Index: xorg-server-1.6.3/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
@@ -545,7 +545,8 @@ listPossibleVideoDrivers(char *matches[]
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
#else
- matches[i++] = xnfstrdup("vesa");
+ if (geteuid() == 0)
+ matches[i++] = xnfstrdup("vesa");
#endif
}
}

105
moblin-xserver-no-root-2.patch Normal file
View File

@ -0,0 +1,105 @@
Index: xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_init.c
===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/os-support/linux/lnx_init.c
+++ xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_init.c
@@ -49,6 +49,7 @@ static Bool KeepTty = FALSE;
static int VTnum = -1;
static Bool VTSwitch = TRUE;
static Bool ShareVTs = FALSE;
+Bool NoHwAccess = FALSE;
static int activeVT = -1;
static int vtPermSave[4];
@@ -80,9 +81,11 @@ saveVtPerms(void)
static void
restoreVtPerms(void)
{
- /* Set the terminal permissions back to before we started. */
- chown("/dev/tty0", vtPermSave[0], vtPermSave[1]);
- chown(vtname, vtPermSave[2], vtPermSave[3]);
+ if (geteuid() == 0) {
+ /* Set the terminal permissions back to before we started. */
+ (void)chown("/dev/tty0", vtPermSave[0], vtPermSave[1]);
+ (void)chown(vtname, vtPermSave[2], vtPermSave[3]);
+ }
}
static void *console_handler;
@@ -210,20 +213,22 @@ xf86OpenConsole(void)
xf86Msg(X_WARNING,
"xf86OpenConsole: Could not save ownership of VT\n");
- /* change ownership of the vt */
- if (chown(vtname, getuid(), getgid()) < 0)
- xf86Msg(X_WARNING,"xf86OpenConsole: chown %s failed: %s\n",
- vtname, strerror(errno));
-
- /*
- * the current VT device we're running on is not "console", we want
- * to grab all consoles too
- *
- * Why is this needed??
- */
- if (chown("/dev/tty0", getuid(), getgid()) < 0)
- xf86Msg(X_WARNING,"xf86OpenConsole: chown /dev/tty0 failed: %s\n",
- strerror(errno));
+ if (geteuid() == 0) {
+ /* change ownership of the vt */
+ if (chown(vtname, getuid(), getgid()) < 0)
+ xf86Msg(X_WARNING,"xf86OpenConsole: chown %s failed: %s\n",
+ vtname, strerror(errno));
+
+ /*
+ * the current VT device we're running on is not
+ * "console", we want to grab all consoles too
+ *
+ * Why is this needed??
+ */
+ if (chown("/dev/tty0", getuid(), getgid()) < 0)
+ xf86Msg(X_WARNING,"xf86OpenConsole: chown /dev/tty0 failed: %s\n",
+ strerror(errno));
+ }
}
/*
@@ -434,6 +439,11 @@ xf86ProcessArgument(int argc, char *argv
ShareVTs = TRUE;
return(1);
}
+ if (!strcmp(argv[i], "-nohwaccess"))
+ {
+ NoHwAccess = TRUE;
+ return(1);
+ }
if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
{
if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
@@ -455,5 +465,6 @@ xf86UseMsg()
ErrorF("don't detach controlling tty (for debugging only)\n");
ErrorF("-novtswitch don't immediately switch to new VT\n");
ErrorF("-sharevts share VTs with another X server\n");
+ ErrorF("-nohwaccess don't access hardware ports directly\n");
return;
}
Index: xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_video.c
===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/os-support/linux/lnx_video.c
+++ xorg-server-1.6.3/hw/xfree86/os-support/linux/lnx_video.c
@@ -51,6 +51,7 @@
#define MAP_FAILED ((void *)-1)
#endif
+extern Bool NoHwAccess;
static Bool ExtendedEnabled = FALSE;
#ifdef __ia64__
@@ -509,6 +510,9 @@ xf86EnableIO(void)
int fd;
unsigned int ioBase_phys;
#endif
+ /* Fake it... */
+ if (NoHwAccess)
+ return TRUE;
if (ExtendedEnabled)
return TRUE;

8
mouse.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/common/xf86Configure.c.orig 2006-10-14 10:24:36.000000000 +0000 Index: hw/xfree86/common/xf86Configure.c
+++ hw/xfree86/common/xf86Configure.c 2006-10-14 10:23:39.000000000 +0000 ===================================================================
@@ -88,8 +88,8 @@ --- hw/xfree86/common/xf86Configure.c.orig
+++ hw/xfree86/common/xf86Configure.c
@@ -80,8 +80,8 @@ static char *DFLT_MOUSE_DEV = "/dev/mous
static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
static char *DFLT_MOUSE_PROTO = "auto"; static char *DFLT_MOUSE_PROTO = "auto";
#elif defined(linux) #elif defined(linux)

8
no-return-in-nonvoid-function.diff
View File

@ -1,6 +1,8 @@
--- hw/kdrive/src/kdrive.c.orig 2008-06-27 19:35:41.000000000 +0000 Index: hw/kdrive/src/kdrive.c
+++ hw/kdrive/src/kdrive.c 2008-06-27 19:40:53.000000000 +0000 ===================================================================
@@ -1397,6 +1397,7 @@ KdInitOutput (ScreenInfo *pScreenInfo --- hw/kdrive/src/kdrive.c.orig
+++ hw/kdrive/src/kdrive.c
@@ -1380,6 +1380,7 @@ OsVendorFatalError(void)
int int
DPMSSet(ClientPtr client, int level) DPMSSet(ClientPtr client, int level)
{ {

8
p_bug96328.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/common/xf86Configure.c.orig 2007-09-29 15:44:40.095702000 +0200 Index: hw/xfree86/common/xf86Configure.c
+++ hw/xfree86/common/xf86Configure.c 2007-09-29 15:50:35.625921250 +0200 ===================================================================
@@ -267,23 +267,36 @@ --- hw/xfree86/common/xf86Configure.c.orig
+++ hw/xfree86/common/xf86Configure.c
@@ -237,23 +237,36 @@ configureInputSection (void)
/* Crude mechanism to auto-detect mouse (os dependent) */ /* Crude mechanism to auto-detect mouse (os dependent) */
{ {

9
p_default-module-path.diff
View File

@ -1,7 +1,8 @@
diff -u -r hw/xfree86.orig/common/xf86Globals.c hw/xfree86/common/xf86Globals.c Index: hw/xfree86/common/xf86Globals.c
--- hw/xfree86.orig/common/xf86Globals.c 2006-07-05 12:37:32.000000000 +0200 ===================================================================
+++ hw/xfree86/common/xf86Globals.c 2006-07-05 14:59:51.000000000 +0200 --- hw/xfree86/common/xf86Globals.c.orig
@@ -176,7 +176,7 @@ +++ hw/xfree86/common/xf86Globals.c
@@ -141,7 +141,7 @@ xf86InfoRec xf86Info = {
}; };
const char *xf86ConfigFile = NULL; const char *xf86ConfigFile = NULL;
const char *xf86InputDeviceList = NULL; const char *xf86InputDeviceList = NULL;

53
p_ia64-console.diff
View File

@ -1,31 +1,7 @@
Index: shared/VTsw_usl.c Index: linux/lnx_init.c
=================================================================== ===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v --- linux/lnx_init.c.orig
retrieving revision 1.5 +++ linux/lnx_init.c
diff -u -r1.5 VTsw_usl.c
--- shared/VTsw_usl.c 3 Jul 2005 07:01:35 -0000 1.5
+++ shared/VTsw_usl.c 29 Jun 2006 09:33:05 -0000
@@ -64,15 +64,15 @@
xf86VTSwitchAway()
{
xf86Info.vtRequestsPending = FALSE;
+#ifdef OSSWITCHAWAY
+ OSSWITCHAWAY;
+#endif
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
{
return(FALSE);
}
else
{
-#ifdef OSSWITCHAWAY
- OSSWITCHAWAY;
-#endif
return(TRUE);
}
}
--- linux/lnx_init.c.orig 2009-02-27 15:41:39.000000000 +0100
+++ linux/lnx_init.c 2009-02-27 15:41:47.000000000 +0100
@@ -252,9 +252,6 @@ xf86OpenConsole(void) @@ -252,9 +252,6 @@ xf86OpenConsole(void)
{ {
struct termios nTty; struct termios nTty;
@ -71,3 +47,26 @@ diff -u -r1.5 VTsw_usl.c
} }
close(xf86Info.consoleFd); /* make the vt-manager happy */ close(xf86Info.consoleFd); /* make the vt-manager happy */
Index: shared/VTsw_usl.c
===================================================================
--- shared/VTsw_usl.c.orig
+++ shared/VTsw_usl.c
@@ -62,15 +62,15 @@ Bool
xf86VTSwitchAway()
{
xf86Info.vtRequestsPending = FALSE;
+#ifdef OSSWITCHAWAY
+ OSSWITCHAWAY;
+#endif
if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
{
return(FALSE);
}
else
{
-#ifdef OSSWITCHAWAY
- OSSWITCHAWAY;
-#endif
return(TRUE);
}
}

8
p_xkills_wrong_client.diff
View File

@ -1,6 +1,8 @@
--- os/connection.c.orig 2007-12-12 23:14:52.787902250 +0100 Index: os/connection.c
+++ os/connection.c 2007-12-12 23:16:10.600765250 +0100 ===================================================================
@@ -1009,7 +1009,7 @@ --- os/connection.c.orig
+++ os/connection.c
@@ -1009,7 +1009,7 @@ CheckConnections(void)
do { do {
r = Select (curclient + 1, &tmask, NULL, NULL, &notime); r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
} while (r < 0 && (errno == EINTR || errno == EAGAIN)); } while (r < 0 && (errno == EINTR || errno == EAGAIN));

13
p_xnest-ignore-getimage-errors.diff
View File

@ -1,11 +1,8 @@
Index: programs/Xserver/hw/xnest/GCOps.c Index: build-3Jvc9fE/xorg-server-1.6.3/hw/xnest/GCOps.c
=================================================================== ===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/GCOps.c,v --- build-3Jvc9fE/xorg-server-1.6.3.orig/hw/xnest/GCOps.c
retrieving revision 1.6 +++ build-3Jvc9fE/xorg-server-1.6.3/hw/xnest/GCOps.c
diff -u -p -r1.6 GCOps.c @@ -94,6 +94,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP
--- programs/Xserver/hw/xnest/GCOps.c 14 Jul 2005 03:36:43 -0000 1.6
+++ programs/Xserver/hw/xnest/GCOps.c 7 Jun 2006 13:40:01 -0000
@@ -96,6 +96,13 @@ xnestPutImage(DrawablePtr pDrawable, GCP
} }
} }
@ -19,7 +16,7 @@ diff -u -p -r1.6 GCOps.c
void void
xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int format, unsigned long planeMask, unsigned int format, unsigned long planeMask,
@@ -103,9 +110,13 @@ xnestGetImage(DrawablePtr pDrawable, int @@ -101,9 +108,13 @@ xnestGetImage(DrawablePtr pDrawable, int
{ {
XImage *ximage; XImage *ximage;
int length; int length;

20
p_xorg_acpi.diff
View File

@ -1,6 +1,7 @@
diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/linux/lnx_acpi.c Index: hw/xfree86/os-support/linux/lnx_acpi.c
--- hw/xfree86/os-support/linux.orig/lnx_acpi.c 2006-08-07 17:57:13.000000000 +0200 ===================================================================
+++ hw/xfree86/os-support/linux/lnx_acpi.c 2006-08-07 17:57:20.000000000 +0200 --- hw/xfree86/os-support/linux/lnx_acpi.c.orig
+++ hw/xfree86/os-support/linux/lnx_acpi.c
@@ -32,8 +32,10 @@ @@ -32,8 +32,10 @@
#define ACPI_VIDEO_HEAD_INVALID (~0u - 1) #define ACPI_VIDEO_HEAD_INVALID (~0u - 1)
#define ACPI_VIDEO_HEAD_END (~0u) #define ACPI_VIDEO_HEAD_END (~0u)
@ -35,7 +36,7 @@ diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/
static int static int
lnxACPIGetEventFromOs(int fd, pmEvent *events, int num) lnxACPIGetEventFromOs(int fd, pmEvent *events, int num)
{ {
@@ -132,16 +150,13 @@ lnxACPIConfirmEventToOs(int fd, pmEvent @@ -127,16 +145,13 @@ lnxACPIConfirmEventToOs(int fd, pmEvent
} }
} }
@ -54,7 +55,7 @@ diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/
if (ACPIihPtr || !xf86Info.pmFlag) if (ACPIihPtr || !xf86Info.pmFlag)
return NULL; return NULL;
@@ -169,6 +184,27 @@ lnxACPIOpen(void) @@ -164,6 +179,27 @@ lnxACPIOpen(void)
return lnxCloseACPI; return lnxCloseACPI;
} }
@ -82,7 +83,7 @@ diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/
static void static void
lnxCloseACPI(void) lnxCloseACPI(void)
{ {
@@ -182,5 +218,11 @@ lnxCloseACPI(void) @@ -177,5 +213,11 @@ lnxCloseACPI(void)
shutdown(fd, 2); shutdown(fd, 2);
close(fd); close(fd);
ACPIihPtr = NULL; ACPIihPtr = NULL;
@ -94,9 +95,10 @@ diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/
+ } + }
} }
} }
diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_apm.c hw/xfree86/os-support/linux/lnx_apm.c Index: hw/xfree86/os-support/linux/lnx_apm.c
--- hw/xfree86/os-support/linux.orig/lnx_apm.c 2006-08-07 17:57:13.000000000 +0200 ===================================================================
+++ hw/xfree86/os-support/linux/lnx_apm.c 2006-08-07 17:58:08.000000000 +0200 --- hw/xfree86/os-support/linux/lnx_apm.c.orig
+++ hw/xfree86/os-support/linux/lnx_apm.c
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#ifdef HAVE_ACPI #ifdef HAVE_ACPI

8
pci-legacy-mem-fallback.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/os-support/bus/linuxPci.c 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
@@ -493,6 +493,7 @@ xf86MapDomainMemory(int ScreenNum, int F @@ -476,6 +476,7 @@ xf86MapDomainMemory(int ScreenNum, int F
* legacy_mem interface is unavailable. * legacy_mem interface is unavailable.
*/ */
if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0))
@ -8,7 +10,7 @@
return linuxMapPci(ScreenNum, Flags, dev, Base, Size, return linuxMapPci(ScreenNum, Flags, dev, Base, Size,
PCIIOC_MMAP_IS_MEM); PCIIOC_MMAP_IS_MEM);
else else
@@ -501,6 +502,8 @@ xf86MapDomainMemory(int ScreenNum, int F @@ -484,6 +485,8 @@ xf86MapDomainMemory(int ScreenNum, int F
if (fd >= 0) if (fd >= 0)
close(fd); close(fd);
if (addr == NULL || addr == MAP_FAILED) { if (addr == NULL || addr == MAP_FAILED) {

8
pixman.diff
View File

@ -1,6 +1,8 @@
--- include/miscstruct.h.orig 2007-11-30 22:14:17.372752750 +0100 Index: include/miscstruct.h
+++ include/miscstruct.h 2007-11-30 22:14:59.483384500 +0100 ===================================================================
@@ -51,7 +51,7 @@ --- include/miscstruct.h.orig
+++ include/miscstruct.h
@@ -50,7 +50,7 @@ SOFTWARE.
#include "misc.h" #include "misc.h"
#include <X11/Xprotostr.h> #include <X11/Xprotostr.h>

9
pu_fixes.diff
View File

@ -1,7 +1,8 @@
diff -u -r -N ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c ./programs/Xserver/hw/xfree86/xaa/xaaImage.c Index: hw/xfree86/xaa/xaaImage.c
--- ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c 2003-10-27 16:30:43.000000000 +0100 ===================================================================
+++ hw/xfree86/xaa/xaaImage.c 2003-10-27 16:32:18.000000000 +0100 --- hw/xfree86/xaa/xaaImage.c.orig
@@ -236,12 +236,16 @@ +++ hw/xfree86/xaa/xaaImage.c
@@ -238,12 +238,16 @@ BAD_ALIGNMENT:
(*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth); (*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth);
(*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft); (*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft);

6
randr1_1-sig11.diff
View File

@ -1,5 +1,7 @@
--- xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c.orig 2009-02-25 20:12:11.000000000 +0100 Index: xorg-server-1.6.3/hw/xfree86/common/xf86RandR.c
+++ xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c 2009-02-27 17:04:34.000000000 +0100 ===================================================================
--- xorg-server-1.6.3.orig/hw/xfree86/common/xf86RandR.c
+++ xorg-server-1.6.3/hw/xfree86/common/xf86RandR.c
@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen, @@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen,
Bool useVirtual = FALSE; Bool useVirtual = FALSE;
Rotation oldRotation = randrp->rotation; Rotation oldRotation = randrp->rotation;

16
truetype_fontpath.diff
View File

@ -1,6 +1,8 @@
--- configure.ac.orig 2009-06-19 19:33:07.000000000 +0000 Index: configure.ac
+++ configure.ac 2009-06-19 19:34:00.000000000 +0000 ===================================================================
@@ -466,7 +466,7 @@ --- configure.ac.orig
+++ 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)]), 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="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ]) [ FONTDIR="${libdir}/X11/fonts" ])
@ -9,9 +11,11 @@
case $host_os in case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
esac esac
--- hw/xfree86/Makefile.am.orig 2009-06-19 19:31:52.000000000 +0000 Index: hw/xfree86/Makefile.am
+++ hw/xfree86/Makefile.am 2009-06-19 19:32:53.000000000 +0000 ===================================================================
@@ -99,6 +99,7 @@ --- hw/xfree86/Makefile.am.orig
+++ hw/xfree86/Makefile.am
@@ -103,6 +103,7 @@ CPP_FILES_FLAGS = \
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \

8
vidmode-sig11.diff
View File

@ -1,6 +1,8 @@
--- hw/xfree86/common/xf86VidMode.c.orig 2008-11-06 17:46:03.000000000 +0100 Index: hw/xfree86/common/xf86VidMode.c
+++ hw/xfree86/common/xf86VidMode.c 2008-11-06 17:48:54.000000000 +0100 ===================================================================
@@ -225,6 +225,8 @@ VidModeGetFirstModeline(int scrnIndex, p --- hw/xfree86/common/xf86VidMode.c.orig
+++ hw/xfree86/common/xf86VidMode.c
@@ -226,6 +226,8 @@ VidModeGetFirstModeline(int scrnIndex, p
pScrn = xf86Screens[scrnIndex]; pScrn = xf86Screens[scrnIndex];
pVidMode = VMPTR(pScrn->pScreen); pVidMode = VMPTR(pScrn->pScreen);

8
xephyr.diff
View File

@ -1,5 +1,7 @@
--- hw/kdrive/Makefile.am.orig 2008-11-14 22:27:05.000000000 +0100 Index: hw/kdrive/Makefile.am
+++ hw/kdrive/Makefile.am 2009-02-27 15:45:07.000000000 +0100 ===================================================================
--- hw/kdrive/Makefile.am.orig
+++ hw/kdrive/Makefile.am
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
if BUILD_KDRIVEFBDEVLIB if BUILD_KDRIVEFBDEVLIB
-FBDEV_SUBDIRS = fbdev -FBDEV_SUBDIRS = fbdev
@ -7,7 +9,7 @@
endif endif
if XFAKESERVER if XFAKESERVER
@@ -21,8 +21,7 @@ @@ -21,8 +21,7 @@ endif
SERVER_SUBDIRS = \ SERVER_SUBDIRS = \
$(XSDL_SUBDIRS) \ $(XSDL_SUBDIRS) \
$(FBDEV_SUBDIRS) \ $(FBDEV_SUBDIRS) \

8
xorg-detect-psb.patch
View File

@ -1,6 +1,8 @@
--- xorg-server-1.6.0/hw/xfree86/common/xf86AutoConfig.c~ 2009-03-26 22:10:45.000000000 -0700 Index: xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
+++ xorg-server-1.6.0/hw/xfree86/common/xf86AutoConfig.c 2009-03-26 22:10:45.000000000 -0700 ===================================================================
@@ -171,6 +171,9 @@ --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86AutoConfig.c
+++ xorg-server-1.6.3/hw/xfree86/common/xf86AutoConfig.c
@@ -175,6 +175,9 @@ videoPtrToDriverList(struct pci_device *
case 0x8086: case 0x8086:
if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) { if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
driverList[0] = "i740"; driverList[0] = "i740";

17
xorg-docs.diff
View File

@ -1,6 +1,8 @@
--- Makefile.am Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am +++ Makefile.am
@@ -20,7 +20,7 @@ @@ -20,11 +20,9 @@
# #
# Process this file with autoconf to create configure. # Process this file with autoconf to create configure.
@ -8,19 +10,14 @@
+SUBDIRS = man +SUBDIRS = man
x11docdir = @X11DOCDIR@ x11docdir = @X11DOCDIR@
dist_x11doc_DATA = MAINTAINERS
--- Makefile.am
+++ Makefile.am
@@ -23,8 +23,6 @@
SUBDIRS = man
x11docdir = @X11DOCDIR@
-dist_x11doc_DATA = MAINTAINERS -dist_x11doc_DATA = MAINTAINERS
- -
EXTRA_DIST = \ EXTRA_DIST = \
MAINTAINERS \ MAINTAINERS \
misc/xlogo.epsi \ misc/xlogo.epsi \
--- man/general/Makefile.am Index: man/general/Makefile.am
===================================================================
--- man/general/Makefile.am.orig
+++ man/general/Makefile.am +++ man/general/Makefile.am
@@ -23,13 +23,8 @@ @@ -23,13 +23,8 @@
miscmandir = $(MISC_MAN_DIR) miscmandir = $(MISC_MAN_DIR)

7
xorg-server-xf4vnc-TranslateNone.diff
View File

@ -1,6 +1,7 @@
diff -u -r -p xorg-server-1.4.0.90.old//hw/vnc/translate.c xorg-server-1.4.0.90/hw/vnc/translate.c Index: xorg-server-1.6.3/hw/vnc/translate.c
--- xorg-server-1.4.0.90.old//hw/vnc/translate.c 2008-07-03 18:59:24.000000000 +0200 ===================================================================
+++ xorg-server-1.4.0.90/hw/vnc/translate.c 2008-07-03 18:59:44.000000000 +0200 --- xorg-server-1.6.3.orig/hw/vnc/translate.c
+++ xorg-server-1.6.3/hw/vnc/translate.c
@@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char @@ -168,17 +168,17 @@ rfbTranslateNone(ScreenPtr pScreen, char
{ {
VNCSCREENPTR(pScreen); VNCSCREENPTR(pScreen);

18
xorg-server-xf4vnc-abi-version.diff
View File

@ -1,7 +1,8 @@
diff -u -r ../xorg-server-1.4.99.906.orig//hw/xfree86/vnc/vncInit.c ./hw/xfree86/vnc/vncInit.c Index: hw/xfree86/vnc/vncInit.c
--- ../xorg-server-1.4.99.906.orig//hw/xfree86/vnc/vncInit.c 2008-08-01 22:02:51.000000000 +0000 ===================================================================
+++ ./hw/xfree86/vnc/vncInit.c 2008-08-01 22:07:32.000000000 +0000 --- hw/xfree86/vnc/vncInit.c.orig
@@ -573,8 +573,8 @@ +++ hw/xfree86/vnc/vncInit.c
@@ -573,8 +573,8 @@ static XF86ModuleVersionInfo vncVersRec
#if 0 #if 0
ABI_EXTENSION_VERSION, ABI_EXTENSION_VERSION,
#else #else
@ -12,10 +13,11 @@ diff -u -r ../xorg-server-1.4.99.906.orig//hw/xfree86/vnc/vncInit.c ./hw/xfree86
#endif #endif
MOD_CLASS_EXTENSION, MOD_CLASS_EXTENSION,
{0,0,0,0} {0,0,0,0}
diff -u -r ../xorg-server-1.4.99.906.orig//xcliplist/cliplistmod.c ./xcliplist/cliplistmod.c Index: xcliplist/cliplistmod.c
--- ../xorg-server-1.4.99.906.orig//xcliplist/cliplistmod.c 2008-08-01 22:02:51.000000000 +0000 ===================================================================
+++ ./xcliplist/cliplistmod.c 2008-08-01 22:07:05.000000000 +0000 --- xcliplist/cliplistmod.c.orig
@@ -26,8 +26,8 @@ +++ xcliplist/cliplistmod.c
@@ -26,8 +26,8 @@ static XF86ModuleVersionInfo VersRec = {
#if 0 #if 0
ABI_EXTENSION_VERSION, ABI_EXTENSION_VERSION,
#else #else

12
xorg-server-xf4vnc-busyloop.diff
View File

@ -1,7 +1,7 @@
diff --git a/hw/vnc/sockets.c b/hw/vnc/sockets.c Index: xorg-server-1.6.3/hw/vnc/sockets.c
index 942fa36..c7a9ea2 100644 ===================================================================
--- a/hw/vnc/sockets.c --- xorg-server-1.6.3.orig/hw/vnc/sockets.c
+++ b/hw/vnc/sockets.c +++ xorg-server-1.6.3/hw/vnc/sockets.c
@@ -448,7 +448,7 @@ WriteExact(sock, buf, len) @@ -448,7 +448,7 @@ WriteExact(sock, buf, len)
int n; int n;
fd_set fds; fd_set fds;
@ -11,7 +11,7 @@ index 942fa36..c7a9ea2 100644
int totalTimeWaited = 0; int totalTimeWaited = 0;
#endif #endif
@@ -469,7 +469,7 @@ WriteExact(sock, buf, len) @@ -470,7 +470,7 @@ WriteExact(sock, buf, len)
return n; return n;
} }
@ -20,7 +20,7 @@ index 942fa36..c7a9ea2 100644
/* Retry every 5 seconds until we exceed rfbMaxClientWait. We /* Retry every 5 seconds until we exceed rfbMaxClientWait. We
need to do this because select doesn't necessarily return need to do this because select doesn't necessarily return
immediately when the other end has gone away */ immediately when the other end has gone away */
@@ -487,7 +487,7 @@ WriteExact(sock, buf, len) @@ -488,7 +488,7 @@ WriteExact(sock, buf, len)
tv.tv_usec = 0; tv.tv_usec = 0;
#endif #endif
n = select(sock+1, NULL, &fds, NULL, &tv); n = select(sock+1, NULL, &fds, NULL, &tv);

8
xorg-server-xf4vnc-clientTimeout.diff
View File

@ -1,6 +1,8 @@
--- a/hw/vnc/sockets.c 2008-12-11 20:30:21.000000000 +0100 Index: xorg-server-1.6.3/hw/vnc/sockets.c
+++ b/hw/vnc/sockets.c 2008-12-17 14:09:17.539288000 +0100 ===================================================================
@@ -490,8 +490,10 @@ --- xorg-server-1.6.3.orig/hw/vnc/sockets.c
+++ xorg-server-1.6.3/hw/vnc/sockets.c
@@ -490,8 +490,10 @@ WriteExact(sock, buf, len)
n = select(sock+1, NULL, &fds, NULL, &tv); n = select(sock+1, NULL, &fds, NULL, &tv);
#if 1 #if 1
if (n < 0) { if (n < 0) {

4
xorg-server-xf4vnc-cutpaste.diff
View File

@ -1,4 +1,6 @@
--- hw/vnc/cutpaste.c 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 @@ rfbSetXCutText(char *str, int len)
8, PropModeReplace, len, 8, PropModeReplace, len,

36
xorg-server-xf4vnc-disable-dmxvnc.diff
View File

@ -1,6 +1,7 @@
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am ./hw/dmx/Makefile.am Index: hw/dmx/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am 2008-07-10 07:15:50.000000000 +0000 ===================================================================
+++ ./hw/dmx/Makefile.am 2008-07-10 07:21:28.000000000 +0000 --- hw/dmx/Makefile.am.orig
+++ hw/dmx/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
DIST_SUBDIRS = input vnc config glxProxy examples doc DIST_SUBDIRS = input vnc config glxProxy examples doc
@ -9,9 +10,10 @@ diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/Makefile.am ./hw/dmx/Makefile.a
bin_PROGRAMS = Xdmx bin_PROGRAMS = Xdmx
if XINERAMA if XINERAMA
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h ./hw/dmx/dmx-config.h Index: hw/dmx/dmx-config.h
--- ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h 2008-07-10 07:15:50.000000000 +0000 ===================================================================
+++ ./hw/dmx/dmx-config.h 2008-07-10 07:19:44.000000000 +0000 --- hw/dmx/dmx-config.h.orig
+++ hw/dmx/dmx-config.h
@@ -72,8 +72,8 @@ @@ -72,8 +72,8 @@
/* Enable the DMX extension */ /* Enable the DMX extension */
#define DMXEXT #define DMXEXT
@ -22,22 +24,24 @@ diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/dmx-config.h ./hw/dmx/dmx-confi
+#undef DMXVNC +#undef DMXVNC
/* Disable the extensions that are not currently supported */ /* Disable the extensions that are not currently supported */
#undef BEZIER #undef MULTIBUFFER
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am ./hw/dmx/input/Makefile.am Index: hw/dmx/input/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/input/Makefile.am 2008-07-10 07:15:50.000000000 +0000 ===================================================================
+++ ./hw/dmx/input/Makefile.am 2008-07-10 07:20:43.000000000 +0000 --- hw/dmx/input/Makefile.am.orig
@@ -65,7 +65,6 @@ +++ hw/dmx/input/Makefile.am
-I$(top_srcdir)/hw/xfree86/common \ @@ -65,7 +65,6 @@ AM_CFLAGS = $(DIX_CFLAGS) \
-I$(top_srcdir)/hw/dmx \
$(GLX_INCS) \ $(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
- -DDMXVNC=1 \ - -DDMXVNC=1 \
$(GLX_DEFS) \ $(GLX_DEFS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
diff -u -r ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am ./hw/dmx/vnc/Makefile.am Index: hw/dmx/vnc/Makefile.am
--- ../xorg-server-1.4.99.905.old//hw/dmx/vnc/Makefile.am 2008-07-10 07:15:50.000000000 +0000 ===================================================================
+++ ./hw/dmx/vnc/Makefile.am 2008-07-10 07:18:02.000000000 +0000 --- hw/dmx/vnc/Makefile.am.orig
@@ -37,7 +37,6 @@ +++ hw/dmx/vnc/Makefile.am
@@ -37,7 +37,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \

376
xorg-server-xf4vnc-fix.diff
View File

@ -1,7 +1,20 @@
Index: xorg-server-1.6.1/hw/vnc/cutpaste.c Index: xorg-server-1.6.3/hw/vnc/cursor.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/cutpaste.c --- xorg-server-1.6.3.orig/hw/vnc/cursor.c
+++ xorg-server-1.6.1/hw/vnc/cutpaste.c +++ xorg-server-1.6.3/hw/vnc/cursor.c
@@ -262,7 +262,7 @@ rfbSendCursorPos(cl, pScreen)
#if XFREE86VNC
if (pScreen == pCursorScreen)
- miPointerPosition(&x, &y);
+ miPointerGetPosition(inputInfo.pointer, &x, &y);
#else
rfbSpriteGetCursorPos(pScreen, &x, &y);
#endif
Index: xorg-server-1.6.3/hw/vnc/cutpaste.c
===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/cutpaste.c
+++ xorg-server-1.6.3/hw/vnc/cutpaste.c
@@ -66,7 +66,7 @@ rfbSetXCutText(char *str, int len) @@ -66,7 +66,7 @@ rfbSetXCutText(char *str, int len)
event.u.selectionClear.time = GetTimeInMillis(); event.u.selectionClear.time = GetTimeInMillis();
event.u.selectionClear.window = pSel->window; event.u.selectionClear.window = pSel->window;
@ -11,10 +24,121 @@ Index: xorg-server-1.6.1/hw/vnc/cutpaste.c
NoEventMask, NoEventMask /* CantBeFiltered */, NoEventMask, NoEventMask /* CantBeFiltered */,
NullGrab); NullGrab);
} }
Index: xorg-server-1.6.1/hw/vnc/kbdptr.c Index: xorg-server-1.6.3/hw/vnc/dispcur.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/kbdptr.c --- xorg-server-1.6.3.orig/hw/vnc/dispcur.c
+++ xorg-server-1.6.1/hw/vnc/kbdptr.c +++ xorg-server-1.6.3/hw/vnc/dispcur.c
@@ -74,7 +74,10 @@ in this Software without prior written a
/* per-screen private data */
-static DevPrivateKey rfbDCScreenKey = &rfbDCScreenKey;
+static int rfbDCScreenKeyStore;
+static DevPrivateKey rfbDCScreenKey = &rfbDCScreenKeyStore;
+static int rfbScreenKeyStore;
+static DevPrivateKey rfbScreenKey = &rfbScreenKeyStore;
static Bool rfbDCCloseScreen(int index, ScreenPtr pScreen);
@@ -205,7 +208,7 @@ rfbDCRealizeCursor (pScreen, pCursor)
CursorPtr pCursor;
{
if (pCursor->bits->refcnt <= 1)
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, NULL);
return TRUE;
}
@@ -303,7 +306,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
xfree ((pointer) pPriv);
return (rfbDCCursorPtr)NULL;
}
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, pPriv);
return pPriv;
}
pPriv->pPicture = 0;
@@ -321,7 +324,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
xfree ((pointer) pPriv);
return (rfbDCCursorPtr)NULL;
}
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, pPriv);
/* create the two sets of bits, clipping as appropriate */
@@ -368,7 +371,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
rfbDCCursorPtr pPriv;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (pPriv && (pCursor->bits->refcnt <= 1))
{
if (pPriv->sourceBits)
@@ -380,7 +383,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
FreePicture (pPriv->pPicture, 0);
#endif
xfree ((pointer) pPriv);
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, NULL);
}
return TRUE;
}
@@ -439,7 +442,7 @@ rfbDCPutUpCursor (pScreen, pCursor, x, y
WindowPtr pWin;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (!pPriv)
{
pPriv = rfbDCRealize(pScreen, pCursor);
@@ -690,7 +693,7 @@ rfbDCMoveCursor (pScreen, pCursor, x, y,
PixmapPtr pTemp;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (!pPriv)
{
pPriv = rfbDCRealize(pScreen, pCursor);
Index: xorg-server-1.6.3/hw/vnc/init.c
===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/init.c
+++ xorg-server-1.6.3/hw/vnc/init.c
@@ -138,7 +138,7 @@ static void rfbCrossScreen(ScreenPtr pSc
static void
-PointerWarpCursor(ScreenPtr pScreen, int x, int y)
+PointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
#if 0
DeviceIntPtr pDev = NULL;
@@ -775,8 +775,8 @@ InitInput(argc, argv)
char *argv[];
{
DeviceIntPtr p, k;
- k = AddInputDevice(rfbKeybdProc, TRUE);
- p = AddInputDevice(rfbMouseProc, TRUE);
+ k = AddInputDevice(serverClient, rfbKeybdProc, TRUE);
+ p = AddInputDevice(serverClient, rfbMouseProc, TRUE);
RegisterKeyboardDevice(k);
RegisterPointerDevice(p);
@@ -843,7 +843,6 @@ rfbMouseProc(pDevice, onoff)
map[4] = 4;
map[5] = 5;
InitPointerDeviceStruct(pDev, map, 5,
- GetMotionHistory,
PtrDeviceControl,
GetMaximumEventsNum(), 2 /* numAxes */);
vncSetPointerDevice(pDevice);
Index: xorg-server-1.6.3/hw/vnc/kbdptr.c
===================================================================
--- xorg-server-1.6.3.orig/hw/vnc/kbdptr.c
+++ xorg-server-1.6.3/hw/vnc/kbdptr.c
@@ -74,19 +74,26 @@ vncSetPointerDevice(DeviceIntPtr ptr) @@ -74,19 +74,26 @@ vncSetPointerDevice(DeviceIntPtr ptr)
static void static void
EnqueueMotion(DeviceIntPtr ptrDev, int x, int y) EnqueueMotion(DeviceIntPtr ptrDev, int x, int y)
@ -105,10 +229,10 @@ Index: xorg-server-1.6.1/hw/vnc/kbdptr.c
ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n", ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n",
(int)keySym, keyCode); (int)keySym, keyCode);
Index: xorg-server-1.6.1/hw/vnc/rfbkeyb.c Index: xorg-server-1.6.3/hw/vnc/rfbkeyb.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/rfbkeyb.c --- xorg-server-1.6.3.orig/hw/vnc/rfbkeyb.c
+++ xorg-server-1.6.1/hw/vnc/rfbkeyb.c +++ xorg-server-1.6.3/hw/vnc/rfbkeyb.c
@@ -388,7 +388,7 @@ static XF86ModuleVersionInfo xf86rfbKeyb @@ -388,7 +388,7 @@ static XF86ModuleVersionInfo xf86rfbKeyb
"xf4vnc Project, see http://xf4vnc.sf.net", "xf4vnc Project, see http://xf4vnc.sf.net",
MODINFOSTRING1, MODINFOSTRING1,
@ -118,10 +242,10 @@ Index: xorg-server-1.6.1/hw/vnc/rfbkeyb.c
1, 0, 0, 1, 0, 0,
ABI_CLASS_XINPUT, ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION, ABI_XINPUT_VERSION,
Index: xorg-server-1.6.1/hw/vnc/rfbmouse.c Index: xorg-server-1.6.3/hw/vnc/rfbmouse.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/rfbmouse.c --- xorg-server-1.6.3.orig/hw/vnc/rfbmouse.c
+++ xorg-server-1.6.1/hw/vnc/rfbmouse.c +++ xorg-server-1.6.3/hw/vnc/rfbmouse.c
@@ -98,10 +98,12 @@ xf86rfbMouseControlProc(DeviceIntPtr dev @@ -98,10 +98,12 @@ xf86rfbMouseControlProc(DeviceIntPtr dev
void *func1; void *func1;
int (*func2)(void); int (*func2)(void);
@ -154,10 +278,10 @@ Index: xorg-server-1.6.1/hw/vnc/rfbmouse.c
1, 0, 0, 1, 0, 0,
ABI_CLASS_XINPUT, ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION, ABI_XINPUT_VERSION,
Index: xorg-server-1.6.1/hw/vnc/rfbserver.c Index: xorg-server-1.6.3/hw/vnc/rfbserver.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/rfbserver.c --- xorg-server-1.6.3.orig/hw/vnc/rfbserver.c
+++ xorg-server-1.6.1/hw/vnc/rfbserver.c +++ xorg-server-1.6.3/hw/vnc/rfbserver.c
@@ -1122,8 +1122,8 @@ rfbProcessClientNormalMessage(cl) @@ -1122,8 +1122,8 @@ rfbProcessClientNormalMessage(cl)
{ {
@ -169,10 +293,10 @@ Index: xorg-server-1.6.1/hw/vnc/rfbserver.c
} }
#endif #endif
Index: xorg-server-1.6.1/hw/vnc/sprite.c Index: xorg-server-1.6.3/hw/vnc/sprite.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/sprite.c --- xorg-server-1.6.3.orig/hw/vnc/sprite.c
+++ xorg-server-1.6.1/hw/vnc/sprite.c +++ xorg-server-1.6.3/hw/vnc/sprite.c
@@ -112,7 +112,8 @@ static void rfbSpriteSaveDoomedAreas @@ -112,7 +112,8 @@ static void rfbSpriteSaveDoomedAreas
static RegionPtr rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed); static RegionPtr rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed);
static void rfbSpriteComputeSaved(ScreenPtr pScreen); static void rfbSpriteComputeSaved(ScreenPtr pScreen);
@ -300,10 +424,53 @@ Index: xorg-server-1.6.1/hw/vnc/sprite.c
/* send new cursor shape to interested viewers */ /* send new cursor shape to interested viewers */
for (cl = rfbClientHead; cl ; cl = cl->next) { for (cl = rfbClientHead; cl ; cl = cl->next) {
Index: xorg-server-1.6.1/hw/xfree86/vnc/vncInit.c Index: xorg-server-1.6.3/hw/vnc/vncext.c
=================================================================== ===================================================================
--- xorg-server-1.6.1.orig/hw/xfree86/vnc/vncInit.c --- xorg-server-1.6.3.orig/hw/vnc/vncext.c
+++ xorg-server-1.6.1/hw/xfree86/vnc/vncInit.c +++ xorg-server-1.6.3/hw/vnc/vncext.c
@@ -36,8 +36,9 @@
#include <arpa/inet.h>
#include <netdb.h>
-DevPrivateKey vncCreateScreenResourcesKey = &vncCreateScreenResourcesKey;
-DevPrivateKey rfbGCKey = &rfbGCKey;
+static int vncCreateScreenResourcesKeyStore, rfbGCKeyStore;
+DevPrivateKey vncCreateScreenResourcesKey = &vncCreateScreenResourcesKeyStore;
+DevPrivateKey rfbGCKey = &rfbGCKeyStore;
int VncSelectNotify(ClientPtr client, BOOL onoff);
void VncExtensionInit(void);
@@ -514,7 +515,7 @@ GenerateVncConnectedEvent(int sock)
else
conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
@@ -557,7 +558,7 @@ GenerateVncChromiumConnectedEvent(int so
else
conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
@@ -586,7 +587,7 @@ GenerateVncDisconnectedEvent(int sock)
conn.type = VncEventBase + XVncDisconnected;
conn.sequenceNumber = pn->client->sequence;
conn.connected = sock;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
Index: xorg-server-1.6.3/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
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include "xf86.h" #include "xf86.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
@ -402,170 +569,3 @@ Index: xorg-server-1.6.1/hw/xfree86/vnc/vncInit.c
pScreen->DisplayCursor = vncDisplayCursor; pScreen->DisplayCursor = vncDisplayCursor;
Index: xorg-server-1.6.1/hw/vnc/vncext.c
===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/vncext.c
+++ xorg-server-1.6.1/hw/vnc/vncext.c
@@ -36,8 +36,9 @@
#include <arpa/inet.h>
#include <netdb.h>
-DevPrivateKey vncCreateScreenResourcesKey = &vncCreateScreenResourcesKey;
-DevPrivateKey rfbGCKey = &rfbGCKey;
+static int vncCreateScreenResourcesKeyStore, rfbGCKeyStore;
+DevPrivateKey vncCreateScreenResourcesKey = &vncCreateScreenResourcesKeyStore;
+DevPrivateKey rfbGCKey = &rfbGCKeyStore;
int VncSelectNotify(ClientPtr client, BOOL onoff);
void VncExtensionInit(void);
@@ -514,7 +515,7 @@ GenerateVncConnectedEvent(int sock)
else
conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
@@ -557,7 +558,7 @@ GenerateVncChromiumConnectedEvent(int so
else
conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
@@ -586,7 +587,7 @@ GenerateVncDisconnectedEvent(int sock)
conn.type = VncEventBase + XVncDisconnected;
conn.sequenceNumber = pn->client->sequence;
conn.connected = sock;
- (void) TryClientEvents(pn->client, (xEventPtr)&conn, 1, NoEventMask,
+ (void) TryClientEvents(pn->client, NULL, (xEventPtr)&conn, 1, NoEventMask,
NoEventMask, NullGrab);
}
pn = pn->next;
Index: xorg-server-1.6.1/hw/vnc/cursor.c
===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/cursor.c
+++ xorg-server-1.6.1/hw/vnc/cursor.c
@@ -262,7 +262,7 @@ rfbSendCursorPos(cl, pScreen)
#if XFREE86VNC
if (pScreen == pCursorScreen)
- miPointerPosition(&x, &y);
+ miPointerGetPosition(inputInfo.pointer, &x, &y);
#else
rfbSpriteGetCursorPos(pScreen, &x, &y);
#endif
Index: xorg-server-1.6.1/hw/vnc/init.c
===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/init.c
+++ xorg-server-1.6.1/hw/vnc/init.c
@@ -138,7 +138,7 @@ static void rfbCrossScreen(ScreenPtr pSc
static void
-PointerWarpCursor(ScreenPtr pScreen, int x, int y)
+PointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
#if 0
DeviceIntPtr pDev = NULL;
@@ -775,8 +775,8 @@ InitInput(argc, argv)
char *argv[];
{
DeviceIntPtr p, k;
- k = AddInputDevice(rfbKeybdProc, TRUE);
- p = AddInputDevice(rfbMouseProc, TRUE);
+ k = AddInputDevice(serverClient, rfbKeybdProc, TRUE);
+ p = AddInputDevice(serverClient, rfbMouseProc, TRUE);
RegisterKeyboardDevice(k);
RegisterPointerDevice(p);
@@ -843,7 +843,6 @@ rfbMouseProc(pDevice, onoff)
map[4] = 4;
map[5] = 5;
InitPointerDeviceStruct(pDev, map, 5,
- GetMotionHistory,
PtrDeviceControl,
GetMaximumEventsNum(), 2 /* numAxes */);
vncSetPointerDevice(pDevice);
Index: xorg-server-1.6.1/hw/vnc/dispcur.c
===================================================================
--- xorg-server-1.6.1.orig/hw/vnc/dispcur.c
+++ xorg-server-1.6.1/hw/vnc/dispcur.c
@@ -74,7 +74,10 @@ in this Software without prior written a
/* per-screen private data */
-static DevPrivateKey rfbDCScreenKey = &rfbDCScreenKey;
+static int rfbDCScreenKeyStore;
+static DevPrivateKey rfbDCScreenKey = &rfbDCScreenKeyStore;
+static int rfbScreenKeyStore;
+static DevPrivateKey rfbScreenKey = &rfbScreenKeyStore;
static Bool rfbDCCloseScreen(int index, ScreenPtr pScreen);
@@ -205,7 +208,7 @@ rfbDCRealizeCursor (pScreen, pCursor)
CursorPtr pCursor;
{
if (pCursor->bits->refcnt <= 1)
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, NULL);
return TRUE;
}
@@ -303,7 +306,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
xfree ((pointer) pPriv);
return (rfbDCCursorPtr)NULL;
}
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, pPriv);
return pPriv;
}
pPriv->pPicture = 0;
@@ -321,7 +324,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
xfree ((pointer) pPriv);
return (rfbDCCursorPtr)NULL;
}
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, pPriv);
/* create the two sets of bits, clipping as appropriate */
@@ -368,7 +371,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
rfbDCCursorPtr pPriv;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (pPriv && (pCursor->bits->refcnt <= 1))
{
if (pPriv->sourceBits)
@@ -380,7 +383,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
FreePicture (pPriv->pPicture, 0);
#endif
xfree ((pointer) pPriv);
- dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
+ dixSetPrivate(&pCursor->bits->devPrivates, rfbScreenKey, NULL);
}
return TRUE;
}
@@ -439,7 +442,7 @@ rfbDCPutUpCursor (pScreen, pCursor, x, y
WindowPtr pWin;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (!pPriv)
{
pPriv = rfbDCRealize(pScreen, pCursor);
@@ -690,7 +693,7 @@ rfbDCMoveCursor (pScreen, pCursor, x, y,
PixmapPtr pTemp;
pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
- pScreen);
+ rfbScreenKey);
if (!pPriv)
{
pPriv = rfbDCRealize(pScreen, pCursor);

948
xorg-server-xf4vnc.patch
View File

File diff suppressed because it is too large Load Diff

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 4 10:50:34 CEST 2009 - eich@suse.de
- Resynced with patches from Intel's Moblin project.
- Updated patches to aply cleanly again.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 1 10:47:53 CEST 2009 - sndirsch@suse.de Sat Aug 1 10:47:53 CEST 2009 - sndirsch@suse.de

33
xorg-x11-server.spec
View File

@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 47 Release: 48
License: GPL v2 or later ; MIT License (or similar) License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -116,12 +116,24 @@ Patch143: autoconfig_fallback_fbdev_first.diff
Patch144: keyrelease-1.5.2.diff Patch144: keyrelease-1.5.2.diff
Patch145: driver-autoconfig.diff Patch145: driver-autoconfig.diff
Patch147: truetype_fontpath.diff Patch147: truetype_fontpath.diff
Patch160: libdri_noPanoramiXExtension_symbol.patch # Moblin
Patch161: cache-xkbcomp-output-for-fast-start-up.patch Patch161: libdri_noPanoramiXExtension_symbol.patch
Patch162: xserver-boottime.patch Patch162: cache-xkbcomp-output-for-fast-start-up.patch
%if %moblin
Patch163: xserver-1.5.0-bg-none-root.patch Patch163: xserver-1.5.0-bg-none-root.patch
%endif
Patch164: xorg-detect-psb.patch Patch164: xorg-detect-psb.patch
Patch168: 0001-Unclaim-PCI-slot-if-driver-probing-fails.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
Patch169: moblin-xorg-x11-nonroot-vesa.patch
%if %moblin
Patch170: xserver-boottime.patch
%endif
Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -244,14 +256,21 @@ popd
%patch144 -p1 %patch144 -p1
%patch145 -p0 %patch145 -p0
%patch147 -p0 %patch147 -p0
%patch160 -p1
%patch161 -p1 %patch161 -p1
%if %moblin
%patch162 -p1 %patch162 -p1
%if %moblin
%patch163 -p1 %patch163 -p1
%endif %endif
%patch164 -p1 %patch164 -p1
%if %moblin
%patch168 -p1 %patch168 -p1
%endif
%patch169 -p1
%if %moblin
%patch170 -p1
%endif
#
%patch190 -p1
%build %build
pushd xorg-docs-* pushd xorg-docs-*

54
xserver-1.5.0-bg-none-root.patch
View File

@ -12,11 +12,11 @@ Subject: [PATCH] Add nr for background=none root
os/utils.c | 3 +++ os/utils.c | 3 +++
6 files changed, 32 insertions(+), 11 deletions(-) 6 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/dix/globals.c b/dix/globals.c Index: xorg-server-1.6.3/dix/globals.c
index 973dc43..dbd76bb 100644 ===================================================================
--- a/dix/globals.c --- xorg-server-1.6.3.orig/dix/globals.c
+++ b/dix/globals.c +++ xorg-server-1.6.3/dix/globals.c
@@ -141,6 +141,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in @@ -141,6 +141,7 @@ FontPtr defaultFont; /* not declared i
CursorPtr rootCursor; CursorPtr rootCursor;
Bool party_like_its_1989 = FALSE; Bool party_like_its_1989 = FALSE;
Bool whiteRoot = FALSE; Bool whiteRoot = FALSE;
@ -24,11 +24,11 @@ index 973dc43..dbd76bb 100644
int cursorScreenDevPriv[MAXSCREENS]; int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c Index: xorg-server-1.6.3/dix/window.c
index c31fa87..8bb178d 100644 ===================================================================
--- a/dix/window.c --- xorg-server-1.6.3.orig/dix/window.c
+++ b/dix/window.c +++ xorg-server-1.6.3/dix/window.c
@@ -482,23 +482,24 @@ InitRootWindow(WindowPtr pWin) @@ -479,23 +479,24 @@ InitRootWindow(WindowPtr pWin)
pWin->cursorIsNone = FALSE; pWin->cursorIsNone = FALSE;
pWin->optional->cursor = rootCursor; pWin->optional->cursor = rootCursor;
rootCursor->refcnt++; rootCursor->refcnt++;
@ -59,10 +59,10 @@ index c31fa87..8bb178d 100644
MapWindow(pWin, serverClient); MapWindow(pWin, serverClient);
} }
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
index 236c00b..083a6ac 100644 ===================================================================
--- a/hw/xfree86/common/xf86Init.c --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c +++ xorg-server-1.6.3/hw/xfree86/common/xf86Init.c
@@ -79,6 +79,7 @@ @@ -79,6 +79,7 @@
#ifdef RENDER #ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
@ -95,10 +95,10 @@ index 236c00b..083a6ac 100644
#ifdef DEBUG #ifdef DEBUG
ErrorF("xf86CreateRootWindow() returns %d\n", ret); ErrorF("xf86CreateRootWindow() returns %d\n", ret);
#endif #endif
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h Index: xorg-server-1.6.3/hw/xfree86/common/xf86str.h
index 904c369..8c38f69 100644 ===================================================================
--- a/hw/xfree86/common/xf86str.h --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h +++ xorg-server-1.6.3/hw/xfree86/common/xf86str.h
@@ -531,7 +531,7 @@ typedef struct _confdrirec { @@ -531,7 +531,7 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr; } confDRIRec, *confDRIPtr;
@ -118,10 +118,10 @@ index 904c369..8c38f69 100644
/* /*
* These can be used when the minor ABI version is incremented. * These can be used when the minor ABI version is incremented.
* The NUM_* parameters must be reduced appropriately to keep the * The NUM_* parameters must be reduced appropriately to keep the
diff --git a/include/opaque.h b/include/opaque.h Index: xorg-server-1.6.3/include/opaque.h
index 07a0715..be1577b 100644 ===================================================================
--- a/include/opaque.h --- xorg-server-1.6.3.orig/include/opaque.h
+++ b/include/opaque.h +++ xorg-server-1.6.3/include/opaque.h
@@ -71,6 +71,7 @@ extern Bool defeatAccessControl; @@ -71,6 +71,7 @@ extern Bool defeatAccessControl;
extern long maxBigRequestSize; extern long maxBigRequestSize;
extern Bool party_like_its_1989; extern Bool party_like_its_1989;
@ -130,10 +130,10 @@ index 07a0715..be1577b 100644
extern Bool CoreDump; extern Bool CoreDump;
diff --git a/os/utils.c b/os/utils.c Index: xorg-server-1.6.3/os/utils.c
index b100949..c41b45b 100644 ===================================================================
--- a/os/utils.c --- xorg-server-1.6.3.orig/os/utils.c
+++ b/os/utils.c +++ xorg-server-1.6.3/os/utils.c
@@ -515,6 +515,7 @@ void UseMsg(void) @@ -515,6 +515,7 @@ void UseMsg(void)
#endif #endif
ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-nolisten string don't listen on protocol\n");
@ -142,7 +142,7 @@ index b100949..c41b45b 100644
ErrorF("-reset reset after last client exists\n"); ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n"); ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n"); ErrorF("-pn accept failure to listen on all ports\n");
@@ -859,6 +860,8 @@ ProcessCommandLine(int argc, char *argv[]) @@ -859,6 +860,8 @@ ProcessCommandLine(int argc, char *argv[
defaultBackingStore = WhenMapped; defaultBackingStore = WhenMapped;
else if ( strcmp( argv[i], "-wr") == 0) else if ( strcmp( argv[i], "-wr") == 0)
whiteRoot = TRUE; whiteRoot = TRUE;

10
xserver-boottime.patch
View File

@ -1,8 +1,8 @@
diff --git a/os/log.c b/os/log.c Index: xorg-server-1.6.3/os/log.c
index 0860847..2c46f1a 100644 ===================================================================
--- a/os/log.c --- xorg-server-1.6.3.orig/os/log.c
+++ b/os/log.c +++ xorg-server-1.6.3/os/log.c
@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args) @@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_li
static char tmpBuffer[1024]; static char tmpBuffer[1024];
int len = 0; int len = 0;

139
zap_warning_xserver.diff
View File

@ -1,8 +1,37 @@
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c ===================================================================
--- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c 2008-03-09 13:27:24.000000000 +0100 --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Config.c
+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c 2008-03-09 13:30:18.000000000 +0100 +++ xorg-server-1.6.3/hw/xfree86/common/xf86Config.c
@@ -267,12 +267,26 @@ @@ -706,6 +706,7 @@ typedef enum {
FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
+ FLAG_ZAPWARNING,
FLAG_DONTZOOM,
FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL,
@@ -743,6 +744,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
{0}, FALSE },
+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -855,6 +858,7 @@ configServerFlags(XF86ConfFlagsPtr flags
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
Index: xorg-server-1.6.3/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
@@ -191,12 +191,26 @@ xf86ProcessActionEvent(ActionEvent actio
#endif #endif
switch (action) { switch (action) {
case ACTION_TERMINATE: case ACTION_TERMINATE:
@ -33,23 +62,51 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1
break; break;
case ACTION_NEXT_MODE: case ACTION_NEXT_MODE:
if (!xf86Info.dontZoom) if (!xf86Info.dontZoom)
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c Index: xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h ===================================================================
--- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h 2007-12-07 03:38:42.000000000 +0100 --- xorg-server-1.6.3.orig/hw/xfree86/common/xf86Globals.c
+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h 2008-03-09 13:29:43.000000000 +0100 +++ xorg-server-1.6.3/hw/xfree86/common/xf86Globals.c
@@ -85,6 +85,7 @@ @@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
Bool inputPending; .vtRequestsPending = FALSE,
.dontVTSwitch = FALSE,
.dontZap = FALSE,
+ .ZapWarning = FALSE,
.dontZoom = FALSE,
.notrapSignals = FALSE,
.caughtSignal = FALSE,
Index: xorg-server-1.6.3/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
@@ -72,6 +72,7 @@ typedef struct {
Bool vtRequestsPending;
Bool dontVTSwitch; Bool dontVTSwitch;
Bool dontZap; Bool dontZap;
+ Bool ZapWarning; + Bool ZapWarning;
Bool dontZoom; Bool dontZoom;
Bool notrapSignals; /* don't exit cleanly - die at fault */ Bool notrapSignals; /* don't exit cleanly - die at fault */
Bool caughtSignal; Bool caughtSignal;
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-server-1.4.0.90/hw/xfree86/doc/man/xorg.conf.man.pre Index: xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
--- xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre 2008-03-09 12:36:39.000000000 +0100 ===================================================================
+++ xorg-server-1.4.0.90/hw/xfree86/doc/man/xorg.conf.man.pre 2008-03-09 13:42:36.000000000 +0100 --- xorg-server-1.6.3.orig/hw/xfree86/doc/man/Xorg.man.pre
@@ -446,6 +446,13 @@ +++ xorg-server-1.6.3/hw/xfree86/doc/man/Xorg.man.pre
is passed to clients. @@ -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
the
-.B DontZap
-__xconfigfile__(__filemansuffix__) file option to a FALSE value.
+.B DontZap/ZapWarning
+__xconfigfile__(__filemansuffix__) file options to a FALSE value.
.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
===================================================================
--- 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
@@ -470,6 +470,13 @@ This action is normally used to terminat
When this option is enabled, the action has no effect.
Default: off. Default: off.
.TP 7 .TP 7
+.BI "Option \*qZapWarning\*q \*q" boolean \*q +.BI "Option \*qZapWarning\*q \*q" boolean \*q
@ -62,53 +119,3 @@ diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/doc/man/xorg.conf.man.pre xorg-se
.BI "Option \*qDontZoom\*q \*q" boolean \*q .BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the This disallows the use of the
.B Ctrl+Alt+Keypad\-Plus .B Ctrl+Alt+Keypad\-Plus
--- xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c.orig 2009-02-27 16:23:51.000000000 +0100
+++ xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c 2009-02-27 16:30:19.000000000 +0100
@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
.vtRequestsPending = FALSE,
.dontVTSwitch = FALSE,
.dontZap = FALSE,
+ .ZapWarning = FALSE,
.dontZoom = FALSE,
.notrapSignals = FALSE,
.caughtSignal = FALSE,
--- xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre.orig 2009-02-25 20:12:11.000000000 +0100
+++ xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre 2009-02-27 16:32:45.000000000 +0100
@@ -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
the
-.B DontZap
-__xconfigfile__(__filemansuffix__) file option to a FALSE value.
+.B DontZap/ZapWarning
+__xconfigfile__(__filemansuffix__) file options to a FALSE value.
.TP 8
.B Ctrl+Alt+Keypad-Plus
Change video mode to next one specified in the configuration file.
--- xorg-server-1.6.2/hw/xfree86/common/xf86Config.c.orig 2009-07-07 19:48:58.000000000 +0200
+++ xorg-server-1.6.2/hw/xfree86/common/xf86Config.c 2009-07-08 02:46:35.000000000 +0200
@@ -706,6 +706,7 @@
FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
+ FLAG_ZAPWARNING,
FLAG_DONTZOOM,
FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL,
@@ -743,6 +744,8 @@
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
{0}, FALSE },
+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -855,6 +858,7 @@
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);