From patchwork Fri Jul 21 12:14:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 51892 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 1570527BBE2; Fri, 21 Jul 2023 13:16:19 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4728E27BBEA for ; Fri, 21 Jul 2023 13:16:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMp3J-0002uC-Qs; Fri, 21 Jul 2023 08:16:10 -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 1qMp3C-0002t0-Ui for guix-patches@gnu.org; Fri, 21 Jul 2023 08:16:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qMp3C-00079B-Lp for guix-patches@gnu.org; Fri, 21 Jul 2023 08:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMp3C-0007Sy-Gf for guix-patches@gnu.org; Fri, 21 Jul 2023 08:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64767] [PATCH 2/5] gnu: libcamera: Split off gst and tools outputs. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jul 2023 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64767@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 64767-submit@debbugs.gnu.org id=B64767.168994171628581 (code B ref 64767); Fri, 21 Jul 2023 12:16:02 +0000 Received: (at 64767) by debbugs.gnu.org; 21 Jul 2023 12:15:16 +0000 Received: from localhost ([127.0.0.1]:60745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMp2S-0007Qu-76 for submit@debbugs.gnu.org; Fri, 21 Jul 2023 08:15:16 -0400 Received: from mail.envs.net ([5.199.136.28]:33720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMp2Q-0007Qm-77 for 64767@debbugs.gnu.org; Fri, 21 Jul 2023 08:15:14 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id AF47038A18D6; Fri, 21 Jul 2023 12:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1689941713; bh=xMfvo/LcMY2YfhjsamPrCCvBA5rd/GPvIDsyKWnQ+Co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AbuAoAW//HT1/2XUi4jCn7MK1KRO5cA11c+3mfMFlSv4QuY7wkQmRIPxz8VjmopGu ch4t7BPRy+3cvWIqM0ACztkw8grfSSGPEKI9eMsw3a0tWxwqAHDnnNqGHzj8vB8lWH heuWVnClk6XdrRBFv/gCWkGV+LcgMdGS6dYntktDqnHFER5vMRVe49v6w8goSvzEg0 p36w/Dtblqip9lVxAT6ArhBQhhZkEcPGkvCgcxcy3dkDfDVVrUzuHOa9emjOWwUqvO zLigGU9WhqsOtw8ojGAGbwGz+TtRFOYvrqlP15ZC+YivJwYXp1Ht4w/pTsjrv7l4Ch LB0H88RWh75PKtkTYOhiEdhYVWkktCQ6J5dfk5lqB4KZj5njLST/lz/zOtXdSG3htb QErIn3/WbN5wowskFbJzGIBs9t8eVR0ilv1uEIUW5UISGLOr22zs3YTBACaiaJQzj2 HOYoQRyarF0JLGe4lQdIJHwpjO9hAuETFT1XUs5ylbXRT9Vx679yRyeF01ObNchvfh b/3fhl6A//cVYKbNLcoSGxfpqunvG8eauIkYS8CMM0H8ikVQfl7gDMEoxEP/oVMbIk lmqgCe+K9NqFCG5Dj5dYALuiVQsuOmzWIidIhHrgCzlk07H3Z3loLpSbug1BIXWcQH owAYC1ekEgQ2Ian+R643UqCk= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id BVJm39XuSt0d; Fri, 21 Jul 2023 12:15:10 +0000 (UTC) Received: from localhost (unknown [117.174.235.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 21 Jul 2023 12:15:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8a6da45f; Fri, 21 Jul 2023 12:14:50 +0000 (UTC) Date: Fri, 21 Jul 2023 20:14:30 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/networking.scm (libcamera)[outputs]: Add gst and tools. [arguments]: Pass "-Dbindir" to configure-flags. Adjust 'move-doc phase to 'move-doc-and-gst. --- gnu/packages/networking.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 52178785d3..84091274f0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -363,25 +363,31 @@ (define-public libcamera (sha256 (base32 "06dj3dpfbayj61015n5kffin2g3hyys11ra0px2g4hmrznvdkhc9")))) (build-system meson-build-system) - (outputs '("out" "doc")) + (outputs '("out" "doc" "gst" "tools")) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags (list + (string-append "-Dbindir=" (assoc-ref %outputs "tools") "/bin") "-Dtest=true" "-Dv4l2=true" ;; XXX: Requires bundled pybind11. "-Dpycamera=disabled") #:phases (modify-phases %standard-phases - (add-after 'install 'move-doc + (add-after 'install 'move-doc-and-gst (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) + (doc (assoc-ref outputs "doc")) + (gst (assoc-ref outputs "gst"))) (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/doc") - (string-append doc "/share/doc")))))))) + (string-append doc "/share/doc")) + (mkdir-p (string-append gst "/lib")) + (rename-file + (string-append out "/lib/gstreamer-1.0") + (string-append gst "/lib/gstreamer-1.0")))))))) (native-inputs (list googletest graphviz ;for 'dot'