diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 903ca661486f..c5edeb2021f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -29,6 +29,7 @@ , libbs2b , libmodplug , mpeg2dec +, libmicrodns , openjpeg , libopus , librsvg @@ -65,6 +66,7 @@ , wayland-protocols , wildmidi , fluidsynth +, libva , libvdpau , wayland , libwebp @@ -87,41 +89,35 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.16.2"; + version = "1.18.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"; + sha256 = "1cn18cbqyysrxnrk5bpxdzd5xcws9g2kmm5rbv00cx6rhn69g5f1"; }; patches = [ - # Fix build with neon 0.31 - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165 - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch"; - sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; - }) ./fix_pkgconfig_includedir.patch - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 - ./opencv-4.3.patch ]; nativeBuildInputs = [ meson ninja pkgconfig + orc # for orcc python3 gettext gobject-introspection ] ++ optionals stdenv.isLinux [ - wayland-protocols + wayland # for wayland-scanner ]; buildInputs = [ gst-plugins-base orc + gobject-introspection faad2 libass libkate @@ -130,6 +126,7 @@ in stdenv.mkDerivation rec { libbs2b libmodplug mpeg2dec + libmicrodns openjpeg libopus librsvg @@ -172,7 +169,9 @@ in stdenv.mkDerivation rec { faac ] ++ optionals stdenv.isLinux [ bluez + libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland + wayland-protocols ] ++ optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin @@ -215,11 +214,14 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Davtp=disabled" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing + "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get # "Could not find libmpcdec header files, but Musepack was enabled via options" @@ -236,19 +238,19 @@ in stdenv.mkDerivation rec { "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing "-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing + "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support + "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing - - # Requires CUDA and we haven't figured out how to make Meson find CUDA yet; - # it probably searches via pkgconfig, for which we have no .pc files, - # see https://github.com/NixOS/nixpkgs/issues/54395 - "-Dnvdec=disabled" - "-Dnvenc=disabled" + "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + ] + ++ optionals (!stdenv.isLinux) [ + "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ optionals stdenv.isDarwin [ "-Dbluez=disabled" @@ -263,6 +265,7 @@ in stdenv.mkDerivation rec { "-Ddvb=disabled" "-Dfbdev=disabled" "-Duvch264=disabled" # requires gudev + "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs "-Dwildmidi=disabled" # see dependencies above @@ -276,6 +279,14 @@ in stdenv.mkDerivation rec { "-Dapplemedia=disabled" ]; + # Argument list too long + strictDeps = true; + + postPatch = '' + patchShebangs \ + scripts/extract-release-date-from-doap-file.py + ''; + # This package has some `_("string literal")` string formats # that trip up clang with format security enabled. hardeningDisable = [ "format" ]; |