summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-12 15:27:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:29:42 +0100
commit99875e2e1a09fe5e9fb9b6eac0ad28fb3f79d74a (patch)
tree84f50a0714cc6d7e4f8a0deca84c8ceaafe59afc
parent019dafd930d773751c4381a4ab762dec8f0d1564 (diff)
downloadpoky-99875e2e1a09fe5e9fb9b6eac0ad28fb3f79d74a.tar.gz
xf86-video-vmware: disable VMWGFX
Our Mesa doesn't yet ship the XA Gallium state tracker that the VMWGFX sub-driver needs, so just disable vmwgfx. Also remove a spurious xvmc dependency. (From OE-Core rev: a6f84a0317997c3f49e136381f8d2f2f5cadd292) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch72
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb7
2 files changed, 77 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch
new file mode 100644
index 0000000000..4b3a3094d9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch
@@ -0,0 +1,72 @@
1Upstream-Status: Submitted (http://lists.x.org/archives/xorg-devel/2013-September/037762.html)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 5ec0aae666feb88d01256cdebbf94a6b373bf4c4 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 11 Sep 2013 21:40:44 +0100
7Subject: [PATCH] build: add explicit option to enable/disable VMWGFX
8
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10---
11 configure.ac | 31 ++++++++++++++-----------------
12 1 file changed, 14 insertions(+), 17 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 0631bcc..3e14abd 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -85,11 +85,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
19 [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
20 [Has version 1.5.0 or greater of the Xserver])])
21
22-PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
23- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
24- [Has version 1.7.0 or greater of the Xserver])
25- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
26-
27 PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
28 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
29 [Has version 1.12.0 or greater of the Xserver])])
30@@ -114,25 +109,27 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
31
32 AC_SUBST([moduledir])
33
34-if test x$BUILD_VMWGFX = xyes; then
35- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
36-fi
37-if test x$BUILD_VMWGFX = xyes; then
38- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
39-fi
40-
41 DRIVER_NAME=vmware
42 AC_SUBST([DRIVER_NAME])
43
44+AC_ARG_ENABLE(vmwgfx,
45+ AS_HELP_STRING([--disable-vmwgfx],
46+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]),
47+ [VMWGFX="$enableval"], [VMWGFX="yes"])
48+
49 AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
50-if test x$BUILD_VMWGFX = xyes; then
51- AC_MSG_RESULT([yes])
52+if test "x$VMWGFX" = xyes; then
53+ AC_MSG_RESULT([yes])
54+ PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
55+ [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
56+ [Has version 1.7.0 or greater of the Xserver])])
57+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
58+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0])
59 AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
60 else
61- AC_MSG_RESULT([no])
62+ AC_MSG_RESULT([no])
63 fi
64-
65-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)
66+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)
67
68 AC_CONFIG_FILES([
69 Makefile
70--
711.7.10.4
72
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
index 0d8c8d22c9..7b48e0c101 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb
@@ -6,10 +6,13 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
6 6
7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" 7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
8 8
9DEPENDS += "virtual/libx11 libxvmc xineramaproto libpciaccess \ 9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
10 ${@base_contains('DISTRO_FEATURES', 'opengl', 'drm virtual/libgl', '', d)}" 10
11SRC_URI += "file://vmwgfx-option.patch"
11 12
12SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08" 13SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08"
13SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d" 14SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d"
14 15
15COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
17
18EXTRA_OECONF += "--disable-vmwgfx"