Fix libcamera compilation

.gitignore

@@ -3,3 +3,4 @@ tmp/
 *.o
 *.d
 html/*.c
+/test_*

.vscode/c_cpp_properties.json

@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/usr/include/libcamera"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-arm64"
+        }
+    ],
+    "version": 4
+}

Makefile

@@ -20,7 +20,7 @@ endif
 
 ifeq (1,$(USE_LIBCAMERA))
 CFLAGS += -DUSE_LIBCAMERA $(shell pkg-config --cflags libcamera)
-LDLIBS +=  $(shell pkg-config --cflags libs)
+LDLIBS +=  $(shell pkg-config --libs libcamera)
 endif
 
 HTML_SRC = $(addsuffix .c,$(HTML))

cmd/test_libcamera.c

@@ -0,0 +1,25 @@
+#include "opts/opts.h"
+#include "opts/log.h"
+#include "opts/fourcc.h"
+#include "device/camera/camera.h"
+
+log_options_t log_options = {
+  .debug = false,
+  .verbose = false
+};
+
+int main(int argc, char *argv[])
+{
+  device_t *dev = NULL;
+
+  dev = device_libcamera_open("CAMERA", "/dev/video0");
+  if (!dev) {
+    printf("Failed to open libcamera\n");
+    return -1;
+  }
+
+  printf("Opened libcamera\n");
+
+  device_close(dev);
+  return 0;
+}

device/libcamera/buffer.cc

@@ -1,10 +1,5 @@
 #include "libcamera.hh"
 
-extern "C" {
-#include "device/buffer.h"
-#include <stdlib.h>
-};
-
 int libcamera_buffer_open(buffer_t *buf)
 {
   buf->libcamera = new buffer_libcamera_t{};

device/libcamera/buffer_list.cc

@@ -1,10 +1,5 @@
 #include "libcamera.hh"
 
-extern "C" {
-#include "device/buffer_list.h"
-#include <stdlib.h>
-};
-
 int libcamera_buffer_list_open(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline)
 {
   buf_list->libcamera = new buffer_list_libcamera_t{};

device/libcamera/device.cc

@@ -1,13 +1,15 @@
 #include "libcamera.hh"
 
-extern "C" {
-#include "device/device.h"
-#include <stdlib.h>
-};
-
 int libcamera_device_open(device_t *dev)
 {
   dev->libcamera = new device_libcamera_t{};
+
+  auto camera_manager = std::make_unique<libcamera::CameraManager>();
+  int ret = camera_manager->start();
+  if (ret < 0) {
+    return -1;
+  }
+
   return 0;
 }
 

device/libcamera/libcamera.cc

@@ -1,9 +1,5 @@
 #include "libcamera.hh"
 
-extern "C" {
-#include "device/device.h"
-};
-
 device_hw_t libcamera_device_hw = {
   .device_open = libcamera_device_open,
   .device_close = libcamera_device_close,

device/libcamera/libcamera.hh

@@ -5,8 +5,16 @@ extern "C" {
 #include <linux/v4l2-subdev.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
+
+#include "device/device.h"
+#include "device/buffer_list.h"
+#include "device/buffer.h"
 };
 
+#include <optional>
+#include <memory>
+
 #include <libcamera/controls.h>
 #include <libcamera/control_ids.h>
 #include <libcamera/property_ids.h>