diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-08-28 15:46:35 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-30 11:14:26 +0100 |
commit | d935a1a3f0c11d180b3080801fa836b3ad12651f (patch) | |
tree | 30b7a3344e83cc1652617815c5f148f13cc1d69f /meta/recipes-graphics/mesa/files | |
parent | f9c451b71ad0093b4c2abedf7f3d714c5a3af5a5 (diff) | |
download | poky-d935a1a3f0c11d180b3080801fa836b3ad12651f.tar.gz |
mesa: Support building without opengl
mesa can build certain things without opengl: most importantly vulkan
drivers.
Add comments on the dependencies between the packageconfigs. Also add
a few dependencies to packageconfigs. Modify default packageconfig to
do the reasonable thing based on distro features.
Add a backported patch to fix the build with --disable-opengl. Fix
do_install_append() so it works even if dri drivers are not built.
(From OE-Core rev: 48d39cf43b59c96d4deca783ec66686f5c8cd3e7)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch b/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch new file mode 100644 index 0000000000..4753c49d22 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 1f7d752193f02d15d5923cee992e8f46d4c6df1b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 28 Aug 2017 13:51:49 +0300 | ||
4 | Subject: [PATCH] configure.ac: Always check for expat | ||
5 | |||
6 | expat was not checked if dri was not built leading to build failure | ||
7 | in vulkan driver: backport a fix (a combination of multiple commits | ||
8 | that should end up in 17.3). | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
12 | --- | ||
13 | configure.ac | 15 ++++++--------- | ||
14 | 1 file changed, 6 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index fd346c8aa2..662faecefa 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -1777,6 +1777,12 @@ if test "x$with_dri_drivers" = xno; then | ||
21 | with_dri_drivers='' | ||
22 | fi | ||
23 | |||
24 | +# Check for expat | ||
25 | +PKG_CHECK_MODULES([EXPAT], [expat]) | ||
26 | +PKG_CHECK_MODULES([EXPAT], [expat],, | ||
27 | + [PKG_CHECK_MODULES([EXPAT], [expat21])] | ||
28 | +) | ||
29 | + | ||
30 | dnl If $with_dri_drivers is yes, drivers will be added through | ||
31 | dnl platform checks. Set DEFINES and LIB_DEPS | ||
32 | if test "x$enable_dri" = xyes; then | ||
33 | @@ -1810,15 +1816,6 @@ if test "x$enable_dri" = xyes; then | ||
34 | with_dri_drivers="i915 i965 nouveau r200 radeon swrast" | ||
35 | fi | ||
36 | |||
37 | - # Check for expat | ||
38 | - PKG_CHECK_MODULES([EXPAT], [expat], [], | ||
39 | - # expat version 2.0 and earlier do not provide expat.pc | ||
40 | - [AC_CHECK_HEADER([expat.h],[], | ||
41 | - [AC_MSG_ERROR([Expat headers required for DRI not found])]) | ||
42 | - AC_CHECK_LIB([expat],[XML_ParserCreate],[], | ||
43 | - [AC_MSG_ERROR([Expat library required for DRI not found])]) | ||
44 | - EXPAT_LIBS="-lexpat"]) | ||
45 | - | ||
46 | # put all the necessary libs together | ||
47 | DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS" | ||
48 | fi | ||
49 | -- | ||
50 | 2.14.1 | ||
51 | |||