Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=32acb99dcde1fe925272520ea934f8fdc2f9d6ac
commit 32acb99dcde1fe925272520ea934f8fdc2f9d6ac Author: Miklos Vajna <vmik...@frugalware.org> Date: Thu Dec 30 01:28:46 2010 +0100 xf86-video-vmware-11.0.3-1-i686 - version bump - drop no longer necessary patch diff --git a/source/x11/xf86-video-vmware/FrugalBuild b/source/x11/xf86-video-vmware/FrugalBuild index c9e19f2..e2bf17a 100644 --- a/source/x11/xf86-video-vmware/FrugalBuild +++ b/source/x11/xf86-video-vmware/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=xf86-video-vmware -pkgver=11.0.1 -pkgrel=3 +pkgver=11.0.3 +pkgrel=1 pkgdesc="X.Org video driver for vmware cards" url="http://xorg.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-drivers') @@ -11,8 +11,6 @@ archs=('i686' 'x86_64') depends=('xorg-server>=1.9.0') makedepends=('randrproto>=1.3.1' 'renderproto' 'xineramaproto') Finclude xorg -source=($source vmware-fix-null-ptr-dereference.patch) -sha1sums=('cc82cbacaa90c28b42440f6a197f5167595c8417' \ - 'df2feec6b46ba476811e6705dd231263f2fc0c08') +sha1sums=('8aa23618a3dfa91f88094a4d1dc45c878f386f69') # optimization OK diff --git a/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch b/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch deleted file mode 100644 index f52cc76..0000000 --- a/source/x11/xf86-video-vmware/vmware-fix-null-ptr-dereference.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur xf86-video-vmware-11.0.1/src/vmwaremodule.c xf86-video-vmware-11.0.1/src/vmwaremodule.c ---- xf86-video-vmware-11.0.1/src/vmwaremodule.c 2010-03-18 16:02:17.000000000 +0200 -+++ xf86-video-vmware-11.0.1/src/vmwaremodule.c 2010-06-04 12:57:29.642813157 +0300 -@@ -143,7 +143,7 @@ - return FALSE; - } - --static Bool -+static void - vmware_chain_module(pointer opts) - { - int vmwlegacy_devices; -@@ -156,6 +156,8 @@ - int i; - - vmware_devices = xf86MatchDevice(VMWARE_DRIVER_NAME, &gdevs); -+ if(vmware_devices <= 0 || gdevs == NULL) -+ return; - vmwgfx_devices = xf86MatchDevice(VMWGFX_DRIVER_NAME, NULL); - vmwlegacy_devices = xf86MatchDevice(VMWLEGACY_DRIVER_NAME, NULL); - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
