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: 49188 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 8D2C1175D4; Sun, 16 Apr 2023 06:51:42 +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 7F9FE17570 for ; Sun, 16 Apr 2023 06:51:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnvI4-0001DX-Ce; Sun, 16 Apr 2023 01:51:08 -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 1pnvI1-0001Ck-C2 for guix-patches@gnu.org; Sun, 16 Apr 2023 01:51:06 -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 1pnvHz-0004rE-Bj for guix-patches@gnu.org; Sun, 16 Apr 2023 01:51:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnvHy-0004Aw-KS; Sun, 16 Apr 2023 01:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 6/6] gnu: gst-plugins-base: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sun, 16 Apr 2023 05:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168162423815096 (code B ref 62873); Sun, 16 Apr 2023 05:51:02 +0000 Received: (at 62873) by debbugs.gnu.org; 16 Apr 2023 05:50:38 +0000 Received: from localhost ([127.0.0.1]:50477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnvHZ-0003vP-Ij for submit@debbugs.gnu.org; Sun, 16 Apr 2023 01:50:37 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:49439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnvHX-0003uG-MC for 62873@debbugs.gnu.org; Sun, 16 Apr 2023 01:50:36 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-3f16b99b936so2939595e9.3 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 22:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681624229; x=1684216229; h=mime-version:message-id:to:subject:date:from:references:in-reply-to :from:to:cc:subject:date:message-id:reply-to; bh=xie6Cx07XH9rW/5tMDEZ2RsR/mTk2DcyQm0zk7KPlUg=; b=UhEfXJ7U2RhR/xK76QmKvCGbK8tMFkw+lC6wkuXwdKxzAgwg3036utnKLm+At10L0z YzL9qSRL1kXBWv8w7Pfa6M+96iQWtcS4Mo3c2XAn9+NDgOdGcdSGdzoSJz/BJVcha0ve f3hEImyoL6EEGSc5ctlQDObxlt9Jhy2JWAIdGQ8X8Ahf2WrskPb5vDS6+kATpiqhTpAF +peQB2P1/XpAaFBBeqh+KQdE9AhoqfCyrlhTaeKeAW2d9TKmgkeCBylHlzccQYiNuGJ/ p4oT1UQLAuEZtlL+JakAxV7fRoYdVZ8iZzdrCMLlGgK/ky1Y/xwPelnJacZnRp/na5AF T8ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681624229; x=1684216229; h=mime-version:message-id:to:subject:date:from:references:in-reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xie6Cx07XH9rW/5tMDEZ2RsR/mTk2DcyQm0zk7KPlUg=; b=eEfmgh0DLH6UjKMRsp7SRDcTDYWD990OQpje5wM1/UhE4CoeB/EH6sZt2F4pmcc4Af flsutp9mifWKz6AcEEYYjvGhWkCAFq3JXFY1rHRHGaJwFNSAbLCXRoZaS7WVi/afTRmT Fqmd2KTvGTELV2oQS7YW02pvUUC0x9+zu8QBj1c8JCK3jTlaCtKmGDRU/GKdUdFdfmuo t52GN4TmC5DmcYfA/UQk/FkEDKIvDdAXJb9ua7CGThabSfohdNeYiN2XktVst8OKv6Dg sEeLevoU1s0IAlaJvfOXujZxNVEP3e9lFnSVgTPl+i+kR44byXKLVENyUQ9OTVXt2Fa/ KhbA== X-Gm-Message-State: AAQBX9ftORvg6GsdSZF+Fve2aO2VRrG+rW3MBzvzkHXP3ml2WUcDJYtw zyzciG8odLkw1/Mhs4aU1P8/0yeBnLoZ2A== X-Google-Smtp-Source: AKy350ZvnUbLACvfkfTvq6yAxLhQ9LErWIdhR7UWP8gxt+OLX23BNhuNsFIxVXWynG6845Gderae3g== X-Received: by 2002:a5d:45ce:0:b0:2f6:de1f:acb6 with SMTP id b14-20020a5d45ce000000b002f6de1facb6mr2766790wrs.34.1681624229153; Sat, 15 Apr 2023 22:50:29 -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 f17-20020adff8d1000000b002ef222822d5sm7280400wrq.74.2023.04.15.22.50.28 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 22:50:28 -0700 (PDT) In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 16 Apr 2023 07:47:00 +0200 Message-ID: <43da6ec9e3cd102cdd1403d144009ba15b2d6769.camel@gmail.com> 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. --- As a follow-up to the master merge, the good, bad, and ugly plugins as well as gst-editing-services build with this simple trick. 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 72b73761d8..1d7c5696f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1303,6 +1303,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 0d051438e3..486ebe6dcd 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -554,7 +554,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); + } +