GNU bug report logs - #25928
[PATCH] gnu: Add darktable.

Previous Next

Package: guix-patches;

Reported by: Roel Janssen <roel <at> gnu.org>

Date: Thu, 2 Mar 2017 00:05:01 UTC

Severity: normal

Tags: moreinfo, patch

Done: Roel Janssen <roel <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25928 in the body.
You can then email your comments to 25928 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Thu, 02 Mar 2017 00:05:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Roel Janssen <roel <at> gnu.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 02 Mar 2017 00:05:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add darktable.
Date: Thu, 02 Mar 2017 01:04:33 +0100
Dear Guix,

And finally, here is a patch for Darktable.
Even though the upstream project strongly recommends x86_64, I do not
know whether it actually does not work on other platforms.  If the
builds fail on anything other than x86_64, we could limit it to this
platform only.

Kind regards,
Roel Janssen

>From 0c7e3fb1343594bae6e2922b1866468e1903c59d Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel <at> gnu.org>
Date: Thu, 2 Mar 2017 00:56:22 +0100
Subject: [PATCH] gnu: Add darktable.

* gnu/packages/photo.scm (darktable): New variable.
---
 gnu/packages/photo.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index ce71d2a44..42da06080 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -31,17 +31,23 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages man)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages web)
@@ -67,6 +73,81 @@
 cameras (CRW/CR2, NEF, RAF, DNG, and others).")
     (license license:lgpl2.1+)))
 
