From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iFOJGEgZpGGveQEAgWs5BA (envelope-from ) for ; Mon, 29 Nov 2021 01:05:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ULAdFEgZpGFJRQAAbx9fmQ (envelope-from ) for ; Mon, 29 Nov 2021 00:05:28 +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 0FB8F2C58D for ; Mon, 29 Nov 2021 01:05:28 +0100 (CET) Received: from localhost ([::1]:48364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrUAg-0005F1-SY for larch@yhetil.org; Sun, 28 Nov 2021 19:05:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0005Eh-E9 for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrUAI-0001JO-5K for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrUAI-0000N1-0o for guix-patches@gnu.org; Sun, 28 Nov 2021 19:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52171] [PATCH core-updates-frozen v2 2/2] gnu: darktable: Build with OpenEXR 3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Nov 2021 00:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52171 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52171@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 52171-submit@debbugs.gnu.org id=B52171.16381442931396 (code B ref 52171); Mon, 29 Nov 2021 00:05:01 +0000 Received: (at 52171) by debbugs.gnu.org; 29 Nov 2021 00:04:53 +0000 Received: from localhost ([127.0.0.1]:36551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA9-0000MS-01 for submit@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:53 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrUA5-0000M1-9M for 52171@debbugs.gnu.org; Sun, 28 Nov 2021 19:04:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A8034240101 for <52171@debbugs.gnu.org>; Mon, 29 Nov 2021 01:04:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638144283; bh=ZzZ0qB9GnLQFHCec+n6I2nm8SYvb2c5vDAIIc/pSpRQ=; h=From:To:Cc:Subject:Date:From; b=DjayBaqU5Tog0vVo4MdJBghIycfanEa+O07AHBqrJ+dHfv1Gcp8UUdOvOV+hY7QMB E6NiYhGNSyONLVmUHEkD8SPd6JErsFlzQsd8pUSNwwcGR3XikCt6H234eLBWNYgKR7 r8/XaFftSIdiwP7AS4B8Qq+P52XMkH3MM5aXX6JdAgXdKfIIwLOZ4N6y4JSdF38g9U p+gDqvX10rVpx4ZOvVBNSK6ZfAaCZhjZy7VKQjuzoj+pWC1+oA9RUDgcxzbT8FkdRH 5zOK++X61TJ+yZIZCLQ3+UdcYrqBB13j0WNc3dQbPqhZb0qlqBEkz3/mJZorXMzcA8 JPhQBzG7hgS7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J2QZf5tGRz6tmN; Mon, 29 Nov 2021 01:04:42 +0100 (CET) From: Vinicius Monego Date: Mon, 29 Nov 2021 00:04:21 +0000 Message-Id: <20211129000421.324049-2-monego@posteo.net> In-Reply-To: <20211129000421.324049-1-monego@posteo.net> References: <20211129000421.324049-1-monego@posteo.net> MIME-Version: 1.0 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638144328; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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:dkim-signature; bh=7Yxvto30GgEZ8UmEYoGO4rml4xtSiLrub0Y2tpVR5H4=; b=o4IGGUGDC5WWKxYgs+ZRKRYeoxlaXYzi79tMmINT5lIQN3L23ip3ZjQX83zsf7x9Oh8z/k HxQg2HzMxJip1F5ZYU1cpTZeH9O84GC3+Q/09l8k/kQo3ln2Ok+KGrsrL5ZzAlM9TI85RI +ki0yWIw4fgVdLFp4Zp1nJCwA3Ysb8pP4UiS26T6u/lQzYb+fQ7Cs7s5w1dKoJ/Y6He/AF 0j9RxVtfeQyTFBjxX67tElqpZQTLvvHLmyisHpf+54w9OvzNy9eV9yl89r/YHcq9XM5LfK gi2CDhjbMDX5MGU16VNvrUwgq79P92VmKLFfjmN53duE/kxIBs+bgDs/To66sQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638144328; a=rsa-sha256; cv=none; b=jgbKtR+BSeXDTIvUuuxq86O6A4gFioqJ3E0WOYgbMRfJpNJ+l+q6x7/7lx/LuOVD9SyCwL XDRwUyEXbsxXo1bX5qYhwXRrK3+wwrRFiOJh13qeBrgvuitXyuSY71mSmofDxax5xZCaFc Sy8NqXF6lbw+hjRragvMzXtuSKnOltDVyx1w0XaTOjVM1k2y+15LxLZjLir0QznHvJThNJ hQ7qspeNBrupatIT1/IrrzbUyp6S6QwbIkY1pZBtcF3fIq+mN1xspZrFMOFWQXNXp1nWGX DsW5tDPOv3amc8MfAnC3B+R/Ulc0mL+6xZwPQ5LrUnz9Qz2ll/gTFP/6IyKsHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DjayBaqU; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DjayBaqU; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0FB8F2C58D X-Spam-Score: -0.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: x6CkOQ2rAd1L * gnu/packages/photo.scm (darktable)[arguments]<#:phases>: Rename 'set-LDFLAGS-and-CPATH to 'set-LDFLAGS. Don't set CPATH. [inputs]: Remove ilmbase. Add imath. Replace openxr-2 with openexr. --- Removed now unused 'inputs' from the lambda. It would be good if someone could test the OpenEXR export because the button doesn't fit in my screen for me to try. gnu/packages/photo.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8a07f32f3c..34d9cc3dd0 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -504,18 +504,12 @@ photographic equipment.") (substitute* "CMakeLists.txt" (("\\$\\{LLVM_INSTALL_PREFIX\\}") (assoc-ref %build-inputs "clang"))))) - (add-before 'configure 'set-LDFLAGS-and-CPATH - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - (assoc-ref outputs "out") "/lib/darktable")) - - ;; Ensure the OpenEXR headers are found. - (setenv "CPATH" - (string-append - (search-input-directory inputs "include/OpenEXR") - ":" (or (getenv "CPATH") ""))))) + (assoc-ref outputs "out") "/lib/darktable")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -550,7 +544,7 @@ photographic equipment.") ("graphicsmagick" ,graphicsmagick) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) - ("ilmbase" ,ilmbase) + ("imath" ,imath) ("iso-codes" ,iso-codes) ;optional, for language names in the preferences ("json-glib" ,json-glib) ("lcms" ,lcms) @@ -569,7 +563,7 @@ photographic equipment.") ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support - ("openexr" ,openexr-2) ;optional, for EXR import/export + ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view ("pugixml" ,pugixml) -- 2.30.2