Accepting request 1194915 from graphics

- Split SDL/Qt-dependent tools to multibuilt subpackage
- Update to release 0.3.1

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

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+	<flavor>full</flavor>
+</multibuild>

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1724157692
+commit: 25c26bf3382ab16389f2c2053e5be1af269ea41d1a3815f45f79f8533b9cac3c
+url: https://src.opensuse.org/jengelh/libcamera
+revision: master

_service

@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="manual">
 		<param name="scm">git</param>
 		<param name="url">https://git.libcamera.org/libcamera/libcamera.git</param>
-		<param name="revision">refs/tags/v0.2.0</param>
+		<param name="revision">refs/tags/v0.3.1</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">v([0-9\.]*)</param>
 	</service>

baselibs.conf

@@ -1,2 +1,2 @@
-libcamera0_2
+libcamera0_3
-libcamera-base0_2
+libcamera-base0_3

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69f7c6904a89c7e9659d87813d4530d01459fa1b14a2533740ad76e1b8a46382
+size 256

libcamera.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Aug 20 07:37:45 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Split SDL/Qt-dependent tools to multibuilt subpackage
+
+-------------------------------------------------------------------
+Mon Aug 12 15:41:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- 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 <rguenther@suse.com>
 

libcamera.spec

@@ -16,10 +16,15 @@
 #
 
 
-%define lname       libcamera0_2
+%define lname       libcamera0_3
-%define lname_base  libcamera-base0_2
+%define lname_base  libcamera-base0_3
-Name:           libcamera
+%if "@BUILD_FLAVOR@" != ""
-Version:        0.2.0
+%define extname -@BUILD_FLAVOR@
+%else
+%define extname %nil
+%endif
+Name:           libcamera%extname
+Version:        0.3.1
 Release:        0
 Summary:        A complex camera support library in C++
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -27,20 +32,20 @@ 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:  gcc11
-BuildRequires:  gcc9-c++
+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 0%{?suse_version} <= 1500
-export CC=gcc-9
+export CC=gcc-11
-export CXX=g++-9
+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