From patchwork Mon May 1 16:17:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 49726 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 55AC027BBE9; Mon, 1 May 2023 17:18: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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 AAB3427BBE2 for ; Mon, 1 May 2023 17:18:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptWE0-0006I1-NF; Mon, 01 May 2023 12:18:04 -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 1ptWDy-0006HQ-Hc for guix-patches@gnu.org; Mon, 01 May 2023 12:18:02 -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 1ptWDy-0006Ay-8l for guix-patches@gnu.org; Mon, 01 May 2023 12:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptWDx-0006cY-TF for guix-patches@gnu.org; Mon, 01 May 2023 12:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63208] [PATCH] gnu: gstreamer: Depend on glib-next Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2023 16:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63208@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168295783725386 (code B ref -1); Mon, 01 May 2023 16:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2023 16:17:17 +0000 Received: from localhost ([127.0.0.1]:40893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptWDE-0006bO-MG for submit@debbugs.gnu.org; Mon, 01 May 2023 12:17:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:60098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptWDA-0006bE-It for submit@debbugs.gnu.org; Mon, 01 May 2023 12:17:15 -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 1ptWD9-0006Dz-3w for guix-patches@gnu.org; Mon, 01 May 2023 12:17:12 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptWD7-00066U-4r for guix-patches@gnu.org; Mon, 01 May 2023 12:17:10 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1aaed87d8bdso10425915ad.3 for ; Mon, 01 May 2023 09:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682957827; x=1685549827; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=jGnhzNgxSuQzTyok7FLE8n5ckYIKoAO/b2y30mDQ6qs=; b=RjTMWhDHhmqLHLdK/r909S0KO2lh9SyQk5LS6FTCG7qDMf17Oqf75067M5kNIbY/gl AT+QADgWkLuwS4UoYbZZnMAyI4pvIAIacQfvE2RsM0X+WdmUcpuInB5+rQEilMDmO/Ei 0+IP2S2Jm7Tvn1ogvj+uRG+THJ/uiMy+qbxyUbnRe8dO8ymAhis6y97JQiSgcESOoEqe P/JBItvhZbkmUO/SEHHoYd+Xs0hJOJ8cEsasURR8ebBsDyxeGeh7Nbxam0apV0Yg0bNZ 8tLEQlPCHTnzlMHDpdMbI21Wj8pdIVppKJipLek8K7krWH9e02qOfBQHVZu/ZAnWfl/4 hylA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682957827; x=1685549827; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jGnhzNgxSuQzTyok7FLE8n5ckYIKoAO/b2y30mDQ6qs=; b=KP4TZ5qn8G12tKdBRhmWSr0Fh5Owby96PODnSuveDwlI2sFCwec4VxOHayhQ4DyNsS tXFdFYfSesEb6NTJIqTibNPuE+Keqo6DnHsO/xLl3ehd3v140TXQrjmU4nHSyMgiKLup biptDs8st+rPrMNsPjdy9qmj4ufGC9QPGjonVTA+ny/fa7dQi4GBYgVdDgdUql0OTbfm b1fQZv+tMv5CaXqbpXX0ylc4HOl41K41WKzTT/fqdjanQAQdd4Ihsm0aqDSTWzGsTTxp IvQ6gW1cuS++Kg3zo0bZf9osHDbX9XbhhrTHGAokLXJ7Pz+6hzDt4kAjd34iWRTUrrAA C6Tg== X-Gm-Message-State: AC+VfDy52jInV9UeU9hgrz+JO+fQ4JFMxzYfxOx3TXcD8Xn8laJc+8ci fYUJgZI7DmL9vWTPorn7ucafbEGCjkE= X-Google-Smtp-Source: ACHHUZ5Vjzqr1j6Tmujj2WMiX4Jcdr/8YiOX9/+kADoTiPfGWL7m/NWoPPHGyEYBW/8twIrGy+MvBA== X-Received: by 2002:a17:902:f683:b0:1a9:f425:5409 with SMTP id l3-20020a170902f68300b001a9f4255409mr12779024plg.49.1682957826852; Mon, 01 May 2023 09:17:06 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id q16-20020a170902dad000b00194caf3e975sm18047231plx.208.2023.05.01.09.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 09:17:06 -0700 (PDT) From: Andy Tai Date: Mon, 1 May 2023 09:17:02 -0700 Message-Id: <20230501161702.29513-1-atai@atai.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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/gstreamer.scm: gstreamer: [arguments] (configure-flags): Add "--wrap-mode=nofallback" to ensure no subproject sources in repo are used [propagated-inputs]: Use glib-next [inputs]: Use glib-next * gnu/packages/gstreamer.scm: gst-plugins-base: [propagated-inputs]: Use glib-next [inputs]: Use glib-next * gnu/packages/gstreamer.scm: gst-plugins-bad: [propagated-inputs]: Use glib-next. Add dav1d [inputs]: Use glib-next * gnu/packages/gstreamer.scm: gst-plugins-ugly: [propagated-inputs]: Use glib-next [inputs]: Use glib-next * gnu/packages/gstreamer.scm: gst-editing-services [propagated-inputs]: Use glib-next [inputs]: Use glib-next --- gnu/packages/gstreamer.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) base-commit: 23552fb2fbcb78757e8b563de9466831f6386105 prerequisite-patch-id: 3805e062116fd14a78ca03847b237e75977c6d8d prerequisite-patch-id: 9967fd9b0de5c36d810ca5c346e49762dfd3dad8 prerequisite-patch-id: f5feb08c9249508d22e0debbe47222324e9f354e diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 8971c11479..ea7b9f1229 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -474,6 +474,7 @@ (define-public gstreamer (build-system meson-build-system) (arguments (list #:disallowed-references (list python) + #:configure-flags #~(list "--wrap-mode=nofallback") #:phases #~(modify-phases %standard-phases #$@%common-gstreamer-phases @@ -506,12 +507,12 @@ (define-public gstreamer ;; Requires: glib-2.0, gobject-2.0 ;; Requires.private: gmodule-no-export-2.0 libunwind libdw (list elfutils ;libdw - glib libunwind)) + glib-next libunwind)) (native-inputs (list bash-completion bison flex gettext-minimal - `(,glib "bin") + `(,glib-next "bin") gobject-introspection perl pkg-config @@ -553,7 +554,7 @@ (define-public gst-plugins-base "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")))) (build-system meson-build-system) (propagated-inputs - (list glib ;required by gstreamer-sdp-1.0.pc + (list glib-next ;required by gstreamer-sdp-1.0.pc gstreamer ;required by gstreamer-plugins-base-1.0.pc libgudev ;required by gstreamer-gl-1.0.pc ;; wayland-client.h is referred to in @@ -582,7 +583,7 @@ (define-public gst-plugins-base zlib)) (native-inputs (list pkg-config - `(,glib "bin") + `(,glib-next "bin") gobject-introspection python-wrapper gettext-minimal @@ -690,7 +691,7 @@ (define libsoup (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs (list gettext-minimal - `(,glib "bin") + `(,glib-next "bin") gobject-introspection gsettings-desktop-schemas libxml2 @@ -704,7 +705,7 @@ (define libsoup cairo flac (librsvg-for-system) - glib + glib-next glib-networking glu gtk+ @@ -827,7 +828,7 @@ (define-public gst-plugins-bad (list gstreamer gst-plugins-base)) (native-inputs (list gettext-minimal - `(,glib "bin") ; for glib-mkenums, etc. + `(,glib-next "bin") ; for glib-mkenums, etc. gobject-introspection gsettings-desktop-schemas gst-plugins-good ;for tests @@ -845,12 +846,13 @@ (define-public gst-plugins-bad ;; ccextractor chromaprint curl + dav1d directfb ;; dssim faad2 flite fluidsynth - glib + glib-next glib-networking glu gsm @@ -971,7 +973,7 @@ (define-public gst-plugins-ugly (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs (list gettext-minimal - `(,glib "bin") + `(,glib-next "bin") gobject-introspection gsettings-desktop-schemas perl @@ -979,7 +981,7 @@ (define-public gst-plugins-ugly python-wrapper xorg-server-for-tests)) (inputs - (list glib + (list glib-next glib-networking liba52 libcdio @@ -1042,11 +1044,11 @@ (define-public gst-editing-services (propagated-inputs (list gstreamer gst-plugins-base)) (inputs - (list glib glib-networking gtk+ libxml2)) + (list glib-next glib-networking gtk+ libxml2)) (native-inputs (list flex gobject-introspection - `(,glib "bin") + `(,glib-next "bin") gst-plugins-bad gst-plugins-good perl