summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-driver/xf86-video-vmware
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-graphics/xorg-driver/xf86-video-vmware
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-video-vmware')
-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
2 files changed, 135 insertions, 0 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