+(define-public darktable
+  (package
+    (name "darktable")
+    (version "2.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/darktable-org/darktable/releases/"
+                    "download/release-"
+                    version "/darktable-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1828vbxx4r36m0brqfs5f51j2j2fxb0f6q8cd1vkaa5zhnaqacqv"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; There are no tests.
+       #:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'set-ldflags
+          (lambda* (#:key outputs #:allow-other-keys)
+            (setenv "LDFLAGS"
+                    (string-append
+                     "-Wl,-rpath="
+                     (assoc-ref outputs "out") "/lib/darktable"))
+            #t))
+         (add-after 'set-paths 'add-ilmbase-include-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; OpenEXR propagates ilmbase, but its include files do not appear
+             ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
+             ;; the CPATH to satisfy the dependency on "ImathInt64.h".
+             (setenv "CPATH"
+                     (string-append
+                      (assoc-ref inputs "ilmbase")
+                      "/include/OpenEXR:" (or (getenv "CPATH") "")))
+             #t)))))
+    (native-inputs
+     `(("llvm" ,llvm-3.9.1)
+       ("clang" ,clang-3.9.1)))
+    (inputs
+     `(("libxslt" ,libxslt)
+       ("libxml2" ,libxml2)
+       ("pugixml" ,pugixml)
+       ("gtk+" ,gtk+)
+       ("sqlite" ,sqlite)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("cairo" ,cairo)
+       ("lcms" ,lcms)
+       ("exiv2" ,exiv2)
+       ("libtiff" ,libtiff)
+       ("curl" ,curl)
+       ("libgphoto2" ,libgphoto2)
+       ("dbus-glib" ,dbus-glib)
+       ("fop" ,fop)
+       ("openexr" ,openexr)
+       ("ilmbase" ,ilmbase)
+       ("libsoup" ,libsoup)
+       ("python-jsonschema" ,python-jsonschema)
+       ("intltool" ,intltool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("libwebp" ,libwebp)
+       ("lensfun" ,lensfun)
+       ("librsvg" ,librsvg)
+       ("json-glib" ,json-glib)
+       ("freeimage" ,freeimage)))
+    (home-page "https://www.darktable.org")
+    (synopsis "Virtual lighttable and darkroom for photographers")
+    (description "Darktable is an open source photography workflow application
+and RAW developer.  It manages your digital negatives in a database, lets you
+view them through a zoomable lighttable and enables you to develop raw images
+and enhance them.")
+    (license license:gpl3+)))
+
 (define-public libexif
   (package
     (name "libexif")
-- 
2.11.0




Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 08 Mar 2017 13:51:02 GMT) Full text and rfc822 format available.

Message #8 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Roel Janssen <roel <at> gnu.org>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 08 Mar 2017 14:50:44 +0100
Hi,

Roel Janssen <roel <at> gnu.org> skribis:

> And finally, here is a patch for Darktable.

Awesome!  Now I have no excuse not to give it a try.  :-)

> Even though the upstream project strongly recommends x86_64, I do not
> know whether it actually does not work on other platforms.  If the
> builds fail on anything other than x86_64, we could limit it to this
> platform only.

Do you have a link to their “recommendation”, out of curiosity?

If it turns out to indeed break on other platforms, then we can add a
‘supported-systems’ field.

>>>From 0c7e3fb1343594bae6e2922b1866468e1903c59d Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel <at> gnu.org>
> Date: Thu, 2 Mar 2017 00:56:22 +0100
> Subject: [PATCH] gnu: Add darktable.
>
> * gnu/packages/photo.scm (darktable): New variable.

LGTM, thank you!

Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 08 Mar 2017 14:30:02 GMT) Full text and rfc822 format available.

Message #11 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 08 Mar 2017 15:29:12 +0100
Ludovic Courtès writes:

> Hi,
>
> Roel Janssen <roel <at> gnu.org> skribis:
>
>> And finally, here is a patch for Darktable.
>
> Awesome!  Now I have no excuse not to give it a try.  :-)
>
>> Even though the upstream project strongly recommends x86_64, I do not
>> know whether it actually does not work on other platforms.  If the
>> builds fail on anything other than x86_64, we could limit it to this
>> platform only.
>
> Do you have a link to their “recommendation”, out of curiosity?

Yes: http://www.darktable.org/install/
It's in the "Prerequisites" section.

> If it turns out to indeed break on other platforms, then we can add a
> ‘supported-systems’ field.
>
>>>>From 0c7e3fb1343594bae6e2922b1866468e1903c59d Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel <at> gnu.org>
>> Date: Thu, 2 Mar 2017 00:56:22 +0100
>> Subject: [PATCH] gnu: Add darktable.
>>
>> * gnu/packages/photo.scm (darktable): New variable.
>
> LGTM, thank you!
>
> Ludo’.





Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 08 Mar 2017 18:00:03 GMT) Full text and rfc822 format available.

Message #14 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Roel Janssen <roel <at> gnu.org>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 8 Mar 2017 12:59:19 -0500
[Message part 1 (text/plain, inline)]
On Thu, Mar 02, 2017 at 01:04:33AM +0100, Roel Janssen wrote:
> Subject: [PATCH] gnu: Add darktable.
> 
> * gnu/packages/photo.scm (darktable): New variable.

Cool!

> ---
>  gnu/packages/photo.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 81 insertions(+)
> 
> diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
> index ce71d2a44..42da06080 100644
> --- a/gnu/packages/photo.scm
> +++ b/gnu/packages/photo.scm
> @@ -31,17 +31,23 @@
>    #:use-module (gnu packages base)
>    #:use-module (gnu packages boost)
>    #:use-module (gnu packages compression)
> +  #:use-module (gnu packages curl)
> +  #:use-module (gnu packages databases)
>    #:use-module (gnu packages ghostscript)
>    #:use-module (gnu packages gl)

It's missing the (gnu packages glib) module, for dbus-glib.

> +       ("fop" ,fop)

And I can't test it further, because this package is missing.

Also, the patch as sent doesn't apply correctly with `git am`. I
recommend attaching the patch if you are using the debbugs guix-patches.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 08 Mar 2017 19:02:02 GMT) Full text and rfc822 format available.

Message #17 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 08 Mar 2017 20:01:07 +0100
Leo Famulari writes:

> On Thu, Mar 02, 2017 at 01:04:33AM +0100, Roel Janssen wrote:
>> Subject: [PATCH] gnu: Add darktable.
>> 
>> * gnu/packages/photo.scm (darktable): New variable.
>
> Cool!
>
>> ---
>>  gnu/packages/photo.scm | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 81 insertions(+)
>> 
>> diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
>> index ce71d2a44..42da06080 100644
>> --- a/gnu/packages/photo.scm
>> +++ b/gnu/packages/photo.scm
>> @@ -31,17 +31,23 @@
>>    #:use-module (gnu packages base)
>>    #:use-module (gnu packages boost)
>>    #:use-module (gnu packages compression)
>> +  #:use-module (gnu packages curl)
>> +  #:use-module (gnu packages databases)
>>    #:use-module (gnu packages ghostscript)
>>    #:use-module (gnu packages gl)
>
> It's missing the (gnu packages glib) module, for dbus-glib.

Yes, the glib module is in another patch I which is a prerequisite for
Darktable.

>> +       ("fop" ,fop)
>
> And I can't test it further, because this package is missing.

I sent a separate patch for fop.

> Also, the patch as sent doesn't apply correctly with `git am`. I
> recommend attaching the patch if you are using the debbugs guix-patches.

Right.  I messed up the patch creation I guess.  I'll do better in the
future.

Kind regards,
Roel Janssen




Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Mon, 13 Mar 2017 22:25:02 GMT) Full text and rfc822 format available.

Message #20 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Roel Janssen <roel <at> gnu.org>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Mon, 13 Mar 2017 23:24:28 +0100
Hi Roel,

On Thu, 02 Mar 2017 01:04:33 +0100
Roel Janssen <roel <at> gnu.org> wrote:

> Dear Guix,
> 
> And finally, here is a patch for Darktable.
> Even though the upstream project strongly recommends x86_64, I do not
> know whether it actually does not work on other platforms.  If the
> builds fail on anything other than x86_64, we could limit it to this
> platform only.
> 
> Kind regards,
> Roel Janssen
> 
> >From 0c7e3fb1343594bae6e2922b1866468e1903c59d Mon Sep 17 00:00:00
> >2001  
> From: Roel Janssen <roel <at> gnu.org>
> Date: Thu, 2 Mar 2017 00:56:22 +0100
> Subject: [PATCH] gnu: Add darktable.
> 
> * gnu/packages/photo.scm (darktable): New variable.
> ---
>  gnu/packages/photo.scm | 81
> ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81
> insertions(+)
> 
> diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
> index ce71d2a44..42da06080 100644
> --- a/gnu/packages/photo.scm
> +++ b/gnu/packages/photo.scm
[..]

> +       ("fop" ,fop)

I couldn't build it yet, because it requires the new llvm, but I think
fop is only needed for documentation:

Arch doesn't have it as a dependency:
https://www.archlinux.org/packages/community/x86_64/darktable/

Here it is mentioned only as dependency for the manual:
https://redmine.darktable.org/projects/darktable/wiki/Building_darktable_22

Hope that makes it easier,

Björn




Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Tue, 14 Mar 2017 22:14:01 GMT) Full text and rfc822 format available.

