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.

Signed-off-by: Ross Burton <ross.burton@intel.com>

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 (file)
index 3529f49..0000000
--- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b514366df767da9acf991567bbee3eaa0c4ddaa6 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 11 Oct 2017 15:40:42 +0800
-Subject: [PATCH 1/8] Makefile.vulkan.am: explictly add lib expat to intel
- libvulkan's lib depends
-Organization: O.S. Systems Software LTDA.
-
-While built with "-fvisibility=default"
-...
-|i586-oe-linux-gcc ... -fvisibility=default ... -o common/.libs/common_libintel_common_la-gen_decoder.o
-...
-
-It triggered the failure
-...
-|i586-oe-linux-g++  ... common/.libs/libintel_common.a ... -o vulkan/.libs/libvulkan_intel.so
-|common/.libs/libintel_common.a(common_libintel_common_la-gen_decoder.o):
-|In function `start_element':
-|/usr/src/debug/mesa/2_17.1.7-r0/mesa-17.1.7/src/intel/common/gen_decoder.c:371:
-undefined reference to `XML_GetCurrentLineNumber'
-...
-
-explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS
-
-Upstream-Status: Accepted
-https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- src/intel/Makefile.vulkan.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
-index 4125cb205a..356c4f8452 100644
---- a/src/intel/Makefile.vulkan.am
-+++ b/src/intel/Makefile.vulkan.am
-@@ -161,6 +161,7 @@ VULKAN_LIB_DEPS = \
-       $(LIBDRM_LIBS) \
-       $(PTHREAD_LIBS) \
-       $(DLOPEN_LIBS) \
-+      $(EXPAT_LIBS) \
-       -lm
- 
- if HAVE_PLATFORM_ANDROID
--- 
-2.18.0
-

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 e559027c3d979a75cc25512161cb5dcd513323cd..5b55b8a1fd09d33c147643254d4188144891c0fa 100644 (file)
--- 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:
 |     ^~~~~~
 `----
 
-Upstream-Status: Pending
+Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 ---
  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 c47c57e9d8ed0bffcf45ea2c698b19b22da81a17..1c76f4b1b1276c918abefc0fd94b5517964d5e77 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
@@ -1,7 +1,6 @@
 require ${BPN}.inc
 
 SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
            file://0002-Simplify-wayland-scanner-lookup.patch \
            file://0003-winsys-svga-drm-Include-sys-types.h.patch \
            file://0004-hardware-gloat.patch \