From 4a0eab3876a577693174ff4b7955282b040a55c7 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: May 28 2020 07:36:43 +0000 Subject: Update libxcam to rev 4 via SR 809514 https://build.opensuse.org/request/show/809514 by user alarrosa + maxlin_factory --- diff --git a/packages/libx/libxcam/.files b/packages/libx/libxcam/.files index 36b0e1e..1370b06 100644 Binary files a/packages/libx/libxcam/.files and b/packages/libx/libxcam/.files differ diff --git a/packages/libx/libxcam/.rev b/packages/libx/libxcam/.rev index f18b661..2bceaf9 100644 --- a/packages/libx/libxcam/.rev +++ b/packages/libx/libxcam/.rev @@ -23,4 +23,12 @@ 639577 + + 10a4201de5da81feb92cd2a5de5cb79d + 1.2.2 + + maxlin_factory + + 809514 + diff --git a/packages/libx/libxcam/allow-newer-opencv.patch b/packages/libx/libxcam/allow-newer-opencv.patch new file mode 100644 index 0000000..c63e96f --- /dev/null +++ b/packages/libx/libxcam/allow-newer-opencv.patch @@ -0,0 +1,77 @@ +From a7ad68cf32079f297b9a210ad81b99207877437f Mon Sep 17 00:00:00 2001 +From: Yinhang Liu +Date: Fri, 20 Sep 2019 19:19:45 +0800 +Subject: [PATCH] OpenCV: support OpenCV version: [3.0.0, 4.0.0) + +--- + README.md | 2 +- + configure.ac | 30 ++++++++++++++++++------------ + 2 files changed, 19 insertions(+), 13 deletions(-) + +diff --git a/README.md b/README.md +index a81da4f2..4e094976 100644 +--- a/README.md ++++ b/README.md +@@ -62,7 +62,7 @@ OpenCL is used to improve performance in different platforms. + * If --enable-gst, need install libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev + * If --enable-aiq, need get ia_imaging lib which we don't support + * If --enable-libcl, need compile [OpenCL](https://www.freedesktop.org/wiki/Software/Beignet) driver +- * If --enable-opencv, suggest [OpenCV](http://opencv.org) versions [3.0.0 - 3.4.3] (or: [OpenCV Wiki](https://github.com/opencv/opencv/wiki)) ++ * If --enable-opencv, suggest [OpenCV](http://opencv.org) versions [3.0.0 - 4.0.0) (or: [OpenCV Wiki](https://github.com/opencv/opencv/wiki)) + * If --enable-render, need compile [OpenSceneGraph](https://github.com/openscenegraph/OpenSceneGraph) library with configure option "-DOSG_WINDOWING_SYSTEM=X11" + * If --enable-gles, need to install [Mesa3D](https://www.mesa3d.org) library + * If --enable-vulkan, need to install [Mesa3D](https://www.mesa3d.org) library +diff --git a/configure.ac b/configure.ac +index ff71d1d4..f5e63402 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,9 +27,9 @@ XCAM_LT_LDFLAGS="-version-number $XCAM_LT_VERSION" + AC_SUBST(XCAM_LT_VERSION) + AC_SUBST(XCAM_LT_LDFLAGS) + +-#xcam required OpenCV version ++#xcam required OpenCV version [XCAM_REQUIRE_CV_MIN, XCAM_REQUIRE_CV_MAX) + XCAM_REQUIRE_CV_MIN=3.0.0 +-XCAM_REQUIRE_CV_MAX=3.4.3 ++XCAM_REQUIRE_CV_MAX=4.0.0 + + #xcam required OpenSceneGraph version + XCAM_REQUIRE_OSG_MIN=3.3.2 +@@ -213,21 +213,27 @@ if test "$HAVE_LIBCL" -eq 1; then + fi + fi + +-# check opencv version number ++# check opencv version + HAVE_OPENCV=0 + if test "$enable_opencv" = "yes"; then +- PKG_CHECK_MODULES( +- [OPENCV], +- [opencv >= $XCAM_REQUIRE_CV_MIN opencv <= $XCAM_REQUIRE_CV_MAX], +- [HAVE_OPENCV=1], +- [HAVE_OPENCV=0]) +- +- XCAM_CV_VERSION=`$PKG_CONFIG --modversion opencv` ++ XCAM_CV_VERSION=`opencv_version` ++ if test -z $XCAM_CV_VERSION; then ++ XCAM_CV_VERSION=`$PKG_CONFIG --modversion opencv` ++ fi + AC_MSG_NOTICE(OpenCV version: $XCAM_CV_VERSION) + +- if test "$HAVE_OPENCV" -eq 0; then +- AC_MSG_ERROR(OpenCV required version: >= $XCAM_REQUIRE_CV_MIN && <= $XCAM_REQUIRE_CV_MAX) ++ XCAM_CV_MAJOR_VERSION=`echo $XCAM_CV_VERSION | cut -d '.' -f 1` ++ ++ opencv_module=opencv ++ if test $XCAM_CV_MAJOR_VERSION -ge 4; then ++ opencv_module=opencv$XCAM_CV_MAJOR_VERSION + fi ++ ++ PKG_CHECK_MODULES( ++ [OPENCV], ++ [$opencv_module >= $XCAM_REQUIRE_CV_MIN $opencv_module < $XCAM_REQUIRE_CV_MAX], ++ [HAVE_OPENCV=1], ++ [AC_MSG_ERROR(OpenCV required version: >= $XCAM_REQUIRE_CV_MIN && < $XCAM_REQUIRE_CV_MAX)]) + fi + + # check opencv videostab module diff --git a/packages/libx/libxcam/libxcam.changes b/packages/libx/libxcam/libxcam.changes index 3af4af6..26f1b79 100644 --- a/packages/libx/libxcam/libxcam.changes +++ b/packages/libx/libxcam/libxcam.changes @@ -1,4 +1,37 @@ ------------------------------------------------------------------- +Thu May 21 14:43:43 UTC 2020 - Aaron Puchert + +- Update to version 1.2.2 + * GLES compute framework enabling. + - enable GL image processing framework. + - enable features of multi-band blender, geometry remap and data-copy. + * GLES surround-view stitching enabling. + - GLES stitching enabled (feature-match may support later). + - performance optimized on compute shaders. + * Vulkan compute framework enabling. + - enabled Vulkan image processing under xcam framework. + - vk-copy-handler as sample code. + * suggest OpenCV version [3.0.0 - 3.4.3] + * support CPU stitching based on dual-const and dual-curve scaling factors. + * support OpenCL stitching based on auto-scale in vertical 2D-direction. + * change test-soft-image to test-surround-view + * Vulkan surround-view stitching enabling. + - enable features of multi-band blender and geometry remap. + - enable Vulkan image stitching. (feature-match may support later) + * Surrond-view texture rendering. + - enable 3D surround view scene rendering and manipulation. + * require OpenSceneGraph minimal version 3.3.2 + * DNN inference framwork enabling. + - enable pedestrian and vehicle detection based on OpenVino + * OpenCV feature match enabled for image stitching pipeline (GLES/Vulkan/CPU) + - support three versions of feature match: default, cluster, capi + * Abstract OpenCV source in ocv module, and build into a separate static library +- Require pkgconfig(opencv), because this still needs OpenCV 3. +- Add allow-newer-opencv.patch: Allow all 3.x.x versions. +- Disable 3alib to prevent compiler errors due to missing linux/atomisp.h. +- Enable Vulkan support. + +------------------------------------------------------------------- Tue Oct 2 10:55:20 UTC 2018 - Antonio Larrosa - 1.1.0 - Update to version 1.1.0 diff --git a/packages/libx/libxcam/libxcam.spec b/packages/libx/libxcam/libxcam.spec index c92b2e9..7958018 100644 --- a/packages/libx/libxcam/libxcam.spec +++ b/packages/libx/libxcam/libxcam.spec @@ -1,7 +1,7 @@ # # spec file for package libxcam # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,15 @@ %define sover 1 %define libname %{name}%{sover} Name: libxcam -Version: 1.1.0 +Version: 1.2.2 Release: 0 Summary: Image processing library for extended camera features and video analysis License: Apache-2.0 Group: Development/Libraries/C and C++ -Url: https://github.com/01org/libxcam +URL: https://github.com/01org/libxcam Source0: https://github.com/01org/libxcam/archive/release_%{version}.tar.gz +# From https://github.com/intel/libxcam/commit/a7ad68cf32079f297b9a210ad81b99207877437f.patch, rebased. +Patch0: allow-newer-opencv.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: beignet-devel >= 1.2.0 @@ -36,7 +38,6 @@ BuildRequires: libdrm-devel BuildRequires: libtool BuildRequires: ocl-icd-devel BuildRequires: opencl-headers -BuildRequires: opencv-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) @@ -44,6 +45,8 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm_intel) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(opencv) +BuildRequires: pkgconfig(vulkan) # Intel graphics hardware only available on these platforms ExclusiveArch: %{ix86} x86_64 @@ -76,6 +79,7 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-release_%{version} +%patch0 -p1 %build autoreconf -fiv @@ -87,9 +91,10 @@ autoreconf -fiv --disable-aiq \ --enable-gst \ --enable-libcl \ + --enable-vulkan \ --enable-opencv \ --enable-capi \ - --enable-3alib \ + --disable-3alib \ --enable-smartlib make %{?_smp_mflags} V=1 @@ -108,6 +113,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/%{name}_core.so.%{sover}* %{_libdir}/%{name}_ocl.so.%{sover}* %{_libdir}/%{name}_soft.so.%{sover}* +%{_libdir}/%{name}_vulkan.so.%{sover}* %{_libdir}/gstreamer-1.0/libgstxcamsrc.so %{_libdir}/gstreamer-1.0/libgstxcamfilter.so @@ -119,5 +125,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libxcam_core.so %{_libdir}/libxcam_ocl.so %{_libdir}/libxcam_soft.so +%{_libdir}/libxcam_vulkan.so %changelog diff --git a/packages/libx/libxcam/release_1.1.0.tar.gz b/packages/libx/libxcam/release_1.1.0.tar.gz deleted file mode 120000 index c3cb971..0000000 --- a/packages/libx/libxcam/release_1.1.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeih76j4bficz246k5hvggduzmbohethrahzm5mzjrppsnalxlmxgo4 \ No newline at end of file diff --git a/packages/libx/libxcam/release_1.2.2.tar.gz b/packages/libx/libxcam/release_1.2.2.tar.gz new file mode 120000 index 0000000..44166dd --- /dev/null +++ b/packages/libx/libxcam/release_1.2.2.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeihczwtyrill357nz5pdba2kvyk7x3ddid3dssmu4vr6ijvbfbmlki \ No newline at end of file