summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2021-01-20 03:02:48 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-01-21 01:04:25 (GMT)
commit7e4066ea24a6ae61801e5b742953276bc7defad0 (patch)
treec8ecadcb5958f87c92a15a8bd7bb65e37b614f9a
parent4599521ddb07a9dd10725fa73c2358859d8f0456 (diff)
downloadmeta-intel-7e4066ea24a6ae61801e5b742953276bc7defad0.tar.gz
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>
-rw-r--r--recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch37
-rw-r--r--recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch37
-rw-r--r--recipes-core/libxcam/libxcam_1.5.0.bb (renamed from recipes-core/libxcam/libxcam_1.4.0.bb)6
3 files changed, 2 insertions, 78 deletions
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 67db3e4..0000000
--- a/recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 8f8a1d131a05aa1494825f0fae32580cbed680e5 Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Thu, 25 Jun 2020 14:22:59 +0800
4Subject: [PATCH] test-soft-image.cpp: fix header path
5
6throw compilation error:
7 | ../../git/tests/test-soft-image.cpp:31:10: fatal error: xcore/fisheye_dewarp.h: No such file or directory
8| 31 | #include <xcore/fisheye_dewarp.h>
9| | ^~~~~~~~~~~~~~~~~~~~~~~~
10| compilation terminated.
11
12TEST_BASE_CXXFLAGS already includes -I$(top_srcdir)/xcore
13
14Ref: https://github.com/intel/libxcam/blob/1.4.0/tests/Makefile.am#L48
15
16Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/734]
17Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
18---
19 tests/test-soft-image.cpp | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/tests/test-soft-image.cpp b/tests/test-soft-image.cpp
23index a9e02d8..1c687e5 100644
24--- a/tests/test-soft-image.cpp
25+++ b/tests/test-soft-image.cpp
26@@ -28,7 +28,7 @@
27 #include <interface/blender.h>
28 #include <interface/geo_mapper.h>
29 #include <interface/stitcher.h>
30-#include <xcore/fisheye_dewarp.h>
31+#include <fisheye_dewarp.h>
32
33 #define MAP_WIDTH 3
34 #define MAP_HEIGHT 4
35--
362.17.1
37
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 05c391a..0000000
--- a/recipes-core/libxcam/libxcam/0002-fix-build-with-vulkan-1.2.140.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Backport
2[https://github.com/intel/libxcam/commit/ebd4d0e034c6536b8a365f5a079749041ab6a7b7]
3
4From ebd4d0e034c6536b8a365f5a079749041ab6a7b7 Mon Sep 17 00:00:00 2001
5From: StefanBruens <stefan.bruens@rwth-aachen.de>
6Date: Thu, 23 Jul 2020 22:03:06 +0200
7Subject: [PATCH] Fix build with Vulkan 1.2.140 and later
8
91.2.140 removed the various _BEGIN_RANGE, _END_RANGE
10and _RANGE_SIZE macros, see e.g.
11https://gitlab.freedesktop.org/mesa/mesa/-/commit/b0cb38f36085ccee6e71b6e50cb4f094d7f03c58#b04a2be508b96c4286a9f20523ba531cd4f7176a_1050_1032
12---
13 modules/vulkan/vk_instance.cpp | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/modules/vulkan/vk_instance.cpp b/modules/vulkan/vk_instance.cpp
17index e856be64..6bc2c38c 100644
18--- a/modules/vulkan/vk_instance.cpp
19+++ b/modules/vulkan/vk_instance.cpp
20@@ -131,14 +131,14 @@ VKInstance::query_physical_info ()
21 dev_num = XCAM_MIN (dev_num, MAX_DEV_NUM);
22 vkEnumeratePhysicalDevices (_instance_id, &dev_num, devs);
23
24- VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE] = {};
25+ VkPhysicalDevice gpu_dev[VK_PHYSICAL_DEVICE_TYPE_CPU + 1] = {};
26
27 VkPhysicalDeviceProperties dev_prop;
28 for (uint32_t i = 0; i < dev_num; ++i) {
29 vkGetPhysicalDeviceProperties (devs[i], &dev_prop);
30
31- if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_BEGIN_RANGE ||
32- dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_END_RANGE) {
33+ if (dev_prop.deviceType < VK_PHYSICAL_DEVICE_TYPE_OTHER ||
34+ dev_prop.deviceType > VK_PHYSICAL_DEVICE_TYPE_CPU) {
35 continue;
36 }
37 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
index bcbd14a..fcd14bd 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"
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10SRCREV = "e0d740f0706f7902d4f262b649d42b1b48c5e4e3" 10SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8"
11SRC_URI = "git://github.com/intel/libxcam.git;branch=1.4.0; \ 11SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0; \
12 file://0001-test-soft-image.cpp-fix-header-path.patch \
13 file://0002-fix-build-with-vulkan-1.2.140.patch \
14" 12"
15 13
16COMPATIBLE_HOST_libc-musl = "null" 14COMPATIBLE_HOST_libc-musl = "null"