Message #23 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Roel Janssen <roel <at> gnu.org>
Cc: 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Tue, 14 Mar 2017 23:13:26 +0100
On Mon, 13 Mar 2017 23:24:28 +0100
Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> wrote:

> Hi Roel,
> 
> On Thu, 02 Mar 2017 01:04:33 +0100
> Roel Janssen <roel <at> gnu.org> wrote:
> 
> > Dear Guix,
> > 
> > And finally, here is a patch for Darktable.
> > Even though the upstream project strongly recommends x86_64, I do
> > not know whether it actually does not work on other platforms.  If
> > the builds fail on anything other than x86_64, we could limit it to
> > this platform only.
> > 
> > Kind regards,
> > Roel Janssen
> >   
> > >From 0c7e3fb1343594bae6e2922b1866468e1903c59d Mon Sep 17 00:00:00
> > >2001    
> > From: Roel Janssen <roel <at> gnu.org>
> > Date: Thu, 2 Mar 2017 00:56:22 +0100
> > Subject: [PATCH] gnu: Add darktable.
> > 
> > * gnu/packages/photo.scm (darktable): New variable.
> > ---
> >  gnu/packages/photo.scm | 81
> > ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> > 81 insertions(+)
> > 
> > diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
> > index ce71d2a44..42da06080 100644
> > --- a/gnu/packages/photo.scm
> > +++ b/gnu/packages/photo.scm  
> [..]
> 
> > +       ("fop" ,fop)  
> 
> I couldn't build it yet, because it requires the new llvm, but I think
> fop is only needed for documentation:
> 
> Arch doesn't have it as a dependency:
> https://www.archlinux.org/packages/community/x86_64/darktable/
> 
> Here it is mentioned only as dependency for the manual:
> https://redmine.darktable.org/projects/darktable/wiki/Building_darktable_22
> 
> Hope that makes it easier,
> 
> Björn
> 
> 

I could build and run it and load two photos into it today, leaving out
the dependency of "fop".

