xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog| 41 ++--
debian/compat |2 -
debian/control |5 +---
debian/patches/series |2 -
debian/rules|1
debian/upstream/signing-key.asc | 30 +
debian/watch|1
7 files changed, 75 insertions(+), 7 deletions(-)
New commits:
commit 6102cfc439c6a1479a3504c01207bd0aed88ff16
Author: Timo Aaltonen
Date: Wed Jan 20 11:30:02 2016 +0200
changelog from 1:13.1.0-2ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 819c73f..ff85199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-vmware (1:13.1.0-2ubuntu1) wily; urgency=medium
+
+ * Merge with Debian, remaining Ubuntu changes:
+ * debian/vmwgfx-fbdev.conf:
+ * debian/xserver-xorg-video-vmware.install:
+- Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass
+ enable_fbdev=1 to the vmwgfx module at load time fixing a crash on
+ suspend from inside of the guest in VMware hosts.
+
+ -- Robert Ancell Wed, 15 Jul 2015 10:27:56
+1200
+
xserver-xorg-video-vmware (1:13.1.0-2) unstable; urgency=medium
* Restrict architecture list to x86.
commit 107ffc365d49d8a050396e740a22662a396fe4bd
Author: Timo Aaltonen
Date: Wed Jan 20 11:27:05 2016 +0200
import 1:13.1.0-0ubuntu1build2
diff --git a/debian/changelog b/debian/changelog
index f8d3210..d9e1ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1build2) wily; urgency=medium
+
+ * Rebuild against the new X (LP: #1462021).
+
+ -- Alberto Milone Fri, 05 Jun 2015 16:19:01
+0200
+
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1build1) vivid; urgency=medium
+
+ * Rebuild to pick up new Xserver dependencies
+
+ -- Maarten Lankhorst Thu, 12 Mar 2015
07:59:37 +
+
xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) vivid; urgency=medium
* Merge from unreleased debian.
diff --git a/debian/control b/debian/control
index 75e310d..0c9e11e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit 3bc76326f77c8749066d523e79cd321d6c06e43e
Author: Julien Cristau
Date: Sat May 9 17:13:50 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 1637b7c..c7660f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-vmware (1:13.1.0-2) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.1.0-2) unstable; urgency=medium
* Restrict architecture list to x86.
- -- Julien Cristau Sat, 09 May 2015 17:13:13 +0200
+ -- Julien Cristau Sat, 09 May 2015 17:13:48 +0200
xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
commit 34f4599462cd078fc95320b2ada679b8eae017fd
Author: Julien Cristau
Date: Sat May 9 17:13:47 2015 +0200
Restrict architecture list to x86.
diff --git a/debian/changelog b/debian/changelog
index d8ff4be..1637b7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:13.1.0-2) UNRELEASED; urgency=medium
+
+ * Restrict architecture list to x86.
+
+ -- Julien Cristau Sat, 09 May 2015 17:13:13 +0200
+
xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 79a5d6f..09c8a10 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git
Package: xserver-xorg-video-vmware
-Architecture: any
+Architecture: any-amd64 any-i386
Depends:
${shlibs:Depends},
${misc:Depends},
commit 3dffc3c23e7b6f832b48b0e7ff1cf0770d168a0e
Author: Julien Cristau
Date: Sun May 3 11:33:32 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 20c42a4..d8ff4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
[ Maarten Lankhorst ]
* New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED;
urgency=medium
* Remove Drew and Cyril from Uploaders.
* Let uscan verify tarball signatures.
- -- Maarten Lankhorst Tue, 20 Jan 2015
11:21:26 +0100
+ -- Julien Cristau Sun, 03 May 2015 11:33:26 +0200
xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
commit 2798707db5533db5182e18b02c83ef145245248b
Author: Julien Cristau
Date: Sun May 3 11:33:10 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/cha
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 65123fa358090683a6de49b27f9e8db05f051e17 Author: Maarten Lankhorst Date: Tue Jan 20 13:14:42 2015 +0100 release to vivid diff --git a/debian/changelog b/debian/changelog index 809df10..f8d3210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) UNRELEASED; urgency=medium +xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) vivid; urgency=medium * Merge from unreleased debian. - -- Maarten Lankhorst Tue, 20 Jan 2015 11:21:26 +0100 + -- Maarten Lankhorst Tue, 20 Jan 2015 13:14:27 +0100 xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1ydxjn-iw...@moszumanska.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog | 381
configure.ac|2
debian/changelog| 13 +
debian/control |2
saa/saa.c |2
saa/saa_unaccel.c | 56 ---
src/vmware.c|5
src/vmware_bootstrap.c |7
src/vmwarevideo.c |9 -
vmwgfx/vmwgfx_crtc.c|9 +
vmwgfx/vmwgfx_driver.c |2
vmwgfx/vmwgfx_overlay.c |1
vmwgfx/vmwgfx_saa.c |3
13 files changed, 460 insertions(+), 32 deletions(-)
New commits:
commit 2a72feff87289063e3e23519e438d9bec8bdf495
Author: Maarten Lankhorst
Date: Tue Jan 20 12:49:14 2015 +0100
Merge from unreleased debian.
diff --git a/debian/changelog b/debian/changelog
index c6d2ea6..809df10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from unreleased debian.
+
+ -- Maarten Lankhorst Tue, 20 Jan 2015
11:21:26 +0100
+
xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
* New upstream release.
commit 6e7d85c60f8182af995a4aa554fdbafddd698f90
Author: Maarten Lankhorst
Date: Tue Jan 20 12:48:07 2015 +0100
New upstream release.
Bump Standards-Version to 3.9.6 (no changes needed).
diff --git a/ChangeLog b/ChangeLog
index f19a6ea..8bfe3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,384 @@
+commit 891ee48e4c1baa2643eda048b4207f8263a37dca
+Author: Thomas Hellstrom
+Date: Mon Jan 19 11:23:50 2015 +0100
+
+vmware: Bump version number for release
+
+Signed-off-by: Thomas Hellstrom
+
+commit 79289b0ffc553ded902eea7b8b9803b098f340e3
+Author: Adam Jackson
+Date: Thu Dec 4 10:35:04 2014 -0500
+
+saa: Adapt to GC client clip changes in xserver 1.17
+
+1.17 always stores the client clip as a region, so there's no longer a
+clientClipType member to look at. Change the code to just inspect
+whether the clientClip is non-null, since that works both before and
+after 1.17.
+
+Signed-off-by: Adam Jackson
+Reviewed-by: Thomas Hellstrom
+
+commit 4664412d7a5266d2b392957406b34abc5db95e48
+Author: Stefan Dirsch
+Date: Tue Oct 7 11:29:32 2014 +0200
+
+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
+Reviewed-by: Daniel Stone
+Acked-by: Thomas Hellstrom
+
+commit 8e1c4e5bd521ec2d4f1a21da432f110c606b3fde
+Author: Thomas Hellstrom
+Date: Mon Sep 22 12:09:13 2014 +0200
+
+vmware/saa: Fix saa_check_poly_fill_rect_noreadback v2
+
+We were not clipping the dirty region correctly, Fix this.
+Also actually do what the comment in the function says: If there are more
than
+an ad-hoc number of rectangles to read back, then revert to the default
+saa_check_poly_fill_rect function that reads back the whole damage region.
+
+v2: Fix commit log message.
+
+Signed-off-by: Thomas Hellstrom
+Reviewed-by: Brian Paul
+Reviewed-by: Sinclair Yeh
+Reviewed-by: Jakob Bornecrantz
+
+commit c23fd33d8ce8491891255d93c04e053bf333bd4e
+Author: Thomas Hellstrom
+Date: Mon Sep 22 11:43:02 2014 +0200
+
+vmware/saa: Fix saa_check_copy_window dirty region v3
+
+The saa_check_copy_window could dirty regions that were never touched,
since
+we were using the X server provided damage region rather than the more
+detailed region actually copied. This would have been OK if we had first
done
+a read-back of the region to be dirtied, but since we want to avoid that,
+instead compute the detailed destination region and use that for dirtying.
+
+This fixes rendering glitches seen with motif applications.
+
+v2: Fix whitespace error.
+v3: Move dirty region computation.
+
+Signed-off-by: Thomas Hellstrom
+Reviewed-by: Brian Paul
+Reviewed-by: Sinclair Yeh
+Reviewed-by: Jakob Bornecrantz
+
+commit f86434ac69bd288c7fba65d178c22a91a0f4f6c2
+Author: Thomas Hellstrom
+Date: Mon Sep 15 15:13:53 2014 +0200
+
+Revert "vmware/saa: Disable the noreadback polyfillrect optimization"
+
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog | 14 +++
debian/rules |7 +++--
saa/saa_unaccel.c| 12 -
src/vmware.c |3 --
src/vmware_bootstrap.c | 59 ---
src/vmwarevideo.c|7 -
vmwgfx/vmwgfx_crtc.c | 13 +-
vmwgfx/vmwgfx_driver.c | 35 +++
vmwgfx/vmwgfx_driver.h |2 +
vmwgfx/vmwgfx_overlay.c | 28 ++
vmwgfx/vmwgfx_saa.c |3 +-
vmwgfx/vmwgfx_xmir.c |6
vmwgfx/vmwgfx_xwayland.c |2 -
13 files changed, 162 insertions(+), 29 deletions(-)
New commits:
commit 3249f38d2f91207266d9e5e6113106bbf9db2eab
Author: Maarten Lankhorst
Date: Wed Sep 10 16:33:11 2014 +0200
release to utopic
diff --git a/debian/changelog b/debian/changelog
index 8c088e2..6f1cc69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) utopic; urgency=medium
* Merge from released debian-unstable.
* Cherry pick some more fixes from master.
- -- Maarten Lankhorst Wed, 06 Aug 2014
15:50:06 +0200
+ -- Maarten Lankhorst Wed, 10 Sep 2014
16:32:01 +0200
xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
commit 378d7adf092513ef8fcd3851bc4f512e51ea2437
Author: Maarten Lankhorst
Date: Wed Aug 6 15:50:51 2014 +0200
Add changelog entries.
diff --git a/debian/changelog b/debian/changelog
index 431efbf..8c088e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from released debian-unstable.
+ * Cherry pick some more fixes from master.
+
+ -- Maarten Lankhorst Wed, 06 Aug 2014
15:50:06 +0200
+
xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
* rules: avoid mixing implicit and normal rules; make 4 doesn't like that
commit 0a596fd0c92fdcf73071869a59029263a2596018
Author: Thomas Hellstrom
Date: Wed Jul 2 14:21:45 2014 +0200
vmware/vmwgfx: Fix an error path segfault
Part of freedesktop.org bugzilla bug #80645
If taking a scanout reference on a pixmap fails, the
struct vmwgfx_screen_entry::pixmap pointer must be set to NULL, otherwise
the driver will incorrectly attempt to remove the scanout reference in the
error path, causing a segfault.
This problem is seen in the above-mentioned bug, but it is not the root
cause of the problem. With this patch applied, the server will terminate
cleanly instead of segfaulting.
Signed-off-by: Thomas Hellstrom
Reviewed-by: Jakob Bornecrantz
diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
index 5fce5f7..4f9cdda 100644
--- a/vmwgfx/vmwgfx_crtc.c
+++ b/vmwgfx/vmwgfx_crtc.c
@@ -193,6 +193,7 @@ crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtcp->entry.pixmap = pixmap;
crtcp->scanout_id = vmwgfx_scanout_ref(&crtcp->entry);
if (crtcp->scanout_id == -1) {
+ crtcp->entry.pixmap = NULL;
LogMessage(X_ERROR, "Failed to convert pixmap to scanout.\n");
return FALSE;
}
commit e2d4e0cb5870f51e8a27cedc74565efb124b75e9
Author: Julien Cristau
Date: Mon Jun 2 22:29:16 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5cf4dd4..62a7de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-vmware (1:13.0.2-3) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
- * rules: avoid mixing implicit and normal rules; make 4 doesn't like that.
+ * rules: avoid mixing implicit and normal rules; make 4 doesn't like that
+(closes: #750265)
- -- Julien Cristau Tue, 29 Apr 2014 18:34:12 +0200
+ -- Julien Cristau Mon, 02 Jun 2014 22:28:59 +0200
xserver-xorg-video-vmware (1:13.0.2-2) unstable; urgency=medium
commit 4e378a730d2d2deffc915af2a3d013d2a994a1b0
Author: Jakob Bornecrantz
Date: Wed May 21 11:52:29 2014 +0200
vmware/legacy: Apply same fix to auto colorkey fill
Signed-off-by: Jakob Bornecrantz
Reviewed-by: Thomas Hellström
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 745c71f..a82110d 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -687,7 +687,12 @@ vmwareVideoInitStream(ScrnInfoPtr pScrn, VMWAREVideoPtr
pVid,
int nBoxes = REGION_NUM_RECTS(&pVid->clipBoxes);
#if HAVE_FILLKEYHELPERDRAWABLE
- xf86XVFillKeyHelperDrawable(draw, pVid->colorKey, clipBoxes);
+ if (draw->type == DRAWABLE_WINDOW) {
+ xf86XVFillKeyHelperDrawable(draw, pVid->colorKey, clipBoxes);
+ DamageDamageRegion(draw, clipBoxes);
+ } else {
+ xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
+}
#else
xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
#
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |7 +++ 1 file changed, 7 insertions(+) New commits: commit 426006760e377047cd0073ef7050bff69e281115 Author: Maarten Lankhorst Date: Tue Apr 8 16:47:45 2014 +0200 bump changelog, release to trusty diff --git a/debian/changelog b/debian/changelog index 4465d9b..5915e00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-vmware (1:13.0.2-2ubuntu1) trusty; urgency=low + + * Merge from released debian-unstable. + * Cherry pick some fixes from git. + + -- Maarten Lankhorst Tue, 08 Apr 2014 16:42:04 +0200 + xserver-xorg-video-vmware (1:13.0.2-2) unstable; urgency=medium * Fix build failure on kfreebsd (closes: #743239) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wxxjg-vf...@moszumanska.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog | 173
configure.ac| 10 +
debian/changelog| 48 ++
debian/control |2
debian/rules|8 -
src/vmware_bootstrap.c | 20 ++
src/vmware_bootstrap.h |2
src/vmwaremodes.c |4
src/vmwarevideo.c |4
vmwgfx/Makefile.am |5
vmwgfx/vmwgfx_dri2.c| 37 +
vmwgfx/vmwgfx_driver.c | 309 ++--
vmwgfx/vmwgfx_driver.h |4
vmwgfx/vmwgfx_drmi.c| 142
vmwgfx/vmwgfx_drmi.h| 13 +
vmwgfx/vmwgfx_hosted.c | 71 ++
vmwgfx/vmwgfx_hosted.h | 258
vmwgfx/vmwgfx_hosted_priv.h | 40 +
vmwgfx/vmwgfx_overlay.c |8 -
vmwgfx/vmwgfx_saa.c | 274 +--
vmwgfx/vmwgfx_saa.h |7
vmwgfx/vmwgfx_saa_priv.h| 13 +
vmwgfx/vmwgfx_tex_video.c |2
vmwgfx/vmwgfx_xa_surface.c | 63 +++-
vmwgfx/vmwgfx_xmir.c| 178 +
vmwgfx/vmwgfx_xwayland.c| 186 ++
26 files changed, 1698 insertions(+), 183 deletions(-)
New commits:
commit d1348cd564c9104ce2a486e4083a9e970b14eec2
Author: Maarten Lankhorst
Date: Tue Apr 8 16:40:23 2014 +0200
bump changelog
diff --git a/debian/changelog b/debian/changelog
index 470e1a9..0dfd7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-xserver-xorg-video-vmware (1:13.0.1.git8da9817-0ubuntu1) trusty; urgency=low
+xserver-xorg-video-vmware (1:13.0.1.git.20140115.8da9817-0ubuntu2) trusty;
urgency=low
+
+ * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst Wed, 05 Feb 2014
10:12:27 +
+
+xserver-xorg-video-vmware (1:13.0.1.git.20140115.8da9817-0ubuntu1) trusty;
urgency=low
* Sync fixes from git to make libxatracker2 work correctly. (LP: #1271186)
commit 64e0faf1480663a990e0f6aeef7af0e69845af49
Author: Thomas Hellstrom
Date: Wed Apr 2 14:05:23 2014 +0200
vmware/vmwgfx: Don't tell XA that we have a mask when we haven't
In some cases, the X server sends us a composit operation with
mask_pict != NULL, but mask_pix == NULL. Assume there's no mask
involved in that case.
Signed-off-by: Thomas Hellstrom
Reviewed-by: Brian Paul
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 3da0222..99a289d 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -1158,6 +1158,8 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8
op,
* and check whether XA can accelerate.
*/
+if (!mask_pix)
+ mask_pict = NULL;
xa_comp = vmwgfx_xa_setup_comp(vsaa->vcomp, op,
src_pict, mask_pict, dst_pict);
if (!xa_comp)
commit c062d08a50a26c99a3b8f565a8b2b00e8dc21c3f
Author: Thomas Hellstrom
Date: Thu Jan 16 18:27:57 2014 +0100
vmware/vmwgfx: Don't change backing-store of active scanout surfaces
With option "HwPresents" on, the driver would sometimes change backing
store of active scanout surfaces, making the kernel module refuse to
present. This was caused by scanout surfaces not having the RENDERTARGET
flag
on by default. So when rendered to, using copies or composites, they
would be reallocated. Fix this by adding the RENDERTARGET flag from start.
Also add code that prints out an error message when we change backing store
of active scanout surfaces
Signed-off-by: Thomas Hellstrom
Reviewed-by: Jakob Bornecrantz
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index b56b05f..3da0222 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -610,9 +610,9 @@ vmwgfx_pix_resize(PixmapPtr pixmap, unsigned int old_pitch,
}
if (vpix->hw) {
- if (xa_surface_redefine(vpix->hw, draw->width, draw->height,
- draw->depth, xa_type_argb,
- xa_format_unknown, vpix->xa_flags, 1) != 0)
+ if (!vmwgfx_xa_surface_redefine(vpix, vpix->hw, draw->width,
+ draw->height, draw->depth, xa_type_argb,
+ xa_format_unknown, vpix->xa_flags, 1))
return FALSE;
}
@@ -1504,7 +1504,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
* The KMS fb will be a HW surface. Create it, add damage
* and get the handle.
*/
- if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT |
+ XA_FLAG_RENDER_TARGET, 0, NULL))
goto out_err;
if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
goto out_err;
diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
index c84827b..4a0c
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog | 145 + configure.ac | 10 ++- debian/changelog |7 ++ debian/control |4 - src/vmware_bootstrap.c |2 src/vmwarevideo.c |4 - vmwgfx/vmwgfx_dri2.c | 15 vmwgfx/vmwgfx_driver.c |6 + vmwgfx/vmwgfx_drmi.c | 103 --- vmwgfx/vmwgfx_drmi.h |5 - vmwgfx/vmwgfx_output.c |2 vmwgfx/vmwgfx_overlay.c|4 - vmwgfx/vmwgfx_saa.c| 107 - vmwgfx/vmwgfx_saa.h| 20 ++ vmwgfx/vmwgfx_saa_priv.h |3 vmwgfx/vmwgfx_tex_video.c | 134 - vmwgfx/vmwgfx_xa_surface.c |6 + 17 files changed, 321 insertions(+), 256 deletions(-) New commits: commit 74236f521452c02608bd3186d9f32761ad86d2a5 Author: Maarten Lankhorst Date: Mon Dec 9 18:16:39 2013 +0100 use a snapshot for libxatracker2 support diff --git a/ChangeLog b/ChangeLog index accf25c..c9ebc96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,148 @@ +commit a40cbd7b4fa19219849b4b0a48f07538772c3e22 +Author: Thomas Hellstrom +Date: Thu Dec 5 02:58:47 2013 -0800 + +vmwgfx: Support also XA version 1 v2 + +We need to support also XA version 1, since we want to be backwards +compatible with older mesa releases. +Unfortunately, the intended way of detecting XA major version at +compile-time was broken on mesa 10 so we need a workaround that tests +for XA version 2 at config time. + +v2: Update the test for XA version 2. + +Signed-off-by: Thomas Hellstrom +Reviewed-by: Jakob Bornecrantz + +commit 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 +Author: Thomas Hellstrom +Date: Thu Nov 28 02:02:20 2013 -0800 + +vmwgfx: Fix some compilation warnings and indentations + +Most of the compilation warnings we're seeing are due to bad xorg headers, +but fix the ones we can fix in the driver. Some indentation fixes as well. + +Signed-off-by: Thomas Hellstrom +Reviewed-by: Jakob Bornecrantz + +commit e26dec8f5278df74a102493bf6d2d8444dab5d6d +Author: Gaetan Nadon +Date: Mon Oct 28 18:21:29 2013 -0400 + +vmwgfx: handle changes of DamageUnregister API in 1.14.99.2 + +Fix is inspired from the intel driver. + +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Gaetan Nadon +Signed-off-by: Jakob Bornecrantz + +commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 +Author: Thomas Hellstrom +Date: Wed Sep 19 21:50:40 2012 +0200 + +vmwgfx: Get rid of device-specific DMA code + +It's rarely used and things seem to work well enough on top of XA. + +Signed-off-by: Thomas Hellstrom +Reviewed-by: Zack Rusin + +commit 7192acf9f0bf8e7176ab0b803b861a858623f709 +Author: Thomas Hellstrom +Date: Wed Sep 19 20:36:57 2012 +0200 + +vmwgfx: Implement textured video completely on top of XA. + +Remove device-specific hacks. This may increase resource usage a little +on old hardware revisions, but we don't need separate code paths on +different hardware revisions. + +Signed-off-by: Thomas Hellstrom +Reviewed-by: Zack Rusin + +commit 835ce4698f916ba080f4132988fd4caf898e0b1e +Author: Thomas Hellstrom +Date: Thu Sep 26 01:25:33 2013 -0700 + +vmwgfx: Avoid HW operations when not master + +Note that for DRI2, a dri2_copy_region becomes a NOP when not master. +Additionally, all dri2 operations that lead to a potential kernel +access will return FALSE. + +Signed-off-by: Thomas Hellstrom +Reviewed-by: Jakob Bornecrantz + +commit 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 +Author: Rob Clark +Date: Mon Jun 10 13:31:31 2013 -0400 + +vmwgfx: update for XA API changes + +Signed-off-by: Rob Clark +Signed-off-by: Jakob Bornecrantz +Reviewed-by: Jakob Bornecrantz +Tested-by: Jakob Bornecrantz + +commit b3345886332ee2b9fd1348dc2cd36257dfd71986 +Author: Jakob Bornecrantz +Date: Wed Apr 17 12:03:32 2013 +0200 + +Bump the version number to 13.0.1 + +commit d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd +Author: Loïc Yhuel +Date: Thu Apr 11 11:29:10 2013 +0200 + +vmwgfx: Use myGlyphs to fix crashes + +Tested-by: Christian Hesse +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Loïc Yhuel +Signed-off-by: Jakob Bornecrantz + +commit 23d87c92b7211cc5249eefe4ab3a2c7f370e279e +Author: Zack Rusin +Date: Thu Feb 14 14:33:01 2013 -0800 + +Kill mibstore + +It was a noop for at least 5 years and it has been removed. + +Signed-off-by: Zack Rusin + +commit 686859fba16ed2616c38bbe5d4e38abf4c5b7ae9 +Author: Zack Rusin +Date: Tue Jan 15 12:05:45 2013 -0800 + +Bump the version number to 13.0.0 + +New abi and various fixes + +Signed-off-by: Zack Rusin + +commit adf375f3d400e51b1e445e89de6bd82be0bb4ef3 +Author: Zack Rusin
xserver-xorg-video-vmware: Changes to 'ubuntu'
configure.ac |2 +- debian/changelog | 33 +++-- debian/patches/series |1 + saa/saa_priv.h |1 - saa/saa_render.c |4 src/vmware.c |2 -- vmwgfx/vmwgfx_crtc.c |6 +- vmwgfx/vmwgfx_driver.c |1 - 8 files changed, 38 insertions(+), 12 deletions(-) New commits: commit 4f3cc7dbf7617dda3c21daf9328adc3aa2ef349d Author: Maarten Lankhorst Date: Wed Jul 10 18:38:13 2013 +0200 release to saucy diff --git a/debian/changelog b/debian/changelog index cebdb3d..2e440a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +xserver-xorg-video-vmware (1:13.0.1-0ubuntu1) saucy; urgency=low + + * New upstream release. + - Drop remove-mibstore.diff (upstream) + - Fix crash under xserver 1.14 (LP: #1199403) + + -- Robert Hooker Wed, 10 Jul 2013 12:14:42 -0400 + +xserver-xorg-video-vmware (1:13.0.0-0ubuntu0.2) saucy; urgency=low + + * Refresh remove-mibstore.diff + + -- Maarten Lankhorst Thu, 04 Jul 2013 23:11:52 +0200 + +xserver-xorg-video-vmware (1:13.0.0-0ubuntu0.1) raring; urgency=low + + * Merge from unreleased debian git. + * remove-mibstore.diff: Remove mibstore. + + -- Timo Aaltonen Fri, 08 Feb 2013 15:05:54 +0200 + +xserver-xorg-video-vmware (1:13.0.0-1) UNRELEASED; urgency=low + + * New upstream release to build against xserver 1.13. + + -- Timo Aaltonen Thu, 02 Aug 2012 10:46:43 +0300 + xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) quantal-proposed; urgency=low * Merge from unreleased debian git, remaining changes: @@ -8,12 +35,6 @@ xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) quantal-proposed; urg -- Timo Aaltonen Thu, 02 Aug 2012 11:14:41 +0300 -xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low - - * New upstream snapshot to build against xserver 1.13. - - -- Timo Aaltonen Thu, 02 Aug 2012 10:46:43 +0300 - xserver-xorg-video-vmware (1:12.0.2-1) unstable; urgency=low * New upstream release: diff --git a/debian/patches/series b/debian/patches/series index e69de29..a82d1b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +#placeholder commit b3345886332ee2b9fd1348dc2cd36257dfd71986 Author: Jakob Bornecrantz Date: Wed Apr 17 12:03:32 2013 +0200 Bump the version number to 13.0.1 diff --git a/configure.ac b/configure.ac index 424fb92..0631bcc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-vmware], -[13.0.0], +[13.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-vmware]) AC_CONFIG_SRCDIR([Makefile.am]) commit d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Author: Loïc Yhuel Date: Thu Apr 11 11:29:10 2013 +0200 vmwgfx: Use myGlyphs to fix crashes Tested-by: Christian Hesse Reviewed-by: Jakob Bornecrantz Signed-off-by: Loïc Yhuel Signed-off-by: Jakob Bornecrantz diff --git a/saa/saa_render.c b/saa/saa_render.c index c69f2c9..c6ce68c 100644 --- a/saa/saa_render.c +++ b/saa/saa_render.c @@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); saa_wrap(sscreen, ps, Triangles, saa_triangles); saa_wrap(sscreen, ps, Composite, saa_composite); + saa_wrap(sscreen, ps, Glyphs,miGlyphs); + saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); } } @@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) saa_unwrap(sscreen, ps, Trapezoids); saa_unwrap(sscreen, ps, Triangles); saa_unwrap(sscreen, ps, Composite); + saa_unwrap(sscreen, ps, Glyphs); + saa_unwrap(sscreen, ps, UnrealizeGlyph); } } #endif commit 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Author: Zack Rusin Date: Thu Feb 14 14:33:01 2013 -0800 Kill mibstore It was a noop for at least 5 years and it has been removed. Signed-off-by: Zack Rusin 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);
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit 289d8e00d763ced95a2a4703b88b3bf4f076e48f Author: Maarten Lankhorst Date: Wed Jul 10 18:45:31 2013 +0200 Rebuild bump with the patches removed. diff --git a/debian/changelog b/debian/changelog index 2e440a1..f0ee760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-vmware (1:13.0.1-0ubuntu2) saucy; urgency=low + + * Rebuild bump with the patches removed. + + -- Maarten Lankhorst Wed, 10 Jul 2013 18:45:00 +0200 + xserver-xorg-video-vmware (1:13.0.1-0ubuntu1) saucy; urgency=low * New upstream release. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1uwxx0-pk...@vasks.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog | 79 +++ configure.ac |6 ++ debian/changelog | 23 ++ saa/saa.c |4 - saa/saa.h |4 + src/Makefile.am|1 src/compat-api.h | 99 + src/vmware.c | 44 ++-- src/vmware.h |5 -- src/vmware_common.h|2 src/vmwarecurs.c | 17 --- src/vmwarevideo.c |5 +- vmwgfx/vmwgfx_dri2.c |4 - vmwgfx/vmwgfx_driver.c | 73 - vmwgfx/vmwgfx_driver.h |7 +-- vmwgfx/vmwgfx_saa.c|4 - vmwgfx/vmwgfx_tex_video.c |6 +- vmwgfx/vmwgfx_xa_surface.c |2 18 files changed, 297 insertions(+), 88 deletions(-) New commits: commit 4c6570204a5cee3b99530b01f80f53a1e152373f Author: Timo Aaltonen Date: Thu Aug 2 11:15:04 2012 +0300 release to quantal-proposed diff --git a/debian/changelog b/debian/changelog index 48674df..cebdb3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) UNRELEASED; urgency=low +xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) quantal-proposed; urgency=low * Merge from unreleased debian git, remaining changes: - Build with XA, enabling accelerated virtualized passthrough @@ -6,7 +6,7 @@ xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) UNRELEASED; urgency=l enable_fbdev=1 to the vmwgfx module at load time fixing a crash on suspend from inside of the guest in VMware hosts. (LP: 994888) - -- Timo Aaltonen Thu, 02 Aug 2012 11:09:09 +0300 + -- Timo Aaltonen Thu, 02 Aug 2012 11:14:41 +0300 xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low commit b21062ea9edc66af3126c8dbc9122130254e9f82 Author: Timo Aaltonen Date: Thu Aug 2 11:14:38 2012 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index 83b541c..48674df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) UNRELEASED; urgency=low + + * Merge from unreleased debian git, remaining changes: +- Build with XA, enabling accelerated virtualized passthrough +- Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass + enable_fbdev=1 to the vmwgfx module at load time fixing a crash on + suspend from inside of the guest in VMware hosts. (LP: 994888) + + -- Timo Aaltonen Thu, 02 Aug 2012 11:09:09 +0300 + xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low * New upstream snapshot to build against xserver 1.13. commit 405d30c7312a1e46a7a87de36f762b7918084908 Author: Timo Aaltonen Date: Thu Aug 2 11:08:55 2012 +0300 fix the revision diff --git a/debian/changelog b/debian/changelog index 2b49a76..d01fe85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1ubuntu1) UNRELEASED; urgency=low +xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low * New upstream snapshot to build against xserver 1.13. commit a97b93e5437a9a3df4c8d6f09419727419704477 Author: Timo Aaltonen Date: Thu Aug 2 11:05:11 2012 +0300 update the changelogs diff --git a/ChangeLog b/ChangeLog index 2a5d2ce..accf25c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,65 @@ +commit e5ac80d8f72963313358e31cfb1ab98583e26f23 +Author: Dave Airlie +Date: Tue Jul 3 13:50:30 2012 +0100 + +vmware: avoid warnings about shadowing 'i' + +Signed-off-by: Dave Airlie + +commit 46c0862d205eefa985e36a74391ca392640cb898 +Author: Dave Airlie +Date: Sat Jun 16 14:43:52 2012 +0100 + +vmware: drop infoFromScreen inline in favour of new interface + +This also should fix the build regression introduced with the fix +for this macro. + +Signed-off-by: Dave Airlie + +commit 50c01998c7800bc02fd6656cc14efa715bf63e08 +Author: Robert Hooker +Date: Fri Jun 15 11:56:59 2012 -0400 + +vmware: Fix up some warnings after new compat API change. + +Fixes multiple instances of these warnings on x86_64: +../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration] +../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs] +../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default] +Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180 + +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Robert Hooker +Signed-off-by: Jakob Bornecrantz + +commit 61df95a86f4997e342d50d7779b00aba2e8849a6 +Author: Dave Airlie +Date: Wed Jun 6 09:58:01 2012 +0100 + +vmware: port vmware d
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |8 debian/vmwgfx-fbdev.conf |1 + debian/xserver-xorg-video-vmware.install |2 ++ 3 files changed, 11 insertions(+) New commits: commit 1a79262a0292cf7892f095da6721ea8041cbd878 Author: Robert Hooker Date: Mon May 21 14:09:25 2012 -0400 Add modprobe conf file to enable vmwgfx kernel module option to fix s3 diff --git a/debian/changelog b/debian/changelog index 82723d4..d63a8e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-vmware (1:12.0.1-1ubuntu2) quantal; urgency=low + + * Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass +enable_fbdev=1 to the vmwgfx module at load time fixing a crash on +suspend from inside of the guest in VMware hosts. (LP: #994888) + + -- Robert Hooker Wed, 11 Apr 2012 14:29:10 -0400 + xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low * Add libxatracker-dev build dep, it was accidentally dropped by diff --git a/debian/vmwgfx-fbdev.conf b/debian/vmwgfx-fbdev.conf new file mode 100644 index 000..d652300 --- /dev/null +++ b/debian/vmwgfx-fbdev.conf @@ -0,0 +1 @@ +options vmwgfx enable_fbdev=1 diff --git a/debian/xserver-xorg-video-vmware.install b/debian/xserver-xorg-video-vmware.install index daa64ce..71e6dcf 100644 --- a/debian/xserver-xorg-video-vmware.install +++ b/debian/xserver-xorg-video-vmware.install @@ -1,3 +1,5 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* usr/bin/vmwarectrl + +../vmwgfx-fbdev.conf /etc/modprobe.d -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1swx3f-00057p...@vasks.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |4 debian/patches/100-vmwgfx-avoid-including-a-library-header.patch | 57 -- debian/patches/series|1 3 files changed, 3 insertions(+), 59 deletions(-) New commits: commit 3df8bb3ec022c00b516dabd701a2c5a3f1ee65fc Author: Robert Hooker Date: Thu Mar 22 18:11:38 2012 -0400 Drop upstream patch. diff --git a/debian/changelog b/debian/changelog index b89b455..82723d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low * Add libxatracker-dev build dep, it was accidentally dropped by syncing the newer version without it, breaking 3D accelerated passthrough support in vmware. (LP: #962599) + * Drop 100-vmwgfx-avoid-including-a-library-header.patch, included +in the update. - -- Robert Hooker Thu, 22 Mar 2012 18:03:40 -0400 + -- Robert Hooker Thu, 22 Mar 2012 18:11:07 -0400 xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low diff --git a/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch b/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch deleted file mode 100644 index 7c18bad..000 --- a/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8ff19c2b2f288d6851b444dbda39544980837b73 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 1 Feb 2012 16:59:13 +0100 -Subject: [PATCH 1/4] vmwgfx: Avoid including a library header and use pixman - for type conversion - -The PictTransform type is a typedef of a pixman type. - -Signed-off-by: Thomas Hellstrom - vmwgfx/vmwgfx_xa_composite.c | 20 ++-- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/vmwgfx/vmwgfx_xa_composite.c b/vmwgfx/vmwgfx_xa_composite.c -index a2e3970..32246e8 100644 a/vmwgfx/vmwgfx_xa_composite.c -+++ b/vmwgfx/vmwgfx_xa_composite.c -@@ -33,8 +33,8 @@ - #include "config.h" - #endif - -+#include - #include --#include - #include "xa_composite.h" - #include "vmwgfx_saa.h" - #include "vmwgfx_saa_priv.h" -@@ -75,17 +75,17 @@ vmwgfx_matrix_from_pict_transform(PictTransform *trans, float *matrix) -if (!trans) - return FALSE; - -- matrix[0] = XFixedToDouble(trans->matrix[0][0]); -- matrix[3] = XFixedToDouble(trans->matrix[0][1]); -- matrix[6] = XFixedToDouble(trans->matrix[0][2]); -+ matrix[0] = pixman_fixed_to_double(trans->matrix[0][0]); -+ matrix[3] = pixman_fixed_to_double(trans->matrix[0][1]); -+ matrix[6] = pixman_fixed_to_double(trans->matrix[0][2]); - -- matrix[1] = XFixedToDouble(trans->matrix[1][0]); -- matrix[4] = XFixedToDouble(trans->matrix[1][1]); -- matrix[7] = XFixedToDouble(trans->matrix[1][2]); -+ matrix[1] = pixman_fixed_to_double(trans->matrix[1][0]); -+ matrix[4] = pixman_fixed_to_double(trans->matrix[1][1]); -+ matrix[7] = pixman_fixed_to_double(trans->matrix[1][2]); - -- matrix[2] = XFixedToDouble(trans->matrix[2][0]); -- matrix[5] = XFixedToDouble(trans->matrix[2][1]); -- matrix[8] = XFixedToDouble(trans->matrix[2][2]); -+ matrix[2] = pixman_fixed_to_double(trans->matrix[2][0]); -+ matrix[5] = pixman_fixed_to_double(trans->matrix[2][1]); -+ matrix[8] = pixman_fixed_to_double(trans->matrix[2][2]); - -return TRUE; - } --- -1.7.8.3 - diff --git a/debian/patches/series b/debian/patches/series index 38bb76e..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -100-vmwgfx-avoid-including-a-library-header.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1saqeq-0007yd...@vasks.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog| 128 +++ Makefile.am |4 + configure.ac | 22 ++- debian/changelog | 16 + saa/Makefile.am |4 + saa/saa_unaccel.c| 102 ++ src/Makefile.am |9 ++- src/vmware.c | 20 -- src/vmware.h |8 +- src/vmware_bootstrap.c | 35 +++ vmwgfx/Makefile.am |6 +- vmwgfx/vmwgfx_ctrl.c | 40 ++--- vmwgfx/vmwgfx_driver.c |1 vmwgfx/vmwgfx_driver.h |9 +++ vmwgfx/vmwgfx_saa.c |2 vmwgfx/vmwgfx_xa_composite.c | 20 +++--- 16 files changed, 335 insertions(+), 91 deletions(-) New commits: commit 23ad157888431debe10d5a17b81330026b905c37 Author: Robert Hooker Date: Thu Mar 22 18:08:39 2012 -0400 Bump changelog and release. diff --git a/debian/changelog b/debian/changelog index c26c7dd..b89b455 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low + + * Add libxatracker-dev build dep, it was accidentally dropped by +syncing the newer version without it, breaking 3D accelerated +passthrough support in vmware. (LP: #962599) + + -- Robert Hooker Thu, 22 Mar 2012 18:03:40 -0400 + xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low * New upstream release. commit 36692128865ced49457fe4b67edb59d79a3a5eb9 Author: Cyril Brulebois Date: Mon Mar 19 22:07:43 2012 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 326b4f9..a682399 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-vmware (1:12.0.1-1) UNRELEASED; urgency=low +xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low * New upstream release. * Actually merge upstream master up to b70116b907 (one extra commit) to avoid memory corruptions. - -- Cyril Brulebois Mon, 19 Mar 2012 21:05:18 + + -- Cyril Brulebois Mon, 19 Mar 2012 22:07:38 +0100 xserver-xorg-video-vmware (1:11.0.99.901-1) unstable; urgency=low commit 89930ef7ee7c04545ffc2ac930a7d04a11d913f5 Author: Cyril Brulebois Date: Mon Mar 19 22:07:33 2012 +0100 New upstream release. Actually merge upstream master up to b70116b907 (one extra commit) to avoid memory corruptions. diff --git a/ChangeLog b/ChangeLog index 5ded524..34051cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,696 @@ +commit b70116b907aa8545f0275589a52275235083bb40 +Author: Zack Rusin +Date: Thu Mar 15 11:37:26 2012 -0400 + +Fix a memory corruption due to a redundant free. + +We use the empty rect purely as a placeholder and never +initialize it with its own memory so lets not try to free +it. +Spotted by Dave Airlie. + +Signed-off-by: Zack Rusin +Reviewed-by: Jakob Bornecrantz + +commit 57f1204292a116b35d5930752bc06f9065332879 +Author: Jakob Bornecrantz +Date: Tue Mar 13 21:41:11 2012 +0100 + +Bump version number for the release + +Signed-off-by: Jakob Bornecrantz + +commit e585f9ea04bbd17398d2fa804be38a4e75bc60e4 +Author: Gaetan Nadon +Date: Tue Mar 13 09:44:46 2012 -0400 + +config: move AC_SYS_LARGEFILE in autoconf init section + +There is no need for this statement to be conditionally included. +It adds support for large files without taking anything away. + +http://www.gnu.org/software/autoconf/manual/autoconf.html + +Signed-off-by: Gaetan Nadon +Signed-off-by: Jakob Bornecrantz + +commit 04169f3860e4a7d03485631bee40c05fc45b72c6 +Author: Gaetan Nadon +Date: Mon Mar 12 14:51:38 2012 -0400 + +config: include saa and vmwgfx subdirs in the tarball + +Use AM_CONDITIONAL. Automake knows what to distribute. +It needs to be able to navigate down the subdirs to find what +needs to be included in the tarball. + +To test reliably, create a tarball and expand it into a separate +directory and build with xatracker. Distcheck will not detect +missing code when such code is configured not to build. + +The content of a tarball *must* always be identical, regardless +of the configuration options used or on which platform it was configured. + +Signed-off-by: Gaetan Nadon +Signed-off-by: Jakob Bornecrantz + +commit e6836ff099e5565dea58a53bba9b2df377241ef7 +Author: Zack Rusin +Date: Thu Mar 8 09:55:07 2012 -0500 + +Bump version number for the release + +Signed-off-by: Zack Rusin + +commit c5c38bab8c493985349356be5fadc14d3aee8040 +Author: Thomas Hellstrom +Date: Wed Feb 8 15:00:20 2012 +0100 + +vmware/legacy: Fix initial mode size v2 + +Commit "vmwlegacy: Make the default be a minium of 800x600..." +read the dimensions from the incorrect register pair. + +v2: Also treat initial widths and h
xserver-xorg-video-vmware: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit b027776b0be0e9469d4132fad7dc788c4fbb4103 Author: Robert Hooker Date: Thu Feb 2 16:26:55 2012 -0500 Add 100-vmwgfx-avoid-including-a-library-header.patch to fix the build. commit 6b49a9b68c387107768b83a96a2b657485ede755 Author: Robert Hooker Date: Thu Feb 2 15:46:54 2012 -0500 debian/control: Update maintainers commit a12166fcf20eb125ff0a7f5bc1fa7072b1486aa2 Author: Robert Hooker Date: Thu Feb 2 15:44:37 2012 -0500 Add libxatracker-dev to build-deps. commit f9f2e96d48f1e62682defcbf87a1b421bbe58f80 Author: Robert Hooker Date: Thu Feb 2 15:44:07 2012 -0500 Bump changelogs. commit 8f101d8c012deac3ecbbcae405b9809b4d4e460e Merge: bd0fa01 193b511 Author: Robert Hooker Date: Thu Feb 2 15:39:51 2012 -0500 Merge branch 'upstream-ubuntu' into ubuntu -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rt4ki-0001fg...@vasks.debian.org
