From 52cb5f3e01b95b6cf57e64a620584fdaed1f65b8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 13 Mar 2012 17:40:00 +0200 Subject: [PATCH] xf86-video-vmware: update to xf86-video-vmware-12.0.0 --- packages/x11/driver/xf86-video-vmware/meta | 4 +- ...gfx-avoid-including-a-library-header.patch | 57 ------------------- 2 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch diff --git a/packages/x11/driver/xf86-video-vmware/meta b/packages/x11/driver/xf86-video-vmware/meta index 29b4dd03ff..802977d05b 100644 --- a/packages/x11/driver/xf86-video-vmware/meta +++ b/packages/x11/driver/xf86-video-vmware/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="xf86-video-vmware" -PKG_VERSION="11.99.901" +PKG_VERSION="12.0.0" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.vmware.com" -PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS="libX11 Mesa" PKG_BUILD_DEPENDS="toolchain Mesa" PKG_PRIORITY="optional" diff --git a/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch b/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch deleted file mode 100644 index 7c18bad709..0000000000 --- a/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-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 -