diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d573d2325fba..3f0ba8bae863 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -19,6 +19,7 @@ , opencvSupport ? false , opencv4 , faad2 +, lcevcdec , ldacbt , liblc3 , libass @@ -105,6 +106,7 @@ , CoreVideo , Foundation , MediaToolbox +, directoryListingUpdater , enableGplPlugins ? true , bluezSupport ? stdenv.hostPlatform.isLinux # Causes every application using GstDeviceMonitor to send mDNS queries every 2 seconds @@ -114,15 +116,18 @@ , guiSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-bad"; - version = "1.24.10"; + version = "1.26.0"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FwfjEDlQybrtNkqK8roEldaxE/zTbhBi3aX1grj4kE0="; + url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz"; + hash = "sha256-+Ch6hMX2Y2ilpQ2l+WmZSgLEfyAiD/4coxVBk+Za8hY="; }; patches = [ @@ -130,11 +135,13 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { inherit (addDriverRunpath) driverLink; }) - # Add support for newer AJA SDK from next GStreamer release + + # Fix Requires in gstreamer-analytics-1.0.pc + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8661 (fetchpatch { - url = "https://github.com/GStreamer/gstreamer/commit/d68ac0db571f44cae42b57c876436b3b09df616b.patch"; - hash = "sha256-ZXwlHzuPT8kUKt5+HkqFH5tzL9l5NusDXImabj4fBbI="; - relative = "subprojects/${pname}"; + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bc93bbf5c87ec994ea136bb40accc09dfa35ae98.patch"; + stripLen = 2; + hash = "sha256-QQDpHe363iPxTuthITRbLUKaAXS2F9s5zfCn/ps14WE="; }) ]; @@ -172,6 +179,7 @@ stdenv.mkDerivation rec { curl.dev fdk_aac gsm + lcevcdec libaom libdc1394 libde265 @@ -269,16 +277,19 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - "-Dglib-asserts=disabled" # asserts should be disabled on stable releases + "-Dglib_assert=false" # asserts should be disabled on stable releases "-Damfcodec=disabled" # Windows-only + "-Dandroidmedia=disabled" # Requires Android system. "-Davtp=disabled" + "-Dcuda-nvmm=disabled" "-Ddirectshow=disabled" # Windows-only "-Dqt6d3d11=disabled" # Windows-only "-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, also this is AGPL so update license when adding support + "-Dlcevcencoder=disabled" # not packaged 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 @@ -292,9 +303,12 @@ stdenv.mkDerivation rec { # is needed, and then patching upstream to find it (though it probably # already works on Arch?). "-Dmusepack=disabled" + "-Dnvcomp=disabled" + "-Dnvdswrapper=disabled" "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing + "-Dsvtjpegxs=disabled" # 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 "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing @@ -369,6 +383,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails 20 out of 58 tests, expensive + passthru = { + updateScript = directoryListingUpdater { }; + }; + meta = with lib; { description = "GStreamer Bad Plugins"; mainProgram = "gst-transcoder-1.0"; @@ -383,4 +401,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; -} +})