commit 9c3b933630fdadbf6c7687758f4b7dd9c53d5f93
Author: Jan Palus <[email protected]>
Date: Thu Nov 3 13:50:56 2022 +0100
rediff patches
demos_out_of_src.patch | 6 +++---
rpath.patch | 2 +-
system_jsoncpp.patch | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/demos_out_of_src.patch b/demos_out_of_src.patch
index 34700e1..369e1f5 100644
--- 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 <[email protected]>
- */
+ * Author: Bill Hollings <[email protected]>
+ */
+#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 b832cb1..5708c0b 100644
--- 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 bbbaabc..16e5381 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/f3300f23b70814094cdcad4b69cace414ff1fb03
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
