next try

Author: saeugetier

io.github.saeugetier.photobooth.json

@@ -84,11 +84,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "patches/disable-ipa-signing.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "patches/fix-cfe-entity-names.patch"
+                    "path": "patches/flatpak-patch.patch"
                 }
             ],
             "modules": [
@@ -337,6 +333,19 @@
                     "path": "test_libcamera.cpp"
                 }
             ]
+        },
+        {
+            "name": "test-libcamera2",
+            "buildsystem": "simple",
+            "build-commands": [
+                "g++ -std=c++17 -Wall -o ${FLATPAK_DEST}/bin/test_libcamera2 test_libcamera2.cpp $(pkg-config --cflags --libs libcamera)"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "test_libcamera2.cpp"
+                }
+            ]
         }
     ]
 }

patches/flatpak-patch.patch

@@ -0,0 +1,31 @@
+diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
+index 77acd2f6..cce0cc2b 100644
+--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp
++++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
+@@ -882,9 +882,9 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
+ 	 */
+ 	for (unsigned int i = 0; i < numCfeDevices; i++) {
+ 		DeviceMatch cfe("rp1-cfe");
+-		cfe.add("rp1-cfe-fe-image0");
+-		cfe.add("rp1-cfe-fe-stats");
+-		cfe.add("rp1-cfe-fe-config");
++		cfe.add("rp1-cfe-fe_image0");
++		cfe.add("rp1-cfe-fe_stats");
++		cfe.add("rp1-cfe-fe_config");
+ 		std::shared_ptr<MediaDevice> cfeDevice = acquireMediaDevice(enumerator, cfe);
+ 
+ 		if (!cfeDevice) {
+@@ -1072,10 +1072,10 @@ int PipelineHandlerPiSP::platformRegister(std::unique_ptr<RPi::CameraData> &came
+ 	PiSPCameraData *data = static_cast<PiSPCameraData *>(cameraData.get());
+ 	int ret;
+ 
+-	MediaEntity *cfeImage = cfe->getEntityByName("rp1-cfe-fe-image0");
++	MediaEntity *cfeImage = cfe->getEntityByName("rp1-cfe-fe_image0");
+ 	MediaEntity *cfeEmbedded = cfe->getEntityByName("rp1-cfe-csi2-ch1");
+-	MediaEntity *cfeStats = cfe->getEntityByName("rp1-cfe-fe-stats");
+-	MediaEntity *cfeConfig = cfe->getEntityByName("rp1-cfe-fe-config");
++	MediaEntity *cfeStats = cfe->getEntityByName("rp1-cfe-fe_stats");
++	MediaEntity *cfeConfig = cfe->getEntityByName("rp1-cfe-fe_config");
+ 	MediaEntity *ispInput = isp->getEntityByName("pispbe-input");
+ 	MediaEntity *IpaPrepare = isp->getEntityByName("pispbe-config");
+ 	MediaEntity *ispOutput0 = isp->getEntityByName("pispbe-output0");

test_libcamera2.cpp

@@ -0,0 +1,71 @@
+#include <iostream>
+#include <memory>
+#include <thread>
+#include <chrono>
+#include <csignal>
+
+#include <libcamera/libcamera.h>
+
+using namespace libcamera;
+
+volatile sig_atomic_t got_signal = 0;
+
+void signalHandler(int sig) {
+    got_signal = sig;
+}
+
+int main()
+{
+    signal(SIGSEGV, signalHandler);
+    signal(SIGBUS, signalHandler);
+    
+    std::cerr << "Step 1: Creating CameraManager" << std::endl;
+    
+    auto cm = std::make_unique<CameraManager>();
+
+    std::cerr << "Step 2: Starting CameraManager" << std::endl;
+    
+    int ret = cm->start();
+    if (ret) {
+        std::cerr << "Failed to start: " << ret << std::endl;
+        return 1;
+    }
+
+    std::cerr << "Step 3: CameraManager started, version: " << cm->version() << std::endl;
+    
+    // Small delay to let background initialization complete
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    
+    std::cerr << "Step 4: Getting cameras" << std::endl;
+    
+    if (got_signal) {
+        std::cerr << "Signal caught: " << got_signal << std::endl;
+        return 1;
+    }
+    
+    auto cameras = cm->cameras();
+    
+    std::cerr << "Step 5: Got " << cameras.size() << " cameras" << std::endl;
+
+    if (got_signal) {
+        std::cerr << "Signal caught: " << got_signal << std::endl;
+        return 1;
+    }
+
+    for (size_t i = 0; i < cameras.size(); i++) {
+        std::cerr << "Step 6." << i << ": Camera " << cameras[i]->id() << std::endl;
+    }
+
+    std::cerr << "Step 7: Sleeping before stop" << std::endl;
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    std::cerr << "Step 8: Stopping CameraManager" << std::endl;
+    cm->stop();
+
+    std::cerr << "Step 9: Releasing CameraManager" << std::endl;
+    cm.reset();
+
+    std::cerr << "Step 10: Done!" << std::endl;
+
+    return cameras.empty() ? 1 : 0;
+}