diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-21 13:51:59 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-08 17:32:44 +0100 |
| commit | 42a4a7b817b3355a9d5c05c2127585d8d449464f (patch) | |
| tree | 066bb97eeb9fd50298814a4918b9a074783b48ba /meta | |
| parent | b1b566375c7b4d4621bd16d17573ad11040e5b8c (diff) | |
| download | openembedded-core-42a4a7b817b3355a9d5c05c2127585d8d449464f.tar.gz openembedded-core-42a4a7b817b3355a9d5c05c2127585d8d449464f.tar.bz2 openembedded-core-42a4a7b817b3355a9d5c05c2127585d8d449464f.zip | |
xf86-video-vmware: Upgrade 13.0.2 -> 13.1.0
Remove one upstreamed patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb) | 7 |
2 files changed, 3 insertions, 41 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch deleted file mode 100644 index cf66403e89..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Tue, 1 Apr 2014 10:11:13 +0200 -Subject: [PATCH 1/2] configure: fix build without xatracker - -ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the -fifth. - -Debian bug#743239 <https://bugs.debian.org/743239> - -Reviewed-by: Thomas Klausner <wiz@NetBSD.org> -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Julien Cristau <jcristau@debian.org> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd3ad4e..be40ed7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then - [PKG_CHECK_EXISTS([xatracker = 2.0.0], - [AC_DEFINE([HAVE_XA_2], 1, - [Has version 2 of XA])])], -- [],[BUILD_VMWGFX=no]) -+ [BUILD_VMWGFX=no]) - # - # Check for prime. - # --- -1.7.10.4 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb index 24041b5cad..89b98eefc3 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" -SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \ - file://0002-add-option-for-vmwgfx.patch" +SRC_URI += "file://0002-add-option-for-vmwgfx.patch" -SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244" -SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54" +SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d" +SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' |