From 44d02ed5dff46df0476157e8449e709983ef9e81d114364ef5a2366a170f71f3 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 7 Dec 2012 10:51:17 +0000
Subject: [PATCH 1/2] Accepting request 141007 from
 home:fcrozat:branches:X11:XOrg

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

(this is needed because fbdev doesn't work properly under kvm / qemu and modesetting driver should be prefer to other fallback anyway).

OBS-URL: https://build.opensuse.org/request/show/141007
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=420
---
 N_autoconfig_fallback_fbdev_first.diff | 19 +++++++++++++++++--
 xorg-x11-server.changes                |  6 ++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/N_autoconfig_fallback_fbdev_first.diff b/N_autoconfig_fallback_fbdev_first.diff
index be1a39f..c3ed047 100644
--- a/N_autoconfig_fallback_fbdev_first.diff
+++ b/N_autoconfig_fallback_fbdev_first.diff
@@ -2,7 +2,14 @@ Index: hw/xfree86/common/xf86AutoConfig.c
 ===================================================================
 --- hw/xfree86/common/xf86AutoConfig.c.orig
 +++ 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 */
      if (i < (nmatches - 1)) {
  #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
@@ -11,7 +18,15 @@ Index: hw/xfree86/common/xf86AutoConfig.c
  #elif defined(__sparc__) && !defined(sun)
          matches[i++] = xnfstrdup("sunffb");
  #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__)
          matches[i++] = xnfstrdup("wsfb");
  #else
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 4d99c20..40ffb4a 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

From 8391ec9a66fdec7bb2c22e1f51b0766e1815e427a47211c305518a1ecf7b196a Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 7 Dec 2012 11:00:51 +0000
Subject: [PATCH 2/2] - Let the old Xfig program find the ghostscript fonts
 (bnc#784305)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=421
---
 xorg-x11-server.changes | 5 +++++
 xorg-x11-server.spec    | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 40ffb4a..453e4c9 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0944cb7..e290096 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -336,7 +336,11 @@ autoreconf -fi
             --with-xkb-output="/var/lib/xkb/compiled" \
 	    --with-default-font-path="/usr/share/fonts/misc: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/,\
+%endif
 /usr/share/fonts/cyrillic:unscaled,\
 /usr/share/fonts/misc/sgi:unscaled,\
 /usr/share/fonts/truetype/,built-ins"