From 458c2ccd01ddb07510ea328e0bb00ae6dd5ff5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 4 Feb 2024 09:22:24 +0800 Subject: [PATCH] Camera (FreeBSD): enable support Requires build dependency `v4l_compat` --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 2 +- src/detection/camera/camera_nosupport.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/detection/camera/camera_nosupport.c diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64ce801bc..8054b367b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -246,7 +246,7 @@ jobs: run: | uname -a sudo pkg update - sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd pulseaudio + sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd pulseaudio v4l_compat cmake -DSET_TWEAK=Off -DBUILD_TESTS=On . cmake --build . --target package --verbose -j4 ./fastfetch --list-features diff --git a/CMakeLists.txt b/CMakeLists.txt index a1998800a..33925ca3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -550,7 +550,7 @@ elseif(BSD) src/detection/wm/wm_nosupport.c src/detection/de/de_linux.c src/detection/wmtheme/wmtheme_linux.c - src/detection/camera/camera_nosupport.c + src/detection/camera/camera_linux.c src/util/platform/FFPlatform_unix.c ) elseif(APPLE) diff --git a/src/detection/camera/camera_nosupport.c b/src/detection/camera/camera_nosupport.c deleted file mode 100644 index ff56815f2..000000000 --- a/src/detection/camera/camera_nosupport.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "camera.h" - -const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result) -{ - return "Not supported on this platform"; -}