forked from pool/xorg-x11-server
Accepting request 210557 from home:tobijk:X11:XOrg
update to 1.14.99.904 OBS-URL: https://build.opensuse.org/request/show/210557 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=477
This commit is contained in:
parent
ccd9266526
commit
9df95a7189
@ -1,59 +0,0 @@
|
||||
From: Egbert Eich <Egbert Eich eich@suse.de>
|
||||
Date: Thu Aug 8 21:43:44 2013 +0200
|
||||
Subject: [PATCH]autoconf: On Linux give fbdev driver a higher precedence than vesa
|
||||
Patch-Mainline: never
|
||||
Git-commit: ccda2310eedf55215de792cdd5a793e3bf58fed1
|
||||
Git-repo:
|
||||
References:
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
|
||||
At SUSE we want to perfer the fbdev driver over the VESA driver
|
||||
at autoconfiguration as it is expected that fbdev will work in
|
||||
allmost all situations where no native driver can be found -
|
||||
even under UEFI and with secure boot.
|
||||
|
||||
Signed-off-by: Egbert Eich <Egbert Eich eich@suse.de>
|
||||
---
|
||||
hw/xfree86/common/xf86AutoConfig.c | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
|
||||
index 2da792e..252fe37 100644
|
||||
--- a/hw/xfree86/common/xf86AutoConfig.c
|
||||
+++ b/hw/xfree86/common/xf86AutoConfig.c
|
||||
@@ -277,26 +277,26 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
|
||||
if (i < (nmatches - 1))
|
||||
i = xf86PciMatchDriver(matches, nmatches);
|
||||
#endif
|
||||
+
|
||||
+#if defined(__linux__)
|
||||
+ matches[i++] = xnfstrdup("modesetting");
|
||||
+#endif
|
||||
/* Fallback to platform default hardware */
|
||||
if (i < (nmatches - 1)) {
|
||||
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||||
- matches[i++] = xnfstrdup("vesa");
|
||||
-#elif defined(__sparc__) && !defined(sun)
|
||||
+#if defined(__sparc__) && !defined(sun)
|
||||
matches[i++] = xnfstrdup("sunffb");
|
||||
+#else
|
||||
+ matches[i++] = xnfstrdup("fbdev");
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if defined(__linux__)
|
||||
- matches[i++] = xnfstrdup("modesetting");
|
||||
-#endif
|
||||
-
|
||||
#if !defined(sun)
|
||||
/* Fallback to platform default frame buffer driver */
|
||||
if (i < (nmatches - 1)) {
|
||||
#if !defined(__linux__) && defined(__sparc__)
|
||||
matches[i++] = xnfstrdup("wsfb");
|
||||
-#else
|
||||
- matches[i++] = xnfstrdup("fbdev");
|
||||
+#elif defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||||
+ matches[i++] = xnfstrdup("vesa");
|
||||
#endif
|
||||
}
|
||||
#endif /* !sun */
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:64c780e8d2e61c0ba1877c3334c468c4e35f9d63bf9b307a62ff1288e2a46f21
|
||||
size 3631174
|
3
xorg-server-1.14.99.904.tar.bz2
Normal file
3
xorg-server-1.14.99.904.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0da88a48a7880891c007c1f941cc99fa1f97ced7605a7ccbe3ada3b24b2cf9c
|
||||
size 3635056
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 11 00:35:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
|
||||
|
||||
- Update to version 1.14.99.904 (1.15 RC4)
|
||||
- Drop superseded patches:
|
||||
+ Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 5 12:18:30 UTC 2013 - sndirsch@suse.com
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
Name: xorg-x11-server
|
||||
|
||||
%define dirsuffix 1.14.99.903.1
|
||||
%define dirsuffix 1.14.99.904
|
||||
|
||||
Summary: X
|
||||
License: GPL-2.0+ and MIT
|
||||
@ -131,8 +131,6 @@ 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
|
||||
Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch
|
||||
# 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
|
||||
@ -224,7 +222,6 @@ cp %{SOURCE96} .
|
||||
|
||||
%patch127 -p1
|
||||
|
||||
%patch143 -p1
|
||||
%patch145 -p0
|
||||
### disabled for now
|
||||
#%patch162 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user