Sync changes to SLFO-1.2 branch

- Update to release 0.4.0

OBS-URL: https://build.opensuse.org/request/show/1233212
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcamera?expand=0&rev=23

_service

@@ -1,9 +1,9 @@
 <services>
 	<service name="tar_scm" mode="manual">
 		<param name="scm">git</param>
-		<param name="url">https://gitlab.freedesktop.org/rmader/libcamera.git</param>
-		<param name="revision">postmarketos-gpuisp-2026-01-17</param>
-		<param name="versionformat">v0.6.0</param>
+		<param name="url">https://git.libcamera.org/libcamera/libcamera.git</param>
+		<param name="revision">refs/tags/v0.5.1</param>
+		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">v([0-9\.]*)</param>
 	</service>
 	<service name="recompress" mode="manual">

libcamera.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 14 19:42:13 UTC 2026 - Adrian Campos Garrido <adriancampos@teachelp.com>
-
-- Update to 0.6.0 with GPUISP 
-
--------------------------------------------------------------------
-Tue Sep  9 12:42:46 UTC 2025 - pgajdos@suse.com
-
-- Update to release 0.5.2
-  * This release substantial development on gstreamer.
-  * In core we can see development that cleans up ProcessManager
-    in a drive to reduce singleton patterns throughout libcamera.
-  * Pipelines are now able to limit the number of requests queued
-    into the pipeline handler which helps prevent issues when
-    applications desire to use a larger request queue.
-  * It's now possible to check if controls exist with new macros
-    defined for every control to help codebases compile against
-    multiple versions.
-- see https://gitlab.freedesktop.org/camera/libcamera/-/releases/v0.5.2
-  for details
-
 -------------------------------------------------------------------
 Wed Jul  9 11:32:16 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.de>
 

libcamera.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcamera
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,15 @@
 #
 
 
-%define lname       libcamera0_6
-%define lname_base  libcamera-base0_6
-%define lname_hal  libcamera-hal
-
+%define lname       libcamera0_5
+%define lname_base  libcamera-base0_5
 %if "@BUILD_FLAVOR@" != ""
 %define extname -@BUILD_FLAVOR@
 %else
 %define extname %nil
 %endif
-
-# Signing breaks reproducible builds, see
-# https://gitlab.freedesktop.org/camera/libcamera/-/issues/233
-%bcond_with    signed_ipa
-
 Name:           libcamera%extname
-Version:        0.6.0
+Version:        0.5.1
 Release:        0
 Summary:        A complex camera support library in C++
 License:        CC-BY-SA-4.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -40,35 +33,29 @@ URL:            https://libcamera.org/
 #Git-Web:       https://git.libcamera.org/libcamera/libcamera.git/
 Source:         libcamera-%version.tar.xz
 Source1:        baselibs.conf
+Patch0:         reproducible.patch
+BuildRequires:  boost-devel
 BuildRequires:  c++_compiler
-BuildRequires:  meson >= 1.0.1
+%if 0%{?suse_version} <= 1500
+BuildRequires:  gcc11
+BuildRequires:  gcc11-c++
+%endif
+BuildRequires:  meson >= 0.56
 BuildRequires:  pkg-config
 BuildRequires:  python3-Jinja2
 BuildRequires:  python3-PyYAML
 BuildRequires:  python3-ply
 BuildRequires:  xz
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(libevent_pthreads)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(pybind11)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(yaml-0.1)
-BuildRequires:  pkgconfig(libpisp)
-BuildRequires:  pkgconfig(gtest)
-BuildRequires:  pkgconfig(libyuv)
-BuildRequires:  Mesa-libGLESv3-devel
-BuildRequires:  pkgconfig(libexif)
-
-%if %{with signed_ipa}
-# OpenSSL used for signing, gnutls for runtime verification
-BuildRequires:  openssl
-BuildRequires:  pkgconfig(gnutls)
-%endif
-%ifarch aarch64 %arm
-BuildRequires:  pkgconfig(libpisp)
-%endif
 %if "@BUILD_FLAVOR@" != ""
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Gui)
@@ -110,67 +97,35 @@ expose multiple kernel device nodes in /dev for different stages of
 the pipeline. The libcamera API groups and exposes these pieces as
 what users consider one "camera".
 
-%package -n %lname_hal
-Summary:        A complex camera support library in C++
-Group:          System/Libraries
-
-%description -n %lname_hal
-libcamera is an experimental camera user-space API.
-
-A camera may consist of multiple sensors or function blocks, and can
-expose multiple kernel device nodes in /dev for different stages of
-the pipeline. The libcamera API groups and exposes these pieces as
-what users consider one "camera".
-
 %package devel
 Summary:        Development for libcamera, a camera support library
 Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 Requires:       %lname_base = %version
