summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-22 19:38:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:16 +0100
commit93a31dfbe57adde0ddb2c4d269600752e9b588bd (patch)
treef11e9f2a68e3e4dca6d064a994286cee87c63e27
parent9c3aac11d5e9928ae904407e1de26ab069aabcaa (diff)
downloadpoky-93a31dfbe57adde0ddb2c4d269600752e9b588bd.tar.gz
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>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch37
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch98
-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.2.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb)7
4 files changed, 139 insertions, 75 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
new file mode 100644
index 0000000000..cf66403e89
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
@@ -0,0 +1,37 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001
5From: Julien Cristau <jcristau@debian.org>
6Date: Tue, 1 Apr 2014 10:11:13 +0200
7Subject: [PATCH 1/2] configure: fix build without xatracker
8
9ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the
10fifth.
11
12Debian bug#743239 <https://bugs.debian.org/743239>
13
14Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
15Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
16Signed-off-by: Julien Cristau <jcristau@debian.org>
17Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index dd3ad4e..be40ed7 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then
27 [PKG_CHECK_EXISTS([xatracker = 2.0.0],
28 [AC_DEFINE([HAVE_XA_2], 1,
29 [Has version 2 of XA])])],
30- [],[BUILD_VMWGFX=no])
31+ [BUILD_VMWGFX=no])
32 #
33 # Check for prime.
34 #
35--
361.7.10.4
37
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
new file mode 100644
index 0000000000..6039d089a1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
@@ -0,0 +1,98 @@
1Upstream-Status:Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From f103d6f570671c649ccd7b225e6d6c9f14371888 Mon Sep 17 00:00:00 2001
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
9---
10 configure.ac | 49 ++++++++++++++++++++-----------------------------
11 1 file changed, 20 insertions(+), 29 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index be40ed7..8e15307 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client,
18 [VMWARECTRL=$enableval], [VMWARECTRL=no])
19 AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes])
20
21+# Define a configure option to build the vmwgfx driver
22+AC_ARG_ENABLE(vmwgfx,
23+ AS_HELP_STRING([--disable-vmwgfx],
24+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]),
25+ [VMWGFX="$enableval"], [VMWGFX="yes"])
26+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)
27+
28 # Store the list of server defined optional extensions in REQUIRED_MODULES
29 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
30 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
31@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
32 [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
33 [Has version 1.5.0 or greater of the Xserver])])
34
35-PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
36- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
37- [Has version 1.7.0 or greater of the Xserver])
38- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
39-
40 PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
41 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
42 [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
45 AC_SUBST([moduledir])
46
47-if test x$BUILD_VMWGFX = xyes; then
48- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
49-fi
50-if test x$BUILD_VMWGFX = xyes; then
51-#
52-# Early versions of mesa 10 forgot to bump the XA major version number in
53-# the xa_tracker.h header
54-#
55- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
56- [PKG_CHECK_EXISTS([xatracker = 2.0.0],
57- [AC_DEFINE([HAVE_XA_2], 1,
58- [Has version 2 of XA])])],
59- [BUILD_VMWGFX=no])
60-#
61-# Check for prime.
62-#
63+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
64+if test x$VMWGFX = xyes; then
65+ PKG_CHECK_MODULES([LIBDRM], [libdrm])
66+ # Check for prime.
67 PKG_CHECK_EXISTS([libdrm >= 2.4.38],
68 [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1,
69 [Has version 2.4.38 or greater of libdrm])])
70-fi
71
72-DRIVER_NAME=vmware
73-AC_SUBST([DRIVER_NAME])
74-
75-AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
76-if test x$BUILD_VMWGFX = xyes; then
77- AC_MSG_RESULT([yes])
78+ # Early versions of mesa 10 forgot to bump the XA major version number
79+ # in the xa_tracker.h header
80+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
81+ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
82+ [AC_DEFINE([HAVE_XA_2], 1,
83+ [Has version 2 of XA])])])
84 AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
85+ AC_MSG_RESULT([yes])
86 else
87 AC_MSG_RESULT([no])
88 fi
89
90-AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)
91+DRIVER_NAME=vmware
92+AC_SUBST([DRIVER_NAME])
93
94 AC_CONFIG_FILES([
95 Makefile
96--
971.7.10.4
98
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
deleted file mode 100644
index 4b3a3094d9..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmwgfx-option.patch
+++ /dev/null
@@ -1,72 +0,0 @@
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.2.bb
index 7b48e0c101..24041b5cad 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.2.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
8 8
9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" 9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
10 10
11SRC_URI += "file://vmwgfx-option.patch" 11SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \
12 file://0002-add-option-for-vmwgfx.patch"
12 13
13SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08" 14SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244"
14SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d" 15SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54"
15 16
16COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 17COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
17 18