mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
xf86-video-vmware: update to 13.0.2
Rebase the patch to add an option to disable vmwgfx, and add a patch from upstream git to fix builds without xatracker. (From OE-Core rev: cd7096c614a1f39043d02ba7c3f62599bf89f19e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
committed by
Richard Purdie
Richard Purdie
parent
9c3aac11d5
commit
93a31dfbe5
@@ -0,0 +1,37 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
Upstream-Status:Submitted
|
||||
Signed-off-by: Ross Burton <ross.burton@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 ++++++++++++++++++++-----------------------------
|
||||
1 file changed, 20 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index be40ed7..8e15307 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,39 +116,28 @@ 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
|
||||
+ 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])
|
||||
+ # 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])
|
||||
+ AC_MSG_RESULT([yes])
|
||||
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
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
Upstream-Status: Submitted (http://lists.x.org/archives/xorg-devel/2013-September/037762.html)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 5ec0aae666feb88d01256cdebbf94a6b373bf4c4 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Wed, 11 Sep 2013 21:40:44 +0100
|
||||
Subject: [PATCH] build: add explicit option to enable/disable VMWGFX
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
---
|
||||
configure.ac | 31 ++++++++++++++-----------------
|
||||
1 file changed, 14 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0631bcc..3e14abd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -85,11 +85,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,25 +109,27 @@ 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
|
||||
- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
|
||||
-fi
|
||||
-
|
||||
DRIVER_NAME=vmware
|
||||
AC_SUBST([DRIVER_NAME])
|
||||
|
||||
+AC_ARG_ENABLE(vmwgfx,
|
||||
+ AS_HELP_STRING([--disable-vmwgfx],
|
||||
+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]),
|
||||
+ [VMWGFX="$enableval"], [VMWGFX="yes"])
|
||||
+
|
||||
AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
|
||||
-if test x$BUILD_VMWGFX = xyes; then
|
||||
- AC_MSG_RESULT([yes])
|
||||
+if test "x$VMWGFX" = xyes; then
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ 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])])
|
||||
+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
|
||||
+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0])
|
||||
AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
|
||||
else
|
||||
- AC_MSG_RESULT([no])
|
||||
+ AC_MSG_RESULT([no])
|
||||
fi
|
||||
-
|
||||
-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)
|
||||
+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
|
||||
|
||||
DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
|
||||
|
||||
SRC_URI += "file://vmwgfx-option.patch"
|
||||
SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \
|
||||
file://0002-add-option-for-vmwgfx.patch"
|
||||
|
||||
SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08"
|
||||
SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d"
|
||||
SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244"
|
||||
SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54"
|
||||
|
||||
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
|
||||
|
||||
Reference in New Issue
Block a user