From c4e2039ca6b0e9506db55b91797bfdceb1c64853 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 26 Jun 2020 10:24:05 +0800 Subject: libxcam: upgrade 1.3.0 -> 1.4.0 Created and submitted a patch to fix header path. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../0001-test-soft-image.cpp-fix-header-path.patch | 37 +++++++++++++++++++++ recipes-core/libxcam/libxcam_1.3.0.bb | 38 ---------------------- recipes-core/libxcam/libxcam_1.4.0.bb | 38 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 38 deletions(-) create mode 100644 recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch delete mode 100644 recipes-core/libxcam/libxcam_1.3.0.bb create mode 100644 recipes-core/libxcam/libxcam_1.4.0.bb 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 new file mode 100644 index 00000000..67db3e4c --- /dev/null +++ b/recipes-core/libxcam/libxcam/0001-test-soft-image.cpp-fix-header-path.patch @@ -0,0 +1,37 @@ +From 8f8a1d131a05aa1494825f0fae32580cbed680e5 Mon Sep 17 00:00:00 2001 +From: Naveen Saini +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 +| | ^~~~~~~~~~~~~~~~~~~~~~~~ +| 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 +--- + 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 + #include + #include +-#include ++#include + + #define MAP_WIDTH 3 + #define MAP_HEIGHT 4 +-- +2.17.1 + diff --git a/recipes-core/libxcam/libxcam_1.3.0.bb b/recipes-core/libxcam/libxcam_1.3.0.bb deleted file mode 100644 index 7bfcacde..00000000 --- a/recipes-core/libxcam/libxcam_1.3.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "libXCam is a project for extended camera(not limited in camera) \ -features and focus on image quality improvement and video analysis" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c911f084a3e5f46b21582a6cc9973e6" -SECTION = "lib" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "90f386c44fdfc550d0c81697cf070b3249bef4dd" -SRC_URI = "git://github.com/intel/libxcam.git;branch=1.3.0 \ - " - -COMPATIBLE_HOST_libc-musl = "null" - -PACKAGECONFIG ??= " gst \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan", "", d)} \ - " - -PACKAGECONFIG[gst] = "--enable-gst, --disable-gst, gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[aiq] = "--enable-aiq, --disable-aiq," -PACKAGECONFIG[libcl] = "--enable-libcl, --disable-libcl," -PACKAGECONFIG[opencv] = "--enable-opencv, --disable-opencv, opencv" -PACKAGECONFIG[render] = "--enable-render, --disable-render," -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 () { - install -d ${D}${bindir}/libxcam - cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ -} - -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-test = "${bindir}/libxcam/*" -PACKAGES =+ "${PN}-test" -RDEPENDS_${PN}-test =+ "bash" diff --git a/recipes-core/libxcam/libxcam_1.4.0.bb b/recipes-core/libxcam/libxcam_1.4.0.bb new file mode 100644 index 00000000..987f94ee --- /dev/null +++ b/recipes-core/libxcam/libxcam_1.4.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "libXCam is a project for extended camera(not limited in camera) \ +features and focus on image quality improvement and video analysis" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c911f084a3e5f46b21582a6cc9973e6" +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" + +COMPATIBLE_HOST_libc-musl = "null" + +PACKAGECONFIG ??= " gst \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan", "", d)} \ + " + +PACKAGECONFIG[gst] = "--enable-gst, --disable-gst, gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[aiq] = "--enable-aiq, --disable-aiq," +PACKAGECONFIG[libcl] = "--enable-libcl, --disable-libcl," +PACKAGECONFIG[opencv] = "--enable-opencv, --disable-opencv, opencv" +PACKAGECONFIG[render] = "--enable-render, --disable-render," +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 () { + install -d ${D}${bindir}/libxcam + cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ +} + +FILES_${PN} += "${libdir}/gstreamer-*/*.so" +FILES_${PN}-test = "${bindir}/libxcam/*" +PACKAGES =+ "${PN}-test" +RDEPENDS_${PN}-test =+ "bash" -- cgit v1.2.3-54-g00ecf