forked from pool/xorg-x11-server
- Dropped:
* N_0001-Check-harder-for-primary-PCI-device.patch
Whith libpciaccess code path irrelevant for Linux.
* N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
Solved differently upstream
* N_bug-197858_dpms.diff
This one is upstream already - apparently nobody check this when
it no longer applied...
* N_bug534768-prefer_local_symbols.patch
Upstream has a better suggestion how to solve this. However this
patch is no longer needed
* N_dpms_screensaver.diff
This topic was solved slightly differently upstream - still patch
got ported without checking it's context.
* N_randr1_1-sig11.diff
No longer needed. Problem was fixed differently upstream.
* u_vgaHW-no-legacy.patch
Problem solved in the nv driver.
- Renamed:
Those patches will go upstream, thus they are prefixed by a u_:
* n__confine_to_shape.diff -> u_confine_to_shape.diff
* N_fbdevhw.diff -> u_fbdevhw.diff
* n_x86emu-include-order.patch -> u_x86emu-include-order.patch
* N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch
Those patches no longer apply but are kept for reference thus prefixed by b_:
* N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch ->
b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
* N_cache-xkbcomp-output-for-fast-start-up.patch ->
b_cache-xkbcomp-output-for-fast-start-up.patch
* N_sync-fix.patch -> b_sync-fix.patch
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=478
This commit is contained in:
Git OBS Bridge
parent
9df95a7189
commit
7286d85738
@ -1,70 +0,0 @@
|
||||
From 35540106538b24ca1765e752fe9d6efc968a88fa Mon Sep 17 00:00:00 2001
|
||||
From: Egbert Eich <eich@linux-p1mv.site>
|
||||
Date: Wed, 7 Oct 2009 16:31:44 +0200
|
||||
Subject: [PATCH] Check harder for primary PCI device.
|
||||
|
||||
Primary PCI devices are identified by checking for an 'PCIINFOCLASSES'
|
||||
device which is VGA and has access to the memory bars enabled.
|
||||
If there should be more than one device for which this is true
|
||||
redo the check and also check if IO resoures are also enabled,
|
||||
if this still doesn't turn up a unique result also check for
|
||||
the presence of a BIOS rom.
|
||||
================================================================================
|
||||
Index: xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
|
||||
===================================================================
|
||||
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c
|
||||
+++ xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
|
||||
@@ -134,9 +134,50 @@ xf86PciProbe(void)
|
||||
primaryBus.id.pci = info;
|
||||
}
|
||||
else {
|
||||
- xf86Msg(X_NOTICE,
|
||||
- "More than one possible primary device found\n");
|
||||
- primaryBus.type ^= (BusType) (-1);
|
||||
+ /*
|
||||
+ * Ok, we found more than one possible primary device with this heuristic
|
||||
+ * Now also check if IO is enabled.
|
||||
+ */
|
||||
+ int j;
|
||||
+
|
||||
+ primaryBus.type = BUS_NONE;
|
||||
+ for (j = 0; j < num; j++) {
|
||||
+ info = xf86PciVideoInfo[j];
|
||||
+ pci_device_cfg_read_u16(info, & command, 4);
|
||||
+
|
||||
+ if ((command & PCI_CMD_MEM_ENABLE)
|
||||
+ && (command & PCI_CMD_IO_ENABLE)
|
||||
+ && (IS_VGA(info->device_class))) {
|
||||
+ if (primaryBus.type == BUS_NONE) {
|
||||
+ primaryBus.type = BUS_PCI;
|
||||
+ primaryBus.id.pci = info;
|
||||
+ } else {
|
||||
+ primaryBus.type = BUS_NONE;
|
||||
+ for (j = 0; j < num; j++) {
|
||||
+ info = xf86PciVideoInfo[j];
|
||||
+ pci_device_cfg_read_u16(info, & command, 4);
|
||||
+
|
||||
+ if ((command & PCI_CMD_MEM_ENABLE)
|
||||
+ && (command & PCI_CMD_IO_ENABLE)
|
||||
+ && (IS_VGA(info->device_class))
|
||||
+ && info->rom_size) {
|
||||
+ if (primaryBus.type == BUS_NONE) {
|
||||
+ primaryBus.type = BUS_PCI;
|
||||
+ primaryBus.id.pci = info;
|
||||
+ } else {
|
||||
+ xf86Msg(X_NOTICE,
|
||||
+ "More than one possible primary device found\n");
|
||||
+ primaryBus.type ^= (BusType)(-1);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
Index: xorg-server-1.12.1/mi/misprite.c
|
||||
===================================================================
|
||||
--- xorg-server-1.12.1.orig/mi/misprite.c
|
||||
+++ xorg-server-1.12.1/mi/misprite.c
|
||||
@@ -378,6 +378,7 @@ miSpriteCloseScreen(int i, ScreenPtr pSc
|
||||
pScreen->InstallColormap = pScreenPriv->InstallColormap;
|
||||
pScreen->StoreColors = pScreenPriv->StoreColors;
|
||||
|
||||
+ miSpriteDisableDamage(pScreen, pScreenPriv);
|
||||
DamageDestroy(pScreenPriv->pDamage);
|
||||
|
||||
free(pScreenPriv);
|
||||
@ -1,70 +0,0 @@
|
||||
Index: hw/xfree86/common/xf86Events.c
|
||||
===================================================================
|
||||
--- hw/xfree86/common/xf86Events.c.orig
|
||||
+++ hw/xfree86/common/xf86Events.c
|
||||
@@ -115,6 +115,7 @@ typedef struct x_IHRec {
|
||||
InputHandlerProc ihproc;
|
||||
pointer data;
|
||||
Bool enabled;
|
||||
+ Bool is_input;
|
||||
struct x_IHRec *next;
|
||||
} IHRec, *IHPtr;
|
||||
|
||||
@@ -445,9 +446,13 @@ xf86VTSwitch(void)
|
||||
* Keep the order: Disable Device > LeaveVT
|
||||
* EnterVT > EnableDevice
|
||||
*/
|
||||
- for (ih = InputHandlers; ih; ih = ih->next)
|
||||
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
||||
+ if (ih->is_input)
|
||||
xf86DisableInputHandler(ih);
|
||||
- for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
|
||||
+ else
|
||||
+ xf86DisableGeneralHandler(ih);
|
||||
+ }
|
||||
+ for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
|
||||
if (pInfo->dev) {
|
||||
xf86ReleaseKeys(pInfo->dev);
|
||||
ProcessInputEvents();
|
||||
@@ -486,8 +491,12 @@ xf86VTSwitch(void)
|
||||
EnableDevice(pInfo->dev, TRUE);
|
||||
pInfo = pInfo->next;
|
||||
}
|
||||
- for (ih = InputHandlers; ih; ih = ih->next)
|
||||
- xf86EnableInputHandler(ih);
|
||||
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
||||
+ if (ih->is_input)
|
||||
+ xf86EnableInputHandler(ih);
|
||||
+ else
|
||||
+ xf86EnableGeneralHandler(ih);
|
||||
+ }
|
||||
|
||||
xf86UnblockSIGIO(prevSIGIO);
|
||||
|
||||
@@ -542,8 +551,12 @@ xf86VTSwitch(void)
|
||||
pInfo = pInfo->next;
|
||||
}
|
||||
|
||||
- for (ih = InputHandlers; ih; ih = ih->next)
|
||||
- xf86EnableInputHandler(ih);
|
||||
+ for (ih = InputHandlers; ih; ih = ih->next) {
|
||||
+ if (ih->is_input)
|
||||
+ xf86EnableInputHandler(ih);
|
||||
+ else
|
||||
+ xf86EnableGeneralHandler(ih);
|
||||
+ }
|
||||
|
||||
xf86UnblockSIGIO(prevSIGIO);
|
||||
}
|
||||
@@ -579,8 +592,10 @@ xf86AddInputHandler(int fd, InputHandler
|
||||
{
|
||||
IHPtr ih = addInputHandler(fd, proc, data);
|
||||
|
||||
- if (ih)
|
||||
+ if (ih) {
|
||||
AddEnabledDevice(fd);
|
||||
+ ih->is_input = TRUE;
|
||||
+ }
|
||||
return ih;
|
||||
}
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: xorg-server-1.12.1/hw/xfree86/loader/loader.c
|
||||
===================================================================
|
||||
--- xorg-server-1.12.1.orig/hw/xfree86/loader/loader.c
|
||||
+++ xorg-server-1.12.1/hw/xfree86/loader/loader.c
|
||||
@@ -152,7 +152,7 @@ LoaderSymbol(const char *name)
|
||||
return p;
|
||||
|
||||
if (!global_scope)
|
||||
- global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
|
||||
+ global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND);
|
||||
|
||||
if (global_scope)
|
||||
return dlsym(global_scope, name);
|
||||
@ -1,14 +0,0 @@
|
||||
Index: xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c
|
||||
===================================================================
|
||||
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86DPMS.c
|
||||
+++ xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c
|
||||
@@ -151,7 +151,8 @@ DPMSSet(ClientPtr client, int level)
|
||||
rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
- }
|
||||
+ } else
|
||||
+ dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset);
|
||||
|
||||
/* For each screen, set the DPMS level */
|
||||
for (i = 0; i < xf86NumScreens; i++) {
|
||||
@ -1,14 +0,0 @@
|
||||
Index: xorg-server-1.12.1/hw/xfree86/common/xf86RandR.c
|
||||
===================================================================
|
||||
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86RandR.c
|
||||
+++ xorg-server-1.12.1/hw/xfree86/common/xf86RandR.c
|
||||
@@ -237,6 +237,9 @@ xf86RandRSetConfig(ScreenPtr pScreen,
|
||||
DeviceIntPtr dev;
|
||||
Bool view_adjusted = FALSE;
|
||||
|
||||
+ if (!scrp->vtSema)
|
||||
+ return FALSE;
|
||||
+
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||
if (!IsMaster(dev) && !IsFloating(dev))
|
||||
continue;
|
||||
@ -1,23 +0,0 @@
|
||||
Author: Andreas Schwab <schwab@suse.de>
|
||||
Subject: disable DACDelay on non-vga-hardware users
|
||||
Patch-Mainline: To be upstreamed
|
||||
Signed-Off-By: Marcus Meissner <meissner@suse.de>
|
||||
|
||||
--- hw/xfree86/vgahw/vgaHW.h
|
||||
+++ hw/xfree86/vgahw/vgaHW.h
|
||||
@@ -168,11 +168,15 @@ typedef struct _vgaHWRec {
|
||||
#define BITS_PER_GUN 6
|
||||
#define COLORMAP_SIZE 256
|
||||
|
||||
+#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) || defined(__nds32__)
|
||||
+#define DACDelay(hw) /* No legacy VGA support */
|
||||
+#else
|
||||
#define DACDelay(hw) \
|
||||
do { \
|
||||
(hw)->readST01((hw)); \
|
||||
(hw)->readST01((hw)); \
|
||||
} while (0)
|
||||
+#endif
|
||||
|
||||
/* Function Prototypes */
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 11 15:26:59 UTC 2013 - eich@suse.com
|
||||
|
||||
- Dropped:
|
||||
* N_0001-Check-harder-for-primary-PCI-device.patch
|
||||
Whith libpciaccess code path irrelevant for Linux.
|
||||
* N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
|
||||
Solved differently upstream
|
||||
* N_bug-197858_dpms.diff
|
||||
This one is upstream already - apparently nobody check this when
|
||||
it no longer applied...
|
||||
* N_bug534768-prefer_local_symbols.patch
|
||||
Upstream has a better suggestion how to solve this. However this
|
||||
patch is no longer needed
|
||||
* N_dpms_screensaver.diff
|
||||
This topic was solved slightly differently upstream - still patch
|
||||
got ported without checking it's context.
|
||||
* N_randr1_1-sig11.diff
|
||||
No longer needed. Problem was fixed differently upstream.
|
||||
* u_vgaHW-no-legacy.patch
|
||||
Problem solved in the nv driver.
|
||||
- Renamed:
|
||||
Those patches will go upstream, thus they are prefixed by a u_:
|
||||
* n__confine_to_shape.diff -> u_confine_to_shape.diff
|
||||
* N_fbdevhw.diff -> u_fbdevhw.diff
|
||||
* n_x86emu-include-order.patch -> u_x86emu-include-order.patch
|
||||
* N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch
|
||||
Those patches no longer apply but are kept for reference thus prefixed by b_:
|
||||
* N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch ->
|
||||
b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
|
||||
* N_cache-xkbcomp-output-for-fast-start-up.patch ->
|
||||
b_cache-xkbcomp-output-for-fast-start-up.patch
|
||||
* N_sync-fix.patch -> b_sync-fix.patch
|
||||
Those patches came from a foreign source but are not upstream, yet, thus
|
||||
prefix ux_:
|
||||
* u_xserver_xvfb-randr.patch -> ux_xserver_xvfb-randr.patch
|
||||
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 11 00:35:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
|
||||
|
||||
|
||||
@ -117,42 +117,29 @@ Obsoletes: xorg-x11-server-glx
|
||||
Requires: xkeyboard-config
|
||||
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch45: N_bug-197858_dpms.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch77: N_fbdevhw.diff
|
||||
Patch77: u_fbdevhw.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch101: N_zap_warning_xserver.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch103: N_confine_to_shape.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch106: N_randr1_1-sig11.diff
|
||||
Patch103: u_confine_to_shape.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch112: N_fix-dpi-values.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch127: N_dpms_screensaver.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch145: N_driver-autoconfig.diff
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch162: N_cache-xkbcomp-output-for-fast-start-up.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch200: N_bug534768-prefer_local_symbols.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch202: N_0001-Check-harder-for-primary-PCI-device.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch203: N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
|
||||
Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch206: N_fix_fglrx_screendepth_issue.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch211: N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
|
||||
Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch213: N_xorg-server-xdmcp.patch
|
||||
Patch213: u_xorg-server-xdmcp.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch222: N_sync-fix.patch
|
||||
Patch222: b_sync-fix.patch
|
||||
# PATCH-FIX-UPSTREAM N_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions
|
||||
Patch223: N_x86emu-include-order.patch
|
||||
Patch223: u_x86emu-include-order.patch
|
||||
|
||||
Patch226: u_vgaHW-no-legacy.patch
|
||||
Patch230: u_xserver_xvfb-randr.patch
|
||||
Patch230: ux_xserver_xvfb-randr.patch
|
||||
|
||||
Patch247: u_randr_allow_rrselectinput_for_providerchange_and_resourcechange_events.patch
|
||||
Patch248: N_randr_fix_abi.patch
|
||||
@ -212,22 +199,14 @@ cp %{SOURCE96} .
|
||||
%patch0 -p1
|
||||
%patch2
|
||||
|
||||
### Needs to be rebased
|
||||
#%patch45 -p0
|
||||
%patch77
|
||||
%patch101 -p1
|
||||
%patch103
|
||||
%patch106 -p1
|
||||
%patch112 -p0
|
||||
|
||||
%patch127 -p1
|
||||
|
||||
%patch145 -p0
|
||||
### disabled for now
|
||||
#%patch162 -p1
|
||||
%patch200 -p1
|
||||
%patch202 -p1
|
||||
%patch203 -p1
|
||||
%patch206 -p0
|
||||
### disabled for now
|
||||
#%patch211 -p1
|
||||
@ -235,7 +214,6 @@ cp %{SOURCE96} .
|
||||
### patch222 might not be applicable anymore
|
||||
#%patch222 -p1
|
||||
%patch223 -p1
|
||||
%patch226 -p0
|
||||
%patch230 -p1
|
||||
%patch247 -p1
|
||||
%patch248 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user