[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Alex Devaure]

---
 gnu/packages/photo.scm | 76 +++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index e6f26c3b72..a229897f08 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -460,7 +460,7 @@ (define-public lensfun
 (define-public darktable
   (package
     (name "darktable")
-    (version "3.6.1")
+    (version "3.8.0")
     (source
      (origin
        (method url-fetch)
@@ -468,7 +468,7 @@ (define-public darktable
              "https://github.com/darktable-org/darktable/releases/"
              "download/release-" version "/darktable-" version ".tar.xz"))
        (sha256
-        (base32 "051dwhdqa9q3zyrvr78g0cfzl1zhaagfvgx9axa9895q0g0wggx2"))))
+        (base32 "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On"
@@ -521,42 +521,42 @@ (define-public darktable
        ("python" ,python-wrapper)
        ("ruby" ,ruby)))
     (inputs
-     `(("cairo" ,cairo)
-       ("colord-gtk" ,colord-gtk) ;optional, for color profile support
-       ("cups" ,cups) ;optional, for printing support
-       ("curl" ,curl)
-       ("dbus-glib" ,dbus-glib)
-       ("exiv2" ,exiv2)
-       ("freeimage" ,freeimage)
-       ("gmic" ,gmic) ;optional, for HaldcLUT support
-       ("graphicsmagick" ,graphicsmagick)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("gtk+" ,gtk+)
-       ("imath" ,imath)
-       ("iso-codes" ,iso-codes) ;optional, for language names in the preferences
-       ("json-glib" ,json-glib)
-       ("lcms" ,lcms)
-       ("lensfun" ,lensfun) ;optional, for the lens distortion plugin
-       ("libgphoto2" ,libgphoto2) ;optional, for camera tethering
-       ("libavif" ,libavif) ;optional, for AVIF support
-       ("libjpeg" ,libjpeg-turbo)
-       ("libomp" ,libomp)
-       ("libpng" ,libpng)
-       ("librsvg" ,librsvg)
-       ("libsecret" ,libsecret) ;optional, for storing passwords
-       ("libsoup" ,libsoup-minimal-2)
-       ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp) ;optional, for WebP support
-       ("libxml2" ,libxml2)
-       ("libxslt" ,libxslt)
-       ("lua" ,lua) ;optional, for plugins
-       ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support
-       ("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)
-       ("python-jsonschema" ,python-jsonschema)
-       ("sqlite" ,sqlite)))
+     (list cairo
+           colord-gtk ;optional, for color profile support
+           cups ;optional, for printing support
+           curl
+           dbus-glib
+           exiv2
+           freeimage
+           gmic ;optional, for HaldcLUT support
+           graphicsmagick
+           gsettings-desktop-schemas
+           gtk+
+           imath
+           iso-codes ;optional, for language names in the preferences
+           json-glib
+           lcms
+           lensfun ;optional, for the lens distortion plugin
+           libgphoto2 ;optional, for camera tethering
+           libavif ;optional, for AVIF support
+           libjpeg-turbo
+           libomp
+           libpng
+           librsvg
+           libsecret ;optional, for storing passwords
+           libsoup-minimal-2
+           libtiff
+           libwebp ;optional, for WebP support
+           libxml2
+           libxslt
+           lua ;optional, for plugins
+           opencl-icd-loader ;optional, for OpenCL support
+           openexr ;optional, for EXR import/export
+           openjpeg ;optional, for JPEG2000 export
+           osm-gps-map ;optional, for geotagging view
+           pugixml
+           python-jsonschema
+           sqlite))
     (home-page "https://www.darktable.org")
     (synopsis "Virtual lighttable and darkroom for photographers")
     (description "Darktable is a photography workflow application and RAW
-- 
2.34.0

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[John Kehayias via Guix-patches via]

Hello,

Thanks for the update to darktable. However, I noticed in the release notes that darktable now requires Lua 5.4 (we only have 5.3.5). When I tried my own update locally I could see that Lua support, needed for plugins, was disabled at configure due to the missing Lua 5.4 version.

Release notes: https://www.darktable.org/2021/12/darktable-3.8.0-released/

I think it would be best to have the newer Lua version so we don't lose plugin support. Is there a patch for Lua 5.4 for Guix (my quick search didn't fine one)?

John

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Ludovic Courtès]

Hi John and Alex,

John Kehayias <john.kehayias@protonmail.com> skribis:

> Thanks for the update to darktable. However, I noticed in the release notes that darktable now requires Lua 5.4 (we only have 5.3.5). When I tried my own update locally I could see that Lua support, needed for plugins, was disabled at configure due to the missing Lua 5.4 version.
>
> Release notes: https://www.darktable.org/2021/12/darktable-3.8.0-released/
>
> I think it would be best to have the newer Lua version so we don't lose plugin support. Is there a patch for Lua 5.4 for Guix (my quick search didn't fine one)?

Indeed.  I don’t see Lua 5.4 in the patch queue at issues.guix.gnu.org.
Does one of you want to give it a try?

Thanks,
Ludo’.

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[John Kehayias via Guix-patches via]

Hello,

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Saturday, January 8th, 2022 at 4:59 PM, Ludovic Courtès <ludo@gnu.org> wrote:

> Hi John and Alex,
>
> John Kehayias john.kehayias@protonmail.com skribis:
>
> > Thanks for the update to darktable. However, I noticed in the release notes that darktable now requires Lua 5.4 (we only have 5.3.5). When I tried my own update locally I could see that Lua support, needed for plugins, was disabled at configure due to the missing Lua 5.4 version.
> >
> > Release notes: https://www.darktable.org/2021/12/darktable-3.8.0-released/
> >
> > I think it would be best to have the newer Lua version so we don't lose plugin support. Is there a patch for Lua 5.4 for Guix (my quick search didn't fine one)?
>
> Indeed. I don’t see Lua 5.4 in the patch queue at issues.guix.gnu.org.
> Does one of you want to give it a try?
>
I just tried a guix build lua --with-latest=lua and it built version 5.4.3 without any issue (even with the patches it has). I don't know anything to test with Lua, but in a guix shell it reported the correct version and the interpreter ran (I looked up a simple print statement which did work).

If there's nothing in particular I should look for, I can submit a quick patch for this. Should the package be lua-5.4 or maybe lua-next? And should the current lua now inherit from this latest version?

I'm assuming for the lua system to be updated would need a staging or core-updates cycle, with guix refresh lua -l reporting "408 packages would ensure 782 dependent packages are rebuilt". So we wouldn't want to replace "lua" with 5.4.3 yet.

John

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Alex Devaure]

Hi John and Ludovic,

John Kehayias <john.kehayias@protonmail.com> writes:

> Hello,
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On Saturday, January 8th, 2022 at 4:59 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>
>> Hi John and Alex,
>>
>> John Kehayias john.kehayias@protonmail.com skribis:
>>
>> > Thanks for the update to darktable. However, I noticed in the
>> > release notes that darktable now requires Lua 5.4 (we only have
>> > 5.3.5). When I tried my own update locally I could see that Lua
>> > support, needed for plugins, was disabled at configure due to the
>> > missing Lua 5.4 version.
>> >
>> > Release notes: https://www.darktable.org/2021/12/darktable-3.8.0-released/
>> >
>> > I think it would be best to have the newer Lua version so we don't lose plugin support. Is there a patch for Lua 5.4 for Guix (my quick search didn't fine one)?
>>
>> Indeed. I don’t see Lua 5.4 in the patch queue at issues.guix.gnu.org.
>> Does one of you want to give it a try?
>>
> I just tried a guix build lua --with-latest=lua and it built version
> 5.4.3 without any issue (even with the patches it has). I don't know
> anything to test with Lua, but in a guix shell it reported the correct
> version and the interpreter ran (I looked up a simple print statement
> which did work).
>
> If there's nothing in particular I should look for, I can submit a quick patch for this. Should the package be lua-5.4 or maybe lua-next? And should the current lua now inherit from this latest version?
>
> I'm assuming for the lua system to be updated would need a staging or
> core-updates cycle, with guix refresh lua -l reporting "408 packages
> would ensure 782 dependent packages are rebuilt". So we wouldn't want
> to replace "lua" with 5.4.3 yet.
>
> John

I managed to build darktable with the last lua version (4.5.3) but I
needed to update the patched for that version.
During that process, I came to the same question than John's: what is
the best and least disturbing way to add lua 4.5.3?

Kind regards,
Alex

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[John Kehayias via Guix-patches via]

Hi Alex and Ludo’,

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Sunday, January 9th, 2022 at 6:56 AM, Alex Devaure wrote:

> I managed to build darktable with the last lua version (4.5.3) but I
> needed to update the patched for that version.
> During that process, I came to the same question than John's: what is
> the best and least disturbing way to add lua 4.5.3?
>

Glad to hear darktable builds with the newer version of Lua.

However, I realized belatedly that the --with-latest transformation will not inherit the patches of the original package. And, as I would have expected, those patches don't apply cleanly to the new 5.4.3 source. I haven't had a chance to investigate, and likely won't be able to for a bit (still catching up on other patches I have).

As for how to introduce the new version, my guess (now that the patches needed to be updated) would be to have a lua-5.4 (or called lua-next) package. If it is just the patches that need to be updated, lua (the 5.3 version) could inherit from lua-5.4 adjusting the source field for that version and using the original patches. Assuming this doesn't cause rebuilds of the lua packages, that is. If more changes are needed, then lua-5.4 would just stand separate from the lua <= 5.3 version set.

John

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Alex Devaure]

Hi John and Ludo,

John Kehayias <john.kehayias@protonmail.com> writes:

> Hi Alex and Ludo’,
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On Sunday, January 9th, 2022 at 6:56 AM, Alex Devaure wrote:
>
>> I managed to build darktable with the last lua version (4.5.3) but I
>> needed to update the patched for that version.
>> During that process, I came to the same question than John's: what is
>> the best and least disturbing way to add lua 4.5.3?
>>
>
> Glad to hear darktable builds with the newer version of Lua.
>
> However, I realized belatedly that the --with-latest transformation
> will not inherit the patches of the original package. And, as I would
> have expected, those patches don't apply cleanly to the new 5.4.3
> source. I haven't had a chance to investigate, and likely won't be
> able to for a bit (still catching up on other patches I have).
>
I modified lua.scm to integrate the version 4.5.3, creating new patches
as the current ones didn't work for that version.

> As for how to introduce the new version, my guess (now that the
> patches needed to be updated) would be to have a lua-5.4 (or called
> lua-next) package. If it is just the patches that need to be updated,
> lua (the 5.3 version) could inherit from lua-5.4 adjusting the source
> field for that version and using the original patches. Assuming this
> doesn't cause rebuilds of the lua packages, that is. If more changes
> are needed, then lua-5.4 would just stand separate from the lua <= 5.3
> version set.
I should be able to send a patch with a new package names lua-5.4
tomorrow (UK time).

>
> John

Best regards,
Alex

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Alex Devaure]

Hi John and Ludo,
I just submitted a patch to add the new version of lua.
Kind regards,
Alex

Alex Devaure <ajadevaure@gmail.com> writes:

> Hi John and Ludo,
>
> John Kehayias <john.kehayias@protonmail.com> writes:
>
>> Hi Alex and Ludo’,
>>
>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>>
>> On Sunday, January 9th, 2022 at 6:56 AM, Alex Devaure wrote:
>>
>>> I managed to build darktable with the last lua version (4.5.3) but I
>>> needed to update the patched for that version.
>>> During that process, I came to the same question than John's: what is
>>> the best and least disturbing way to add lua 4.5.3?
>>>
>>
>> Glad to hear darktable builds with the newer version of Lua.
>>
>> However, I realized belatedly that the --with-latest transformation
>> will not inherit the patches of the original package. And, as I would
>> have expected, those patches don't apply cleanly to the new 5.4.3
>> source. I haven't had a chance to investigate, and likely won't be
>> able to for a bit (still catching up on other patches I have).
>>
> I modified lua.scm to integrate the version 4.5.3, creating new patches
> as the current ones didn't work for that version.
>
>> As for how to introduce the new version, my guess (now that the
>> patches needed to be updated) would be to have a lua-5.4 (or called
>> lua-next) package. If it is just the patches that need to be updated,
>> lua (the 5.3 version) could inherit from lua-5.4 adjusting the source
>> field for that version and using the original patches. Assuming this
>> doesn't cause rebuilds of the lua packages, that is. If more changes
>> are needed, then lua-5.4 would just stand separate from the lua <= 5.3
>> version set.
> I should be able to send a patch with a new package names lua-5.4
> tomorrow (UK time).
>
>>
>> John
>
> Best regards,
> Alex

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Ludovic Courtès]

Hi,

Alex Devaure <ajadevaure@gmail.com> skribis:

> I just submitted a patch to add the new version of lua.

Nice.  Now that the newer Lua is committed, could you update the
Darktable patch accordingly?  And then I think we’ll be done.

Thanks in advance,
Ludo’.

[bug#52956] [PATCH] gnu: darktable: update to 3.8.0

[Alex Devaure]

[-- Attachment #1: Type: text/plain, Size: 88 bytes --]

Hi Ludo,
I attached the updated patch for darktable using lua 5.4.3.
Kind regards,
Alex

[-- Attachment #2: Type: text/plain, Size: 3977 bytes --]

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 913e1070f7..14da5cf5fb 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -457,7 +457,7 @@ (define-public lensfun
 (define-public darktable
   (package
     (name "darktable")
-    (version "3.6.1")
+    (version "3.8.0")
     (source
      (origin
        (method url-fetch)
@@ -465,7 +465,7 @@ (define-public darktable
              "https://github.com/darktable-org/darktable/releases/"
              "download/release-" version "/darktable-" version ".tar.xz"))
        (sha256
-        (base32 "051dwhdqa9q3zyrvr78g0cfzl1zhaagfvgx9axa9895q0g0wggx2"))))
+        (base32 "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On"
@@ -518,42 +518,42 @@ (define-public darktable
        ("python" ,python-wrapper)
        ("ruby" ,ruby)))
     (inputs
-     `(("cairo" ,cairo)
-       ("colord-gtk" ,colord-gtk) ;optional, for color profile support
-       ("cups" ,cups) ;optional, for printing support
-       ("curl" ,curl)
-       ("dbus-glib" ,dbus-glib)
-       ("exiv2" ,exiv2)
-       ("freeimage" ,freeimage)
-       ("gmic" ,gmic) ;optional, for HaldcLUT support
-       ("graphicsmagick" ,graphicsmagick)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("gtk+" ,gtk+)
-       ("imath" ,imath)
-       ("iso-codes" ,iso-codes) ;optional, for language names in the preferences
-       ("json-glib" ,json-glib)
-       ("lcms" ,lcms)
-       ("lensfun" ,lensfun) ;optional, for the lens distortion plugin
-       ("libgphoto2" ,libgphoto2) ;optional, for camera tethering
-       ("libavif" ,libavif) ;optional, for AVIF support
-       ("libjpeg" ,libjpeg-turbo)
-       ("libomp" ,libomp)
-       ("libpng" ,libpng)
-       ("librsvg" ,librsvg)
-       ("libsecret" ,libsecret) ;optional, for storing passwords
-       ("libsoup" ,libsoup-minimal-2)
-       ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp) ;optional, for WebP support
-       ("libxml2" ,libxml2)
-       ("libxslt" ,libxslt)
-       ("lua" ,lua) ;optional, for plugins
-       ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support
-       ("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)
-       ("python-jsonschema" ,python-jsonschema)
-       ("sqlite" ,sqlite)))
+     (list cairo
+           colord-gtk ;optional, for color profile support
+           cups ;optional, for printing support
+           curl
+           dbus-glib
+           exiv2
+           freeimage
+           gmic ;optional, for HaldcLUT support
+           graphicsmagick
+           gsettings-desktop-schemas
+           gtk+
+           imath
+           iso-codes ;optional, for language names in the preferences
+           json-glib
+           lcms
+           lensfun ;optional, for the lens distortion plugin
+           libgphoto2 ;optional, for camera tethering
+           libavif ;optional, for AVIF support
+           libjpeg-turbo
+           libomp
+           libpng
+           librsvg
+           libsecret ;optional, for storing passwords
+           libsoup-minimal-2
+           libtiff
+           libwebp ;optional, for WebP support
+           libxml2
+           libxslt
+           lua-5.4 ;optional, for plugins
+           opencl-icd-loader ;optional, for OpenCL support
+           openexr ;optional, for EXR import/export
+           openjpeg ;optional, for JPEG2000 export
+           osm-gps-map ;optional, for geotagging view
+           pugixml
+           python-jsonschema
+           sqlite))
     (home-page "https://www.darktable.org")
     (synopsis "Virtual lighttable and darkroom for photographers")
     (description "Darktable is a photography workflow application and RAW

[-- Attachment #3: Type: text/plain, Size: 343 bytes --]


Ludovic Courtès <ludo@gnu.org> writes:

> Hi,
>
> Alex Devaure <ajadevaure@gmail.com> skribis:
>
>> I just submitted a patch to add the new version of lua.
>
> Nice.  Now that the newer Lua is committed, could you update the
> Darktable patch accordingly?  And then I think we’ll be done.
>
> Thanks in advance,
> Ludo’.

bug#52956: [PATCH] gnu: darktable: update to 3.8.0

[Ludovic Courtès]

Hi,

Alex Devaure <ajadevaure@gmail.com> skribis:

> Hi Ludo,
> I attached the updated patch for darktable using lua 5.4.3.
> Kind regards,
> Alex
>
> diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
> index 913e1070f7..14da5cf5fb 100644
> --- a/gnu/packages/photo.scm
> +++ b/gnu/packages/photo.scm
> @@ -457,7 +457,7 @@ (define-public lensfun
>  (define-public darktable
>    (package
>      (name "darktable")
> -    (version "3.6.1")
> +    (version "3.8.0")

Applied with a commit log.  Thanks!

Ludo’.