[27/29] vulkan: refresh patches

Message ID 20180305172046.21729-27-ross.burton@intel.com
State Accepted
Commit 453a433768bff76e4d3ad9bf40fd9d8210b0950e
Headers show
Series
  • [01/29] dbus: remove upstreamed patch
Related show

Commit Message

Ross Burton March 5, 2018, 5:20 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 .../vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch b/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
index 3cf241d62a0..bcf84a5a3e7 100644
--- a/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
+++ b/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
@@ -11,9 +11,11 @@  Date:   Tue Feb 16 10:05:25 2016 -0500
 Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 
---- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -61,46 +61,6 @@
+Index: git/demos/CMakeLists.txt
+===================================================================
+--- git.orig/demos/CMakeLists.txt
++++ git/demos/CMakeLists.txt
+@@ -63,46 +63,6 @@ elseif(UNIX)
  else()
  endif()
  
@@ -60,7 +62,7 @@  Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  
  if(WIN32)
      include_directories (
-@@ -114,43 +74,6 @@
+@@ -116,43 +76,6 @@ endif()
  add_executable(${API_LOWERCASE}info vulkaninfo.c)
  target_link_libraries(${API_LOWERCASE}info ${LIBRARIES})
  
@@ -103,4 +105,4 @@  Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 -endif()
  
  if(UNIX)
-     install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR})
+     if(INSTALL_LVL_FILES)