Accepting request 159949 from home:sumski:branches:X11:XOrg

- Add mibstore.patch, fixes build with xorg-server 1.14

OBS-URL: https://build.opensuse.org/request/show/159949
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vesa?expand=0&rev=6

mibstore.patch

@@ -0,0 +1,32 @@
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
+ 

xf86-video-vesa.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 19 10:20:02 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Add mibstore.patch, fixes build with xorg-server 1.14
+
 -------------------------------------------------------------------
 Sun Sep  2 19:26:30 UTC 2012 - zaitor@opensuse.org
 

xf86-video-vesa.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-vesa
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ Group:          System/X11/Servers/XF86_4
 Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
 Patch0:         xf86-video-vesa_DefaultRefresh.diff
+#PATCH-FIX-UPSTREAM mibstore.patch -- removes obsolete include
+Patch1:         mibstore.patch
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
 BuildRequires:  pkgconfig(pciaccess) >= 0.10
@@ -50,6 +52,7 @@ supports depths 8, 15 16 and 24.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure