Hello community, here is the log from the commit of package xf86-video-vmware for openSUSE:Factory checked in at 2013-03-21 09:55:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vmware (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-vmware", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vmware/xf86-video-vmware.changes 2013-01-25 09:41:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-vmware.new/xf86-video-vmware.changes 2013-03-21 09:55:08.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Mar 20 11:28:56 UTC 2013 - [email protected] + +- make supplements conditional on hardware (bnc#810333) + +------------------------------------------------------------------- +Tue Mar 19 15:37:45 UTC 2013 - [email protected] + +- Add U_mibstore.patch, fixes build with xorg-server 1.14 + +------------------------------------------------------------------- New: ---- U_mibstore.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vmware.spec ++++++ --- /var/tmp/diff_new_pack.ov3C6u/_old 2013-03-21 09:55:09.000000000 +0100 +++ /var/tmp/diff_new_pack.ov3C6u/_new 2013-03-21 09:55:09.000000000 +0100 @@ -25,6 +25,8 @@ Url: http://xorg.freedesktop.org/ #Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 +#PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include +Patch0: U_mibstore.patch ExclusiveArch: %ix86 x86_64 BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -38,7 +40,7 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-server) >= 1.0.1 BuildRequires: pkgconfig(xproto) -Supplements: xorg-x11-server +Supplements: modalias(xorg-x11-server:pci:v000015ADd*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 @@ -49,6 +51,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ U_mibstore.patch ++++++ >From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 From: Zack Rusin <[email protected]> Date: Thu, 14 Feb 2013 22:33:01 +0000 Subject: Kill mibstore It was a noop for at least 5 years and it has been removed. Signed-off-by: Zack Rusin <[email protected]> --- diff --git a/saa/saa_priv.h b/saa/saa_priv.h index 6652054..5d81453 100644 --- a/saa/saa_priv.h +++ b/saa/saa_priv.h @@ -48,7 +48,6 @@ #include "pixmapstr.h" #include "windowstr.h" #include "servermd.h" -#include "mibstore.h" #include "colormapst.h" #include "gcstruct.h" #include "input.h" diff --git a/src/vmware.c b/src/vmware.c index 41201f1..6b74e14 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -23,7 +23,6 @@ char rcsId_vmware[] = #include "xf86Pci.h" /* pci */ #include "mipointer.h" /* sw cursor */ -#include "mibstore.h" /* backing store */ #include "micmap.h" /* mi color map */ #include "vgaHW.h" /* VGA hardware */ #include "fb.h" @@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) * If backing store is to be supported (as is usually the case), * initialise it. */ - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index 9959ffb..7863ba2 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) (ms->only_hw_presents) ? "enabled" : "disabled"); } - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
