mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

xf86-video-vmware: update 13.3.0 -> 13.4.0

Browse Source 
Remove 0002-add-option-for-vmwgfx.patch; the original reason has been long resolved:

    Our Mesa doesn't yet ship the XA Gallium state tracker that the VMWGFX
    sub-driver needs, so just disable vmwgfx.

(From OE-Core rev: 04ee687c93b305275d4675133d125448af011d54)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-02-08 08:20:56 +01:00
committed by Richard Purdie
parent c4f80179ca
commit 372be4753e
2 changed files with 2 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
View File

@@ -1,103 +0,0 @@
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
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
configure.ac | 51 +++++++++++++++++++++------------------------------
1 file changed, 21 insertions(+), 30 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9f259ce..f3fec57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client,
[VMWARECTRL=$enableval], [VMWARECTRL=no])
AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes])
+# Define a configure option to build the vmwgfx driver
+AC_ARG_ENABLE(vmwgfx,
+ AS_HELP_STRING([--disable-vmwgfx],
+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]),
+ [VMWGFX="$enableval"], [VMWGFX="yes"])
+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)
+
# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
[AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
[Has version 1.5.0 or greater of the Xserver])])
-PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
- [Has version 1.7.0 or greater of the Xserver])
- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
-
PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
[Has version 1.12.0 or greater of the Xserver])])
@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([moduledir])
-if test x$BUILD_VMWGFX = xyes; then
- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
-fi
-if test x$BUILD_VMWGFX = xyes; then
-#
-# Early versions of mesa 10 forgot to bump the XA major version number in
-# the xa_tracker.h header
-#
- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
- [PKG_CHECK_EXISTS([xatracker = 2.0.0],
- [AC_DEFINE([HAVE_XA_2], 1,
- [Has version 2 of XA])])],
- [BUILD_VMWGFX=no])
-#
-# Check for prime.
-#
+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
+if test x$VMWGFX = xyes; then
+ AC_MSG_RESULT([yes])
+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
+ # Check for prime.
PKG_CHECK_EXISTS([libdrm >= 2.4.38],
[AC_DEFINE([HAVE_LIBDRM_2_4_38], 1,
[Has version 2.4.38 or greater of libdrm])])
-fi
-DRIVER_NAME=vmware
-AC_SUBST([DRIVER_NAME])
-
-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
-if test x$BUILD_VMWGFX = xyes; then
- 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
+ # in the xa_tracker.h header
+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
+ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
+ [AC_DEFINE([HAVE_XA_2], 1,
+ [Has version 2 of XA])])])
+ AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
libudev_check=yes
AC_ARG_WITH([libudev],
[AS_HELP_STRING([--without-libudev],
@@ -158,7 +148,8 @@ else
AC_MSG_RESULT([no])
fi
-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)
+DRIVER_NAME=vmware
+AC_SUBST([DRIVER_NAME])
AC_CONFIG_FILES([
Makefile
--
2.1.4

9
meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb → meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb
View File

@@ -7,13 +7,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
DEPENDS += "virtual/libx11 xorgproto libpciaccess"
XORG_DRIVER_COMPRESSOR = ".tar.xz"
SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
SRC_URI[md5sum] = "08d66d062055080ff699ab4869726ea2"
SRC_URI[sha256sum] = "47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c"
SRC_URI[sha256sum] = "aed31ee5ed5ecc6e2226705383e7ad06f7602c1376a295305f376b17af3eb81a"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
PACKAGECONFIG ?= ""
PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa"