From patchwork Sun Jun 26 17:23:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 40430 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C60C27BBEB; Thu, 30 Jun 2022 18:06:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A1C9727BBE9 for ; Thu, 30 Jun 2022 18:06:23 +0100 (BST) Received: from localhost ([::1]:46720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6xcT-0007RB-MR for patchwork@mira.cbaines.net; Thu, 30 Jun 2022 13:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6xbM-0005uR-4y for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6xbL-00089Q-R4 for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6xbL-0000rQ-LO for guix-patches@gnu.org; Thu, 30 Jun 2022 13:05:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54744] [PATCH staging v2 04/20] gnu: gst-plugins-good: Update to 1.20.3. References: <86bkxeop1g.fsf@163.com> In-Reply-To: <86bkxeop1g.fsf@163.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Jun 2022 17:05:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54744 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54744@debbugs.gnu.org Cc: Zhu Zihao Received: via spool by 54744-submit@debbugs.gnu.org id=B54744.16566087073234 (code B ref 54744); Thu, 30 Jun 2022 17:05:11 +0000 Received: (at 54744) by debbugs.gnu.org; 30 Jun 2022 17:05:07 +0000 Received: from localhost ([127.0.0.1]:35497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xbG-0000pr-5t for submit@debbugs.gnu.org; Thu, 30 Jun 2022 13:05:07 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:44971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6xaX-0000kY-Kn for 54744@debbugs.gnu.org; Thu, 30 Jun 2022 13:04:23 -0400 Received: by mail-ej1-f67.google.com with SMTP id sb34so40141020ejc.11 for <54744@debbugs.gnu.org>; Thu, 30 Jun 2022 10:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:cc:content-transfer-encoding :message-id; bh=WZ4kaD2w6ULs2eruYyGtsGlA6IyUX72AYyrAfWYMa/U=; b=pOASP2pcpvHWsRbGK2QmVFJ/VqKXlrxNFvs8w+cXRFuK3pwz3B3YAKiPcdvBO6TJCe faVGU9SCopOMg2RwSRlZHbT2XG1GPkXFzc9I5KO1IZdMW1twlHONP7gPt4NW6P4+bOie QiboaXuerd/UtRTbea6Ao+VC7gLq/hkVZsk2xe3geLD9/iTAinv94Q4hNruYOFjhN4IU huwyRVtwbova2YhSsjEZLLW7TRyhUwrlZvfPwN7+RkT8NsAaGDy+Gk2M0X1WmoyVbULT TZnKMiLq5GfLxRrH2Exyn14EWOakchukEiCmtj+GP06XjhlXpcVIV2uv5IyRUbp6N7sE 3oxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to:cc :content-transfer-encoding:message-id; bh=WZ4kaD2w6ULs2eruYyGtsGlA6IyUX72AYyrAfWYMa/U=; b=zbGuESwZbe2dbTC4+jyBSafou2L6+0J2RbwDGgy3a7ov3b88f/NBz+XGQ2bMo5/SO2 Xlu0nNbEMRTFI2vDbP7dTTBXI0lzt3iqTSRLwMMU9CSLy6mklTx4S4iGPFwL8OYZ2+IN QLV+TU5d3y5xhlKUGFZqPLcWYzp8o+oJiuk8sy1PWCLukizMtZRU5PoPiu0h0Hgj6+Xa Qa6rjZmihobkIIRrJQPe9S1fPmqVJw2yfDb5gUPSLJfH45NgifZoAjARx9XBSh0sNnJg L11sQ3TGE26ETVyJnimlRBdrTsB+5Pjfz081qpBNnt7GDZkFNMx35BbyFYR2WJZyCHeh krzQ== X-Gm-Message-State: AJIora+LMqEOVdkeigYtuPmAfJHQyb4w/bjAF9+ZBfZovT00QNdLepMa KsH/Mlmy3RGuXwdh/sKl5KLMxh5qcvc= X-Google-Smtp-Source: AGRyM1uXIU12g44xL5UqHH5ppQ2UDQjswiXVWnFGkuh0i/AHuv+En6evr2AhxsFY9KVmhGG2CcQ0Cw== X-Received: by 2002:a17:906:9c84:b0:6e0:7c75:6f01 with SMTP id fj4-20020a1709069c8400b006e07c756f01mr9990863ejc.103.1656608656101; Thu, 30 Jun 2022 10:04:16 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id by27-20020a0564021b1b00b004356112a8a2sm13443872edb.15.2022.06.30.10.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 10:04:15 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Jun 2022 19:23:19 +0200 MIME-Version: 1.0 Message-ID: <28c5b3c4c07e29c68055b9f67ec9cc4853fc07ff.camel@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.20.3. [source]: 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 + ;; + (("\\[ '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?= -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: ---- - 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?= -Date: Thu, 12 Nov 2020 23:39:21 +0000 -Subject: [PATCH 2/2] tests: qtdemux: fix typo in caps field - -timesacle -> timescale - -Part-of: ---- - 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 -