From 64471af51e6865fbdb31ad8ba3b27e9099a1c22a Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Wed, 3 Dec 2025 15:41:11 +0800 Subject: [PATCH] Update to the upstream version 0.6.0 Update to 0.6.0 Resolves: RHEL-132576 --- .gitignore | 1 + 0001-disable-rpi-pisp.patch | 13 ++++++++++++ libcamera.spec | 42 ++++++++++++++++++++++++------------- sources | 2 +- 4 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 0001-disable-rpi-pisp.patch diff --git a/.gitignore b/.gitignore index 973e935..1a02f70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libcamera-0.3.2.tar.xz +/libcamera-v0.6.0.tar.bz2 diff --git a/0001-disable-rpi-pisp.patch b/0001-disable-rpi-pisp.patch new file mode 100644 index 0000000..9918fec --- /dev/null +++ b/0001-disable-rpi-pisp.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 9ba5e2ca..cbfbf479 100644 +--- a/meson.build ++++ b/meson.build +@@ -215,7 +215,7 @@ pipelines_support = { + 'ipu3': arch_x86, + 'mali-c55': arch_arm, + 'rkisp1': arch_arm, +- 'rpi/pisp': arch_arm, ++ #'rpi/pisp': arch_arm, + 'rpi/vc4': arch_arm, + 'simple': ['any'], + 'uvcvideo': ['any'], diff --git a/libcamera.spec b/libcamera.spec index 49fa34c..91c8f68 100644 --- a/libcamera.spec +++ b/libcamera.spec @@ -1,26 +1,25 @@ +# RHEL does not include all documentation dependencies (e.g. sphinxcontrib-doxylink) +%bcond docs %{undefined rhel} + Name: libcamera -Version: 0.3.2 -Release: 4%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A library to support complex camera ISPs # see .reuse/dep5 and COPYING for details License: LGPL-2.1-or-later URL: http://libcamera.org/ -# Upstream is still under development and does not release tarballs, -# but they do tag releases (https://git.libcamera.org/libcamera/libcamera.git/) -# -# For use the following to do generate a tarball from a git tag: -# -# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{version} | xz > %%{name}-%%{version}.tar.xz -Source0: %{name}-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/camera/libcamera/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 Source1: qcam.desktop Source2: qcam.metainfo.xml Source3: 70-libcamera.rules +# disable rpi/pisp +Patch01: 0001-disable-rpi-pisp.patch + # libcamera does not currently build on these architectures ExcludeArch: s390x ppc64le -BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: meson @@ -47,6 +46,12 @@ BuildRequires: python3-pyyaml BuildRequires: python3-sphinx BuildRequires: SDL2-devel BuildRequires: systemd-devel +%if %{with docs} +BuildRequires: doxygen +BuildRequires: python3-sphinx +BuildRequires: python3-sphinxcontrib-doxylink +%endif + # Installing the firmware to ensure the Intel MIPI camera works Recommends: intel-vsc-firmware # libcamera is not really usable without its IPA plugins @@ -68,12 +73,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Files for development with %{name}. +%if %{with docs} %package doc Summary: Documentation for %{name} License: LGPL-2.1-or-later AND CC-BY-4.0 %description doc HTML based documentation for %{name} including getting started and API. +%endif %package ipa Summary: ISP Image Processing Algorithm Plugins for %{name} @@ -122,7 +129,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Python bindings for %{name} %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-v%{version} %build # cam/qcam crash with LTO @@ -130,7 +137,9 @@ Python bindings for %{name} export CFLAGS="%{optflags} -Wno-deprecated-declarations" export CXXFLAGS="%{optflags} -Wno-deprecated-declarations" -%meson -Dv4l2=true -Dlc-compliance=disabled -Dtracing=disabled +%meson -Dv4l2=true -Dlc-compliance=disabled \ + -Dlibunwind=disabled -Dtracing=disabled %{!?with_docs:-Ddocumentation=disabled} + %meson_build # Stripping requires the re-signing of IPA libraries, manually @@ -139,7 +148,7 @@ export CXXFLAGS="%{optflags} -Wno-deprecated-declarations" %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ %{__os_install_post} \ - %{_builddir}/%{name}-%{version}/src/ipa/ipa-sign-install.sh %{_builddir}/%{name}-%{version}/%{_vpath_builddir}/src/ipa-priv-key.pem %{buildroot}/%{_libdir}/libcamera/ipa_*.so \ + %{_builddir}/%{name}-v%{version}/src/ipa/ipa-sign-install.sh %{_builddir}/%{name}-%{version}/%{_vpath_builddir}/src/ipa-priv-key.pem %{buildroot}/%{_libdir}/libcamera/ipa_*.so \ %{nil} %install @@ -164,7 +173,7 @@ rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-*/html/.doctrees %files %license COPYING.rst LICENSES/LGPL-2.1-or-later.txt # We leave the version here explicitly to know when it bumps -%{_libdir}/libcamera*.so.0.3 +%{_libdir}/libcamera*.so.0.6 %{_libdir}/libcamera*.so.%{version} %{_udevrulesdir}/70-libcamera.rules @@ -174,8 +183,10 @@ rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-*/html/.doctrees %{_libdir}/pkgconfig/libcamera-base.pc %{_libdir}/pkgconfig/libcamera.pc +%if %{with docs} %files doc %doc %{_docdir}/%{name}-*/ +%endif %files ipa %{_datadir}/libcamera/ @@ -203,6 +214,9 @@ rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-*/html/.doctrees %{python3_sitearch}/* %changelog +* Wed Dec 03 2025 Kate Hsuan - 0.6.0-1 +- Update to the latest upstream version (RHEL-132576) + * Mon Sep 08 2025 Kate Hsuan - 0.3.2-4 - Add a weak dependency to intel-vsc-firmware diff --git a/sources b/sources index 25271dd..b49e95a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libcamera-0.3.2.tar.xz) = 793b9a2864d61dbb4b1ef3c81b3e61b17da318cabce08d204533b9f64cd55033f70f1b7093bf3095f95428b5254b295ba4f01226e476662a9085b90587af41c2 +SHA512 (libcamera-v0.6.0.tar.bz2) = afb39c77f36ecd51fb39b9bdaec313b222a0710bb922fca56f199e10f67517277a7a806f076030e7f7dae8076cfcc1628574d553d83974bfd049b9a9da252fc6