hosts/skycam: remove patched camera utilities
All checks were successful
Check flake / build-amd64-linux (push) Successful in 1m19s
All checks were successful
Check flake / build-amd64-linux (push) Successful in 1m19s
- Remove libcamera overlay - Remove camera-streamer package - Remove rpicam-apps package
This commit is contained in:
@ -1,24 +0,0 @@
|
||||
From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Holt <jordan@vimium.com>
|
||||
Date: Sat, 10 Aug 2024 15:37:15 +0100
|
||||
Subject: [PATCH] Disable libdatachannel
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d5029bd..e50ba1a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -23,7 +23,7 @@ USE_HW_H264 ?= 1
|
||||
USE_FFMPEG ?= $(shell pkg-config libavutil libavformat libavcodec && echo 1)
|
||||
USE_LIBCAMERA ?= $(shell pkg-config libcamera && echo 1)
|
||||
USE_RTSP ?= $(shell pkg-config live555 && echo 1)
|
||||
-USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1)
|
||||
+USE_LIBDATACHANNEL ?= 0
|
||||
|
||||
ifeq (1,$(DEBUG))
|
||||
CFLAGS += -g
|
||||
--
|
||||
2.44.1
|
@ -1,82 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
gnumake,
|
||||
pkg-config,
|
||||
xxd,
|
||||
|
||||
v4l-utils,
|
||||
nlohmann_json,
|
||||
ffmpegSupport ? true,
|
||||
ffmpeg,
|
||||
libcameraSupport ? true,
|
||||
libcamera,
|
||||
rtspSupport ? false,
|
||||
live555,
|
||||
webrtcSupport ? false,
|
||||
openssl,
|
||||
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "camera-streamer";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayufan";
|
||||
repo = "camera-streamer";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Disable-libdatachannel.patch
|
||||
];
|
||||
|
||||
# Second replacement fixes literal newline in generated version.h.
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '/usr/local/bin' '/bin' \
|
||||
--replace 'echo "#define' 'echo -e "#define'
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
"-Wno-error=stringop-overflow"
|
||||
"-Wno-error=format"
|
||||
"-Wno-format"
|
||||
"-Wno-format-security"
|
||||
"-Wno-error=unused-result"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gnumake
|
||||
pkg-config
|
||||
xxd
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
nlohmann_json
|
||||
v4l-utils
|
||||
]
|
||||
++ (lib.optional ffmpegSupport ffmpeg)
|
||||
++ (lib.optional libcameraSupport libcamera)
|
||||
++ (lib.optional rtspSupport live555)
|
||||
++ (lib.optional webrtcSupport openssl);
|
||||
|
||||
installFlags = [ "DESTDIR=${builtins.placeholder "out"}" ];
|
||||
preInstall = "mkdir -p $out/bin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance low-latency camera streamer for Raspberry Pi's";
|
||||
website = "https://github.com/ayufan/camera-streamer";
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
})
|
@ -1,58 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
boost,
|
||||
ffmpeg,
|
||||
libcamera,
|
||||
libdrm,
|
||||
libexif,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rpicam-apps";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "rpicam-apps";
|
||||
rev = "v" + finalAttrs.version;
|
||||
hash = "sha256-3NG2ZE/Ub3lTbfne0LCXuDgLGTPaAAADRdElEbZwvls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
ffmpeg
|
||||
libcamera
|
||||
libdrm
|
||||
libexif
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
];
|
||||
|
||||
# Meson is no longer able to pick up Boost automatically:
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131
|
||||
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
|
||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
libcamera-based applications to drive the cameras on a Raspberry Pi platform
|
||||
'';
|
||||
homepage = "https://github.com/raspberrypi/rpicam-apps";
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
})
|
Reference in New Issue
Block a user