Hello community,
here is the log from the commit of package xf86-video-neomagic for
openSUSE:Factory checked in at 2013-03-22 13:02:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-neomagic (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-neomagic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-neomagic", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-neomagic/xf86-video-neomagic.changes
2012-09-15 17:30:26.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-neomagic.new/xf86-video-neomagic.changes
2013-03-22 13:02:22.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Mar 21 14:02:51 UTC 2013 - [email protected]
+
+- Add mibstore.patch, fixes build with xorg-server 1.14
+
+-------------------------------------------------------------------
+Wed Mar 20 17:48:37 UTC 2013 - [email protected]
+
+- introduce hardware supplements conditional on xorg-x11-server
+ package (bnc#810333)
+
+-------------------------------------------------------------------
New:
----
U_Remove-mibstore.h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-neomagic.spec ++++++
--- /var/tmp/diff_new_pack.p5ZMNJ/_old 2013-03-22 13:02:24.000000000 +0100
+++ /var/tmp/diff_new_pack.p5ZMNJ/_new 2013-03-22 13:02:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-neomagic
#
-# 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,7 @@
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+Patch0: U_Remove-mibstore.h.patch
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
@@ -35,7 +36,7 @@
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901
BuildRequires: pkgconfig(xproto)
-Supplements: xorg-x11-server
+Supplements: modalias(xorg-x11-server:pci:v000010C8d*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
@@ -47,6 +48,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure
++++++ U_Remove-mibstore.h.patch ++++++
>From 005d61313e989bf054b1cc2190f1c743362d86ff Mon Sep 17 00:00:00 2001
From: Adam Jackson <[email protected]>
Date: Tue, 25 Sep 2012 08:54:44 -0400
Subject: [PATCH] Remove mibstore.h
Signed-off-by: Adam Jackson <[email protected]>
---
src/neo_driver.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/neo_driver.c b/src/neo_driver.c
index ce89ce0..a17b925 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -69,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
@@ -1618,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
"Acceleration %s Initialized\n",ret ? "" : "not");
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
--
1.7.10.4
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
