summary refs log tree commit diff
path: root/pkgs/os-specific/linux/v4l-utils
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2022-02-21 03:23:37 -0800
committerGitHub <noreply@github.com>2022-02-21 12:23:37 +0100
commitdfab9e35c612076d411728df24b67f852faa8024 (patch)
treee8be9630a57a600aeecbf6660290b4435ed90905 /pkgs/os-specific/linux/v4l-utils
parent5e0b594cc3905fd58d6350a4e3595868e80811af (diff)
downloadnixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar.gz
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar.bz2
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar.lz
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar.xz
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.tar.zst
nixpkgs-dfab9e35c612076d411728df24b67f852faa8024.zip
libv4l: 1.20.0 -> 1.22.1
* libv4l: 1.20.0 -> 1.22.1 (#143322)

* v4l-utils: build in parallel

and fix patching of shebangs under utils
and add meta.changelog URL
and clarify meta.license (libs are LGPL 2.1 but tools are GPL 2)

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
Diffstat (limited to 'pkgs/os-specific/linux/v4l-utils')
-rw-r--r--pkgs/os-specific/linux/v4l-utils/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 90a052fdef9..3fdd9e791bd 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -12,11 +12,11 @@ let
 # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
 in stdenv.mkDerivation rec {
   pname = "v4l-utils";
-  version = "1.20.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "1xr66y6w422hil6s7n8d61a2vhwh4im8l267amf41jvw7xqihqcm";
+    hash = "sha256-Zcb76DCkTKEFxEOwJxgsGyyQU6kdHnKthJ36s4i5TjE=";
   };
 
   outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ];
@@ -40,14 +40,16 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libjpeg ];
 
   postPatch = ''
-    patchShebangs utils/cec-ctl/msg2ctl.pl
-    patchShebangs utils/libcecutil/cec-gen.pl
+    patchShebangs utils/
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
     homepage = "https://linuxtv.org/projects.php";
-    license = licenses.lgpl21Plus;
+    changelog = "https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog?h=v4l-utils-${version}";
+    license = with licenses; [ lgpl21Plus gpl2Plus ];
     maintainers = with maintainers; [ codyopel ];
     platforms = platforms.linux;
   };