Björn




Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Fri, 17 Mar 2017 07:57:02 GMT) Full text and rfc822 format available.

Message #26 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: John Darrington <john <at> darrington.wattle.id.au>
To: 25928 <at> debbugs.gnu.org
Subject: darktable
Date: Fri, 17 Mar 2017 08:56:33 +0100
[Message part 1 (text/plain, inline)]
I suggest that you replace "lighttable" in the package description
either with "light table" or  "light-table".

Other than that, it LGTM.

J'

-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Thu, 30 Mar 2017 12:49:01 GMT) Full text and rfc822 format available.

Message #29 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 25928 <at> debbugs.gnu.org, Roel Janssen <roel <at> gnu.org>
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Thu, 30 Mar 2017 15:19:35 +0200
Hi Björn,

> I could build and run it and load two photos into it today, leaving out
> the dependency of "fop".

thanks for testing!

Roel, could you push a version of this patch without the dependency on
“fop”?  You could add a FIXME comment if this means that some features
will be missing without it.

Thanks!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net





Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Thu, 30 Mar 2017 13:02:01 GMT) Full text and rfc822 format available.

Message #32 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Thu, 30 Mar 2017 15:00:46 +0200
Ricardo Wurmus writes:

> Hi Björn,
>
>> I could build and run it and load two photos into it today, leaving out
>> the dependency of "fop".
>
> thanks for testing!
>
> Roel, could you push a version of this patch without the dependency on
> “fop”?  You could add a FIXME comment if this means that some features
> will be missing without it.
>
> Thanks!

No.  First we need the LLVM and CLANG version upgrade.  I haven't found
the time to test that (yet).

Kind regards,
Roel Janssen




Added tag(s) moreinfo. Request was from Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de> to control <at> debbugs.gnu.org. (Thu, 13 Apr 2017 10:52:01 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 10 May 2017 14:09:01 GMT) Full text and rfc822 format available.

Message #37 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 10 May 2017 16:08:23 +0200
[0001-gnu-Add-darktable.patch (text/x-patch, attachment)]
[Message part 2 (text/plain, inline)]
Ricardo Wurmus writes:

> Hi Björn,
>
>> I could build and run it and load two photos into it today, leaving out
>> the dependency of "fop".
>
> thanks for testing!
>
> Roel, could you push a version of this patch without the dependency on
> “fop”?  You could add a FIXME comment if this means that some features
> will be missing without it.
>
> Thanks!

Now that LLVM and CLANG 3.9.1 are in master, darktable is good to go in
too.

Attached is a new patch without "fop" as dependency.  I also upgraded
darktable to the latest release (2.2.4).

I built and tested this version, and I cannot find any feature we're
missing by not including "fop".

Is this OK to push?

Kind regards,
Roel Janssen

Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 10 May 2017 14:41:01 GMT) Full text and rfc822 format available.

Message #40 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Roel Janssen <roel <at> gnu.org>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 10 May 2017 16:40:24 +0200
Roel Janssen <roel <at> gnu.org> writes:

