3 files changed, 103 insertions, 45 deletions

diff --git a/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch
new file mode 100644
index 00000000..f15d5cc7
--- /dev/null
+++ b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch
@@ -0,0 +1,94 @@
+From d4c97b50b577ea16b9ff6d9a352ab474a119310e Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Wed, 18 May 2022 15:41:24 +0800
+Subject: [PATCH] fake_v4l2_device.h: fix narrowing warning
+
+Use uint32_t instead of int for IOCTLs commands.
+
+Warning log:
+| ../../../git/xcore/fake_v4l2_device.h: In member function 'virtual int XCam::FakeV4l2Device::io_control(int, void*)':
+| ../../../git/xcore/fake_v4l2_device.h:42:14: error: narrowing conversion of '3225441794' from 'long unsigned int' to 'int' [-Wnarrowing]
+|    42 |         case VIDIOC_ENUM_FMT:
+|       |              ^~~~~~~~~~~~~~~
+| make[4]: *** [Makefile:685: libgstxcamsrc_la-gstxcamsrc.lo] Error 1
+
+Issue: https://github.com/intel/libxcam/issues/801
+Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/802]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ xcore/base/xcam_common.h | 2 +-
+ xcore/fake_v4l2_device.h | 2 +-
+ xcore/v4l2_device.cpp    | 2 +-
+ xcore/v4l2_device.h      | 2 +-
+ xcore/xcam_common.cpp    | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xcore/base/xcam_common.h b/xcore/base/xcam_common.h
+index 1f16e1e..4aa6cb9 100644
+--- a/xcore/base/xcam_common.h
++++ b/xcore/base/xcam_common.h
+@@ -75,7 +75,7 @@ void xcam_free (void *ptr);
+   * return, 0 successfully
+   *            else, check errno
+   */
+-int xcam_device_ioctl (int fd, int cmd, void *arg);
++int xcam_device_ioctl (int fd, uint32_t cmd, void *arg);
+ const char *xcam_fourcc_to_string (uint32_t fourcc);
+ 
+ void xcam_set_log (const char* file_name);
+diff --git a/xcore/fake_v4l2_device.h b/xcore/fake_v4l2_device.h
+index f679c19..e29787d 100644
+--- a/xcore/fake_v4l2_device.h
++++ b/xcore/fake_v4l2_device.h
+@@ -33,7 +33,7 @@ public:
+         : V4l2Device ("/dev/null")
+     {}
+ 
+-    int io_control (int cmd, void *arg)
++    int io_control (uint32_t cmd, void *arg)
+     {
+         XCAM_UNUSED (arg);
+ 
+diff --git a/xcore/v4l2_device.cpp b/xcore/v4l2_device.cpp
+index 395461e..66a8ac6 100644
+--- a/xcore/v4l2_device.cpp
++++ b/xcore/v4l2_device.cpp
+@@ -185,7 +185,7 @@ V4l2Device::close ()
+ }
+ 
+ int
+-V4l2Device::io_control (int cmd, void *arg)
++V4l2Device::io_control (uint32_t cmd, void *arg)
+ 
+ {
+     if (_fd <= 0)
+diff --git a/xcore/v4l2_device.h b/xcore/v4l2_device.h
+index b4ad7ad..2551a92 100644
+--- a/xcore/v4l2_device.h
++++ b/xcore/v4l2_device.h
+@@ -104,7 +104,7 @@ public:
+     XCamReturn queue_buffer (SmartPtr<V4l2Buffer> &buf);
+ 
+     // use as less as possible
+-    virtual int io_control (int cmd, void *arg);
++    virtual int io_control (uint32_t cmd, void *arg);
+ 
+ protected:
+ 
+diff --git a/xcore/xcam_common.cpp b/xcore/xcam_common.cpp
+index 848884d..d4d5093 100644
+--- a/xcore/xcam_common.cpp
++++ b/xcore/xcam_common.cpp
+@@ -53,7 +53,7 @@ void xcam_free(void *ptr)
+         free (ptr);
+ }
+ 
+-int xcam_device_ioctl (int fd, int cmd, void *arg)
++int xcam_device_ioctl (int fd, uint32_t cmd, void *arg)
+ {
+     int ret = 0;
+     int tried_time = 0;
+-- 
+2.25.1
+
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_1.4.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
index 987f94ee..31e9344b 100644
--- a/recipes-core/libxcam/libxcam_1.4.0.bb
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -7,11 +7,12 @@ 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"
+SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8"
+SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0;protocol=https \
+            file://0001-fake_v4l2_device.h-fix-narrowing-warning.patch \
+"
 
-COMPATIBLE_HOST_libc-musl = "null"
+COMPATIBLE_HOST:libc-musl = "null"
 
 PACKAGECONFIG ??= " gst \
                     ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \
@@ -27,12 +28,12 @@ PACKAGECONFIG[gles]   = "--enable-gles, --disable-gles, virtual/mesa"
 PACKAGECONFIG[vulkan] = "--enable-vulkan, --disable-vulkan, vulkan-loader virtual/mesa"
 PACKAGECONFIG[dnn]    = "--enable-dnn, --disable-dnn,"
 
-do_install_append () {
+do_install:append () {
     install -d ${D}${bindir}/libxcam
     cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/
 }
 
-FILES_${PN} += "${libdir}/gstreamer-*/*.so"
-FILES_${PN}-test = "${bindir}/libxcam/*"
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-test = "${bindir}/libxcam/*"
 PACKAGES =+ "${PN}-test"
-RDEPENDS_${PN}-test =+ "bash"
+RDEPENDS:${PN}-test =+ "bash"