From b789cf09b324247489c098e65330f580d025a97c344da895fbfea61c1847fd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 09:40:52 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main libcamera revision f799a872f5185d47c4fc5d22e1c8f948 --- _multibuild | 3 ++ _service | 2 +- baselibs.conf | 4 +-- libcamera-0.2.0.tar.xz | 3 -- libcamera-0.4.0.tar.xz | 3 ++ libcamera.changes | 71 ++++++++++++++++++++++++++++++++++++ libcamera.spec | 81 ++++++++++++++++++++++++++++++++++-------- 7 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 _multibuild delete mode 100644 libcamera-0.2.0.tar.xz create mode 100644 libcamera-0.4.0.tar.xz diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..120926f --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + full + diff --git a/_service b/_service index 285bc2a..70cfa68 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://git.libcamera.org/libcamera/libcamera.git - refs/tags/v0.2.0 + refs/tags/v0.4.0 @PARENT_TAG@ v([0-9\.]*) diff --git a/baselibs.conf b/baselibs.conf index bc3c228..e5fb5cc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libcamera0_2 -libcamera-base0_2 +libcamera0_4 +libcamera-base0_4 diff --git a/libcamera-0.2.0.tar.xz b/libcamera-0.2.0.tar.xz deleted file mode 100644 index 65b6724..0000000 --- a/libcamera-0.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3e5c031a89a5cf8a0810e3fcdb6eb7066f23d73bd9181e56f141d59ffe0aab2 -size 1081292 diff --git a/libcamera-0.4.0.tar.xz b/libcamera-0.4.0.tar.xz new file mode 100644 index 0000000..e0da004 --- /dev/null +++ b/libcamera-0.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:735327c80d8363761c5297b4d6ba8ba17d60ee5ac05c67b3a087adcad626119b +size 1208712 diff --git a/libcamera.changes b/libcamera.changes index 4ecebd1..380fbc3 100644 --- a/libcamera.changes +++ b/libcamera.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Mon Dec 23 21:51:19 UTC 2024 - Antonio Larrosa + +- Update to release 0.4.0 + * The abi-compliance-checker reports that there is both ABI and + API breakage in this release. + * The majority of the ABI breakages are around the public API for + Control handling and definitions, which have caused underlying + identifiers to be changed, and the reuqired storage for + controls has increased. + * This release brings in 253 commits, with substantial + development on image control and tuning features for IPA and + Pipeline handlers supporting libipa, as well as integrating + libipa support for IPA handling on the ARM Mali-C55 ISP. + * A new 'Virtual Pipeline Handler' has been introduced to support + more testing in CI and virtual environments. + * Gstreamer has had some interesting development to rework + expressing the full control set from libcamera using auto + generation from the full control descriptors. + * A key and notable change in this release too is that the + softISP is now moving towards utilising the libipa + implementaitons which will enable future tuning and image + control capabilities, and should also support future + development on a GPU-ISP implementation for GPU-accelerated + handling. I do believe this work may have introduced an + oscillation regression in the AEGC which will need to be + investigated and fixed in the near future, but I don't want to + hold up progressing the ABI updates at this stage. + * The i.MX8MP can now make full use of the DW100 Dewarp Engine + for full rotation and digital zoom capabilities. + * Raspberry Pi systems now have improved support for the OV7251, + IMX462, and IMX327 Sensors, and libipa platforms can now make + use of the GalaxyCore gc05a2 and gc08a3 Image sensors. + * For a full list of changes, please see: + https://git.libcamera.org/libcamera/libcamera.git/commit/?id=35ed4b91291d9f3d08e4b51acfb51163e65df8f8 + +------------------------------------------------------------------- +Sat Oct 19 17:05:03 UTC 2024 - Jan Engelhardt + +- Update to release 0.3.2 + * Add Sony IMX214 sensor properties + +------------------------------------------------------------------- +Tue Aug 20 07:37:45 UTC 2024 - Jan Engelhardt + +- Split SDL/Qt-dependent tools to multibuilt subpackage + +------------------------------------------------------------------- +Mon Aug 12 15:41:49 UTC 2024 - Jan Engelhardt + +- Update to release 0.3.1 + * new Soft ISP feature and enablement in the simple-pipeline + handler for Qualcomm based devices supporting CamSS and the + inclusion of a new Pipeline handler to support the Mali-C55 + ISP which now has open source kernel drivers available. + * The i.MX8MP ISP is now officially supported through the + existing RKISP1 pipeline handler, and the Simple Pipeline + handler now supports the MediaTek MT8365 platform. + * Three additional camera sensors, IMX283, IMX335, and IMX415 + are also now supported. + * The IPU6 is now supported by the SoftISP and Simple Pipeline + handler and the Onsemi AR0144 is now supported by libipa. A + new control has been added to support setting and reading of + Gamma, and gamma control has been added to the RKISP1 IPA. + +------------------------------------------------------------------- +Tue Mar 19 07:41:24 UTC 2024 - Richard Biener + +- Avoid %if %{pkg_vcmp gcc < 8}, instead replicate the condition + from the BuildRequires section. + ------------------------------------------------------------------- Sat Jan 13 08:48:16 UTC 2024 - Jan Engelhardt diff --git a/libcamera.spec b/libcamera.spec index 4670510..e4fc1c8 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -16,31 +16,36 @@ # -%define lname libcamera0_2 -%define lname_base libcamera-base0_2 -Name: libcamera -Version: 0.2.0 +%define lname libcamera0_4 +%define lname_base libcamera-base0_4 +%if "@BUILD_FLAVOR@" != "" +%define extname -@BUILD_FLAVOR@ +%else +%define extname %nil +%endif +Name: libcamera%extname +Version: 0.4.0 Release: 0 Summary: A complex camera support library in C++ -License: GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-SA-4.0 Group: Development/Libraries/C and C++ URL: https://libcamera.org/ #Git-Web: https://git.libcamera.org/libcamera/libcamera.git/ -Source: %name-%version.tar.xz +Source: libcamera-%version.tar.xz Source1: baselibs.conf BuildRequires: boost-devel BuildRequires: c++_compiler %if 0%{?suse_version} <= 1500 -BuildRequires: gcc9 -BuildRequires: gcc9-c++ +BuildRequires: gcc11 +BuildRequires: gcc11-c++ %endif BuildRequires: libQt5Core-devel BuildRequires: libQt5Gui-devel BuildRequires: libQt5Widgets-devel BuildRequires: meson >= 0.56 -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: python3-Jinja2 BuildRequires: python3-PyYAML BuildRequires: python3-ply @@ -52,7 +57,17 @@ BuildRequires: pkgconfig(libevent_pthreads) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(pybind11) BuildRequires: pkgconfig(yaml-0.1) +%if "@BUILD_FLAVOR@" != "" +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6OpenGL) +BuildRequires: pkgconfig(Qt6OpenGLWidgets) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(sdl2) +%endif %description libcamera is an experimental camera user-space API. @@ -104,6 +119,14 @@ Group: Development/Tools/Other %description tools libcamera is an experimental camera user-space API. +%package -n libcamera-cam +Summary: Command-line interfaces for libcamera +Group: Development/Tools/Other +# Heavy runtime deps (SDL, Qt6) + +%description -n libcamera-cam +libcamera is an experimental camera user-space API. + "cam" is a command-line utility to interact with cameras. The initial state is limited and only supports listing cameras in the system and selecting a camera to interact with. @@ -116,17 +139,28 @@ Group: Productivity/Multimedia/Other libcamera is an experimental camera user-space API. This is its integration plugin for gstreamer. +%package -n python3-libcamera +Summary: Python bindings for libcamera +Group: Development/Languages/Python + +%description -n python3-libcamera +Python bindings for libcamera. + %prep -%autosetup -p1 +%autosetup -p1 -n libcamera-%version %build -%if %{pkg_vcmp gcc < 8} -export CC=gcc-9 -export CXX=g++-9 +%if 0%{?suse_version} <= 1500 +export CC=gcc-11 +export CXX=g++-11 %endif %meson \ -Ddocumentation=disabled \ +%if "@BUILD_FLAVOR@" != "" -Dqcam=enabled \ +%else + -Dqcam=disabled \ +%endif -Dv4l2=false -Dtracing=disabled \ -Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc \ -Dlc-compliance=disabled @@ -134,10 +168,18 @@ export CXX=g++-9 %install %meson_install +pushd "%buildroot" +%if "@BUILD_FLAVOR@" != "" +find . ! -type d ! -path ./usr/bin/cam ! -path ./usr/bin/qcam -print -delete +%else +rm -v usr/bin/cam +%endif +popd %ldconfig_scriptlets -n %lname %ldconfig_scriptlets -n %lname_base +%if "@BUILD_FLAVOR@" == "" %files -n %lname %_libdir/libcamera.so.* @@ -152,8 +194,6 @@ export CXX=g++-9 %_libdir/pkgconfig/*.pc %files tools -%_bindir/cam -%_bindir/qcam %_libexecdir/libcamera/ %_libdir/libcamera/ %_datadir/libcamera/ @@ -161,4 +201,15 @@ export CXX=g++-9 %files -n gstreamer-plugins-libcamera %_libdir/gstreamer-1.0/ +%files -n python3-libcamera +%python3_sitearch/* + +%else + +%files -n libcamera-cam +%_bindir/cam +%_bindir/qcam + +%endif + %changelog