Commit ef576b1f authored by Yarny0's avatar Yarny0
Browse files

v4l-utils: 1.30.1 -> 1.32.0 

Changelog:
https://git.linuxtv.org/v4l-utils.git/commit/?id=5a666c7ce89c00d66aa8e53c8f098a0c6c401f91
https://git.linuxtv.org/v4l-utils.git/tag/?h=v4l-utils-1.32.0

Meson patches removed due to
https://git.linuxtv.org/v4l-utils.git/commit/?id=34aa1df2b23fb85b030cddf64c427137ddf04e93
https://git.linuxtv.org/v4l-utils.git/commit/?id=1a86657afd88889fe0918128211fb231b0eeeccd
parent 8913c168

pkgs/by-name/v4/v4l-utils/package.nix

+2 −11
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ in 
# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt

stdenv.mkDerivation (finalAttrs: {

  pname = "v4l-utils";

  version = "1.30.1";

  version = "1.32.0";



  src = fetchurl {

    url = "https://linuxtv.org/downloads/v4l-utils/v4l-utils-${finalAttrs.version}.tar.xz";

    hash = "sha256-wc9UnC7DzznrXse/FXMTSeYbJqIbXpY5IttCIzO64Zc=";

    hash = "sha256-aCiCihd3VSbrk/slipKU0dEHPWM8NE3XHs1Oeh/7ffw=";

  };



  patches = [
@@ -106,17 +106,8 @@ stdenv.mkDerivation (finalAttrs: { 


  propagatedBuildInputs = [ libjpeg ];



  # these two `substituteInPlace` have been sent upstream as patches

  # https://lore.kernel.org/linux-media/867c4d2e-7871-4280-8c89-d4b654597f32@public-files.de/T/

  # they might fail and have to be removed once the patches get accepted

  postPatch = ''

    patchShebangs utils/

    substituteInPlace \

      lib/libdvbv5/meson.build \

      --replace-fail "install_dir: 'include/libdvbv5'" "install_dir: get_option('includedir') / 'libdvbv5'"

    substituteInPlace \

      meson.build \

      --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')"

  '';



  # Meson unable to find moc/uic/rcc in case of cross-compilation