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

Accepting request 39692 from X11:XOrg

Browse Source 
Copy from X11:XOrg/xorg-x11-server based on submit request 39692 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/39692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=166
This commit is contained in:
OBS User autobuild 2010-05-13 22:33:13 +00:00 committed by Git OBS Bridge
commit 64dce59389
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorg-detect-psb.patch
View File

@ -19,7 +19,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
+ case 0x8109: case 0x8108: case 0x4102: + case 0x8109: case 0x8108: case 0x4102:
+ driverList[0] = "psb"; driverList[1] = "psb_drv"; break; + driverList[0] = "psb"; driverList[1] = "psb_drv"; break;
+ default: + default:
+ driverList[0] = "intel"; break; + driverList[0] = "intel"; driverList[1] = "intellegacy"; break;
} }
break; break;
case 0x102b: driverList[0] = "mga"; break; case 0x102b: driverList[0] = "mga"; break;

14
xorg-x11-server.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun May 9 03:27:39 CEST 2010 - sndirsch@suse.de
- xorg-detect-psb.patch
* added "intellegacy" as fallback for "intel" (gets active if
'nomodeset' is set as kernel option) since there is now a new
package for the older intel driver, which still has UMS support
-------------------------------------------------------------------
Thu Apr 29 01:36:52 CEST 2010 - sndirsch@suse.de
- remove Xdmx manual page from xorg-x11-server, since it's already
in xorg-x11-server-extra
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 26 10:40:11 UTC 2010 - eich@suse.de Mon Apr 26 10:40:11 UTC 2010 - eich@suse.de

3
xorg-x11-server.spec
View File

@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel
%endif %endif
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
Version: 7.5_%{dirsuffix} Version: 7.5_%{dirsuffix}
Release: 6 Release: 7
License: GPLv2+ ; MIT License (or similar) License: GPLv2+ ; 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
@ -376,6 +376,7 @@ exit 0
%dir /usr/%{_lib}/xorg %dir /usr/%{_lib}/xorg
/usr/%{_lib}/xorg/protocol.txt /usr/%{_lib}/xorg/protocol.txt
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_mandir}/man1/Xdmx.1*
%exclude %{_mandir}/man1/Xephyr.1* %exclude %{_mandir}/man1/Xephyr.1*
%exclude %{_mandir}/man1/Xnest.1* %exclude %{_mandir}/man1/Xnest.1*
%exclude %{_mandir}/man1/Xvfb.1* %exclude %{_mandir}/man1/Xvfb.1*