- u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch

* ad hoc fix for mmap's truncated offset parameter on 32bit
    (bnc#917385)
- N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch
  * hwcursor still considered broken in cirrus KMS ((bnc#864141,
    bnc#866152)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=561

N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch

@@ -0,0 +1,29 @@
+From b09233d2145363e9a5598818e7731b5fc06babfd Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Mon, 16 Feb 2015 16:55:04 +0100
+Subject: [PATCH] Force swcursor for KMS drivers without hw cursor support
+
+hwcursor still considered broken on cirrus KMS (bnc#864141, bnc#866152)
+---
+ hw/xfree86/drivers/modesetting/driver.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
+index d52517d..e1af7d4 100644
+--- a/hw/xfree86/drivers/modesetting/driver.c
++++ b/hw/xfree86/drivers/modesetting/driver.c
+@@ -764,9 +764,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+     if (!xf86SetDefaultVisual(pScrn, -1))
+         return FALSE;
+ 
+-    if (xf86ReturnOptValBool(ms->Options, OPTION_SW_CURSOR, FALSE)) {
+-        ms->drmmode.sw_cursor = TRUE;
+-    }
++    /* hw cursor still considered broken on cirrus */
++    ms->drmmode.sw_cursor = xf86ReturnOptValBool(ms->Options, OPTION_SW_CURSOR, TRUE);
+ 
+     ms->cursor_width = 64;
+     ms->cursor_height = 64;
+-- 
+1.8.4.5
+

u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch

@@ -0,0 +1,31 @@
+From 2c36b0001729fa2c22255777bce66b99adc6c568 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Mon, 16 Feb 2015 15:00:54 +0100
+Subject: [PATCH] ad hoc fix for mmap's truncated offset parameter on 32bit
+
+Builtin modesetting driver didn't work on 32bit on cirrus KMS.
+See https://bugzilla.suse.com/show_bug.cgi?id=917385 for more details.
+---
+ hw/xfree86/drivers/modesetting/dumb_bo.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xfree86/drivers/modesetting/dumb_bo.c b/hw/xfree86/drivers/modesetting/dumb_bo.c
+index 58d420e..95b34a2 100644
+--- a/hw/xfree86/drivers/modesetting/dumb_bo.c
++++ b/hw/xfree86/drivers/modesetting/dumb_bo.c
+@@ -25,6 +25,12 @@
+  *
+  */
+ 
++/*
++ * ad hoc fix for mmap's truncated offset parameter on 32bit
++ * see also https://bugzilla.suse.com/show_bug.cgi?id=917385
++ */
++#define _FILE_OFFSET_BITS 64
++
+ #include "dumb_bo.h"
+ 
+ #include <errno.h>
+-- 
+1.8.4.5
+

xorg-x11-server.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb 16 14:11:57 UTC 2015 - sndirsch@suse.com
+
+- u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch 
+  * ad hoc fix for mmap's truncated offset parameter on 32bit
+    (bnc#917385)
+- N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch
+  * hwcursor still considered broken in cirrus KMS ((bnc#864141,
+    bnc#866152)
+
 -------------------------------------------------------------------
 Tue Feb 10 23:27:48 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
 

xorg-x11-server.spec

@@ -161,6 +161,8 @@ Patch110:       u_connection-avoid-crash-when-CloseWellKnownConnections-gets-cal
 Patch111:       u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
 Patch112:       u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
 Patch113:       u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch
+Patch114:       u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch
+Patch115:       N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch
 
 Patch1000:      n_xserver-optimus-autoconfig-hack.patch
 
@@ -249,6 +251,8 @@ cp %{SOURCE90} .
 %patch111 -p1
 %patch112 -p1
 %patch113 -p1
+%patch114 -p1
+%patch115 -p1
 
 %patch1000 -p1