[arch-commits] Commit in xf86-video-vmware/repos (6 files)

Jan de Groot jgc at nymeria.archlinux.org
Wed Apr 17 14:08:02 UTC 2013


    Date: Wednesday, April 17, 2013 @ 16:08:02
  Author: jgc
Revision: 183093

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-vmware/repos/extra-i686/PKGBUILD
    (from rev 183092, xf86-video-vmware/trunk/PKGBUILD)
  xf86-video-vmware/repos/extra-x86_64/PKGBUILD
    (from rev 183092, xf86-video-vmware/trunk/PKGBUILD)
Deleted:
  xf86-video-vmware/repos/extra-i686/PKGBUILD
  xf86-video-vmware/repos/extra-i686/git-fixes.patch
  xf86-video-vmware/repos/extra-x86_64/PKGBUILD
  xf86-video-vmware/repos/extra-x86_64/git-fixes.patch

------------------------------+
 /PKGBUILD                    |   62 ++++++++++++++++++++++++++++
 extra-i686/PKGBUILD          |   33 ---------------
 extra-i686/git-fixes.patch   |   89 -----------------------------------------
 extra-x86_64/PKGBUILD        |   33 ---------------
 extra-x86_64/git-fixes.patch |   89 -----------------------------------------
 5 files changed, 62 insertions(+), 244 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-04-17 14:07:54 UTC (rev 183092)
+++ extra-i686/PKGBUILD	2013-04-17 14:08:02 UTC (rev 183093)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-vmware
-pkgver=13.0.0
-pkgrel=3
-pkgdesc="X.org vmware video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
-            '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-  ./configure --prefix=/usr --enable-vmwarectrl-client
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-vmware/repos/extra-i686/PKGBUILD (from rev 183092, xf86-video-vmware/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-04-17 14:08:02 UTC (rev 183093)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vmware
+pkgver=13.0.1
+pkgrel=1
+pkgdesc="X.org vmware video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('libdrm' 'svga-dri' 'mesa')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-vmwarectrl-client
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch	2013-04-17 14:07:54 UTC (rev 183092)
+++ extra-i686/git-fixes.patch	2013-04-17 14:08:02 UTC (rev 183093)
@@ -1,89 +0,0 @@
-From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
-From: Zack Rusin <zackr at vmware.com>
-Date: Thu, 14 Feb 2013 22:33:01 +0000
-Subject: Kill mibstore
-
-It was a noop for at least 5 years and it has been removed.
-
-Signed-off-by: Zack Rusin <zackr at vmware.com>
----
-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);
-     xf86SetSilkenMouse(pScreen);
- 
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 9959ffb..7863ba2 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
- 		   (ms->only_hw_presents) ? "enabled" : "disabled");
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
-     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
---
-cgit v0.9.0.2-2-gbebe
-From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001
-From: Loïc Yhuel <loic.yhuel at gmail.com>
-Date: Thu, 11 Apr 2013 09:29:10 +0000
-Subject: vmwgfx: Use myGlyphs to fix crashes
-
-Tested-by: Christian Hesse <mail at eworm.de>
-Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>
-Signed-off-by: Loïc Yhuel <loic.yhuel at gmail.com>
-Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>
----
-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
---
-cgit v0.9.0.2-2-gbebe

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-04-17 14:07:54 UTC (rev 183092)
+++ extra-x86_64/PKGBUILD	2013-04-17 14:08:02 UTC (rev 183093)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-vmware
-pkgver=13.0.0
-pkgrel=3
-pkgdesc="X.org vmware video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
-            '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git-fixes.patch
-  ./configure --prefix=/usr --enable-vmwarectrl-client
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xf86-video-vmware/repos/extra-x86_64/PKGBUILD (from rev 183092, xf86-video-vmware/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-04-17 14:08:02 UTC (rev 183093)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-vmware
+pkgver=13.0.1
+pkgrel=1
+pkgdesc="X.org vmware video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('libdrm' 'svga-dri' 'mesa')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool' '!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-vmwarectrl-client
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: extra-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch	2013-04-17 14:07:54 UTC (rev 183092)
+++ extra-x86_64/git-fixes.patch	2013-04-17 14:08:02 UTC (rev 183093)
@@ -1,89 +0,0 @@
-From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
-From: Zack Rusin <zackr at vmware.com>
-Date: Thu, 14 Feb 2013 22:33:01 +0000
-Subject: Kill mibstore
-
-It was a noop for at least 5 years and it has been removed.
-
-Signed-off-by: Zack Rusin <zackr at vmware.com>
----
-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);
-     xf86SetSilkenMouse(pScreen);
- 
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 9959ffb..7863ba2 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
- 		   (ms->only_hw_presents) ? "enabled" : "disabled");
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
-     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
---
-cgit v0.9.0.2-2-gbebe
-From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001
-From: Loïc Yhuel <loic.yhuel at gmail.com>
-Date: Thu, 11 Apr 2013 09:29:10 +0000
-Subject: vmwgfx: Use myGlyphs to fix crashes
-
-Tested-by: Christian Hesse <mail at eworm.de>
-Reviewed-by: Jakob Bornecrantz <jakob at vmware.com>
-Signed-off-by: Loïc Yhuel <loic.yhuel at gmail.com>
-Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>
----
-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
---
-cgit v0.9.0.2-2-gbebe




More information about the arch-commits mailing list