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

Accepting request 162807 from X11:XOrg

Browse Source 
- Add Source URL, see https://en.opensuse.org/SourceUrls (forwarded request 162711 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/162807
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=259
This commit is contained in:
Stephan Kulow 2013-04-09 08:28:03 +00:00 committed by Git OBS Bridge
commit 0b132eff4a
8 changed files with 56 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
N_zap_warning_xserver.diff
View File

@ -2,7 +2,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Config.c
=================================================================== ===================================================================
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c
+++ xorg-server-1.12.1/hw/xfree86/common/xf86Config.c +++ xorg-server-1.12.1/hw/xfree86/common/xf86Config.c
@@ -685,6 +685,7 @@ typedef enum { @@ -680,6 +680,7 @@ typedef enum {
FLAG_NOTRAPSIGNALS, FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH, FLAG_DONTVTSWITCH,
FLAG_DONTZAP, FLAG_DONTZAP,
@ -10,7 +10,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Config.c
FLAG_DONTZOOM, FLAG_DONTZOOM,
FLAG_DISABLEVIDMODE, FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL, FLAG_ALLOWNONLOCAL,
@@ -721,6 +722,8 @@ static OptionInfoRec FlagOptions[] = { @@ -717,6 +718,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE}, {0}, FALSE},
{FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN, {FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
{0}, FALSE}, {0}, FALSE},
@ -19,7 +19,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Config.c
{FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN, {FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE}, {0}, FALSE},
{FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN, {FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -807,6 +810,7 @@ configServerFlags(XF86ConfFlagsPtr flags @@ -805,6 +805,7 @@ configServerFlags(XF86ConfFlagsPtr flags
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals); xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
@ -31,11 +31,12 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Events.c
=================================================================== ===================================================================
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Events.c --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Events.c
+++ xorg-server-1.12.1/hw/xfree86/common/xf86Events.c +++ xorg-server-1.12.1/hw/xfree86/common/xf86Events.c
@@ -180,12 +180,25 @@ xf86ProcessActionEvent(ActionEvent actio @@ -182,13 +182,25 @@ xf86ProcessActionEvent(ActionEvent actio
DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg); DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
switch (action) { switch (action) {
case ACTION_TERMINATE: case ACTION_TERMINATE:
- if (!xf86Info.dontZap) { - if (!xf86Info.dontZap) {
- xf86Msg(X_INFO, "Server zapped. Shutting down.\n");
+ if (xf86Info.dontZap) + if (xf86Info.dontZap)
+ break; + break;
+ +
@ -65,7 +66,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Globals.c
=================================================================== ===================================================================
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Globals.c --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Globals.c
+++ xorg-server-1.12.1/hw/xfree86/common/xf86Globals.c +++ xorg-server-1.12.1/hw/xfree86/common/xf86Globals.c
@@ -104,6 +104,7 @@ xf86InfoRec xf86Info = { @@ -108,6 +108,7 @@ xf86InfoRec xf86Info = {
.autoVTSwitch = TRUE, .autoVTSwitch = TRUE,
.ShareVTs = FALSE, .ShareVTs = FALSE,
.dontZap = FALSE, .dontZap = FALSE,
@ -77,7 +78,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86Privstr.h
=================================================================== ===================================================================
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Privstr.h --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Privstr.h
+++ xorg-server-1.12.1/hw/xfree86/common/xf86Privstr.h +++ xorg-server-1.12.1/hw/xfree86/common/xf86Privstr.h
@@ -68,6 +68,7 @@ typedef struct { @@ -70,6 +70,7 @@ typedef struct {
Bool autoVTSwitch; Bool autoVTSwitch;
Bool ShareVTs; Bool ShareVTs;
Bool dontZap; Bool dontZap;

88
u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
View File

@ -1,88 +0,0 @@
From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Sun, 22 Jul 2012 12:29:51 +0200
Subject: [PATCH 3/3] Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV.
IDs stolen from Kernel psb driver.
---
hw/xfree86/common/xf86pciBus.c | 64 +++++++++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index a2c18eb..258988a 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1147,14 +1147,62 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
driverList[0] = "i128";
break;
case 0x8086:
- if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
- driverList[0] = "i740";
- }
- else if (dev->device_id == 0x8108) {
- break; /* "hooray" for poulsbo */
- }
- else {
- driverList[0] = "intel";
+ switch (dev->device_id)
+ {
+ /* Intel i740 */
+ case 0x00d1:
+ case 0x7800:
+ driverList[0] = "i740";
+ break;
+ /* GMA500/Poulsbo */
+ case 0x8108:
+ case 0x8109:
+ /* Try psb driver on Poulsbo - if available */
+ driverList[0] = "psb";
+ driverList[1] = "psb_drv";
+ break;
+ /* GMA600/Oaktrail */
+ case 0x4100:
+ case 0x4101:
+ case 0x4102:
+ case 0x4103:
+ case 0x4104:
+ case 0x4105:
+ case 0x4106:
+ case 0x4107:
+ /* Atom E620/Oaktrail */
+ case 0x4108:
+ /* Medfield */
+ case 0x0130:
+ case 0x0131:
+ case 0x0132:
+ case 0x0133:
+ case 0x0134:
+ case 0x0135:
+ case 0x0136:
+ case 0x0137:
+ /* GMA 3600/CDV */
+ case 0x0be0:
+ case 0x0be1:
+ case 0x0be2:
+ case 0x0be3:
+ case 0x0be4:
+ case 0x0be5:
+ case 0x0be6:
+ case 0x0be7:
+ case 0x0be8:
+ case 0x0be9:
+ case 0x0bea:
+ case 0x0beb:
+ case 0x0bec:
+ case 0x0bed:
+ case 0x0bee:
+ case 0x0bef:
+ /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
+ break;
+ default:
+ driverList[0] = "intel";
+ break;
}
break;
case 0x102b:
--
1.7.3.4

18
u_aarch64-support.patch
View File

@ -15,24 +15,6 @@ Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c
/* /*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
@@ -511,7 +512,7 @@ xf86EnableIO(void)
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
@@ -540,7 +541,7 @@ xf86DisableIO(void)
#if defined(__powerpc__)
munmap(ioBase, 0x20000);
ioBase = NULL;
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
iopl(0);
ioperm(0, 1024, 0);
#endif
Index: xorg-server-1.13.2/include/servermd.h Index: xorg-server-1.13.2/include/servermd.h
=================================================================== ===================================================================
--- xorg-server-1.13.2.orig/include/servermd.h --- xorg-server-1.13.2.orig/include/servermd.h

3
xorg-server-1.13.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408
size 5477756

3
xorg-server-1.14.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630
size 5507907

4
xorg-server-provides
View File

@ -1,4 +1,4 @@
Provides: X11_ABI_XINPUT = 18.0 Provides: X11_ABI_XINPUT = 19.1
Provides: X11_ABI_VIDEODRV = 13.1 Provides: X11_ABI_VIDEODRV = 14.1
Provides: X11_ABI_ANSIC = 0.4 Provides: X11_ABI_ANSIC = 0.4
Provides: X11_ABI_EXTENSION = 7.0 Provides: X11_ABI_EXTENSION = 7.0

40
xorg-x11-server.changes
View File

@ -1,8 +1,48 @@
-------------------------------------------------------------------
Fri Apr 5 08:05:09 UTC 2013 - idonmez@suse.com
- Add Source URL, see https://en.opensuse.org/SourceUrls
-------------------------------------------------------------------
Wed Mar 13 16:46:09 UTC 2013 - sndirsch@suse.com
- rebased u_aarch64-support.patch and reenabled it
-------------------------------------------------------------------
Fri Mar 8 16:16:07 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
- u_aarch64-support.patch: Basic support for aarch64 disabled for
the initial build of 1.14.0!
-------------------------------------------------------------------
Wed Mar 6 22:19:38 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
- Update to version 1.14.0:
Here's the 1.14 X server release; the last couple of weeks
yielded a couple of useful bug fixes, but nothing that earth
shattering.
+ a bunch of fixes to the touch device
+ a few fixes to the GPU hotplug bits
+ software rendering speedups (due to using the new pixman APIs)
+ elimination of a lot of warning messages (we've still too many)
+ pointer barriers work
There are lots of other fixes too, as always thanks to all who provided
patches, review and comments for this release!
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 6 11:26:53 UTC 2013 - schwab@suse.de Wed Mar 6 11:26:53 UTC 2013 - schwab@suse.de
- u_aarch64-support.patch: Basic support for aarch64. - u_aarch64-support.patch: Basic support for aarch64.
-------------------------------------------------------------------
Thu Feb 21 00:41:00 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
- Update to version 1.14 RC2 1.13.99.902:
+ Remove upstreamed patches:
u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch (patch225)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 20 13:36:40 UTC 2013 - sndirsch@suse.com Wed Feb 20 13:36:40 UTC 2013 - sndirsch@suse.com

8
xorg-x11-server.spec
View File

@ -17,12 +17,13 @@
Name: xorg-x11-server Name: xorg-x11-server
%define dirsuffix 1.13.2
%define dirsuffix 1.14.0
%define vnc 0 %define vnc 0
Summary: X Summary: X
License: GPL-2.0+ and MIT License: GPL-2.0+ and MIT
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
Source0: xorg-server-%{dirsuffix}.tar.bz2 Source0: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-%{dirsuffix}.tar.bz2
Source1: sysconfig.displaymanager.template Source1: sysconfig.displaymanager.template
Source3: README.updates Source3: README.updates
Source4: xorgcfg.tar.bz2 Source4: xorgcfg.tar.bz2
@ -175,7 +176,7 @@ Patch213: N_xorg-server-xdmcp.patch
Patch220: N_Use-external-tool-for-creating-backtraces-on-crashes.patch Patch220: N_Use-external-tool-for-creating-backtraces-on-crashes.patch
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch222: N_sync-fix.patch Patch222: N_sync-fix.patch
Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
Patch226: u_vgaHW-no-legacy.patch Patch226: u_vgaHW-no-legacy.patch
Patch227: u_init_framebuffer_base.patch Patch227: u_init_framebuffer_base.patch
Patch228: u_aarch64-support.patch Patch228: u_aarch64-support.patch
@ -295,7 +296,6 @@ cp %{SOURCE96} .
#%patch220 -p1 #%patch220 -p1
### patch222 might not be applicable anymore ### patch222 might not be applicable anymore
#%patch222 -p1 #%patch222 -p1
%patch225 -p1
%patch226 -p0 %patch226 -p0
%patch227 -p1 %patch227 -p1
%patch228 -p1 %patch228 -p1