summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch37
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb)4
2 files changed, 23 insertions, 18 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
index 6039d089a1..5bda720ce5 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
@@ -1,17 +1,18 @@
1Upstream-Status:Submitted 1From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001
2Signed-off-by: Ross Burton <ross.burton@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 9 Dec 2016 14:35:45 +0200
4Subject: [PATCH] Add option for vmwgfx
3 5
4From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001 6Upstream-Status:Submitted
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 25 Jun 2014 16:16:44 +0100
7Subject: [PATCH 2/2] add option for vmwgfx
8 7
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9--- 10---
10 configure.ac | 49 ++++++++++++++++++++----------------------------- 11 configure.ac | 51 +++++++++++++++++++++------------------------------
11 1 file changed, 20 insertions(+), 29 deletions(-) 12 1 file changed, 21 insertions(+), 30 deletions(-)
12 13
13diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
14index be40ed7..8e15307 100644 15index 9f259ce..f3fec57 100644
15--- a/configure.ac 16--- a/configure.ac
16+++ b/configure.ac 17+++ b/configure.ac
17@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, 18@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client,
@@ -40,7 +41,7 @@ index be40ed7..8e15307 100644
40 PKG_CHECK_EXISTS([xorg-server >= 1.12.0], 41 PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
41 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, 42 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
42 [Has version 1.12.0 or greater of the Xserver])]) 43 [Has version 1.12.0 or greater of the Xserver])])
43@@ -114,39 +116,28 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) 44@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
44 45
45 AC_SUBST([moduledir]) 46 AC_SUBST([moduledir])
46 47
@@ -62,6 +63,7 @@ index be40ed7..8e15307 100644
62-# 63-#
63+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) 64+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
64+if test x$VMWGFX = xyes; then 65+if test x$VMWGFX = xyes; then
66+ AC_MSG_RESULT([yes])
65+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) 67+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
66+ # Check for prime. 68+ # Check for prime.
67 PKG_CHECK_EXISTS([libdrm >= 2.4.38], 69 PKG_CHECK_EXISTS([libdrm >= 2.4.38],
@@ -75,15 +77,18 @@ index be40ed7..8e15307 100644
75-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) 77-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
76-if test x$BUILD_VMWGFX = xyes; then 78-if test x$BUILD_VMWGFX = xyes; then
77- AC_MSG_RESULT([yes]) 79- AC_MSG_RESULT([yes])
80- AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
78+ # Early versions of mesa 10 forgot to bump the XA major version number 81+ # Early versions of mesa 10 forgot to bump the XA major version number
79+ # in the xa_tracker.h header 82+ # in the xa_tracker.h header
80+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], 83+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
81+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], 84+ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
82+ [AC_DEFINE([HAVE_XA_2], 1, 85+ [AC_DEFINE([HAVE_XA_2], 1,
83+ [Has version 2 of XA])])]) 86+ [Has version 2 of XA])])])
84 AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) 87+ AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
85+ AC_MSG_RESULT([yes]) 88 libudev_check=yes
86 else 89 AC_ARG_WITH([libudev],
90 [AS_HELP_STRING([--without-libudev],
91@@ -158,7 +148,8 @@ else
87 AC_MSG_RESULT([no]) 92 AC_MSG_RESULT([no])
88 fi 93 fi
89 94
@@ -94,5 +99,5 @@ index be40ed7..8e15307 100644
94 AC_CONFIG_FILES([ 99 AC_CONFIG_FILES([
95 Makefile 100 Makefile
96-- 101--
971.7.10.4 1022.1.4
98 103
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
index 8c891e6aed..706d35d2fc 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
@@ -10,8 +10,8 @@ DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
10 10
11SRC_URI += "file://0002-add-option-for-vmwgfx.patch" 11SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
12 12
13SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d" 13SRC_URI[md5sum] = "4c3912e4d8947f6c2fc1ee9e2f211d74"
14SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc" 14SRC_URI[sha256sum] = "e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b"
15 15
16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
17 17
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-09 15:33:37 +0000