-Requires:       %lname_hal = %version
 
 %description devel
 libcamera is an experimental camera user-space API.
 
 This subpackage contains the header files.
 
-%package ipa
-Summary:        Plugins for hardware specific image processing blocks
-Group:          System/Libraries
-# Previously named libcamera-tools, although it provides none
-Provides:       libcamera-tools = %version-%release
-Obsoletes:      libcamera-tools < %version-%release
+%package tools
+Summary:        Command-line utilities from libcamera
+Group:          Development/Tools/Other
 
-%description ipa
+%description tools
 libcamera is an experimental camera user-space API.
 
-This package provides plugins for interfacing with various ISP
-(Image Signal Processor) hardware blocks, as well as
-calibration data for some camera sensors.
-
 %package -n libcamera-cam
 Summary:        Command-line interfaces for libcamera
 Group:          Development/Tools/Other
-# Heavy runtime deps (SDL)
+# 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. It allows
-to query and set image stream properties, and to capture the stream
-to a file or show a live view.
-
-%package -n libcamera-qcam
-Summary:        Qt interfaces for libcamera
-Group:          Development/Tools/Other
-# Heavy runtime deps (Qt6)
-
-%description -n libcamera-qcam
-libcamera is an experimental camera user-space API.
-
-"qcam" is a Qt interface to interact with cameras. It allows to
-query and set image stream properties, and to capture the stream
-to a file or show a live view.
+"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.
 
 %package -n gstreamer-plugins-libcamera
 Summary:        GStreamer plugins from libcamera
@@ -191,6 +146,10 @@ Python bindings for libcamera.
 %autosetup -p1 -n libcamera-%version
 
 %build
+%if 0%{?suse_version} <= 1500
+export CC=gcc-11
+export CXX=g++-11
+%endif
 %meson \
 	-Ddocumentation=disabled \
 %if "@BUILD_FLAVOR@" != ""
@@ -198,11 +157,9 @@ Python bindings for libcamera.
 %else
 	-Dqcam=disabled \
 %endif
-	-Dv4l2=enabled -Dtracing=disabled \
-	-Dlc-compliance=enabled -Dudev=enabled \
-        -Dandroid=enabled \
-        -Dpipelines=all -Dipas=ipu3,mali-c55,rkisp1,rpi/pisp,rpi/vc4,simple,vimc
-
+	-Dv4l2=false -Dtracing=disabled \
+	-Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc \
+	-Dlc-compliance=disabled
 %meson_build
 
 %install
@@ -211,7 +168,6 @@ cd "%buildroot"
 %if "@BUILD_FLAVOR@" != ""
 find . ! -type d ! -path ./usr/bin/cam ! -path ./usr/bin/qcam -print -delete
 %else
-# Delete limited variant without SDL
 rm -v usr/bin/cam
 %endif
 
@@ -225,9 +181,6 @@ rm -v usr/bin/cam
 %files -n %lname_base
 %_libdir/libcamera-base.so.*
 
-%files -n %lname_hal
-%_libdir/libcamera-hal.so
-
 %files devel
 %license LICENSES/*GPL*
 %_includedir/libcamera/
@@ -235,12 +188,10 @@ rm -v usr/bin/cam
 %_libdir/libcamera.so
 %_libdir/pkgconfig/*.pc
 
-%files ipa
+%files tools
 %_libexecdir/libcamera/
 %_libdir/libcamera/
 %_datadir/libcamera/
-%_bindir/lc-compliance
-%_bindir/libcamerify
 
 %files -n gstreamer-plugins-libcamera
 %_libdir/gstreamer-1.0/
@@ -252,11 +203,8 @@ rm -v usr/bin/cam
 
 %files -n libcamera-cam
 %_bindir/cam
-
-%files -n libcamera-qcam
 %_bindir/qcam
 
 %endif
 
 %changelog
-

reproducible.patch

@@ -0,0 +1,21 @@
+Date: 2024-09-21
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+
+Skip module signing for https://bugzilla.opensuse.org/show_bug.cgi?id=1217690
+reproducible builds, until we can get a better upstream solution
+such as
+https://lists.libcamera.org/pipermail/libcamera-devel/2024-January/040244.html
+
+diff --git a/src/meson.build b/src/meson.build
+index 8eb8f05..41e556d 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -16,7 +16,7 @@ summary({
+ 
+ # Module Signing
+ openssl = find_program('openssl', required : false)
+-if openssl.found()
++if false
+     ipa_priv_key = custom_target('ipa-priv-key',
+                                  output : ['ipa-priv-key.pem'],
+                                  command : [gen_ipa_priv_key, '@OUTPUT@'])