From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6M+iCSas8WA6RQEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:56:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2OJdBSas8WDTYgAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 15:56:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AFA117EAA for ; Fri, 16 Jul 2021 17:56:21 +0200 (CEST) Received: from localhost ([::1]:37364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QCJ-0003oU-9A for larch@yhetil.org; Fri, 16 Jul 2021 11:56:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QC2-0003o2-Km for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QC2-0006ZS-DV for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QC2-00035L-Cv for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 06/15] gnu: Use 'search-input-directory' for the OpenEXR header directory. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645090711721 (code B ref 49597); Fri, 16 Jul 2021 15:56:02 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:55:07 +0000 Received: from localhost ([127.0.0.1]:52147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QB4-000325-0Z for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAy-00031G-NL for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33720) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QAt-0005dQ-ET; Fri, 16 Jul 2021 11:54:51 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QAs-0004IN-FN; Fri, 16 Jul 2021 11:54:51 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:11 +0200 Message-Id: <20210716155420.32447-6-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626450981; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=saBa+zobKr9V5xkJHdNBOUe+tlwpgK1BANq4Eu+sICU=; b=Qs47vsIA1ohOWxIG7+Yb2WHvOiaCjA56GLBeDutWfLMLlSj7Mtev2Ub3TrKBWBUHmWK8XZ QCjoRJnmpZxwGjWlx6RasbtT17VOtDZ6nKupnG1RvCTfAkfKZcPiktmhsFnAVSQvz6zLWb /ZYNnaiSpXwlpJJdideUHV9/GxODfZ+j0QUO5K4k/4HsHt79cBRKlIuZXnhIQ5+lBii4z1 FMrTg8xhoEgCqp0gFDs2hpwHc//k+VXogl0jdmdQNm1DnOBPi/8BxRuPuvTPW5mXD19WKR Btmo2SdOcDoPVl6Ixpld5UhXzPIeFYUFrriFkRqrFT+uVhJGUNqXiZ0bJU4Ing== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450981; a=rsa-sha256; cv=none; b=K2U5YXeJO8wScHuNBC4R2aOBVwGbcMqM0U/LH+OqawW4hP143L7rpmC2oMErvi3hGA2+Wl z7S8f+sD3LZtAFVOMOe2BW+FOoWFfsRqd+jA8loqlXdS+Mtk5jzU2IypPkdKY8lEfQHQxM /e8Y2rfLmtDurwpzahrd1G30Rq09rsX9CQgznodSDc2fv/763b9TGzxmZt+p/3fdz0TrEW S2fsOJ17ebWc5CsHZ4ZQKVKFrQVq6EPVUl079jqXCuL+wXrM01VYFBnSu6wjtL7O6XTh1L qtvHQ+8kZ52PfW3wz/S5arG+uLf5CTjg6RzRZubuNKwgIJURZPsYeHQdrbzr2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.91 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: AFA117EAA X-Spam-Score: -1.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: xvU5gn61no21 * gnu/packages/graphics.scm (blender): Use 'search-input-directory' when searching for "include/OpenEXR". (blender-2.79): Likewise. * gnu/packages/image-processing.scm (opencv): Likewise. * gnu/packages/image-viewers.scm (luminance-hdr): Likewise. * gnu/packages/photo.scm (darktable): Likewise. --- gnu/packages/graphics.scm | 16 +++++++--------- gnu/packages/image-processing.scm | 7 +++---- gnu/packages/image-viewers.scm | 9 ++++----- gnu/packages/photo.scm | 8 ++++---- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3735a860b1..50677fd957 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2021 Ludovic Courtès ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus @@ -558,10 +558,9 @@ typically encountered in feature film production.") ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; the CPATH to satisfy the dependency on "half.h". (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)))))) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))))))) (inputs `(("boost" ,boost) ("jemalloc" ,jemalloc) @@ -660,10 +659,9 @@ application can be customized via its API for Python scripting.") ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; the CPATH to satisfy the dependency on "half.h". (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)))))) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))))))) (inputs `(("boost" ,boost) ("jemalloc" ,jemalloc) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7b29c2a215..08754b1b0c 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -512,10 +512,9 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; the CPATH to satisfy the dependency on "ImathVec.h". (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))) (add-before 'check 'start-xserver (lambda* (#:key inputs #:allow-other-keys) (let ((xorg-server (assoc-ref inputs "xorg-server")) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index f01b6a614a..744337ec94 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -385,10 +385,9 @@ It supports JPEG, PNG and GIF formats.") ;; not use 'OpenEXR.pc'. Thus, we need to add ;; "$ilmbase/include/OpenEXR/" to the CPATH. (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") "")))))))) (home-page "http://qtpfsgui.sourceforge.net") (synopsis "High dynamic range (HDR) imaging application") (description diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index ae2806d243..7720492d2c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2017, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner @@ -506,9 +506,9 @@ photographic equipment.") ;; Ensure the OpenEXR headers are found. (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR:" (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") -- 2.32.0