diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/video')
4 files changed, 44 insertions, 55 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 9a19a6789e57..2f7e4d97cbba 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -1,39 +1,31 @@ -{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "0.9.6"; + version = "20200701.154658.b0d6223"; - src = fetchhg { - url = "https://bitbucket.org/wez/atomicparsley"; - sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; + src = fetchFromGitHub { + owner = "wez"; + repo = pname; + rev = version; + sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # AC_FUNC_MALLOC is broken on cross builds. - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + installPhase = '' + runHook preInstall + install -D AtomicParsley $out/bin/AtomicParsley + runHook postInstall + ''; meta = with stdenv.lib; { - description = '' - A lightweight command line program for reading, parsing and - setting metadata into MPEG-4 files - ''; - - longDescription = '' - This is a maintained fork of the original AtomicParsley. - ''; - - homepage = "https://bitbucket.org/wez/atomicparsley"; - license = licenses.gpl2; + description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files"; + homepage = "https://github.com/wez/atomicparsley"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix index 94a1a5d04f32..87585caebfb5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/video/bento4/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "bento4"; - version = "1.5.1-629"; + version = "1.6.0-637"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - sha256 = "1614idy0r7qrkiaq4kz3gh1b1bpx592aqvi574kxnjrxc34kpmb3"; + sha256 = "0iwqi71nj0iczffvpxmz0prvmmnyiqypfwvzivkh38wl0br82bkp"; }; patches = [ ./libap4.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix deleted file mode 100644 index 9a1f9f121031..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/flvtool2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildRubyGem, ruby }: - -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "flvtool2"; - version = "1.0.6"; - source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; - - meta = { - broken = true; # depends on ruby 2.2 - homepage = "https://github.com/unnu/flvtool2"; - description = "A tool to manipulate Macromedia Flash Video files"; - platforms = ruby.meta.platforms; - license = lib.licenses.bsd3; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix index ae7a45b562d9..ae300f47b19e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -1,18 +1,32 @@ -{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }: +{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }: rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.4"; + version = "0.4.0-alpha"; - src = fetchFromGitHub { - owner = "xiph"; - repo = "rav1e"; - rev = "v${version}"; - sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs"; - }; + src = stdenv.mkDerivation rec { + name = "${pname}-${version}-source"; + + src = fetchFromGitHub { + owner = "xiph"; + repo = "rav1e"; + rev = "v${version}"; + sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9"; + }; + + cargoLock = fetchurl { + url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock"; + sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl"; + }; - cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24"; + installPhase = '' + mkdir -p $out + cp -r ./* $out/ + cp ${cargoLock} $out/Cargo.lock + ''; + }; + cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1"; nativeBuildInputs = [ nasm cargo-c ]; postBuild = '' @@ -31,7 +45,7 @@ rustPlatform.buildRustPackage rec { libaom (the reference encoder) is too slow. Features: https://github.com/xiph/rav1e#features ''; - inherit (src.meta) homepage; + homepage = "https://github.com/xiph/rav1e"; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ maintainers.primeos ]; |