temp/libcamera: backport sw-ISP mode selection patch

For https://bugs.libcamera.org/show_bug.cgi?id=236

temp/libcamera/0005-pipeline-simple-Consider-output-sizes-when-choosing-.patch

+From 33f19f1059eef968ae7f89b8b5a18bcd6f90303a Mon Sep 17 00:00:00 2001
+From: Robert Mader <robert.mader@collabora.com>
+Date: Fri, 11 Oct 2024 20:13:24 +0200
+Subject: [PATCH] pipeline: simple: Consider output sizes when choosing pipe
+ config
+
+In order to avoid having to adjust the size further down below which
+again can break user assumptions. Notably, without this the capture size
+of 1920x1080 gets adjusted to 1912x1080 when used with the swISP using a
+bayer pattern width of 4, breaking users like Gstreamer down the line.
+
+Closes https://bugs.libcamera.org/show_bug.cgi?id=236
+
+Signed-off-by: Robert Mader <robert.mader@collabora.com>
+
+---
+
+I'm not really sure if this is the correct approach, but sending it out
+already for feedback. So far this gives me promissing results on tested
+devices.
+---
+ src/libcamera/pipeline/simple/simple.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
+index b32f8b2c..497db731 100644
+--- a/src/libcamera/pipeline/simple/simple.cpp
++++ b/src/libcamera/pipeline/simple/simple.cpp
+@@ -1037,7 +1037,8 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
+ 		const Size &size = pipeConfig->captureSize;
+ 
+ 		if (size.width >= maxStreamSize.width &&
+-		    size.height >= maxStreamSize.height) {
++		    size.height >= maxStreamSize.height &&
++		    pipeConfig->outputSizes.contains(maxStreamSize)) {
+ 			if (!pipeConfig_ || size < pipeConfig_->captureSize)
+ 				pipeConfig_ = pipeConfig;
+ 		}
+-- 
+2.47.0
+

temp/libcamera/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=libcamera
 pkgver=9999
 _pkgver=0.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Linux camera framework"
 url="https://libcamera.org/"
 arch="all"
@@ -46,6 +46,7 @@ source="https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$_pkgver/libc
 	0002-libcamera-simple-Force-disable-softwareISP-for-milli.patch
 	0003-libcamera-simple-Enable-softISP-for-the-Pinephone.patch
 	0004-libcamera-simple-Skip-hwISP-formats-if-swISP-is-acti.patch
+	0005-pipeline-simple-Consider-output-sizes-when-choosing-.patch
 	qcam.desktop
 	90-libcamera.rules
 	"
@@ -150,6 +151,7 @@ ac7df3e4509ae874199810057f4d8416da71720c15534578cc352608a8ae228dfa4814f9eb995d55
 9b6da8bd11ff9d8400ed721fbbeb960ac8753c078fdd971d786a446a9f96fea19dfc55be2705dc44a152e11de996f88139c1d24637bffc257da5083d19fe80c9  0002-libcamera-simple-Force-disable-softwareISP-for-milli.patch
 0fc6a1108c4e905d2d422a664622dc25ec459f13765b5711ad009d4df0fd0cceda8cd067a18e5e54eb2346b292481952161e72deb03d416ba80b300256c25e40  0003-libcamera-simple-Enable-softISP-for-the-Pinephone.patch
 35c74746453f4c2e24a2185331afabcf64e3af01bec2462ec09940518cda0e91c4a1f33853b4b009e1f8352af3c606fbd4b4d3791ffbba0f610f19538380c4c8  0004-libcamera-simple-Skip-hwISP-formats-if-swISP-is-acti.patch
+2d76f55f238a340948f660e9a2defc0b32eca71b75b1ed0e2c6befe9e4205d404d3f244376bc25f466bb209e534f9330f99d4fa18dc1a2c3e304abf0acd0fdd5  0005-pipeline-simple-Consider-output-sizes-when-choosing-.patch
 22167a4eceb6d1b40b0b7c45fdf116c71684f5340de7f767535cb8e160ad9d2ae0f00cb3d461f73a344520a48a4641cf46226841d78bee06bfbfd2a91337f754  qcam.desktop
 cb4eb19eec766f1b8667a8b7c9d5f7d44a2dce79fddfdf3b6e3d1849066cebe79f82566bdcf6659c7ddf4faaf233d5adac10cda636935785e5305e2b7e9b34a9  90-libcamera.rules
 "