Accepting request 282535 from X11:XOrg

- Update to version 13.1.0:
  + Adapt to GC client clip changes in server 1.17
  + Fix xf86xv.h cannot be included without first including
    xorg-server.h
  + Fix saa_check_poly_fill_rect_noreadback v2
  + Fix saa_check_copy_window dirty region v3
  + Revert "vmware/saa: Disable the noreadback polyfillrect
    optimization"
  + Fix cursor problem with multimon
  + Don't add puixmaps to the pixmap list if they're already
    on it.
  + Fix overlay related compile breakage on earlier X servers
  + Fix bootstrap related compile errors on earlier X servers
  + Clear the PITCHLOCK register if available before modeset
  + Fix out of bound array indexing
  + Fix compilation issue on older X servers
  + Fix uninitialized values in video commands
  + Fix an error path segfault (fdo#80645)
  + Fix auto colorkey fill usage
  + Better error logging when handling cursors
  + Don't move cursors without images
  + Fix xwayland build on newer XA versions
  + Add support for server managed fds
  + Add support for XSERVER_PLATFORM_BUS
  + Fix initial dirty region for pixmaps
  + Set desired modes after xMir screen init
  + Don't tell XA that we have a mask when we haven't
  + Don't change backing-store of active scanout services
  + Fix build without xatracker
- Changes from version 13.0.1
  + Fix compilation on newer X servers
  + Always allocate shared hardware surfaces
  + Require libdrm 2.4.38 to build XMir
  + Block DMA to prime surfaces for now
  + Enable direct dmas
  + Add support for XWayland
  + Add support for XMir v2
  + Add an infrastructure to be able to run hosted under
    a compositor v2
  + Fix compile breakage on XA version 1
  + Really allow XA version 2
  + Revert "vmwgfx: Get rid of device-specific DMA code"
  + Support also XA version 1 v2
  + Handle changes of DamageUnregister API in 1.14.99.2
  + Implement textured video completely on top of XA
  + Avoid HW operations when not master
  + Update for XA API changes
+ Dropped (patches accepted upstream):
  + U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch
  + u_xf86xv.h-cannot-be-included-without-first-including-.patch
  + xf86-video-vmware-13.0.2.tar.bz2

OBS-URL: https://build.opensuse.org/request/show/282535
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xf86-video-vmware?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2015-01-25 20:13:45 +00:00 committed by Git OBS Bridge
commit 7706493f4a
6 changed files with 61 additions and 85 deletions

View File

@ -1,32 +0,0 @@
From 32562129750077a23f26f2e69adc8403eb24bf3f Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed, 3 Sep 2014 07:08:41 -0700
Subject: [PATCH] vmware/vmwgfx: Don't add pixmaps to the pixmap list if
they're already on it
This could cause loops through the list to spin indefinitely.
This would most likely occur at VT switches.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
---
vmwgfx/vmwgfx_saa.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index b9204c6..bca3d93 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -694,7 +694,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
vmwgfx_pixmap_free_storage(vpix);
- WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
+ if (WSBMLISTEMPTY(&vpix->pixmap_list))
+ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
return TRUE;
--
1.8.4.5

View File

@ -1,43 +0,0 @@
From 5efdd9808dcd42b95241142a309b3298c54ab4f5 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Mon, 6 Oct 2014 12:52:16 +0200
Subject: [PATCH] xf86xv.h cannot be included without first including
xorg-server.h.
Without this the build fails on systems with the latest glibc,
throwing this error:
In file included from /usr/include/string.h:634:0,
from /usr/include/xorg/os.h:53,
from /usr/include/xorg/misc.h:115,
from /usr/include/xorg/screenint.h:50,
from /usr/include/xorg/scrnintstr.h:50,
from /usr/include/xorg/xvdix.h:55,
from /usr/include/xorg/xf86xv.h:32,
from vmwgfx_overlay.c:38:
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);
This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
causing os.h to redefine it.
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
---
vmwgfx/vmwgfx_overlay.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
index ef1d541..2b05b0e 100644
--- a/vmwgfx/vmwgfx_overlay.c
+++ b/vmwgfx/vmwgfx_overlay.c
@@ -35,6 +35,7 @@
*/
+#include "xorg-server.h"
#include "xf86xv.h"
#include "fourcc.h"
#define debug_printf(...)
--
1.8.4.5

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54
size 438773

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc
size 459255

View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Fri Jan 23 00:00:28 UTC 2015 - sfalken@opensuse.org
- Update to version 13.1.0:
+ Adapt to GC client clip changes in server 1.17
+ Fix xf86xv.h cannot be included without first including
xorg-server.h
+ Fix saa_check_poly_fill_rect_noreadback v2
+ Fix saa_check_copy_window dirty region v3
+ Revert "vmware/saa: Disable the noreadback polyfillrect
optimization"
+ Fix cursor problem with multimon
+ Don't add puixmaps to the pixmap list if they're already
on it.
+ Fix overlay related compile breakage on earlier X servers
+ Fix bootstrap related compile errors on earlier X servers
+ Clear the PITCHLOCK register if available before modeset
+ Fix out of bound array indexing
+ Fix compilation issue on older X servers
+ Fix uninitialized values in video commands
+ Fix an error path segfault (fdo#80645)
+ Fix auto colorkey fill usage
+ Better error logging when handling cursors
+ Don't move cursors without images
+ Fix xwayland build on newer XA versions
+ Add support for server managed fds
+ Add support for XSERVER_PLATFORM_BUS
+ Fix initial dirty region for pixmaps
+ Set desired modes after xMir screen init
+ Don't tell XA that we have a mask when we haven't
+ Don't change backing-store of active scanout services
+ Fix build without xatracker
- Changes from version 13.0.1
+ Fix compilation on newer X servers
+ Always allocate shared hardware surfaces
+ Require libdrm 2.4.38 to build XMir
+ Block DMA to prime surfaces for now
+ Enable direct dmas
+ Add support for XWayland
+ Add support for XMir v2
+ Add an infrastructure to be able to run hosted under
a compositor v2
+ Fix compile breakage on XA version 1
+ Really allow XA version 2
+ Revert "vmwgfx: Get rid of device-specific DMA code"
+ Support also XA version 1 v2
+ Handle changes of DamageUnregister API in 1.14.99.2
+ Implement textured video completely on top of XA
+ Avoid HW operations when not master
+ Update for XA API changes
+ Dropped (patches accepted upstream):
+ U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch
+ u_xf86xv.h-cannot-be-included-without-first-including-.patch
+ xf86-video-vmware-13.0.2.tar.bz2
-------------------------------------------------------------------
Tue Oct 14 09:23:37 UTC 2014 - sndirsch@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xf86-video-vmware
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,16 +17,14 @@
Name: xf86-video-vmware
Version: 13.0.2
Version: 13.1.0
Release: 0
Summary: VMware SVGA video driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
#http://xorg.freedesktop.org/releases/individual/driver/
Source0: %{name}-%{version}.tar.bz2
Patch0: u_xf86xv.h-cannot-be-included-without-first-including-.patch
Patch1: U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
ExclusiveArch: %ix86 x86_64
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
@ -51,8 +49,6 @@ vmware is an Xorg driver for VMware virtual video cards.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure