enable ISP pipeline and IPA (bluenviron/mediamtx#3715)

bluenviron · Sep 5, 2024 · d5e2da6 · d5e2da6
1 parent 99855e0
commit d5e2da6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/meson.build b/meson.build
@@ -54,8 +54,8 @@ libcamera_dep = dependency(
         'strip=true',
         'wrap_mode=forcefallback',
         'lc-compliance=disabled',
-        'ipas=rpi/vc4',
-        'pipelines=rpi/vc4',
+        'ipas=rpi/vc4,rpi/pisp',
+        'pipelines=rpi/vc4,rpi/pisp',
         'cam=disabled',
         'documentation=disabled',
         'gstreamer=disabled',

diff --git a/subprojects/packagefiles/libcamera.patch b/subprojects/packagefiles/libcamera.patch
@@ -78,6 +78,19 @@ index 89504cee..be183929 100644
 
  if liblttng.found()
      tracing_enabled = true
+diff --git a/src/libcamera/pipeline/rpi/pisp/meson.build b/src/libcamera/pipeline/rpi/pisp/meson.build
+index 1f0ca3ca..170b9744 100644
+--- a/src/libcamera/pipeline/rpi/pisp/meson.build
++++ b/src/libcamera/pipeline/rpi/pisp/meson.build
+@@ -5,7 +5,7 @@ libcamera_sources += files([
+ ])
+
+ librt = cc.find_library('rt', required : true)
+-libpisp_dep = dependency('libpisp', fallback : ['libpisp', 'libpisp_dep'])
++libpisp_dep = dependency('libpisp', fallback : ['libpisp', 'libpisp_dep'], static : true)
+
+ libcamera_deps += [libpisp_dep, librt]
+
 diff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build
 index aa4d9cd7..31b994a9 100644
 --- a/src/libcamera/proxy/worker/meson.build