diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-09-12 15:27:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-14 08:23:58 +0100 |
| commit | a6f84a0317997c3f49e136381f8d2f2f5cadd292 (patch) | |
| tree | baddb916e2e78ac3bd2e2298df72f1c9edd0e7aa /meta | |
| parent | 8909b3b71b2ac792ae092b8f0a6c2ade28f6b73b (diff) | |
| download | openembedded-core-a6f84a0317997c3f49e136381f8d2f2f5cadd292.tar.gz openembedded-core-a6f84a0317997c3f49e136381f8d2f2f5cadd292.tar.bz2 openembedded-core-a6f84a0317997c3f49e136381f8d2f2f5cadd292.zip | |
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.
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch | 72 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb | 7 |
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 @@ +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 + 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." LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" -DEPENDS += "virtual/libx11 libxvmc xineramaproto libpciaccess \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'drm virtual/libgl', '', d)}" +DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" + +SRC_URI += "file://vmwgfx-option.patch" SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08" SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' + +EXTRA_OECONF += "--disable-vmwgfx" |