From patchwork Sun Apr 16 05:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50001 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 1C90127BBEE; Sun, 14 May 2023 11:40:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3197B27BBE9 for ; Sun, 14 May 2023 11:40:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1py993-0001DM-Io; Sun, 14 May 2023 06:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1py991-0001B6-CS for guix-patches@gnu.org; Sun, 14 May 2023 06:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1py991-0002IW-3L for guix-patches@gnu.org; Sun, 14 May 2023 06:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1py990-000433-DZ; Sun, 14 May 2023 06:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, rg@raghavgururajan.name, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 14 May 2023 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63499 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63499@debbugs.gnu.org Cc: maxim.cournoyer@gmail.com, rg@raghavgururajan.name, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: maxim.cournoyer@gmail.com, rg@raghavgururajan.name, liliana.prikler@gmail.com Received: via spool by 63499-submit@debbugs.gnu.org id=B63499.168406078015508 (code B ref 63499); Sun, 14 May 2023 10:40:02 +0000 Received: (at 63499) by debbugs.gnu.org; 14 May 2023 10:39:40 +0000 Received: from localhost ([127.0.0.1]:40393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1py98e-000422-0b for submit@debbugs.gnu.org; Sun, 14 May 2023 06:39:40 -0400 Received: from mail-ed1-f51.google.com ([209.85.208.51]:54782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1py98c-00041c-ND for 63499@debbugs.gnu.org; Sun, 14 May 2023 06:39:39 -0400 Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-50b37f3e664so20481829a12.1 for <63499@debbugs.gnu.org>; Sun, 14 May 2023 03:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684060773; x=1686652773; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=h9TvxM2a+Lqb1Sispf3KS4+Gxwm13Q1JnWFGZ01AlnQ=; b=M2c1kdY/II+cuUCzCgvXa2pbVciM2UegzmY52XbbTwrUtwjrh7nWZwqPh05zSdeVSg e/6pwHKGs6Lq9bZeH9kuMQTOkEghGoAVwJQRhSKMjGTkpDERxdTjNvHFJHUVA1wrXGDF xFXGfLIU62SaneBITFBOgd61JCIIMo0koLt6wlrfGjRDzA1c+GT3BQlQJQLwLRKAbWkD Ix0KoHqYQqZXsEnBC6TiGLmIG/Jx8CixGsaJNmCt5inghZavMgUk173Vmu23aCrHb5KU 4c7irOKXpzStVeg7AxDWuPeiLCTRArqnd3A/Ugze/qg4A8m3zj5gvUCCEPmJUOxoVmnG DpWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684060773; x=1686652773; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=h9TvxM2a+Lqb1Sispf3KS4+Gxwm13Q1JnWFGZ01AlnQ=; b=TPMEpuDIDyDm2rbfmrxkr2GPmGtR6M0IQlYWsG/PY98Ej6N/eRqsQJLadIOcbnvEKw YauZokW9G/osGfctCRfFGZ8JkOeLAQ22aoOHBAGodwTFqH4T9Oro9lSAcTQPSLDH2/c0 8hunJYLqDXGqTyXLOf8rtedpOljaQrYfXoVvwz/Zrwk5gH8bG6GBZj40a6ANnpUFXkj9 uj9Io6SvFD8m2LR1S3tD0lLYZPhTmek6twZrLvwsxtt7qLKxuhF52QJKzrtSTuoDNc4V b/h8cRH2HqCA6DJ3Zp53H6q84/TypTOG6QqEERdS1C4T8/E8C+EW9BJtZClJHwr7YloZ RRDQ== X-Gm-Message-State: AC+VfDwsbnCE74sPUi9Vvhc3NWJ6/ymjjo5TQ05doMpijM2Z1Vu9EXtB pkthJ+DQxdSK9s4CyccTca+9agi2dhU= X-Google-Smtp-Source: ACHHUZ7FdsLcTBw0sanv5Z0wmu5NJSKT9A4LCO42cjQE6at3Bd7xbBA3T4KOts7sJTtnttJLPcHmTQ== X-Received: by 2002:a17:906:dc89:b0:956:fbd7:bc5e with SMTP id cs9-20020a170906dc8900b00956fbd7bc5emr31092602ejc.64.1684060772920; Sun, 14 May 2023 03:39:32 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n10-20020a17090673ca00b0096a6be0b66dsm4628527ejl.208.2023.05.14.03.39.32 for <63499@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 03:39:32 -0700 (PDT) Message-Id: <2c36d93661d5cf9d3a7c60068571225716f129bd.1684060546.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 16 Apr 2023 07:47:00 +0200 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/gst-plugins-base-fix-broken-test.patch: New file. * gnu/packages/gstreamer.scm (gst-plugins-base)[patches]: Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 3 ++- .../gst-plugins-base-fix-broken-test.patch | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43d6077943..0ff787e8f3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1316,6 +1316,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ + %D%/packages/patches/gst-plugins-base-fix-broken-test.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 8971c11479..f7e5b397fd 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -550,7 +550,8 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")))) + "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")) + (patches (search-patches "gst-plugins-base-fix-broken-test.patch")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc diff --git a/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch new file mode 100644 index 0000000000..2785983d8d --- /dev/null +++ b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch @@ -0,0 +1,22 @@ +Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c +=================================================================== +--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c ++++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c +@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem) + + alloc = gst_fd_allocator_new (); + fail_unless (alloc); +- mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED); ++ mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE); + + fail_unless (gst_memory_map (mem, &info, GST_MAP_READ)); + fail_unless (info.data[5] == '5'); +@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem) + gst_memory_unmap (mem, &info); + + gst_memory_unref (mem); +- fail_unless (g_close (fd, NULL) == 0); ++ fail_unless (g_close (fd, NULL)); + gst_object_unref (alloc); + } +