From 62ac7ad8747118c3165e47707ae311282e6db77c Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 14 Oct 2019 13:43:10 +0800 Subject: libxcam: upgrade 1.2.2 -> 1.3.0 Patch is already merged, so not required anymore. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- ...kan-point-to-correct-location-of-spv-shad.patch | 30 --------------------- recipes-core/libxcam/libxcam_1.2.2.bb | 31 ---------------------- recipes-core/libxcam/libxcam_1.3.0.bb | 30 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch delete mode 100644 recipes-core/libxcam/libxcam_1.2.2.bb create mode 100644 recipes-core/libxcam/libxcam_1.3.0.bb diff --git a/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch b/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch deleted file mode 100644 index 911d7aac..00000000 --- a/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 99f7a588ee827e25a153ac066a4f80f13a86e10e Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Mon, 29 Jul 2019 12:27:19 +0800 -Subject: [PATCH] modules/vulkan: point to correct location of spv shaders - -They are not generated and are present in source directory. - -Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/654] - -Signed-off-by: Anuj Mittal ---- - modules/vulkan/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/vulkan/Makefile.am b/modules/vulkan/Makefile.am -index 22763f0..56578ec 100644 ---- a/modules/vulkan/Makefile.am -+++ b/modules/vulkan/Makefile.am -@@ -5,7 +5,7 @@ XCAM_VK_CXXFLAGS = \ - $(LIBVULKAN_CFLAGS) \ - -I$(top_srcdir)/xcore \ - -I$(top_srcdir)/modules \ -- -I$(top_builddir)/shaders/spv \ -+ -I$(top_srcdir)/shaders/spv \ - $(NULL) - - XCAM_VK_LIBS = \ --- -2.7.4 - diff --git a/recipes-core/libxcam/libxcam_1.2.2.bb b/recipes-core/libxcam/libxcam_1.2.2.bb deleted file mode 100644 index 80bef154..00000000 --- a/recipes-core/libxcam/libxcam_1.2.2.bb +++ /dev/null @@ -1,31 +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 = "28769ade4793006c8db9a1720359c310fa1e0d6a" -SRC_URI = "git://github.com/intel/libxcam.git;branch=1.2.2 \ - file://0001-modules-vulkan-point-to-correct-location-of-spv-shad.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," - -FILES_${PN} += "${libdir}/gstreamer-*/*.so" diff --git a/recipes-core/libxcam/libxcam_1.3.0.bb b/recipes-core/libxcam/libxcam_1.3.0.bb new file mode 100644 index 00000000..1bf00286 --- /dev/null +++ b/recipes-core/libxcam/libxcam_1.3.0.bb @@ -0,0 +1,30 @@ +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," + +FILES_${PN} += "${libdir}/gstreamer-*/*.so" -- cgit v1.2.3-54-g00ecf