mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
gnu: gstreamer: Update to 1.16.1.
* gnu/packages/patches/gstreamer-buffer-reset-offset.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gstreamer.scm (gstreamer): Update to 1.16.1. [source](patches): Remove. (gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.16.1.
This commit is contained in:
parent
45b01f2e05
commit
d1b8ef998d
3 changed files with 14 additions and 75 deletions
|
@ -936,7 +936,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/guile-relocatable.patch \
|
||||
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
|
||||
%D%/packages/patches/guile-emacs-fix-configure.patch \
|
||||
%D%/packages/patches/gstreamer-buffer-reset-offset.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk2-theme-paths.patch \
|
||||
|
|
|
@ -106,17 +106,16 @@ arrays of data.")
|
|||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
|
||||
version ".tar.xz"))
|
||||
(patches (search-patches "gstreamer-buffer-reset-offset.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"))))
|
||||
"0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
@ -155,7 +154,7 @@ This package provides the core library and elements.")
|
|||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -163,7 +162,7 @@ This package provides the core library and elements.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"))))
|
||||
"0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(propagated-inputs
|
||||
|
@ -214,7 +213,7 @@ for the GStreamer multimedia library.")
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -223,7 +222,7 @@ for the GStreamer multimedia library.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"))))
|
||||
"07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("aalib" ,aalib)
|
||||
|
@ -277,14 +276,14 @@ developers consider to have good quality code and correct functionality.")
|
|||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"))))
|
||||
"1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n"))))
|
||||
(outputs '("out" "doc"))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -357,7 +356,7 @@ par compared to the rest.")
|
|||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -365,7 +364,7 @@ par compared to the rest.")
|
|||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"))))
|
||||
"07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gst-plugins-base" ,gst-plugins-base)
|
||||
|
@ -392,7 +391,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -400,7 +399,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"))
|
||||
"1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -428,7 +427,7 @@ compression formats through the use of the libav library.")
|
|||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.16.0")
|
||||
(version "1.16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -436,7 +435,7 @@ compression formats through the use of the libav library.")
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m"))))
|
||||
"12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
Fix a buffer offset problem in GStreamer 1.16. Initially reported by Mark H.
|
||||
Weaver in <https://lists.gnu.org/archive/html/guix-devel/2019-06/msg00140.html>.
|
||||
|
||||
See also <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/316>.
|
||||
|
||||
From 1734c9fc1a4f99b165383ae1eb02f04e0844a00c Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
||||
Date: Sat, 29 Jun 2019 09:22:05 -0400
|
||||
Subject: [PATCH] bufferpool: Fix the buffer size reset code
|
||||
|
||||
The offset in gst_buffer_resize() is additive. So to move back the
|
||||
offset to zero, we need to pass the opposite of the current offset. This
|
||||
was raised through the related unit test failingon 32bit as on 64bit
|
||||
the alignment padding was enough to hide the issue. The test was
|
||||
modified to also fail on 64bit. This patch will remove spurious
|
||||
assertions like:
|
||||
|
||||
assertion 'bufmax >= bufoffs + offset + size' failed
|
||||
|
||||
Fixes #316
|
||||
---
|
||||
gst/gstbufferpool.c | 7 +++++--
|
||||
tests/check/gst/gstbufferpool.c | 2 +-
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c
|
||||
index e5c7a5872..619860e63 100644
|
||||
--- a/gst/gstbufferpool.c
|
||||
+++ b/gst/gstbufferpool.c
|
||||
@@ -1222,8 +1222,11 @@ default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer)
|
||||
GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE;
|
||||
|
||||
/* if the memory is intact reset the size to the full size */
|
||||
- if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY))
|
||||
- gst_buffer_resize (buffer, 0, pool->priv->size);
|
||||
+ if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) {
|
||||
+ gsize offset;
|
||||
+ gst_buffer_get_sizes (buffer, &offset, NULL);
|
||||
+ gst_buffer_resize (buffer, -offset, pool->priv->size);
|
||||
+ }
|
||||
|
||||
/* remove all metadata without the POOLED flag */
|
||||
gst_buffer_foreach_meta (buffer, remove_meta_unpooled, pool);
|
||||
diff --git a/tests/check/gst/gstbufferpool.c b/tests/check/gst/gstbufferpool.c
|
||||
index f0c3c8d8e..dd9b2dc03 100644
|
||||
--- a/tests/check/gst/gstbufferpool.c
|
||||
+++ b/tests/check/gst/gstbufferpool.c
|
||||
@@ -190,7 +190,7 @@ GST_START_TEST (test_buffer_modify_discard)
|
||||
gst_buffer_pool_acquire_buffer (pool, &buf, NULL);
|
||||
buffer_track_destroy (buf, &dcount);
|
||||
/* do resize, as we didn't modify the memory, pool should reuse this buffer */
|
||||
- gst_buffer_resize (buf, 5, 2);
|
||||
+ gst_buffer_resize (buf, 8, 2);
|
||||
gst_buffer_unref (buf);
|
||||
|
||||
/* buffer should've gone back into pool */
|
||||
--
|
||||
2.22.0
|
||||
|
Loading…
Reference in a new issue