From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gFo7JicWpGHYdQEAgWs5BA (envelope-from ) for ; Mon, 29 Nov 2021 00:52:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id BT/iIScWpGEULwAAB5/wlQ (envelope-from ) for ; Sun, 28 Nov 2021 23:52:07 +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 381EF2C12F for ; Mon, 29 Nov 2021 00:52:07 +0100 (CET) Received: from localhost ([::1]:44844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrTxm-0003Rg-C7 for larch@yhetil.org; Sun, 28 Nov 2021 18:52:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrTxi-0003RX-Be for guix-patches@gnu.org; Sun, 28 Nov 2021 18:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53229) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrTxi-0008MK-3c for guix-patches@gnu.org; Sun, 28 Nov 2021 18:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrTxi-0008Uc-0M for guix-patches@gnu.org; Sun, 28 Nov 2021 18:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52171] [PATCH core-updates-frozen 2/2] gnu: darktable: Build with OpenEXR 3. References: <20211128234857.321602-1-monego@posteo.net> In-Reply-To: <20211128234857.321602-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Nov 2021 23:52: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.163814349732614 (code B ref 52171); Sun, 28 Nov 2021 23:52:01 +0000 Received: (at 52171) by debbugs.gnu.org; 28 Nov 2021 23:51:37 +0000 Received: from localhost ([127.0.0.1]:36542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrTxJ-0008Tx-Hk for submit@debbugs.gnu.org; Sun, 28 Nov 2021 18:51:37 -0500 Received: from mout01.posteo.de ([185.67.36.65]:41045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrTxG-0008Ti-4r for 52171@debbugs.gnu.org; Sun, 28 Nov 2021 18:51:36 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 93817240027 for <52171@debbugs.gnu.org>; Mon, 29 Nov 2021 00:51:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1638143487; bh=sYmBbrimRorjglxUh6v8S2Rl7rhSQ/4TwUqjGn5msN4=; h=From:To:Cc:Subject:Date:From; b=Jz//ebSzSMZqVYhxPkcZDqqR3rus/F4aRZbvu+otJtvahwgul3DMSzk/g2lz2YdwC jOZ1pUNVtc7piDPWYh7f6VysQmWEnwCQy/1uNPYUeoGLJ6NYbP79RXTW4dA4R0+RXW U9fs2jup0Sv9qvZDjGjCDWDNm4E9beq9kLN6bTX/fDcAAVAimfgSxC7/PqTfSlL+om EkGd1nmpDJzb6TA2WAP01OxKnH7Wy3SVhXJuD+JrXCIL1IYwsY0xSHUtHb28JOk/Ah 4RRwXPb+3phMl+ke79stHuJ8j8T/kxHuHQgtLQTbttzvna0luttJ5I3ZuS3ZBD51Iy vvDIRR5utIQbQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4J2QHL41nxz9rxB; Mon, 29 Nov 2021 00:51:26 +0100 (CET) From: Vinicius Monego Date: Sun, 28 Nov 2021 23:51:10 +0000 Message-Id: <20211128235110.321777-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=1638143527; 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=ZLOnR3SCDgPfCMgspk7gxz3U5VBPwfIvG8vtP70iAx4=; b=rP021XGVNiduD0fE9sr6QVxNDYxuY2l5ZKhmuxtNhHcLtx4b6oNVflALiRNj9n1g7D57UT jdiNrR0YS/q3SPXRx1cuyO5V39kjGQCq3fHI0KfIEsb5rwsP0EnqYyhovKZcchXfwvacy0 y6dFr32Zxhc9iSGihdmwZyXngi1+3o7ZaOJmK9+VnMN+5afPdmFW4OlukC93sJLGrQh2wl 1IaLqo8x5n8JJch9en4Mb6H5seM33hIt16n4pvt4lRQ1x9Ow9zqsZrQvuAG5Nfv6TG6NTC 7fnsnuADh4+XYFrOo4fFqlO7RPK2im2CcAhAcxLlHpMlPNbp4qo7rh5M3KsUIg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638143527; a=rsa-sha256; cv=none; b=jwambASR4nCyd1zYYFCLOoTVSWqhtCnRQAr211/id+Ek4JGK+ktxMGm+mingbrvt+eqkgW hxTCr6MfjRlBHA8ha8vuc3QX8O8gFsmMGS8L+2lS1EbGypbLL68ATvAQbVsFwFhTJJuXBQ aCZalGXaVpZJ/RVYyhfbVun4SowXYEc8pFWABrQGxCGSDBjJPqQKdj+j9f2PUumKWBowcd Os5TafS95WFsCEj21JbhuZc288fSUh2qPLS4ybqFtBSNLZsd1qKFTP8GQOH7lOSjeedGXV vTTZ3LUr3JX8kKpWSYBJICk4nfkVy+2AhpaptZxris5KTSZlhb2ZplF37CyGzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="Jz//ebSz"; 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="Jz//ebSz"; 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: 381EF2C12F X-Spam-Score: -0.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3TqHBp65xyrz * gnu/packages/photo.scm (darktable)[arguments]<#:phases>: Rename 'set-LDFLAGS-and-CPATH to 'set-LDFLAGS. Don't set CPATH. [inputs]: Remove ilmbase. Add imath. Change openxr-2 to openexr. --- gnu/packages/photo.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8a07f32f3c..9b60ec2884 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 + (add-before 'configure 'set-LDFLAGS (lambda* (#:key inputs 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