From patchwork Fri Feb 17 17:00:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47057 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 575B1168B2; Fri, 17 Feb 2023 17:04:44 +0000 (GMT) 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 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 7185A16793 for ; Fri, 17 Feb 2023 17:04:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT47u-0006uM-Sb; Fri, 17 Feb 2023 12:02:27 -0500 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 1pT47X-0006iC-Kh for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:07 -0500 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 1pT47X-0000KI-9w for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47X-00081n-0o for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 03/21] gnu: spice-gtk: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665328530580 (code B ref 61576); Fri, 17 Feb 2023 17:02:02 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:25 +0000 Received: from localhost ([127.0.0.1]:41332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46u-0007wx-PF for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:25 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:39922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46r-0007wA-Ik for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:22 -0500 Received: by mail-qt1-f174.google.com with SMTP id e26so1468182qtq.6 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TQmVNxlk2lY22wiPRwEGEg1OW1I0We6KY3fnqk0d0Bk=; b=SCIYMx+6Wm7dwHjGFpDDJ8PEsB98uwMJ6f6hBGREn63TVAzG7M7JGXN01nsoiL4lbk x0vluwLhNVzMHq+QwEi78D2yqm1R3RXtZ6sq4XKyVxynpVekn3AhVNz7qi6ogze6dJa1 31dStZQHeNkAppfxVH8pyKKuUiAUxiL8+xH8KVKwRyFo3X+pAXQiuK57Rku7NpAdTOu5 pyiVZS5n5uKv+zBu5bczFIlRqxCAmEEbFbZlhum/Cc1B9M3RWIZEOWoE+vx8q2/pSQvk ri7MLGDPCpBnbOxcrsxc2hWNFFfCmftUX22ZP9Gq1fhbYBk//MI4pPa0OthlWszS/Am7 zrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TQmVNxlk2lY22wiPRwEGEg1OW1I0We6KY3fnqk0d0Bk=; b=WVImNdICPuirsPeMk0VQ19t207JfVMr0ol/3g6jTPEwQytQ6CYGBt8DUIjQklm5IRK rk5rGsV65C4sy1k/SxlmVU9sfeyy5F34M/9aEUcAJyuSQJvqisB6aSAgEtfQie0yQrBl RN01+6tBoZ2kd84kSLIhFzkelT5/TE9lwIvT2yYlhuA5QztHs1XaPPtvYznLjoof6x+V R/IYxypIa0c/KYdxZrtk8TyHjmy/MBGqk5xj2Abu/jCgLlLnDg+Mthn8ID3aHwinSBqG 2iTVxstyBt8c80HQOOsEnUa7ure/5AB1EUqVMZqQkroovrrUeTxr5upPP/cJqOWxuC9S TYNw== X-Gm-Message-State: AO0yUKVHnybJY9Llj54Qj0Z6ZXCllxlWpvXc5U8nsofiVRl/TMGQUx2h rzZvKojptRFOUPdPENzGTgKiH3bjCFiiODoZ X-Google-Smtp-Source: AK7set8bGVQoCw9RyyRkItvJuuS9tyu4gvs6CR3nxN6FDXbY0j6w+JcKQjQTz0tZ2VYUqpMte+4lJA== X-Received: by 2002:a05:622a:287:b0:3b9:b42a:7fb5 with SMTP id z7-20020a05622a028700b003b9b42a7fb5mr17937004qtw.56.1676653275835; Fri, 17 Feb 2023 09:01:15 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:15 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:44 -0500 Message-Id: <20230217170103.10147-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@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/spice.scm (spice-gtk) [arguments]: Streamline and use gexps. --- gnu/packages/spice.scm | 59 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index c513e3db13..3d625a063a 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019, 2020, 2022 Marius Bakke -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,35 +148,34 @@ (define-public spice-gtk "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-gstaudio" - "--enable-gstvideo" - "--enable-pulse" - "--enable-vala" - "--enable-introspection") - #:phases - (modify-phases %standard-phases - (add-before 'check 'disable-session-test - (lambda _ - ;; XXX: Disable session tests, because they require USB support, - ;; which is not available in the build container. - (substitute* "tests/Makefile" - (("test-session\\$\\(EXEEXT\\) ") "")))) - (add-after 'install 'patch-la-files - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libjpeg (assoc-ref inputs "libjpeg"))) - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append out "/lib") "\\.la$") - (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg")))))) - (add-after 'install 'wrap-spicy - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/spicy") - `("GST_PLUGIN_SYSTEM_PATH" ":" - prefix (,gst-plugin-path))))))))) + (list + #:configure-flags #~(list "--enable-gstaudio" + "--enable-gstvideo" + "--enable-pulse" + "--enable-vala" + "--enable-introspection") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'disable-session-test + (lambda _ + ;; XXX: Disable session tests, because they require USB support, + ;; which is not available in the build container. + (substitute* "tests/Makefile" + (("test-session\\$\\(EXEEXT\\) ") "")))) + (add-after 'install 'patch-la-files + (lambda _ + ;; Add an absolute reference for libjpeg in the .la files + ;; so it does not have to be propagated. + (substitute* (find-files (string-append #$output "/lib") + "\\.la$") + (("-ljpeg") + (string-append "-L" #$(this-package-input "libjpeg-turbo") + "/lib -ljpeg"))))) + (add-after 'install 'wrap-spicy + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/spicy") + `("GST_PLUGIN_SYSTEM_PATH" ":" + prefix (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))) (native-inputs (list `(,glib "bin") intltool