Hello community, here is the log from the commit of package xf86-video-nv for openSUSE:Factory checked in at 2013-03-22 13:04:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-nv (Old) and /work/SRC/openSUSE:Factory/.xf86-video-nv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-nv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-nv/xf86-video-nv.changes 2012-09-15 17:30:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-nv.new/xf86-video-nv.changes 2013-03-22 13:04:41.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Mar 21 15:22:59 CET 2013 - [email protected] + +- Add mibstore.patch, fixes build with xorg-server 1.14 + +------------------------------------------------------------------- +Wed Mar 20 14:31:58 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-nv.spec ++++++ --- /var/tmp/diff_new_pack.X4Kvfp/_old 2013-03-22 13:04:43.000000000 +0100 +++ /var/tmp/diff_new_pack.X4Kvfp/_new 2013-03-22 13:04:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-nv # -# 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,7 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Patch0: xf86-video-nv-bug519261-increase-virtual.diff +Patch1: U_Remove-mibstore.h.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -38,7 +39,8 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-server) >= 1.3 BuildRequires: pkgconfig(xproto) -Supplements: xorg-x11-server +Supplements: modalias(xorg-x11-server:pci:v000010DEd*sv*sd*bc03sc*i*) +Supplements: modalias(xorg-x11-server:pci:v000012D2d*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 Provides: xorg-x11-driver-video-nvidia = %{version} @@ -58,6 +60,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fi ++++++ U_Remove-mibstore.h.patch ++++++ >From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001 From: Adam Jackson <[email protected]> Date: Tue, 25 Sep 2012 08:54:49 -0400 Subject: [PATCH] Remove mibstore.h Signed-off-by: Adam Jackson <[email protected]> --- src/g80_driver.c | 2 -- src/nv_driver.c | 1 - src/nv_include.h | 3 --- src/riva_driver.c | 1 - src/riva_include.h | 3 --- 5 files changed, 10 deletions(-) diff --git a/src/g80_driver.c b/src/g80_driver.c index cc4e197..719b96c 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -34,7 +34,6 @@ #include <xf86Resources.h> #endif #include <mipointer.h> -#include <mibstore.h> #include <micmap.h> #include <xf86cmap.h> #include <fb.h> @@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL) } } - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); diff --git a/src/nv_driver.c b/src/nv_driver.c index 6dad6e5..8f35334 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) if (!pNv->NoAccel) NVAccelInit(pScreen); - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); diff --git a/src/nv_include.h b/src/nv_include.h index fb190bf..f174eef 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -24,9 +24,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" -/* All drivers implementing backing store need this */ -#include "mibstore.h" - #include "micmap.h" #include "xf86DDC.h" diff --git a/src/riva_driver.c b/src/riva_driver.c index e0667ef..759501e 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL) if (!pRiva->NoAccel) RivaAccelInit(pScreen); - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); diff --git a/src/riva_include.h b/src/riva_include.h index f2c5302..c7aeef7 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -22,9 +22,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" -/* All drivers implementing backing store need this */ -#include "mibstore.h" - #include "micmap.h" #include "xf86DDC.h" -- 1.7.10.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
