rediff patches

diff --git a/demos_out_of_src.patch b/demos_out_of_src.patch
index 34700e104b5fc14f0f7beb44b92c2a8749be07ee..369e1f5131dd7116dfa1faed4867527c6a3b872f 100644 (file)
--- a/demos_out_of_src.patch
+++ b/demos_out_of_src.patch
@@ -1,8 +1,8 @@
 --- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers.orig/demos/cube.c     2016-11-10 18:52:27.000000000 +0100
 +++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/cube.c  2016-11-23 14:16:34.000000000 +0100
 @@ -23,6 +23,12 @@
- * Author: Tony Barbour <tony@LunarG.com>
- */
+  * Author: Bill Hollings <bill.hollings@brenwill.com>
+  */
  
 +#ifdef DATADIR
 +#define DEMO_DATA_DIR DATADIR "/vulkan-sdk-demos/"
@@ -12,7 +12,7 @@
 +
  #define _GNU_SOURCE
  #include <stdio.h>
- #include <stdlib.h>
+ #include <stdarg.h>
 @@ -134,7 +136,7 @@
      int32_t tex_width, tex_height;
  };

diff --git a/rpath.patch b/rpath.patch
index b832cb1dfe6807532f3882f1e267e82075815ed8..5708c0bcd9cbe02ab53c08bad5fc8338f74b2ce8 100644 (file)
--- a/rpath.patch
+++ b/rpath.patch
@@ -2,7 +2,7 @@ diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/layersvt/CMakeLists.txt Vulk
 --- VulkanTools-sdk-1.0.32.0.orig/layersvt/CMakeLists.txt      2016-11-10 18:52:27.000000000 +0100
 +++ VulkanTools-sdk-1.0.32.0/layersvt/CMakeLists.txt   2016-11-23 14:18:09.000000000 +0100
 @@ -30,7 +30,7 @@
-     VkLayer_screenshot
+     VkLayer_device_simulation
      )
  
 -set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer)

diff --git a/system_jsoncpp.patch b/system_jsoncpp.patch
index bbbaabcb177862a6ce25741efac3f483c382c86b..16e53814f9245f0f16ea360c09630a41b2a08f27 100644 (file)
--- a/system_jsoncpp.patch
+++ b/system_jsoncpp.patch
@@ -34,7 +34,7 @@
 -target_link_libraries(via ${LIBRARIES})
 +target_link_libraries(via ${LIBRARIES} ${JSONCPP_LIB})
  if(WIN32)
-     target_link_libraries(via version)
+     target_link_libraries(via version shlwapi Cfgmgr32)
  endif()
 --- VulkanTools-sdk-1.0.68.0/via/CMakeLists-SDK.txt.orig       2018-02-07 18:36:10.000000000 +0100
 +++ VulkanTools-sdk-1.0.68.0/via/CMakeLists-SDK.txt    2018-03-03 13:54:26.184272423 +0100