Hello community, here is the log from the commit of package xf86-video-vmware for openSUSE:Factory checked in at 2014-10-15 16:19:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vmware (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-vmware" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vmware/xf86-video-vmware.changes 2014-05-10 08:32:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-vmware.new/xf86-video-vmware.changes 2014-10-15 16:20:00.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Oct 14 09:23:37 UTC 2014 - [email protected] + +- U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch + * prevent endless looping during Xserver reset (bnc#900884) + +------------------------------------------------------------------- +Mon Oct 6 10:55:58 UTC 2014 - [email protected] + +- u_xf86xv.h-cannot-be-included-without-first-including-.patch + * include xorg-server.h before xf86xv.h in order to fix + build with latest glibc + +------------------------------------------------------------------- New: ---- U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch u_xf86xv.h-cannot-be-included-without-first-including-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vmware.spec ++++++ --- /var/tmp/diff_new_pack.JZpKkD/_old 2014-10-15 16:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.JZpKkD/_new 2014-10-15 16:20:01.000000000 +0200 @@ -25,6 +25,8 @@ 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 ExclusiveArch: %ix86 x86_64 BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -49,6 +51,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure ++++++ U_vmware-vmwgfx-Don-t-add-pixmaps-to-the-pixmap-list-i.patch ++++++ >From 32562129750077a23f26f2e69adc8403eb24bf3f Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom <[email protected]> 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 <[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]> --- 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 ++++++ u_xf86xv.h-cannot-be-included-without-first-including-.patch ++++++ >From 5efdd9808dcd42b95241142a309b3298c54ab4f5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <[email protected]> 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 <[email protected]> --- 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
