summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-04 14:28:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-06 22:55:01 +0100
commite3e8e1f125604deca7a2783b6f407bae2f130579 (patch)
treefd74744bb64431b989675bae9cf7dca925d8c143 /meta/recipes-graphics/mesa
parent5fef9fcd58e88f296606ae6780904345014e4d29 (diff)
downloadpoky-e3e8e1f125604deca7a2783b6f407bae2f130579.tar.gz
mesa: patch cleanup
0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch was fixed a different way upstream so remove. 0007-dri-i965-Add-missing-time.h-include.patch is now accepted upstream so mark as backport. (From OE-Core rev: 8fb143fe69147c32e945e798662d78e606bfe0a0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch46
-rw-r--r--meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch2
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.1.3.bb1
3 files changed, 1 insertions, 48 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
deleted file mode 100644
index 3529f493e7..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From b514366df767da9acf991567bbee3eaa0c4ddaa6 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 11 Oct 2017 15:40:42 +0800
4Subject: [PATCH 1/8] Makefile.vulkan.am: explictly add lib expat to intel
5 libvulkan's lib depends
6Organization: O.S. Systems Software LTDA.
7
8While built with "-fvisibility=default"
9...
10|i586-oe-linux-gcc ... -fvisibility=default ... -o common/.libs/common_libintel_common_la-gen_decoder.o
11...
12
13It triggered the failure
14...
15|i586-oe-linux-g++ ... common/.libs/libintel_common.a ... -o vulkan/.libs/libvulkan_intel.so
16|common/.libs/libintel_common.a(common_libintel_common_la-gen_decoder.o):
17|In function `start_element':
18|/usr/src/debug/mesa/2_17.1.7-r0/mesa-17.1.7/src/intel/common/gen_decoder.c:371:
19undefined reference to `XML_GetCurrentLineNumber'
20...
21
22explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS
23
24Upstream-Status: Accepted
25https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf
26
27Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
28---
29 src/intel/Makefile.vulkan.am | 1 +
30 1 file changed, 1 insertion(+)
31
32diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
33index 4125cb205a..356c4f8452 100644
34--- a/src/intel/Makefile.vulkan.am
35+++ b/src/intel/Makefile.vulkan.am
36@@ -161,6 +161,7 @@ VULKAN_LIB_DEPS = \
37 $(LIBDRM_LIBS) \
38 $(PTHREAD_LIBS) \
39 $(DLOPEN_LIBS) \
40+ $(EXPAT_LIBS) \
41 -lm
42
43 if HAVE_PLATFORM_ANDROID
44--
452.18.0
46
diff --git a/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch
index e559027c3d..5b55b8a1fd 100644
--- a/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch
+++ b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch
@@ -13,7 +13,7 @@ This fixes a build error when using musl:
13| ^~~~~~ 13| ^~~~~~
14`---- 14`----
15 15
16Upstream-Status: Pending 16Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18--- 18---
19 src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 + 19 src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 +
diff --git a/meta/recipes-graphics/mesa/mesa_18.1.3.bb b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
index c47c57e9d8..1c76f4b1b1 100644
--- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
@@ -1,7 +1,6 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
5 file://0002-Simplify-wayland-scanner-lookup.patch \ 4 file://0002-Simplify-wayland-scanner-lookup.patch \
6 file://0003-winsys-svga-drm-Include-sys-types.h.patch \ 5 file://0003-winsys-svga-drm-Include-sys-types.h.patch \
7 file://0004-hardware-gloat.patch \ 6 file://0004-hardware-gloat.patch \