pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #159461 from dali99/libaom-tunes

libaom: Add support for butteraugli and vmaf tunes

authored by

Sandro and committed by
GitHub ce660322 d40b996c

+28 -11
unified split
+14 -2
pkgs/development/libraries/libaom/default.nix
··· 1 - { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 }: 1 + { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 2 + , enableButteraugli ? false, libjxl, libhwy # Broken 3 + , enableVmaf ? true, libvmaf 4 + }: 2 5 3 6 stdenv.mkDerivation rec { 4 7 pname = "libaom"; ··· 16 19 yasm perl cmake pkg-config python3 17 20 ]; 18 21 22 + buildInputs = lib.optionals enableButteraugli [ 23 + libjxl 24 + libhwy 25 + ] ++ lib.optional enableVmaf libvmaf; 26 + 19 27 preConfigure = '' 20 28 # build uses `git describe` to set the build version 21 29 cat > $NIX_BUILD_TOP/git << "EOF" ··· 32 40 cmakeFlags = [ 33 41 "-DBUILD_SHARED_LIBS=ON" 34 42 "-DENABLE_TESTS=OFF" 43 + ] ++ lib.optionals enableButteraugli [ 44 + "-DCONFIG_TUNE_BUTTERAUGLI=1" 45 + ] ++ lib.optionals enableVmaf [ 46 + "-DCONFIG_TUNE_VMAF=1" 35 47 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 36 48 # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: 37 49 "-DCONFIG_RUNTIME_CPU_DETECT=0" ··· 58 70 ''; 59 71 homepage = "https://aomedia.org/av1-features/get-started/"; 60 72 changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG"; 61 - maintainers = with maintainers; [ primeos kiloreux ]; 73 + maintainers = with maintainers; [ primeos kiloreux dandellion ]; 62 74 platforms = platforms.all; 63 75 license = licenses.bsd2; 64 76 };
+10 -8
pkgs/development/libraries/libjxl/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub 2 2 , fetchpatch 3 - , asciidoc 4 3 , brotli 5 4 , cmake 6 - , graphviz 7 - , doxygen 8 5 , giflib 9 6 , gperftools 10 7 , gtest ··· 14 11 , libwebp 15 12 , openexr 16 13 , pkg-config 17 - , python3 18 14 , zlib 15 + , buildDocs ? true 16 + , asciidoc 17 + , graphviz 18 + , doxygen 19 + , python3 19 20 }: 20 21 21 22 stdenv.mkDerivation rec { ··· 50 51 ]; 51 52 52 53 nativeBuildInputs = [ 53 - asciidoc # for docs 54 54 cmake 55 - graphviz # for docs via doxygen component `dot` 56 - doxygen # for docs 57 55 gtest 58 56 pkg-config 59 - python3 # for docs 57 + ] ++ lib.optionals buildDocs [ 58 + asciidoc 59 + graphviz 60 + doxygen 61 + python3 60 62 ]; 61 63 62 64 # Functionality not currently provided by this package
+4 -1
pkgs/top-level/all-packages.nix
··· 18187 18187 18188 18188 libantlr3c = callPackage ../development/libraries/libantlr3c {}; 18189 18189 18190 - libaom = callPackage ../development/libraries/libaom { }; 18190 + libaom = callPackage ../development/libraries/libaom { 18191 + # Remove circular dependency for libavif 18192 + libjxl = libjxl.override { buildDocs = false; }; 18193 + }; 18191 18194 18192 18195 libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; 18193 18196 libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };