From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 54744@debbugs.gnu.org
Cc: Zhu Zihao <all_but_last@163.com>
Subject: [bug#54744] [PATCH staging v2 04/20] gnu: gst-plugins-good: Update to 1.20.3.
Date: Sun, 26 Jun 2022 19:23:19 +0200 [thread overview]
Message-ID: <28c5b3c4c07e29c68055b9f67ec9cc4853fc07ff.camel@gmail.com> (raw)
In-Reply-To: <86bkxeop1g.fsf@163.com>
* gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.20.3.
[source]<patches>: Remove “gst-plugins-good-fix-test.patch”.
[arguments]<#:phases>: Add ‘absolutize-libsoup-library’ and
‘skip-failing-tests’.
* gnu/packages/patches/gst-plugins-good-fix-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 1 -
gnu/packages/gstreamer.scm | 19 +++-
.../patches/gst-plugins-good-fix-test.patch | 94 -------------------
3 files changed, 16 insertions(+), 98 deletions(-)
delete mode 100644 gnu/packages/patches/gst-plugins-good-fix-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f8ccbd34ec..51dcf2b596 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1225,7 +1225,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-plugins-good-fix-test.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 867c3f5d95..9fb92ea44b 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -608,7 +608,7 @@ (define-public gst-plugins-base
(define-public gst-plugins-good
(package
(name "gst-plugins-good")
- (version "1.18.5")
+ (version "1.20.3")
(source
(origin
(method url-fetch)
@@ -616,15 +616,28 @@ (define-public gst-plugins-good
(string-append
"https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz"))
- (patches (search-patches "gst-plugins-good-fix-test.patch"))
(sha256
- (base32 "0svrapawych2s3lm4lx3x023zxq5kcx50jnfmh0qigszfskyxbis"))))
+ (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
(modify-phases %standard-phases
,@%common-gstreamer-phases
+ (add-after 'unpack 'absolutize-libsoup-library
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define libsoup
+ (search-input-file inputs "lib/libsoup-3.0.so"))
+
+ (substitute* "ext/soup/gstsouploader.c"
+ (("(#define LIBSOUP_3_SONAME ).+$" _ prefix)
+ (string-append prefix "\"" libsoup "\"\n")))))
+ (add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "tests/check/meson.build"
+ ;; Reported as shaky upstream, see
+ ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
+ (("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]"))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
diff --git a/gnu/packages/patches/gst-plugins-good-fix-test.patch b/gnu/packages/patches/gst-plugins-good-fix-test.patch
deleted file mode 100644
index 38ec0ba802..0000000000
--- a/gnu/packages/patches/gst-plugins-good-fix-test.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Fix a broken test:
-
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
-
-Patches copied from upstream source repository:
-
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/f5310ce346180a717f091f2f09bcbb3ddfb15436
-
-From 2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Thu, 12 Nov 2020 23:38:21 +0000
-Subject: [PATCH 1/2] tests: qtdemux: fix crash on 32-bit architectures
-
-Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
----
- tests/check/elements/qtdemux.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
-index 5271c6576..0c748278b 100644
---- a/tests/check/elements/qtdemux.c
-+++ b/tests/check/elements/qtdemux.c
-@@ -797,9 +797,10 @@ GST_START_TEST (test_qtdemux_pad_names)
- "protection-system", G_TYPE_STRING,
- "9a04f079-9840-4286-ab92-e65be0885f95", NULL);
- caps =
-- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
-- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
-- GST_TYPE_CAPS, mediacaps, NULL);
-+ gst_caps_new_simple ("video/quicktime",
-+ "variant", G_TYPE_STRING, "mss-fragmented",
-+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
-+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
-
- /* Send segment event* */
- event = gst_event_new_caps (caps);
-@@ -852,9 +853,10 @@ GST_START_TEST (test_qtdemux_pad_names)
- "protection-system", G_TYPE_STRING,
- "9a04f079-9840-4286-ab92-e65be0885f95", NULL);
- caps =
-- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
-- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
-- GST_TYPE_CAPS, mediacaps, NULL);
-+ gst_caps_new_simple ("video/quicktime",
-+ "variant", G_TYPE_STRING, "mss-fragmented",
-+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
-+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
-
- /* Send segment event* */
- event = gst_event_new_caps (caps);
---
-2.30.0
-
-
-From f5310ce346180a717f091f2f09bcbb3ddfb15436 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Thu, 12 Nov 2020 23:39:21 +0000
-Subject: [PATCH 2/2] tests: qtdemux: fix typo in caps field
-
-timesacle -> timescale
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
----
- tests/check/elements/qtdemux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
-index 0c748278b..4a14c45c0 100644
---- a/tests/check/elements/qtdemux.c
-+++ b/tests/check/elements/qtdemux.c
-@@ -799,7 +799,7 @@ GST_START_TEST (test_qtdemux_pad_names)
- caps =
- gst_caps_new_simple ("video/quicktime",
- "variant", G_TYPE_STRING, "mss-fragmented",
-- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
-+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
- "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
-
- /* Send segment event* */
-@@ -855,7 +855,7 @@ GST_START_TEST (test_qtdemux_pad_names)
- caps =
- gst_caps_new_simple ("video/quicktime",
- "variant", G_TYPE_STRING, "mss-fragmented",
-- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
-+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
- "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
-
- /* Send segment event* */
---
-2.30.0
-
--
2.36.1
next prev parent reply other threads:[~2022-06-30 17:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 3:38 [bug#54744] [PATCH] Update gstreamer and its families to 1.20.1 Zhu Zihao
2022-04-06 5:56 ` Liliana Marie Prikler
2022-04-06 9:16 ` Zhu Zihao
2022-04-06 10:05 ` Liliana Marie Prikler
2022-04-06 15:34 ` Zhu Zihao
2022-04-07 6:27 ` Liliana Marie Prikler
2022-06-26 17:17 ` [bug#54744] [PATCH staging v2 01/20] gnu: python-gst: Add upstream-name Liliana Marie Prikler
2022-06-26 17:22 ` [bug#54744] [PATCH staging v2 02/20] gnu: gstreamer: Update to 1.20.3 Liliana Marie Prikler
2022-06-26 17:22 ` [bug#54744] [PATCH staging v2 03/20] gnu: gst-plugins-base: " Liliana Marie Prikler
2022-06-26 17:23 ` Liliana Marie Prikler [this message]
2022-06-26 17:25 ` [bug#54744] [PATCH staging v2 05/20] gnu: gst-plugins-bad: " Liliana Marie Prikler
2022-06-26 17:25 ` [bug#54744] [PATCH staging v2 06/20] gnu: gst-plugins-ugly: " Liliana Marie Prikler
2022-06-26 17:25 ` [bug#54744] [PATCH staging v2 07/20] gnu: gst-libav: " Liliana Marie Prikler
2022-06-26 17:25 ` [bug#54744] [PATCH staging v2 08/20] gnu: gst-editing-services: " Liliana Marie Prikler
2022-06-26 17:26 ` [bug#54744] [PATCH staging v2 09/20] gnu: gstreamer-docs: " Liliana Marie Prikler
2022-06-26 17:26 ` [bug#54744] [PATCH staging v2 10/20] gnu: python-gst: " Liliana Marie Prikler
2022-06-28 18:41 ` [bug#54744] [PATCH staging v2 11/20] gnu: gst-plugins/selection: Implement in terms of G-Expressions Liliana Marie Prikler
2022-06-28 18:59 ` [bug#54744] [PATCH staging v2 12/20] gnu: Add gst-plugins-bad-minimal Liliana Marie Prikler
2022-06-28 19:19 ` [bug#54744] [PATCH staging v2 13/20] gnu: webkitgtk: Add missing inputs Liliana Marie Prikler
2022-06-29 19:15 ` [bug#54744] [PATCH staging v2 14/20] gnu: gstreamer: Use new package style Liliana Marie Prikler
2022-06-29 19:17 ` [bug#54744] [PATCH staging v2 15/20] gnu: gst-plugins-good: " Liliana Marie Prikler
2022-06-29 19:18 ` [bug#54744] [PATCH staging v2 16/20] gnu: gst-plugins-bad: " Liliana Marie Prikler
2022-06-29 19:19 ` [bug#54744] [PATCH staging v2 17/20] gnu: gst-plugins-ugly: " Liliana Marie Prikler
2022-06-29 19:20 ` [bug#54744] [PATCH staging v2 18/20] gnu: gst-editing-services: " Liliana Marie Prikler
2022-06-29 19:20 ` [bug#54744] [PATCH staging v2 19/20] gnu: gst-python: " Liliana Marie Prikler
2022-06-30 4:14 ` [bug#54744] [PATCH staging v2 20/20] gnu: gst-editing-services: Update FIXME comment Liliana Marie Prikler
2022-06-30 16:55 ` [bug#54744] [PATCH staging v2 00/20] Update gstreamer et al. to 1.20.3 Liliana Marie Prikler
2022-07-03 7:28 ` Zhu Zihao
2022-07-31 10:19 ` bug#54744: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=28c5b3c4c07e29c68055b9f67ec9cc4853fc07ff.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=54744@debbugs.gnu.org \
--cc=all_but_last@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).