From 7e4066ea24a6ae61801e5b742953276bc7defad0 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Wed, 20 Jan 2021 11:02:48 +0800
Subject: [PATCH] libxcam: upgrade 1.4.0 -> 1.5.0

Drop patches which are merged and avaialble in this
release.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...-test-soft-image.cpp-fix-header-path.patch | 37 -------------------
 .../0002-fix-build-with-vulkan-1.2.140.patch  | 37 -------------------
 .../{libxcam_1.4.0.bb => libxcam_1.5.0.bb}    |  6 +--
 3 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch
 delete mode 100644 recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch
 rename recipes-core/libxcam/{libxcam_1.4.0.bb => libxcam_1.5.0.bb} (85%)

diff --git a/recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch b/recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch
deleted file mode 100644
index 67db3e4c..00000000
--- a/recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8f8a1d131a05aa1494825f0fae32580cbed680e5 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Thu, 25 Jun 2020 14:22:59 +0800
-Subject: [PATCH] test-soft-image.cpp: fix header path
-
-throw compilation error:
- | ../../git/tests/test-soft-image.cpp:31:10: fatal error: xcore/fisheye_dewarp.h: No such file or directory
-|    31 | #include <xcore/fisheye_dewarp.h>
-|       |          ^~~~~~~~~~~~~~~~~~~~~~~~
-| compilation terminated.
-
-TEST_BASE_CXXFLAGS already includes -I$(top_srcdir)/xcore
-
-Ref: https://github.com/intel/libxcam/blob/1.4.0/tests/Makefile.am#L48
-
-Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/734]
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- tests/test-soft-image.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-soft-image.cpp b/tests/test-soft-image.cpp
-index a9e02d8..1c687e5 100644
---- a/tests/test-soft-image.cpp
-+++ b/tests/test-soft-image.cpp
-@@ -28,7 +28,7 @@
- #include <interface/blender.h>
- #include <interface/geo_mapper.h>
- #include <interface/stitcher.h>
--#include <xcore/fisheye_dewarp.h>
-+#include <fisheye_dewarp.h>
- 
- #define MAP_WIDTH 3
- #define MAP_HEIGHT 4
--- 
-2.17.1
-
diff --git a/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch b/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch
deleted file mode 100644
index 05c391ab..00000000
--- a/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-[https://github.com/intel/libxcam/commit/ebd4d0e034c6536b8a365f5a079749041ab6a7b7]
-
-From ebd4d0e034c6536b8a365f5a079749041ab6a7b7 Mon Sep 17 00:00:00 2001
-From: StefanBruens <stefan.bruens@rwth-aachen.de>
-Date: Thu, 23 Jul 2020 22:03:06 +0200
-Subject: [PATCH] Fix build with Vulkan 1.2.140 and later
-
-1.2.140 removed the various _BEGIN_RANGE, _END_RANGE
-and _RANGE_SIZE macros, see e.g.
-https://gitlab.freedesktop.org/mesa/mesa/-/commit/b0cb38f36085ccee6e71b6e50cb4f094d7f03c58#b04a2be508b96c4286a9f20523ba531cd4f7176a_1050_1032
----
- modules/vulkan/vk_instance.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules/vulkan/vk_instance.cpp b/modules/vulkan/vk_instance.cpp
-index e856be64..6bc2c38c 100644
---- a/modules/vulkan/vk_instance.cpp
-+++ b/modules/vulkan/vk_instance.cpp
-@@ -131,14 +131,14 @@ VKInstance::query_physical_info ()
-     dev_num = XCAM_MIN (dev_num, MAX_DEV_NUM);
-     vkEnumeratePhysicalDevices (_instance_id, &dev_num, devs);
-
--    VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE] = {};
-+    VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_CPU + 1] = {};
-
-     VkPhysicalDeviceProperties dev_prop;
-     for (uint32_t i = 0; i < dev_num; ++i) {
-         vkGetPhysicalDeviceProperties (devs[i], &dev_prop);
-
--        if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_BEGIN_RANGE ||
--                dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_END_RANGE) {
-+        if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_OTHER ||
-+                dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_CPU) {
-             continue;
-         }
-         if (gpu_dev[dev_prop.deviceType]) {
diff --git a/recipes-core/libxcam/libxcam_1.4.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
similarity index 85%
rename from recipes-core/libxcam/libxcam_1.4.0.bb
rename to recipes-core/libxcam/libxcam_1.5.0.bb
index bcbd14ac..fcd14bd4 100644
--- a/recipes-core/libxcam/libxcam_1.4.0.bb
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -7,10 +7,8 @@ SECTION = "lib"
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/git"
-SRCREV = "e0d740f0706f7902d4f262b649d42b1b48c5e4e3"
-SRC_URI = "git://github.com/intel/libxcam.git;branch=1.4.0; \
-            file://0001-test-soft-image.cpp-fix-header-path.patch \
-            file://0002-fix-build-with-vulkan-1.2.140.patch \
+SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8"
+SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0; \
 "
 
 COMPATIBLE_HOST_libc-musl = "null"