mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

xf86-video-vmware: Upgrade 13.1.0 -> 13.2.1

Browse Source 
Bug fixes, ABI 23 support.
Rebase the add-option-for-vmwgfx patch.

(From OE-Core rev: 89b71c22d1f773573ff2ab707f6e337b4d9089c6)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen
2016-12-12 12:11:48 +02:00
committed by Richard Purdie
parent 8ddb6b4164
commit f647549500
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
+21 -16
View File
@@ -1,17 +1,18 @@
From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Fri, 9 Dec 2016 14:35:45 +0200
Subject: [PATCH] Add option for vmwgfx
Upstream-Status:Submitted Upstream-Status:Submitted
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 25 Jun 2014 16:16:44 +0100
Subject: [PATCH 2/2] add option for vmwgfx
--- ---
configure.ac | 49 ++++++++++++++++++++----------------------------- configure.ac | 51 +++++++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 29 deletions(-) 1 file changed, 21 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index be40ed7..8e15307 100644 index 9f259ce..f3fec57 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, @@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client,
@@ -40,7 +41,7 @@ index be40ed7..8e15307 100644
PKG_CHECK_EXISTS([xorg-server >= 1.12.0], PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
[Has version 1.12.0 or greater of the Xserver])]) [Has version 1.12.0 or greater of the Xserver])])
@@ -114,39 +116,28 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) @@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([moduledir]) AC_SUBST([moduledir])
@@ -62,6 +63,7 @@ index be40ed7..8e15307 100644
-# -#
+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) +AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
+if test x$VMWGFX = xyes; then +if test x$VMWGFX = xyes; then
+ AC_MSG_RESULT([yes])
+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) + PKG_CHECK_MODULES([LIBDRM], [libdrm])
+ # Check for prime. + # Check for prime.
PKG_CHECK_EXISTS([libdrm >= 2.4.38], PKG_CHECK_EXISTS([libdrm >= 2.4.38],
@@ -75,15 +77,18 @@ index be40ed7..8e15307 100644
-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) -AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
-if test x$BUILD_VMWGFX = xyes; then -if test x$BUILD_VMWGFX = xyes; then
- AC_MSG_RESULT([yes]) - AC_MSG_RESULT([yes])
- AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
+ # Early versions of mesa 10 forgot to bump the XA major version number + # Early versions of mesa 10 forgot to bump the XA major version number
+ # in the xa_tracker.h header + # in the xa_tracker.h header
+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], + PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], + [PKG_CHECK_EXISTS([xatracker = 2.0.0],
+ [AC_DEFINE([HAVE_XA_2], 1, + [AC_DEFINE([HAVE_XA_2], 1,
+ [Has version 2 of XA])])]) + [Has version 2 of XA])])])
AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) + AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
+ AC_MSG_RESULT([yes]) libudev_check=yes
else AC_ARG_WITH([libudev],
[AS_HELP_STRING([--without-libudev],
@@ -158,7 +148,8 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@@ -94,5 +99,5 @@ index be40ed7..8e15307 100644
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
-- --
1.7.10.4 2.1.4
meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb → meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
+2 -2
View File
@@ -10,8 +10,8 @@ DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
SRC_URI += "file://0002-add-option-for-vmwgfx.patch" SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d" SRC_URI[md5sum] = "4c3912e4d8947f6c2fc1ee9e2f211d74"
SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc" SRC_URI[sha256sum] = "e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'