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 <[email protected]> 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 <[email protected]> Thu, 22 Mar 2012 18:03:40 -0400 + -- Robert Hooker <[email protected]> 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..0000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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 <pixman.h> - #include <picturestr.h> --#include <X11/extensions/Xrender.h> - #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 [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