> From 5053b44b621932d3c3aa0f1ddb8b01dd04cd4680 Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel <at> gnu.org>
> Date: Wed, 10 May 2017 16:06:38 +0200
> Subject: [PATCH] gnu: Add darktable.
>
> * gnu/packages/photo.scm (darktable): New variable.
> ---
[…]
> +    (arguments
> +     `(#:tests? #f ; There are no tests.
> +       #:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'set-ldflags
> +          (lambda* (#:key outputs #:allow-other-keys)
> +            (setenv "LDFLAGS"
> +                    (string-append
> +                     "-Wl,-rpath="
> +                     (assoc-ref outputs "out") "/lib/darktable"))
> +            #t))
> +         (add-after 'set-paths 'add-ilmbase-include-path
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             ;; OpenEXR propagates ilmbase, but its include files do not appear
> +             ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
> +             ;; the CPATH to satisfy the dependency on "ImathInt64.h".
> +             (setenv "CPATH"
> +                     (string-append
> +                      (assoc-ref inputs "ilmbase")
> +                      "/include/OpenEXR:" (or (getenv "CPATH") "")))
> +             #t)))))

I wonder if it would be possible to augment LDFLAGS and CPATH in
#:configure-flags or #:make-flags instead of using build phases (which I
find a bit crude).

If that’s too hard I promise I won’t complain about doing it with build
phases :)

> +    (native-inputs
> +     `(("llvm" ,llvm-3.9.1)
> +       ("clang" ,clang-3.9.1)))
> +    (inputs
> +     `(("libxslt" ,libxslt)
> +       ("libxml2" ,libxml2)
> +       ("pugixml" ,pugixml)
> +       ("gtk+" ,gtk+)
> +       ("sqlite" ,sqlite)
> +       ("libjpeg" ,libjpeg)
> +       ("libpng" ,libpng)
> +       ("cairo" ,cairo)
> +       ("lcms" ,lcms)
> +       ("exiv2" ,exiv2)
> +       ("libtiff" ,libtiff)
> +       ("curl" ,curl)
> +       ("libgphoto2" ,libgphoto2)
> +       ("dbus-glib" ,dbus-glib)
> +       ("openexr" ,openexr)
> +       ("ilmbase" ,ilmbase)
> +       ("libsoup" ,libsoup)
> +       ("python-jsonschema" ,python-jsonschema)
> +       ("intltool" ,intltool)
> +       ("perl" ,perl)
> +       ("pkg-config" ,pkg-config)
> +       ("libwebp" ,libwebp)
> +       ("lensfun" ,lensfun)
> +       ("librsvg" ,librsvg)
> +       ("json-glib" ,json-glib)
> +       ("freeimage" ,freeimage)))
> +    (home-page "https://www.darktable.org")
> +    (synopsis "Virtual lighttable and darkroom for photographers")
> +    (description "Darktable is an open source photography workflow
> application

s/an open source/a/

> +and RAW developer.  It manages your digital negatives in a database, lets you
> +view them through a zoomable lighttable and enables you to develop raw images
> +and enhance them.")
> +    (license license:gpl3+)))

Good to push with the change to the description.
Thanks!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net





Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 10 May 2017 15:29:02 GMT) Full text and rfc822 format available.

Message #43 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 10 May 2017 17:28:25 +0200
[0001-gnu-Add-darktable.patch (text/x-patch, attachment)]
[Message part 2 (text/plain, inline)]
Ricardo Wurmus writes:

> Roel Janssen <roel <at> gnu.org> writes:
>
>> From 5053b44b621932d3c3aa0f1ddb8b01dd04cd4680 Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel <at> gnu.org>
>> Date: Wed, 10 May 2017 16:06:38 +0200
>> Subject: [PATCH] gnu: Add darktable.
>>
>> * gnu/packages/photo.scm (darktable): New variable.
>> ---
> […]
>> +    (arguments
>> +     `(#:tests? #f ; There are no tests.
>> +       #:configure-flags '("-DCMAKE_INSTALL_LIBDIR=lib")
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-before 'configure 'set-ldflags
>> +          (lambda* (#:key outputs #:allow-other-keys)
>> +            (setenv "LDFLAGS"
>> +                    (string-append
>> +                     "-Wl,-rpath="
>> +                     (assoc-ref outputs "out") "/lib/darktable"))
>> +            #t))
>> +         (add-after 'set-paths 'add-ilmbase-include-path
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             ;; OpenEXR propagates ilmbase, but its include files do not appear
>> +             ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
>> +             ;; the CPATH to satisfy the dependency on "ImathInt64.h".
>> +             (setenv "CPATH"
>> +                     (string-append
>> +                      (assoc-ref inputs "ilmbase")
>> +                      "/include/OpenEXR:" (or (getenv "CPATH") "")))
>> +             #t)))))
>
> I wonder if it would be possible to augment LDFLAGS and CPATH in
> #:configure-flags or #:make-flags instead of using build phases (which I
> find a bit crude).
>
> If that’s too hard I promise I won’t complain about doing it with build
> phases :)

See attached patch.  By adding the LDFLAGS part to either #:make-flags
or #:configure-flags, the run-path validation phase fails at the end of
the build process.

So, maybe we can settle half-way here? :-)

>> +    (native-inputs
>> +     `(("llvm" ,llvm-3.9.1)
>> +       ("clang" ,clang-3.9.1)))
>> +    (inputs
>> +     `(("libxslt" ,libxslt)
>> +       ("libxml2" ,libxml2)
>> +       ("pugixml" ,pugixml)
>> +       ("gtk+" ,gtk+)
>> +       ("sqlite" ,sqlite)
>> +       ("libjpeg" ,libjpeg)
>> +       ("libpng" ,libpng)
>> +       ("cairo" ,cairo)
>> +       ("lcms" ,lcms)
>> +       ("exiv2" ,exiv2)
>> +       ("libtiff" ,libtiff)
>> +       ("curl" ,curl)
>> +       ("libgphoto2" ,libgphoto2)
>> +       ("dbus-glib" ,dbus-glib)
>> +       ("openexr" ,openexr)
>> +       ("ilmbase" ,ilmbase)
>> +       ("libsoup" ,libsoup)
>> +       ("python-jsonschema" ,python-jsonschema)
>> +       ("intltool" ,intltool)
>> +       ("perl" ,perl)
>> +       ("pkg-config" ,pkg-config)
>> +       ("libwebp" ,libwebp)
>> +       ("lensfun" ,lensfun)
>> +       ("librsvg" ,librsvg)
>> +       ("json-glib" ,json-glib)
>> +       ("freeimage" ,freeimage)))
>> +    (home-page "https://www.darktable.org")
>> +    (synopsis "Virtual lighttable and darkroom for photographers")
>> +    (description "Darktable is an open source photography workflow
>> application
>
> s/an open source/a/

Oops.  Adjusted in the new patch.

>> +and RAW developer.  It manages your digital negatives in a database, lets you
>> +view them through a zoomable lighttable and enables you to develop raw images
>> +and enhance them.")
>> +    (license license:gpl3+)))
>
> Good to push with the change to the description.
> Thanks!

Is this then finally the moment we get to have darktable in Guix? :-)

