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 ms11 with LMTPS id yAxFOyxd9l4yMQAA0tVLHw (envelope-from ) for ; Fri, 26 Jun 2020 20:40:12 +0000 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 cK0UNyxd9l6VQQAAB5/wlQ (envelope-from ) for ; Fri, 26 Jun 2020 20:40:12 +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 33B3D9400E1 for ; Fri, 26 Jun 2020 20:40:12 +0000 (UTC) Received: from localhost ([::1]:53762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jov8s-0005X5-FR for larch@yhetil.org; Fri, 26 Jun 2020 16:40:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jov8k-0005Uj-A3 for guix-patches@gnu.org; Fri, 26 Jun 2020 16:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jov8j-0005Ix-W0 for guix-patches@gnu.org; Fri, 26 Jun 2020 16:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jov8j-0005xU-Lz for guix-patches@gnu.org; Fri, 26 Jun 2020 16:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Jun 2020 20:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42067@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159320397122858 (code B ref -1); Fri, 26 Jun 2020 20:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2020 20:39:31 +0000 Received: from localhost ([127.0.0.1]:43192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jov8F-0005wc-0n for submit@debbugs.gnu.org; Fri, 26 Jun 2020 16:39:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:51368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jov8D-0005wU-1g for submit@debbugs.gnu.org; Fri, 26 Jun 2020 16:39:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jov8C-000514-9T for guix-patches@gnu.org; Fri, 26 Jun 2020 16:39:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:42481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jov8A-0005As-2q for guix-patches@gnu.org; Fri, 26 Jun 2020 16:39:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 25856160060 for ; Fri, 26 Jun 2020 22:39:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1593203963; bh=Yqbp6i6YXltOS9hSTJ/SpL6GyHIRi+THI/1dMyeJzTs=; h=From:To:Cc:Subject:Date:From; b=IDhHiai8aMW6UrCDQbu4Ccq71q6mHJsRYB7lp4q4yuBu7sDtjtP12a+MeyKKGbd7E 5/mh79kIEM6qp7rVRXBj/0Xo3Uw+3ko0QOQ2xUxOvayX9SYOSu/twX7JDRNCnXNtu8 JveQi2K60KyTiBnHJcnjKDaDktF43MLX7V2GqcYoiCXujg/rxA11yuqdc2KvnJDQC9 dMgggymlqa7hlm4vy4a1GXgGXNSIRDKHwaDP+uNfOwB/LBnL3tM1PZf9q7HHiZurGa apkVMW6MtlA8lh6wCj9jBjeS32W/Kn6aawFfRs+VOiWWMi+Ax8LyGXR75g08Iacyh7 SkwRVZKqy10GQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49tpdj5Ckqz9rxK; Fri, 26 Jun 2020 22:39:21 +0200 (CEST) From: Vinicius Monego Date: Fri, 26 Jun 2020 17:39:04 -0300 Message-Id: <20200626203904.16748-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/26 16:35:05 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=IDhHiai8; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=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-Spam-Score: 5.09 X-TUID: fQKFrZiUaCEh [arguments]: Fix opencl-c.h path. [native-inputs]: Add opencl-headers, make LLVM version specific. [inputs]: Add gmic. --- gnu/packages/photo.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 75bbc45380..5b5e057b65 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) @@ -63,6 +64,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -480,7 +482,12 @@ photographic equipment.") (modify-phases %standard-phases (add-before 'configure 'prepare-build-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" "clang") (setenv "CXX" "clang++"))) + (setenv "CC" "clang") (setenv "CXX" "clang++") + ;; Darktable looks for opencl-c.h in the LLVM dir. Guix installs + ;; it to the Clang dir. We fix this by patching CMakeLists.txt. + (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) (setenv "LDFLAGS" @@ -508,7 +515,8 @@ photographic equipment.") ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("llvm" ,llvm) + ("llvm" ,llvm-9) ;should match the Clang version + ("opencl-headers" ,opencl-headers) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a))) @@ -520,6 +528,7 @@ photographic equipment.") ("dbus-glib" ,dbus-glib) ("exiv2" ,exiv2) ("freeimage" ,freeimage) + ("gmic" ,gmic) ("graphicsmagick" ,graphicsmagick) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) @@ -539,7 +548,7 @@ photographic equipment.") ("libwebp" ,libwebp) ("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("lua" ,lua) + ("lua" ,lua) ;for plugins ("openexr" ,openexr) ("openjpeg" ,openjpeg) ("osm-gps-map" ,osm-gps-map) -- 2.20.1