[rpms/opencv] opencv5: Add opencv_vulkan.patch

[rpms/opencv] opencv5: Add opencv_vulkan.patch

[Sandro Mani]

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 6f9cc15be1a7c2f8303530b829188d18648a58d3
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2020-05-21T21:35:52+02:00
Stats  : +31/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/6f9cc15be1a7c2f8303530b829188d18648a58d3?branch=opencv5

Log:
Add opencv_vulkan.patch

---
diff --git a/opencv.spec b/opencv.spec
index 9536b6a..78ccc5c 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -78,6 +78,8 @@ Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
 Patch1:         https://github.com/opencv/opencv/commit/fb3a334bbee3535d508af6510d9903d26ba37d34.patch
 Patch2:         https://github.com/opencv/opencv/commit/bd531bd82852808f7fa403e3ee159bd62b1c08cc.patch
+# Comment out removed vulkan symbols
+Patch3:         opencv_vulkan.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -255,6 +257,7 @@ popd &>/dev/null
 %patch0 -p1 -b .install_3rdparty_licenses
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 pushd %{name}_contrib-%{version}
 popd

diff --git a/opencv_vulkan.patch b/opencv_vulkan.patch
new file mode 100644
index 0000000..3a322a7
--- /dev/null
+++ b/opencv_vulkan.patch
@@ -0,0 +1,28 @@
+diff -rupN opencv-4.2.0/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp opencv-4.2.0-new/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp
+--- opencv-4.2.0/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp	2019-12-20 14:44:16.000000000 +0100
++++ opencv-4.2.0-new/modules/dnn/src/vkcom/vulkan/function_list.inl.hpp	2020-05-21 12:39:08.652679166 +0200
+@@ -254,15 +254,15 @@ VK_FUNC(vkCmdDrawIndirectCountAMD)
+ VK_FUNC(vkCmdDrawIndexedIndirectCountAMD)
+ VK_FUNC(vkGetShaderInfoAMD)
+ VK_FUNC(vkGetPhysicalDeviceExternalImageFormatPropertiesNV)
+-VK_FUNC(vkCmdProcessCommandsNVX)
+-VK_FUNC(vkCmdReserveSpaceForCommandsNVX)
+-VK_FUNC(vkCreateIndirectCommandsLayoutNVX)
+-VK_FUNC(vkDestroyIndirectCommandsLayoutNVX)
+-VK_FUNC(vkCreateObjectTableNVX)
+-VK_FUNC(vkDestroyObjectTableNVX)
+-VK_FUNC(vkRegisterObjectsNVX)
+-VK_FUNC(vkUnregisterObjectsNVX)
+-VK_FUNC(vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX)
++// VK_FUNC(vkCmdProcessCommandsNVX)
++// VK_FUNC(vkCmdReserveSpaceForCommandsNVX)
++// VK_FUNC(vkCreateIndirectCommandsLayoutNVX)
++// VK_FUNC(vkDestroyIndirectCommandsLayoutNVX)
++// VK_FUNC(vkCreateObjectTableNVX)
++// VK_FUNC(vkDestroyObjectTableNVX)
++// VK_FUNC(vkRegisterObjectsNVX)
++// VK_FUNC(vkUnregisterObjectsNVX)
++// VK_FUNC(vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX)
+ VK_FUNC(vkCmdSetViewportWScalingNV)
+ VK_FUNC(vkReleaseDisplayEXT)
+ VK_FUNC(vkGetPhysicalDeviceSurfaceCapabilities2EXT)