Kind regards,
Roel Janssen

Information forwarded to guix-patches <at> gnu.org:
bug#25928; Package guix-patches. (Wed, 10 May 2017 16:07:02 GMT) Full text and rfc822 format available.

Message #46 received at 25928 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Roel Janssen <roel <at> gnu.org>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928 <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 10 May 2017 18:06:32 +0200
Roel Janssen <roel <at> gnu.org> writes:

> > I wonder if it would be possible to augment LDFLAGS and CPATH in
> > #:configure-flags or #:make-flags instead of using build phases (which I
> > find a bit crude).
> >
> > If that’s too hard I promise I won’t complain about doing it with build
> > phases :)

> See attached patch.  By adding the LDFLAGS part to either #:make-flags
> or #:configure-flags, the run-path validation phase fails at the end of
> the build process.

> So, maybe we can settle half-way here? :-)

Sure, looks good to me!

> > Good to push with the change to the description.
> > Thanks!

> Is this then finally the moment we get to have darktable in Guix? :-)

Yay!  Thank you!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net





Reply sent to Roel Janssen <roel <at> gnu.org>:
You have taken responsibility. (Wed, 10 May 2017 17:52:01 GMT) Full text and rfc822 format available.

Notification sent to Roel Janssen <roel <at> gnu.org>:
bug acknowledged by developer. (Wed, 10 May 2017 17:52:02 GMT) Full text and rfc822 format available.

Message #51 received at 25928-done <at> debbugs.gnu.org (full text, mbox):

From: Roel Janssen <roel <at> gnu.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 25928-done <at> debbugs.gnu.org
Subject: Re: bug#25928: [PATCH] gnu: Add darktable.
Date: Wed, 10 May 2017 19:51:42 +0200
Ricardo Wurmus writes:

> Roel Janssen <roel <at> gnu.org> writes:
>
>> > I wonder if it would be possible to augment LDFLAGS and CPATH in
>> > #:configure-flags or #:make-flags instead of using build phases (which I
>> > find a bit crude).
>> >
>> > If that’s too hard I promise I won’t complain about doing it with build
>> > phases :)
>
>> See attached patch.  By adding the LDFLAGS part to either #:make-flags
>> or #:configure-flags, the run-path validation phase fails at the end of
>> the build process.
>
>> So, maybe we can settle half-way here? :-)
>
> Sure, looks good to me!
>
>> > Good to push with the change to the description.
>> > Thanks!
>
>> Is this then finally the moment we get to have darktable in Guix? :-)
>
> Yay!  Thank you!

Pushed in 91a9c65c7bae73d999ccc2288833e909ce4a0871.

Thanks!

Kind regards,
Roel Janssen




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 08 Jun 2017 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 6 years and 295 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.