[arch-commits] Commit in xf86-video-vmware/trunk (PKGBUILD git_fixes.diff)
Date: Wednesday, January 16, 2013 @ 04:39:27
Author: jgc
Revision: 175176
upgpkg: xf86-video-vmware 13.0.0-1
Modified:
xf86-video-vmware/trunk/PKGBUILD
Deleted:
xf86-video-vmware/trunk/git_fixes.diff
+
PKGBUILD | 10
git_fixes.diff | 894 ---
2 files changed, 4 insertions(+), 900 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-16 01:32:46 UTC (rev 175175)
+++ PKGBUILD2013-01-16 09:39:27 UTC (rev 175176)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=xf86-video-vmware
-pkgver=12.0.2
-pkgrel=2
+pkgver=13.0.0
+pkgrel=1
pkgdesc=X.org vmware video driver
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
@@ -13,13 +13,11 @@
conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git_fixes.diff)
-sha1sums=('efa47f365d88da245804a9934719ff860ed04f95'
- 'ad475b37e2614f365533a40da0fb5b9e2709e3c6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/git_fixes.diff
./configure --prefix=/usr --enable-vmwarectrl-client
make
}
Deleted: git_fixes.diff
===
--- git_fixes.diff 2013-01-16 01:32:46 UTC (rev 175175)
+++ git_fixes.diff 2013-01-16 09:39:27 UTC (rev 175176)
@@ -1,894 +0,0 @@
-From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
-From: Brian Paul bri...@vmware.com
-Date: Fri, 20 Apr 2012 20:24:26 +
-Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
-
-This fixes a failed assertion in the gallium/svga driver in the
-svga_texture_get_handle() function. The texture resource wasn't
-getting created with the PIPE_BIND_SHARED flag so the !cachable
-assertion would fail and the X session would abort. This didn't
-happen with release builds.
-
-Reviewed-by: Jakob Bornecrantz ja...@vmware.com
-diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
-index 2a18762..8b30e45 100644
a/vmwgfx/vmwgfx_xa_surface.c
-+++ b/vmwgfx/vmwgfx_xa_surface.c
-@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
-
- vpix-staging_format = format;
- vpix-staging_remove_flags = 0;
--vpix-staging_add_flags = XA_FLAG_RENDER_TARGET;
-+vpix-staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
-
- return TRUE;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie airl...@redhat.com
-Date: Wed, 06 Jun 2012 08:58:01 +
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz ja...@vmware.com
-Reviewed-by: Jakob Bornecrantz ja...@vmware.com
-Signed-off-by: Dave Airlie airl...@redhat.com
-Signed-off-by: Jakob Bornecrantz ja...@vmware.com
-diff --git a/saa/saa.c b/saa/saa.c
-index 173c090..f2d68e9 100644
a/saa/saa.c
-+++ b/saa/saa.c
-@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
- * screen private, before calling down to the next CloseScreen.
- */
- Bool
--saa_close_screen(int i, ScreenPtr pScreen)
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
- struct saa_screen_priv *sscreen = saa_screen(pScreen);
- struct saa_driver *driver = sscreen-driver;
-@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
-
- free(sscreen);
-
--return (*pScreen-CloseScreen) (i, pScreen);
-+return (*pScreen-CloseScreen) (CLOSE_SCREEN_ARGS);
- }
-
- struct saa_driver *
-diff --git a/saa/saa.h b/saa/saa.h
-index c7aa3b6..4e5ced5 100644
a/saa/saa.h
-+++ b/saa/saa.h
-@@ -44,6 +44,8 @@
- #include damage.h
- #include picturestr.h
-
-+#include ../src/compat-api.h
-+
- #define SAA_VERSION_MAJOR 0
- #define SAA_VERSION_MINOR 1
-
-@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
- saa_bitmap_to_region(PixmapPtr pPix);
-
- extern _X_EXPORT Bool
--saa_close_screen(int i, ScreenPtr pScreen);
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
-
- extern _X_EXPORT Bool
- saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04c9e0d..b0dd147 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,6 +37,7 @@ endif
- vmware_drv_la_SOURCES = \
- bits2pixels.c \
- bits2pixels.h \
-+ compat-api.h \
- guest_os.h \
- includeCheck.h \
- svga_escape.h \
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 000..6bc946f
a/dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Copyright
[arch-commits] Commit in xf86-video-vmware/trunk (PKGBUILD git_fixes.diff)
Date: Saturday, October 6, 2012 @ 14:56:39
Author: andyrtr
Revision: 168192
upgpkg: xf86-video-vmware 12.0.2-2
rebuild for new Xorg-server; depend on the server ABI; fix makedeps; add git
fixes to get it build and work with new Xorg
Added:
xf86-video-vmware/trunk/git_fixes.diff
Modified:
xf86-video-vmware/trunk/PKGBUILD
+
PKGBUILD | 14
git_fixes.diff | 894 +++
2 files changed, 902 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-06 18:56:34 UTC (rev 168191)
+++ PKGBUILD2012-10-06 18:56:39 UTC (rev 168192)
@@ -3,21 +3,23 @@
pkgname=xf86-video-vmware
pkgver=12.0.2
-pkgrel=1
+pkgrel=2
pkgdesc=X.org vmware video driver
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
license=('custom')
-depends=('libdrm' 'svga-dri')
-makedepends=('xorg-server-devel=1.11.99.903' 'libx11' 'libxext')
-conflicts=('xorg-server1.11.99.903')
+depends=('libdrm' 'svga-dri' 'mesa')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto'
'scrnsaverproto')
+conflicts=('xorg-server1.13.0' 'X-ABI-VIDEODRV_VERSION13'
'X-ABI-VIDEODRV_VERSION=14')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('efa47f365d88da245804a9934719ff860ed04f95')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
git_fixes.diff)
+sha1sums=('efa47f365d88da245804a9934719ff860ed04f95'
+ 'ad475b37e2614f365533a40da0fb5b9e2709e3c6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git_fixes.diff
./configure --prefix=/usr --enable-vmwarectrl-client
make
}
Added: git_fixes.diff
===
--- git_fixes.diff (rev 0)
+++ git_fixes.diff 2012-10-06 18:56:39 UTC (rev 168192)
@@ -0,0 +1,894 @@
+From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
+From: Brian Paul bri...@vmware.com
+Date: Fri, 20 Apr 2012 20:24:26 +
+Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
+
+This fixes a failed assertion in the gallium/svga driver in the
+svga_texture_get_handle() function. The texture resource wasn't
+getting created with the PIPE_BIND_SHARED flag so the !cachable
+assertion would fail and the X session would abort. This didn't
+happen with release builds.
+
+Reviewed-by: Jakob Bornecrantz ja...@vmware.com
+---
+diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
+index 2a18762..8b30e45 100644
+--- a/vmwgfx/vmwgfx_xa_surface.c
b/vmwgfx/vmwgfx_xa_surface.c
+@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
+
+ vpix-staging_format = format;
+ vpix-staging_remove_flags = 0;
+-vpix-staging_add_flags = XA_FLAG_RENDER_TARGET;
++vpix-staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
+
+ return TRUE;
+ }
+--
+cgit v0.9.0.2-2-gbebe
+From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie airl...@redhat.com
+Date: Wed, 06 Jun 2012 08:58:01 +
+Subject: vmware: port vmware driver to new compat API
+
+This is a port of the vmware driver to the new compat API.
+
+Tested-by: Jakob Bornecrantz ja...@vmware.com
+Reviewed-by: Jakob Bornecrantz ja...@vmware.com
+Signed-off-by: Dave Airlie airl...@redhat.com
+Signed-off-by: Jakob Bornecrantz ja...@vmware.com
+---
+diff --git a/saa/saa.c b/saa/saa.c
+index 173c090..f2d68e9 100644
+--- a/saa/saa.c
b/saa/saa.c
+@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
+ * screen private, before calling down to the next CloseScreen.
+ */
+ Bool
+-saa_close_screen(int i, ScreenPtr pScreen)
++saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
+ {
+ struct saa_screen_priv *sscreen = saa_screen(pScreen);
+ struct saa_driver *driver = sscreen-driver;
+@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
+
+ free(sscreen);
+
+-return (*pScreen-CloseScreen) (i, pScreen);
++return (*pScreen-CloseScreen) (CLOSE_SCREEN_ARGS);
+ }
+
+ struct saa_driver *
+diff --git a/saa/saa.h b/saa/saa.h
+index c7aa3b6..4e5ced5 100644
+--- a/saa/saa.h
b/saa/saa.h
+@@ -44,6 +44,8 @@
+ #include damage.h
+ #include picturestr.h
+
++#include ../src/compat-api.h
++
+ #define SAA_VERSION_MAJOR 0
+ #define SAA_VERSION_MINOR 1
+
+@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
+ saa_bitmap_to_region(PixmapPtr pPix);
+
+ extern _X_EXPORT Bool
+-saa_close_screen(int i, ScreenPtr pScreen);
++saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
+
+ extern _X_EXPORT Bool
+ saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 04c9e0d..b0dd147 100644
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -37,6 +37,7 @@ endif
+ vmware_drv_la_SOURCES = \
+
