From f5fbcf260f0fbcf07ec079fccbcd389dd27c9841 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:34:42 -0800 Subject: [PATCH 1/3] gst_all_1.gst-plugins-base: 1.18.5 -> 1.20. --- pkgs/development/libraries/gstreamer/base/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 8b6073cb9588..db76164fde2a 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,19 +41,15 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; + sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -121,7 +117,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ common/scangobj-merge.py \ - scripts/extract-release-date-from-doap-file.py + scripts/ ''; # This package has some `_("string literal")` string formats From c2e0d0286d883c6defc64516737afaee5339e0f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:35:45 -0800 Subject: [PATCH 2/3] gst_all_1.gstreamer: 1.18.5 -> 1.20.0 --- pkgs/development/libraries/gstreamer/core/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 268da0171630..fa1188347731 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "bin" @@ -34,13 +34,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; + sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja From 4f35eed05fe814ba01013bfe8ed29f1d39f613f4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:36:03 -0800 Subject: [PATCH 3/3] gst_all_1.gst-libav: 1.18.5 -> 1.20.0 --- pkgs/development/libraries/gstreamer/libav/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7f2828253c88..0d9f22d7d65f 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, gstreamer , gst-plugins-base , gettext , libav @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg="; + sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc="; }; outputs = [ "out" "dev" ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gstreamer gst-plugins-base libav ];