From unknown Sun Jun 22 11:34:31 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#42067 <42067@debbugs.gnu.org> To: bug#42067 <42067@debbugs.gnu.org> Subject: Status: [PATCH] gnu: darktable: Add optional dependencies. Reply-To: bug#42067 <42067@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:34:31 +0000 retitle 42067 [PATCH] gnu: darktable: Add optional dependencies. reassign 42067 guix-patches submitter 42067 Vinicius Monego severity 42067 normal tag 42067 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 26 16:39:31 2020 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: darktable: Add optional dependencies. 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-Debbugs-Envelope-To: submit Cc: Vinicius Monego X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) [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 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 17:59:13 2020 Received: (at 42067-done) by debbugs.gnu.org; 29 Jun 2020 21:59:13 +0000 Received: from localhost ([127.0.0.1]:49672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1o1-0001i5-30 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 17:59:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq1nz-0001ht-1j for 42067-done@debbugs.gnu.org; Mon, 29 Jun 2020 17:59:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39482) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq1ns-00015l-Po; Mon, 29 Jun 2020 17:59:04 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48334 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jq1nr-0001OQ-L1; Mon, 29 Jun 2020 17:59:04 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Vinicius Monego Subject: Re: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies. References: <20200626203904.16748-1-monego@posteo.net> Date: Mon, 29 Jun 2020 23:59:01 +0200 In-Reply-To: <20200626203904.16748-1-monego@posteo.net> (Vinicius Monego's message of "Fri, 26 Jun 2020 17:39:04 -0300") Message-ID: <87eepxa5zu.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42067-done Cc: 42067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Vinicius Monego skribis: > [arguments]: Fix opencl-c.h path. > [native-inputs]: Add opencl-headers, make LLVM version specific. > [inputs]: Add gmic. I adjusted the commit log and applied the tiny change below. > (add-before 'configure 'prepare-build-environment > (lambda* (#:key inputs #:allow-other-keys) > - (setenv "CC" "clang") (setenv "CXX" "clang++"))) > + (setenv "CC" "clang") (setenv "CXX" "clang++") BTW, why are we building with Clang? Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5b5e057b65..09767f464e 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -486,8 +486,9 @@ photographic equipment.") ;; 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"))))) + (("\\$\\{LLVM_INSTALL_PREFIX\\}") + (assoc-ref %build-inputs "clang"))) + #t)) (add-before 'configure 'set-LDFLAGS-and-CPATH (lambda* (#:key inputs outputs #:allow-other-keys) (setenv "LDFLAGS" --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 29 22:42:23 2020 Received: (at 42067-done) by debbugs.gnu.org; 30 Jun 2020 02:42:23 +0000 Received: from localhost ([127.0.0.1]:49895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq6E3-000065-A8 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 22:42:23 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq6Dz-00005q-Qf for 42067-done@debbugs.gnu.org; Mon, 29 Jun 2020 22:42:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 26ECD2400FB for <42067-done@debbugs.gnu.org>; Tue, 30 Jun 2020 04:42:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1593484933; bh=zwpnwlzig+4pgo82Y8GkOezLrIdXW0o8+AaavvTeopE=; h=Subject:From:To:Cc:Date:From; b=F5WrCGBOu6/IoBzS73YpYgL9QPk1YRbhUQCxVqJeV/eJ8wPTfJb20insgbu0wLQ+F h3E2oiNBNpjeuyGWy/uZGL75JalclcQk1EwZW1C9M8rmBZRgm4IvB/xOkPNPUow4F+ 9OPxXnKuGExFDosTjLJEy2G788nDFoeszebp1wPWPmI3uAF9Wv61dniic+QY/ZTVTS 7SqNSum0B3Yq9O8FRV28ohw4dPRgC1V8i7fdcQMaGkrPz0PQti/+aYeqlwGd0RiMKC txB5jCsn/8Aykkdhsmg2254HJ18SZG5hfPo1Y3kjYN1z2DuwfIJpDdWPxWJKAhhADF rVdIWjmsXAZUA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 49wpXy6f4Rz9rxL; Tue, 30 Jun 2020 04:42:10 +0200 (CEST) Message-ID: Subject: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies. From: Vinicius Monego To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Date: Mon, 29 Jun 2020 23:42:06 -0300 In-Reply-To: <87eepxa5zu.fsf@gnu.org> References: <20200626203904.16748-1-monego@posteo.net> <87eepxa5zu.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42067-done Cc: 42067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Ludo, > > BTW, why are we building with Clang? > This was briefly discussed in the version update thread (2020- 06/msg00651). To be more descriptive: DT 3+ requires GCC/Clang 8+ and will fail to build with the default GCC 7.5.0. We have to load a newer version of GCC, or use Clang. Marius attempted to build it with gcc-9 and "ran into other problems" although I have succesfully built DT3 with the same compiler and version a while ago. Meanwhile, DT's CMakeLists.txt checks for LLVM to enable "test- compilation of OpenCL programs". If LLVM is not found, this test- compilation is skipped. If LLVM is found, it checks for Clang, and the required opencl header is located inside Clang's directory. Because we "have to have" Clang this way, it made more sense to me to compile with it. Anyways, OpenCL is optional. To build with GCC only, we would have to load the gcc module and skip the test-compilation. It may be possible to use both gcc and clang, but that would add redundancy. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 30 06:05:16 2020 Received: (at 42067-done) by debbugs.gnu.org; 30 Jun 2020 10:05:16 +0000 Received: from localhost ([127.0.0.1]:50208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqD8d-0002Xp-U8 for submit@debbugs.gnu.org; Tue, 30 Jun 2020 06:05:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqD8b-0002Xc-Rd for 42067-done@debbugs.gnu.org; Tue, 30 Jun 2020 06:05:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48138) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqD8W-0004tT-KJ; Tue, 30 Jun 2020 06:05:08 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=45200 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jqD8W-0000Uy-02; Tue, 30 Jun 2020 06:05:08 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Vinicius Monego Subject: Re: [bug#42067] [PATCH] gnu: darktable: Add optional dependencies. References: <20200626203904.16748-1-monego@posteo.net> <87eepxa5zu.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 Messidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 30 Jun 2020 12:05:06 +0200 In-Reply-To: (Vinicius Monego's message of "Mon, 29 Jun 2020 23:42:06 -0300") Message-ID: <87tuys7tt9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42067-done Cc: 42067-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Vinicius, Vinicius Monego skribis: >> BTW, why are we building with Clang? >>=20 > > This was briefly discussed in the version update thread (2020- > 06/msg00651). To be more descriptive: Oh sorry, I have overlooked that. > DT 3+ requires GCC/Clang 8+ and will fail to build with the default GCC > 7.5.0. We have to load a newer version of GCC, or use Clang. Marius > attempted to build it with gcc-9 and "ran into other problems" although > I have succesfully built DT3 with the same compiler and version a while > ago. > > Meanwhile, DT's CMakeLists.txt checks for LLVM to enable "test- > compilation of OpenCL programs". If LLVM is not found, this test- > compilation is skipped. If LLVM is found, it checks for Clang, and the > required opencl header is located inside Clang's directory. Because we > "have to have" Clang this way, it made more sense to me to compile with > it. > > Anyways, OpenCL is optional. To build with GCC only, we would have to > load the gcc module and skip the test-compilation. It may be possible > to use both gcc and clang, but that would add redundancy. What=E2=80=99s the =E2=80=9Ctest-compilation of OpenCL programs=E2=80=9D? = Are we just talking about the test suite? Either way, I guess my main points are (1) it=E2=80=99d be nice to add a co= mment on why we=E2=80=99re using Clang, and (2) if we can use GCC instead, that s= hould be our default choice. I=E2=80=99m not saying we should address this right away, but we should keep it in mind. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 11:34:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 28 Jul 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator