From patchwork Sat Dec 3 08:13:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45026 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 132E227BBEB; Sat, 3 Dec 2022 10:01:32 +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=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 2C54027BBE9 for ; Sat, 3 Dec 2022 10:01:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1PKe-0004oI-0k; Sat, 03 Dec 2022 05:01:17 -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 1p1PKY-0004hL-93 for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:10 -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 1p1PKX-0001cM-VN for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1PKT-0007PT-P7 for guix-patches@gnu.org; Sat, 03 Dec 2022 05:01:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59800] [PATCH 2/5] gnu: openscenegraph: Add output for plugins. References: <034d0ae2b33c04dc7a5f8f75ab285e20937ce4ec.camel@gmail.com> In-Reply-To: <034d0ae2b33c04dc7a5f8f75ab285e20937ce4ec.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Dec 2022 10:01:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59800 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59800@debbugs.gnu.org Received: via spool by 59800-submit@debbugs.gnu.org id=B59800.167006166028394 (code B ref 59800); Sat, 03 Dec 2022 10:01:05 +0000 Received: (at 59800) by debbugs.gnu.org; 3 Dec 2022 10:01:00 +0000 Received: from localhost ([127.0.0.1]:51493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKO-0007Nt-36 for submit@debbugs.gnu.org; Sat, 03 Dec 2022 05:01:00 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:41539) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1PKK-0007NO-LC for 59800@debbugs.gnu.org; Sat, 03 Dec 2022 05:00:57 -0500 Received: by mail-ej1-f67.google.com with SMTP id vp12so16852794ejc.8 for <59800@debbugs.gnu.org>; Sat, 03 Dec 2022 02:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=CjmdZU5sCDxbin49D2po2CemVrbZ12BtPgtv3MekVyA=; b=FprXs4mbowh7en+TSgr3cerJF4FrjeP7cUDP0gXE6KTs4YcWf1vBM77dE3m4hivDPj hbNaU28gL+3RvR4/7G9oqfLEgtiYPl15LWbW+IKo3Pe4dOuaLoMAVDEIvgrPg/eihOqU B8s2pigR3Qh+apoD9QcgWIK53fzubeM6maubtnE+8V6JNWILdY12Nxctr0/s/GP7GvYN 7KjdqBYf3jYeKBWAPEQKoowedQEILhjakPWnQLkBvNUfD2JPG2z5qpjxa6Tsu/h4MHr+ bfIC2wmfD4wNQVJ18wjYbTT8yUSfx9m1oxDLo7tCMZZZF0MzNvWyfot6wPTYge36ny6s ZQPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CjmdZU5sCDxbin49D2po2CemVrbZ12BtPgtv3MekVyA=; b=kcYwoDO6xf6vC7RmNtE4Z7xdO/jWeLPAOWEGQHLODlS269Deymg+qdm5MnRZ/PqHQi wrBddMe2T82iMdw0s8HmH39mU48GQCxiJ8ch6WZ6N9cdwSVaE4Hdhy8HqqPAMCFcH4N6 j0LFHcqV2OoCHdZDi5+Z+0tPinFjGiZcyiYsleIp/EM4P3ul0BYWqr91I9Rb5eYbDe/b BJ7dd0t2eRzMsD0KeR/IDsHcObvY/Gqh+whLolgr/b1KHZsbp070zVzvOkOC5ZgjddMc pYwz/Isto72fBO78p2M9ezxn3NjzkV2U71rddgcxdNVk7/iMhadrY+1S7RNm9BuUX6bY SjiQ== X-Gm-Message-State: ANoB5pk+J52xK41JatZMCMNQs+NiqKx7fSL2nMCGzOLa6dXDMcJyI5sE 6PfC9MeavpgwRHG/akg7eXl+v6Nh51g= X-Google-Smtp-Source: AA0mqf6tKE88dk3GHmYr5KyG+GzZ9o3+EPpZ3PTdc+05QxOh8dbbe51ur5wiCST70BkUFahHHze0EA== X-Received: by 2002:a17:906:1310:b0:7c0:c5e9:634d with SMTP id w16-20020a170906131000b007c0c5e9634dmr5238238ejb.220.1670061651159; Sat, 03 Dec 2022 02:00:51 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t15-20020aa7d4cf000000b0046c53c3b2dfsm906869edr.38.2022.12.03.02.00.50 for <59800@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 02:00:50 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 09:13:50 +0100 MIME-Version: 1.0 Message-ID: <7be02d37bc51f8e11d1d5fe187692f9cb67d5d4a.camel@gmail.com> 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 This makes it so that other packages can find plugins via pkg-config and link to them in the usual manner. * gnu/packages/graphics.scm (openscenegraph)[outputs]: Add “pluginlib”. [properties]: Add output synopsis for “pluginlib”. [arguments]<#:modules>: Use (ice-9 regex). <#:phases>: Add ‘copy-plugins’. --- gnu/packages/graphics.scm | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4193c2949b..b892e44f72 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1289,8 +1289,10 @@ (define-public openscenegraph (base32 "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1")) (file-name (git-file-name name version)))) (properties - `((upstream-name . "OpenSceneGraph"))) + `((upstream-name . "OpenSceneGraph") + (output-synopsis "pluginlib" "Plugins as shared libraries"))) (build-system cmake-build-system) + (outputs (list "out" "pluginlib")) (arguments (list #:tests? #f ; no test target available @@ -1300,7 +1302,40 @@ (define-public openscenegraph #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_RPATH=" #$output "/lib:" - #$output "/lib64")))) + #$output "/lib64")) + #:modules `((guix build cmake-build-system) + (guix build utils) + (ice-9 regex)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'copy-plugins + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (pluginlib (assoc-ref outputs "pluginlib"))) + (mkdir-p (string-append pluginlib "/lib/pkgconfig")) + (with-directory-excursion (string-append out "/lib/osgPlugins-" + #$version) + (for-each + (lambda (lib) + (let ((blib (basename lib)) + (m (string-match "([^/]*)\\.so$" lib))) + (symlink (canonicalize-path lib) + (string-append pluginlib "/lib/lib" blib)) + (call-with-output-file (string-append + pluginlib + "/lib/pkgconfig/" + (match:substring m 1) ".pc") + (lambda (port) + (format port "libdir=~a/lib~%" pluginlib) + (newline port) + (format port "Name: ~a~%" (match:substring m 1)) + (format port "Version: ~a~%" #$version) + (display "Description: A plugin for openscenegraph\n" + port) + (display "Requires: openscenegraph\n" port) + (format port "Libs: -L${libdir} -l~a~%" + (match:substring m 1)))))) + (find-files "." "\\.so"))))))))) (native-inputs (list pkg-config unzip)) (inputs