From d008e25470d76a69e5cd32b9089349ae3aff2a53 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 30 Aug 2025 23:31:06 +0800 Subject: [PATCH 1/3] v4l2-relayd: 0.1.3 -> 0.1.5 --- pkgs/by-name/v4/v4l2-relayd/package.nix | 13 +++++++------ .../upstream-v4l2loopback-compatibility.patch | 16 ---------------- 2 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch diff --git a/pkgs/by-name/v4/v4l2-relayd/package.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix index 8d056f3a00e2..b4b47eb35a16 100644 --- a/pkgs/by-name/v4/v4l2-relayd/package.nix +++ b/pkgs/by-name/v4/v4l2-relayd/package.nix @@ -8,21 +8,18 @@ libtool, pkg-config, which, + gitUpdater, }: stdenv.mkDerivation rec { pname = "v4l2-relayd"; - version = "0.1.3"; + version = "0.1.5"; src = fetchgit { url = "https://git.launchpad.net/v4l2-relayd"; tag = "upstream/${version}"; - hash = "sha256-oU6naDFZ0PQVHZ3brANfMULDqYMYxeJN+MCUCvN/DpU="; + hash = "sha256-D+OWkny+TYNJt08X+nl7EYs5tp51vjvig/vuID6lkmg="; }; - patches = [ - ./upstream-v4l2loopback-compatibility.patch - ]; - nativeBuildInputs = [ autoreconfHook libtool @@ -38,6 +35,10 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --prefix=$out"; + passthru.updateScript = gitUpdater { + rev-prefix = "upstream/"; + }; + meta = with lib; { description = "Streaming relay for v4l2loopback using GStreamer"; mainProgram = "v4l2-relayd"; diff --git a/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch b/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch deleted file mode 100644 index 643535228256..000000000000 --- a/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/v4l2-relayd.c b/src/v4l2-relayd.c -index 21bb0d5..cfc9e27 100644 ---- a/src/v4l2-relayd.c -+++ b/src/v4l2-relayd.c -@@ -27,7 +27,10 @@ - #include - #include - --#define V4L2_EVENT_PRI_CLIENT_USAGE V4L2_EVENT_PRIVATE_START -+#define V4L2LOOPBACK_EVENT_BASE (V4L2_EVENT_PRIVATE_START) -+#define V4L2LOOPBACK_EVENT_OFFSET 0x08E00000 -+#define V4L2_EVENT_PRI_CLIENT_USAGE \ -+ (V4L2LOOPBACK_EVENT_BASE + V4L2LOOPBACK_EVENT_OFFSET + 1) - - struct v4l2_event_client_usage { - __u32 count; From 912b0bff9a32b6a23be63deaa8730f5b9f10ea40 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 30 Aug 2025 23:31:51 +0800 Subject: [PATCH 2/3] v4l2-relayd: use finalAttrs --- pkgs/by-name/v4/v4l2-relayd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/v4/v4l2-relayd/package.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix index b4b47eb35a16..3db282309fa8 100644 --- a/pkgs/by-name/v4/v4l2-relayd/package.nix +++ b/pkgs/by-name/v4/v4l2-relayd/package.nix @@ -10,13 +10,13 @@ which, gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "v4l2-relayd"; version = "0.1.5"; src = fetchgit { url = "https://git.launchpad.net/v4l2-relayd"; - tag = "upstream/${version}"; + tag = "upstream/${finalAttrs.version}"; hash = "sha256-D+OWkny+TYNJt08X+nl7EYs5tp51vjvig/vuID6lkmg="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; }; -} +}) From f226058ee38600733d1240392c2109bf2ef6c699 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 30 Aug 2025 23:32:14 +0800 Subject: [PATCH 3/3] v4l2-relayd: remove with lib --- pkgs/by-name/v4/v4l2-relayd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/v4/v4l2-relayd/package.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix index 3db282309fa8..b74a90c2e2a4 100644 --- a/pkgs/by-name/v4/v4l2-relayd/package.nix +++ b/pkgs/by-name/v4/v4l2-relayd/package.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { rev-prefix = "upstream/"; }; - meta = with lib; { + meta = { description = "Streaming relay for v4l2loopback using GStreamer"; mainProgram = "v4l2-relayd"; homepage = "https://git.launchpad.net/v4l2-relayd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ betaboon ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; }; })