Hello community,

here is the log from the commit of package xf86-video-geode for 
openSUSE:Factory checked in at 2013-03-21 11:01:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-geode (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-geode.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-geode", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-geode/xf86-video-geode.changes        
2012-12-28 22:50:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xf86-video-geode.new/xf86-video-geode.changes   
2013-03-21 11:01:08.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Mar 20 14:46:16 UTC 2013 - [email protected]
+
+- introduce hardware supplements conditional on xorg-x11-server
+  package (bnc#810333)
+
+-------------------------------------------------------------------
+Tue Mar 19 15:44:59 UTC 2013 - [email protected]
+
+- Add U_mibstore.patch, fixes build with xorg-server 1.14
+
+-------------------------------------------------------------------

New:
----
  U_mibstore.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xf86-video-geode.spec ++++++
--- /var/tmp/diff_new_pack.genGwx/_old  2013-03-21 11:01:10.000000000 +0100
+++ /var/tmp/diff_new_pack.genGwx/_new  2013-03-21 11:01:10.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-geode
 #
-# 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
@@ -24,6 +24,8 @@
 Group:          System/X11/Servers/XF86_4
 Url:            http://xorg.freedesktop.org/
 Source0:        
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+#PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include
+Patch0:         U_mibstore.patch
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
 BuildRequires:  pkgconfig(pciaccess) >= 0.8.0
@@ -34,7 +36,8 @@
 BuildRequires:  pkgconfig(xorg-macros) >= 1.4
 BuildRequires:  pkgconfig(xorg-server)
 BuildRequires:  pkgconfig(xproto)
-Supplements:    xorg-x11-server
+Supplements:    modalias(xorg-x11-server:pci:v00001022d*sv*sd*bc03sc*i*)
+Supplements:    modalias(xorg-x11-server:pci:v0000100bd*sv*sd*bc03sc*i*)
 # This was part of the xorg-x11-driver-video package up to version 7.6
 Conflicts:      xorg-x11-driver-video <= 7.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -51,6 +54,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure

++++++ U_mibstore.patch ++++++
>From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001
From: Adam Jackson <[email protected]>
Date: Thu, 10 Jan 2013 03:16:26 +0000
Subject: Remove mibstore.h

Signed-off-by: Adam Jackson <[email protected]>
---
diff --git a/src/geode_driver.c b/src/geode_driver.c
index b27bfd5..9cd0af9 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -59,8 +59,6 @@
 /* Machine independent stuff */
 #include "mipointer.h"
 #include "micmap.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "vbe.h"
 
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 5268f29..7f44e19 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pGeode->NoAccel)
         GXAccelInit(pScrn);
 
-    miInitializeBackingStore(pScrn);
     xf86SetBackingStore(pScrn);
 
     /* Set up the soft cursor */
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 6d7f37f..146578e 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pGeode->NoAccel)
         pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE;
 
-    miInitializeBackingStore(pScrn);
     xf86SetBackingStore(pScrn);
 
     /* Set up the soft cursor */
--
cgit v0.9.0.2-2-gbebe
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to