summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-05-21 13:51:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:05 +0100
commit1a6bcd7037e5288823a42eb83bfa07104b91ae13 (patch)
treee46dd14762d4023b8c62f344581f9114312eafe9
parent01319863b649277b74e72ad39e0f63c74ed2a3fa (diff)
downloadpoky-1a6bcd7037e5288823a42eb83bfa07104b91ae13.tar.gz
xf86-video-vmware: Upgrade 13.0.2 -> 13.1.0
Remove one upstreamed patch. (From OE-Core rev: 42a4a7b817b3355a9d5c05c2127585d8d449464f) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch37
-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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001
5From: Julien Cristau <jcristau@debian.org>
6Date: Tue, 1 Apr 2014 10:11:13 +0200
7Subject: [PATCH 1/2] configure: fix build without xatracker
8
9ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the
10fifth.
11
12Debian bug#743239 <https://bugs.debian.org/743239>
13
14Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
15Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
16Signed-off-by: Julien Cristau <jcristau@debian.org>
17Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index dd3ad4e..be40ed7 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then
27 [PKG_CHECK_EXISTS([xatracker = 2.0.0],
28 [AC_DEFINE([HAVE_XA_2], 1,
29 [Has version 2 of XA])])],
30- [],[BUILD_VMWGFX=no])
31+ [BUILD_VMWGFX=no])
32 #
33 # Check for prime.
34 #
35--
361.7.10.4
37
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"
8 8
9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" 9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
10 10
11SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \ 11SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
12 file://0002-add-option-for-vmwgfx.patch"
13 12
14SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244" 13SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d"
15SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54" 14SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc"
16 15
17COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
18 17