pool/xorg-x11-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 144524 from X11:XOrg

Browse Source 
- Let the old Xfig program find the ghostscript fonts (bnc#784305) 

- Update N_autoconfig_fallback_fbdev_first.diff to ensure
  modesetting driver is used before fbdev.

OBS-URL: https://build.opensuse.org/request/show/144524
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=249
This commit is contained in:
Ismail Dönmez 2012-12-07 13:59:02 +00:00 committed by Git OBS Bridge
commit fc2c205442
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
N_autoconfig_fallback_fbdev_first.diff
View File

@ -2,7 +2,14 @@ Index: hw/xfree86/common/xf86AutoConfig.c
=================================================================== ===================================================================
--- hw/xfree86/common/xf86AutoConfig.c.orig --- hw/xfree86/common/xf86AutoConfig.c.orig
+++ hw/xfree86/common/xf86AutoConfig.c +++ hw/xfree86/common/xf86AutoConfig.c
@@ -264,7 +264,7 @@ listPossibleVideoDrivers(char *matches[] @@ -267,26 +267,26 @@ listPossibleVideoDrivers(char *matches[]
if (i < (nmatches - 1))
i = xf86PciMatchDriver(matches, nmatches);
#endif
+
+#if defined(__linux__)
+ matches[i++] = xnfstrdup("modesetting");
+#endif
/* 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__)
@ -11,7 +18,15 @@ Index: hw/xfree86/common/xf86AutoConfig.c
#elif defined(__sparc__) && !defined(sun) #elif defined(__sparc__) && !defined(sun)
matches[i++] = xnfstrdup("sunffb"); matches[i++] = xnfstrdup("sunffb");
#endif #endif
@@ -276,7 +276,7 @@ listPossibleVideoDrivers(char *matches[] }
-#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__) #if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb"); matches[i++] = xnfstrdup("wsfb");
#else #else

11
xorg-x11-server.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 27 13:00:41 UTC 2012 - werner@suse.de
- Let the old Xfig program find the ghostscript fonts (bnc#784305)
-------------------------------------------------------------------
Mon Nov 12 17:27:21 UTC 2012 - fcrozat@suse.com
- Update N_autoconfig_fallback_fbdev_first.diff to ensure
modesetting driver is used before fbdev.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 30 10:45:57 UTC 2012 - sndirsch@suse.com Tue Oct 30 10:45:57 UTC 2012 - sndirsch@suse.com

4
xorg-x11-server.spec
View File

@ -336,7 +336,11 @@ autoreconf -fi
--with-xkb-output="/var/lib/xkb/compiled" \ --with-xkb-output="/var/lib/xkb/compiled" \
--with-default-font-path="/usr/share/fonts/misc:unscaled,\ --with-default-font-path="/usr/share/fonts/misc:unscaled,\
/usr/share/fonts/Type1/,/usr/share/fonts/100dpi:unscaled,\ /usr/share/fonts/Type1/,/usr/share/fonts/100dpi:unscaled,\
%if 0%{?suse_version} > 1210
/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/ghostscript/,\
%else
/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/URW/,\ /usr/share/fonts/75dpi:unscaled,/usr/share/fonts/URW/,\
%endif
/usr/share/fonts/cyrillic:unscaled,\ /usr/share/fonts/cyrillic:unscaled,\
/usr/share/fonts/misc/sgi:unscaled,\ /usr/share/fonts/misc/sgi:unscaled,\
/usr/share/fonts/truetype/,built-ins" /usr/share/fonts/truetype/,built-ins"