[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
46/149: gnu: gst-libav: Update to 1.19.2.
From: |
guix-commits |
Subject: |
46/149: gnu: gst-libav: Update to 1.19.2. |
Date: |
Tue, 26 Oct 2021 23:52:13 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit d3606c4597bfd986110161c711049ec302c4439c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Oct 2 00:29:20 2021 -0400
gnu: gst-libav: Update to 1.19.2.
* gnu/packages/gstreamer.scm (gst-libav): Update to 1.19.2.
[source]: Re-indent origin. Delete patches field.
[meson]: Use meson-0.55.
* gnu/packages/patches/gst-libav-64channels-stack-corruption.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): De-register it.
---
gnu/local.mk | 1 -
gnu/packages/gstreamer.scm | 21 +++++++--------
.../gst-libav-64channels-stack-corruption.patch | 31 ----------------------
3 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0dd2a44..9c9c0d3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1215,7 +1215,6 @@ dist_patch_DATA =
\
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
%D%/packages/patches/gspell-dash-test.patch \
- %D%/packages/patches/gst-libav-64channels-stack-corruption.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index efa5b2c..be6c85e 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -949,18 +949,17 @@ think twice about shipping them.")
(define-public gst-libav
(package
(name "gst-libav")
- (version "1.18.4")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append
- "https://gstreamer.freedesktop.org/src/" name "/"
- name "-" version ".tar.xz"))
- (patches (search-patches "gst-libav-64channels-stack-corruption.patch"))
- (sha256
- (base32 "15n3x3vhshqa3icw93g4vqmqd46122anzqvfxwn6q8famlxlcjil"))))
+ (version "1.19.2")
+ (source (origin
+ (method url-fetch)
+ (uri(string-append
+ "https://gstreamer.freedesktop.org/src/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
"0rv4vxrqvlc8lm1afcg934k961gysx94xshmb5jv4xpwjkl8akzw"))))
(build-system meson-build-system)
+ (arguments
+ `(#:meson ,meson-0.55))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
diff --git a/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch
b/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch
deleted file mode 100644
index cc174e6..0000000
--- a/gnu/packages/patches/gst-libav-64channels-stack-corruption.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix a stack corruption when handling files with more than 64 audio
-channels:
-
-https://gstreamer.freedesktop.org/security/sa-2021-0005.html
-
-Patch copied from upstream source repository:
-
-https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/dcea8baa14a5fc3b796d876baaf2f238546ba2b1
-
-diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
-index
b5be4bb7a5f2712f78383da9319754a8849e3307..be22f22cf5c7c7b22b13e44b10999adaacbcca2b
100644
---- a/ext/libav/gstavcodecmap.c
-+++ b/ext/libav/gstavcodecmap.c
-@@ -102,7 +102,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout,
gint channels,
- guint nchannels = 0;
- gboolean none_layout = FALSE;
-
-- if (channel_layout == 0) {
-+ if (channel_layout == 0 || channels > 64) {
- nchannels = channels;
- none_layout = TRUE;
- } else {
-@@ -163,7 +163,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout,
gint channels,
- } else {
- guint i;
-
-- for (i = 0; i < nchannels; i++)
-+ for (i = 0; i < nchannels && i < 64; i++)
- pos[i] = GST_AUDIO_CHANNEL_POSITION_NONE;
- }
- }
- 12/149: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., (continued)
- 12/149: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/26
- 26/149: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/26
- 28/149: gnu: python-pygobject: Update to 3.40.1., guix-commits, 2021/10/26
- 27/149: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/10/26
- 30/149: gnu: farstream: Enable tests., guix-commits, 2021/10/26
- 32/149: gnu: python-docutils: Update to 0.17.1., guix-commits, 2021/10/26
- 37/149: gnu: python-sphinxcontrib-serializinghtml: Update to 1.1.5., guix-commits, 2021/10/26
- 38/149: gnu: python-sphinx: Update to 4.2.0., guix-commits, 2021/10/26
- 34/149: gnu: gnupg: Don't explicitly return #t from phases., guix-commits, 2021/10/26
- 44/149: gnu: gst-plugins-bad: Update to 1.19.2., guix-commits, 2021/10/26
- 46/149: gnu: gst-libav: Update to 1.19.2.,
guix-commits <=
- 48/149: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/26
- 02/149: gnu: gst-plugins-base: Depend on Opus for all systems., guix-commits, 2021/10/26
- 53/149: gnu: googletest: Update to 1.11.0., guix-commits, 2021/10/26
- 03/149: gnu: rust: Update to 1.50., guix-commits, 2021/10/26
- 17/149: gnu: mutter: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/26
- 21/149: gnu: gst-plugins-base: Enable more features., guix-commits, 2021/10/26
- 24/149: gnu: gst-libav: Update to 1.18.4., guix-commits, 2021/10/26
- 25/149: gnu: gst-plugins-bad: Update to 1.18.4., guix-commits, 2021/10/26
- 23/149: gnu: gst-plugins-ugly: Update to 1.18.4., guix-commits, 2021/10/26
- 45/149: gnu: gst-plugins-ugly: Update to 1.19.2., guix-commits, 2021/10/26