diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
5 files changed, 63 insertions, 108 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 deleted file mode 100644 index 4753c49d22..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
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 | |||
diff --git a/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch b/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch new file mode 100644 index 0000000000..0b4aabf979 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 18c3e684a8259a0644214f88c7ead7fa31573fd9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Fri, 29 Dec 2017 10:27:59 -0200 | ||
4 | Subject: [PATCH] Use Python 3 to execute the scripts | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | The MESA build system uses Python 2 but as OE-Core has moved away from | ||
8 | it, we change it to use Python 3 instead. | ||
9 | |||
10 | Upstream-Status: Inappropriate [ configuration ] | ||
11 | |||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index b107f04c2e..055546142d 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -114,7 +114,7 @@ AC_PROG_CXX | ||
22 | AM_PROG_CC_C_O | ||
23 | AM_PROG_AS | ||
24 | AX_CHECK_GNU_MAKE | ||
25 | -AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) | ||
26 | +AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python]) | ||
27 | AC_PROG_SED | ||
28 | AC_PROG_MKDIR_P | ||
29 | |||
30 | -- | ||
31 | 2.15.1 | ||
32 | |||
diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/llvm-config-version.patch index aa33a1e915..fd79991aab 100644 --- a/meta/recipes-graphics/mesa/files/llvm-config-version.patch +++ b/meta/recipes-graphics/mesa/files/llvm-config-version.patch | |||
@@ -1,18 +1,24 @@ | |||
1 | When building llvm from git or svn it embeds the svn/git revision into internal version string | 1 | From: Otavio Salvador <otavio@ossystems.com.br> |
2 | Subject: [PATCH] Properly get LLVM version when using LLVM Git releases | ||
2 | 3 | ||
3 | $ /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/mesa/2_17.1.5-r0/recipe-sysroot/usr/lib/llvm5.0/llvm-config-host --version | 4 | $ llvm-config-host --version |
4 | 5.0.0git-9a5c333388c | 5 | 5.0.0git-9a5c333388c |
5 | 6 | ||
6 | We need to ignore everything after 5.0.0 which is what the cut cmd is doing | 7 | We need to ignore everything after 5.0.0 which is what the cut cmd is |
8 | doing | ||
7 | 9 | ||
8 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | --- | ||
14 | configure.ac | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | 16 | ||
11 | Index: mesa-17.1.5/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
12 | =================================================================== | 18 | index a02173f244..b107f04c2e 100644 |
13 | --- mesa-17.1.5.orig/configure.ac | 19 | --- a/configure.ac |
14 | +++ mesa-17.1.5/configure.ac | 20 | +++ b/configure.ac |
15 | @@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { | 21 | @@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() { |
16 | 22 | ||
17 | llvm_set_environment_variables() { | 23 | llvm_set_environment_variables() { |
18 | if test "x$LLVM_CONFIG" != xno; then | 24 | if test "x$LLVM_CONFIG" != xno; then |
@@ -21,12 +27,15 @@ Index: mesa-17.1.5/configure.ac | |||
21 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` | 27 | LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` |
22 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` | 28 | LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` |
23 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` | 29 | LLVM_LIBDIR=`$LLVM_CONFIG --libdir` |
24 | @@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then | 30 | @@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { |
31 | dnl ourselves. | ||
25 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) | 32 | dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) |
26 | if test "x$enable_llvm_shared_libs" = xyes; then | 33 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
27 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, | 34 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
28 | - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` | 35 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` |
29 | + LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version|cut -c1-5` | 36 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) |
30 | AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) | ||
31 | 37 | ||
32 | if test "x$llvm_have_one_so" = xyes; then | 38 | if test "x$llvm_have_one_so" = xyes; then |
39 | -- | ||
40 | 2.15.1 | ||
41 | |||
diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch index 0280ee8599..98f910f89f 100644 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch | |||
@@ -1,26 +1,28 @@ | |||
1 | endianness check is OS wide and not specific to libc | 1 | From: Otavio Salvador <otavio@ossystems.com.br> |
2 | Subject: [PATCH] endianness check is OS wide and not specific to libc | ||
2 | 3 | ||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 7 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
7 | --- | 9 | --- |
8 | src/util/u_endian.h | 2 +- | 10 | src/util/u_endian.h | 2 +- |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 12 | ||
11 | diff --git a/src/util/u_endian.h b/src/util/u_endian.h | 13 | diff --git a/src/util/u_endian.h b/src/util/u_endian.h |
12 | index b9d563d..2d5eab9 100644 | 14 | index 9e09f80181..3148033fae 100644 |
13 | --- a/src/util/u_endian.h | 15 | --- a/src/util/u_endian.h |
14 | +++ b/src/util/u_endian.h | 16 | +++ b/src/util/u_endian.h |
15 | @@ -27,7 +27,7 @@ | 17 | @@ -27,7 +27,7 @@ |
16 | #ifndef U_ENDIAN_H | 18 | #ifndef U_ENDIAN_H |
17 | #define U_ENDIAN_H | 19 | #define U_ENDIAN_H |
18 | 20 | ||
19 | -#if defined(__GLIBC__) || defined(ANDROID) | 21 | -#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) |
20 | +#if defined(__linux__) | 22 | +#if defined(__linux__) |
21 | #include <endian.h> | 23 | #include <endian.h> |
22 | 24 | ||
23 | #if __BYTE_ORDER == __LITTLE_ENDIAN | 25 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
24 | -- | 26 | -- |
25 | 2.1.4 | 27 | 2.15.1 |
26 | 28 | ||
diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch deleted file mode 100644 index 15ee5eeb14..0000000000 --- a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 12 Jul 2017 17:10:07 +0100 | ||
7 | Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when | ||
8 | required | ||
9 | |||
10 | In out-of-tree builds src/intel/vulkan won't exist, so always create it before | ||
11 | writing into it. | ||
12 | |||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | --- | ||
15 | src/intel/Makefile.vulkan.am | 2 ++ | ||
16 | 1 file changed, 2 insertions(+) | ||
17 | |||
18 | diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am | ||
19 | index 3857a5dc62..26e9cd410c 100644 | ||
20 | --- a/src/intel/Makefile.vulkan.am | ||
21 | +++ b/src/intel/Makefile.vulkan.am | ||
22 | @@ -44,11 +44,13 @@ EXTRA_DIST += \ | ||
23 | vulkan/TODO | ||
24 | |||
25 | vulkan/dev_icd.json : vulkan/dev_icd.json.in | ||
26 | + $(MKDIR_GEN) | ||
27 | $(AM_V_GEN) $(SED) \ | ||
28 | -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ | ||
29 | < $(srcdir)/vulkan/dev_icd.json.in > $@ | ||
30 | |||
31 | vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in | ||
32 | + $(MKDIR_GEN) | ||
33 | $(AM_V_GEN) $(SED) \ | ||
34 | -e "s#@install_libdir@#${libdir}#" \ | ||
35 | < $(srcdir)/vulkan/intel_icd.json.in > $@ | ||
36 | -- | ||
37 | 2.11.0 | ||