pkg/55911: Update of darktable to version 3.4

[Thilo Manske <t.manske%gmx.net@localhost>]

>Number:         55911
>Category:       pkg
>Synopsis:       Update of darktable to version 3.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 05 11:30:01 +0000 2021
>Originator:     T Manske
>Release:        NetBSD 9.99.77
>Organization:
	<organization of PR author (multiple lines)>
>Environment:
System: NetBSD Fuzzy 9.99.77 NetBSD 9.99.77 (Fuzzy) #199: Sun Jan 3 12:32:=
18
Architecture: x86_64
Machine: amd64
>Description:
darktable 3.4.0 was released this christmas

I also added some pkgoptions and reenabled building with the map tab.

>How-To-Repeat:

>Fix:

This is patch against pkgsrc-current as of today.
I hope this doesn't get garbled as I have to send this pr
via mutt. Not that geography/osm-gps-map is missing a buildlink3.mk
which is also included here

diff -Naur darktable/Makefile darktable-3.4.0/Makefile
=2D-- darktable/Makefile	2020-12-15 08:43:53.474623150 +0100
+++ darktable-3.4.0/Makefile	2021-01-05 12:10:35.067006514 +0100
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.118 2020/12/04 04:55:56 riastradh Exp $

-DISTNAME=3D	darktable-3.0.0
-PKGREVISION=3D	12
+DISTNAME=3D	darktable-3.4.0
 CATEGORIES=3D	graphics
 MASTER_SITES=3D	${MASTER_SITE_GITHUB:=3Ddarktable-org/}
 GITHUB_PROJECT=3D	darktable
@@ -63,20 +62,21 @@
 pre-configure:
 	${MKDIR} ${WRKDIR}/pkgsrc_build

-BUILDLINK_API_DEPENDS.sqlite3+=3D	sqlite3>=3D3.7.14.1nb1
+.include "options.mk"

+BUILDLINK_API_DEPENDS.sqlite3+=3D	sqlite3>=3D3.7.14.1nb1
 .include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.GConf+=3D	GConf>=3D3.2.3
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .if ${OPSYS} !=3D "SunOS"
 .include "../../devel/libinotify/buildlink3.mk"
 .endif
-.include "../../devel/libgphoto2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.zlib+=3D	zlib>=3D1.2.11
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gegl+=3D	gegl>=3D0.4.22
 .include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
@@ -89,11 +89,8 @@
 BUILDLINK_DEPMETHOD.clang=3D	build
 .include "../../lang/clang/buildlink3.mk"
 .include "../../lang/lua53/buildlink3.mk"
-.include "../../net/flickcurl/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../parallel/openmp/buildlink3.mk"
-.include "../../print/cups-base/buildlink3.mk"
-.include "../../security/libsecret/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/pugixml/buildlink3.mk"
diff -Naur darktable/PLIST darktable-3.4.0/PLIST
=2D-- darktable/PLIST	2020-01-30 07:22:57.410004412 +0100
+++ darktable-3.4.0/PLIST	2021-01-05 12:10:57.732040105 +0100
@@ -15,12 +15,11 @@
 lib/darktable/plugins/imageio/format/libpng.so
 lib/darktable/plugins/imageio/format/libppm.so
 lib/darktable/plugins/imageio/format/libtiff.so
+${PLIST.webp}lib/darktable/plugins/imageio/format/libwebp.so
+lib/darktable/plugins/imageio/format/libxcf.so
 lib/darktable/plugins/imageio/storage/libdisk.so
 lib/darktable/plugins/imageio/storage/libemail.so
-lib/darktable/plugins/imageio/storage/libfacebook.so
-lib/darktable/plugins/imageio/storage/libflickr.so
 lib/darktable/plugins/imageio/storage/libgallery.so
-lib/darktable/plugins/imageio/storage/libgooglephoto.so
 lib/darktable/plugins/imageio/storage/liblatex.so
 lib/darktable/plugins/imageio/storage/libpiwigo.so
 lib/darktable/plugins/libashift.so
@@ -33,6 +32,7 @@
 lib/darktable/plugins/libborders.so
 lib/darktable/plugins/libcacorrect.so
 lib/darktable/plugins/libchannelmixer.so
+lib/darktable/plugins/libchannelmixerrgb.so
 lib/darktable/plugins/libclahe.so
 lib/darktable/plugins/libclipping.so
 lib/darktable/plugins/libcolisa.so
@@ -74,6 +74,7 @@
 lib/darktable/plugins/liblut3d.so
 lib/darktable/plugins/libmask_manager.so
 lib/darktable/plugins/libmonochrome.so
+lib/darktable/plugins/libnegadoctor.so
 lib/darktable/plugins/libnlmeans.so
 lib/darktable/plugins/liboverexposed.so
 lib/darktable/plugins/libprofile_gamma.so
@@ -101,7 +102,7 @@
 lib/darktable/plugins/libwatermark.so
 lib/darktable/plugins/libzonesystem.so
 lib/darktable/plugins/lighttable/libbackgroundjobs.so
-lib/darktable/plugins/lighttable/libcamera.so
+${PLIST.camera}lib/darktable/plugins/lighttable/libcamera.so
 lib/darktable/plugins/lighttable/libcollect.so
 lib/darktable/plugins/lighttable/libcolorlabels.so
 lib/darktable/plugins/lighttable/libcolorpicker.so
@@ -119,16 +120,19 @@
 lib/darktable/plugins/lighttable/libimage.so
 lib/darktable/plugins/lighttable/libimage_infos.so
 lib/darktable/plugins/lighttable/libimport.so
+lib/darktable/plugins/lighttable/libioporder.so
 lib/darktable/plugins/lighttable/liblighttable_mode.so
-lib/darktable/plugins/lighttable/liblive_view.so
+${PLIST.camera}lib/darktable/plugins/lighttable/liblive_view.so
+${PLIST.map}lib/darktable/plugins/lighttable/liblocation.so
+${PLIST.map}lib/darktable/plugins/lighttable/libmap_locations.so
+${PLIST.map}lib/darktable/plugins/lighttable/libmap_settings.so
 lib/darktable/plugins/lighttable/libmasks.so
 lib/darktable/plugins/lighttable/libmetadata.so
 lib/darktable/plugins/lighttable/libmetadata_view.so
 lib/darktable/plugins/lighttable/libmodule_toolbox.so
 lib/darktable/plugins/lighttable/libmodulegroups.so
-lib/darktable/plugins/lighttable/libmodulelist.so
 lib/darktable/plugins/lighttable/libnavigation.so
-lib/darktable/plugins/lighttable/libprint_settings.so
+${PLIST.print}lib/darktable/plugins/lighttable/libprint_settings.so
 lib/darktable/plugins/lighttable/libratings.so
 lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
@@ -142,9 +146,10 @@
 lib/darktable/views/libdarkroom.so
 lib/darktable/views/libknight.so
 lib/darktable/views/liblighttable.so
-lib/darktable/views/libprint.so
+${PLIST.map}lib/darktable/views/libmap.so
+${PLIST.print}lib/darktable/views/libprint.so
 lib/darktable/views/libslideshow.so
-lib/darktable/views/libtethering.so
+${PLIST.camera}lib/darktable/views/libtethering.so
 share/appdata/darktable.appdata.xml
 share/applications/darktable.desktop
 share/darktable/darktable.bash
@@ -155,6 +160,7 @@
 share/darktable/luarc
 share/darktable/noiseprofiles.json
 share/darktable/pixmaps/dt_logo_128x128.png
+share/darktable/pixmaps/dt_text.svg
 share/darktable/pixmaps/idbutton-1.png
 share/darktable/pixmaps/idbutton-1.svg
 share/darktable/pixmaps/idbutton-2.png
@@ -308,6 +314,7 @@
 share/darktable/themes/darktable-icons.css
 share/darktable/themes/darktable.css
 share/darktable/tools/common.sh
+share/darktable/tools/extract_wb_from_images.sh
 share/darktable/tools/purge_from_cache.sh
 share/darktable/tools/purge_non_existing_images.sh
 share/darktable/tools/purge_unused_tags.sh
@@ -326,18 +333,17 @@
 share/icons/hicolor/scalable/apps/darktable-2.svg
 share/icons/hicolor/scalable/apps/darktable-3.svg
 share/icons/hicolor/scalable/apps/darktable.svg
-share/locale/ca/LC_MESSAGES/darktable.mo
+share/locale/af/LC_MESSAGES/darktable.mo
 share/locale/cs/LC_MESSAGES/darktable.mo
-share/locale/da/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
 share/locale/es/LC_MESSAGES/darktable.mo
+share/locale/fi/LC_MESSAGES/darktable.mo
 share/locale/fr/LC_MESSAGES/darktable.mo
 share/locale/he/LC_MESSAGES/darktable.mo
 share/locale/hu/LC_MESSAGES/darktable.mo
 share/locale/it/LC_MESSAGES/darktable.mo
-share/locale/ja/LC_MESSAGES/darktable.mo
-share/locale/nb/LC_MESSAGES/darktable.mo
-share/locale/nl/LC_MESSAGES/darktable.mo
 share/locale/pl/LC_MESSAGES/darktable.mo
+share/locale/pt_BR/LC_MESSAGES/darktable.mo
 share/locale/ru/LC_MESSAGES/darktable.mo
+share/locale/sk/LC_MESSAGES/darktable.mo
 share/locale/sl/LC_MESSAGES/darktable.mo
diff -Naur darktable/distinfo darktable-3.4.0/distinfo
=2D-- darktable/distinfo	2020-01-30 07:22:57.416564813 +0100
+++ darktable-3.4.0/distinfo	2020-12-27 12:50:58.990971597 +0100
@@ -1,11 +1,13 @@
 $NetBSD: distinfo,v 1.32 2020/01/05 02:30:08 ryoon Exp $

-SHA1 (darktable-3.0.0.tar.xz) =3D 468ea6cbc313ec899b448f5c9c8ce4144d5f35c=
7
-RMD160 (darktable-3.0.0.tar.xz) =3D b7d1c358250a950548a01d2de9bee9f551cf5=
dee
-SHA512 (darktable-3.0.0.tar.xz) =3D de154cc19281f61316363243db3e531be33ac=
4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196=
807c876b421faafc6
-Size (darktable-3.0.0.tar.xz) =3D 3827412 bytes
-SHA1 (patch-CMakeLists.txt) =3D 2b2c6c0733af56e61e5be598a59644b40e8f26a6
+SHA1 (darktable-3.4.0.tar.xz) =3D 07d2df983a763f61647426c33f7f4b3994e06bb=
b
+RMD160 (darktable-3.4.0.tar.xz) =3D 888291d418b5e7702fa16445065c277a1a5e5=
cfb
+SHA512 (darktable-3.4.0.tar.xz) =3D b0a1e58f9af4007b22bacd7c61c75bdd036db=
9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc0=
35bb37939804c749f
+Size (darktable-3.4.0.tar.xz) =3D 4444452 bytes
+SHA1 (patch-CMakeLists.txt) =3D cbce38b0c6924971e9d34eca991a95fc9c37c543
 SHA1 (patch-cmake_compiler-warnings.cmake) =3D b65fbb5222cca791088137e823=
402df6b9423121
 SHA1 (patch-src_CMakeLists.txt) =3D 4535599cf1d0f6aae1909bd4dc09281311e23=
e0c
 SHA1 (patch-src_common_system__signal__handling.c) =3D 296f5618c618a9b16a=
f2ca5a1d9ff408c437c220
+SHA1 (patch-src_develop_masks_circle.c) =3D 3e9fdb3eafd2d61f274c814626275=
08dd8e65475
+SHA1 (patch-src_develop_masks_ellipse.c) =3D a0f6afa3db1e5100c8096cf820e0=
17f81c65ff04
 SHA1 (patch-tools_noise_benchmark.sh) =3D 1e26ebbbc73e44ec41c092297d681f3=
3fb55155d
diff -Naur darktable/options.mk darktable-3.4.0/options.mk
=2D-- darktable/options.mk	1970-01-01 01:00:00.000000000 +0100
+++ darktable-3.4.0/options.mk	2021-01-05 10:24:27.093395242 +0100
@@ -0,0 +1,64 @@
+
+PKG_OPTIONS_VAR=3D	PKG_OPTIONS.darktable
+PKG_SUPPORTED_OPTIONS=3D	camera graphicsmagick map print webp
+# these options are not tested
+# PKG_SUPPORTED_OPTIONS+=3D	kwallet libsecret
+
+PKG_SUGGESTED_OPTIONS=3D	graphicsmagick map webp
+
+PLIST_VARS=3D	camera print graphicsmagick webp map
+PLIST_VARS+=3D kwallet libsecret
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcamera)
+.include "../../devel/libgphoto2/buildlink3.mk"
+PLIST.camera=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_CAMERA_SUPPORT=3DOFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mgraphicsmagick)
+.include "../../graphics/GraphicsMagick/buildlink3.mk"
+PLIST.graphicsmagick=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_GRAPHICSMAGICK=3DOFF
+.endif
+
+. if !empty(PKG_OPTIONS:Mmap)
+.include "../../geography/osm-gps-map/buildlink3.mk"
+PLIST.map=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_MAP=3DOFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mprint)
+.include "../../print/cups-base/buildlink3.mk"
+PLIST.print=3D	yes
+.else
+CMAKE_ARGS+=3D	-DBUILD_PRINT=3DOFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mwebp)
+.include "../../graphics/libwebp/buildlink3.mk"
+PLIST.webp=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_WEBP=3DOFF
+.endif
+
+# untested - TODO PLIST
+.if !empty(PKG_OPTIONS:Mkwallet)
+.include "../../security/kwallet/buildlink3.mk"
+PLIST.kwallet=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_KWALLET=3DOFF
+.endif
+
+# untested - TODO PLIST
+.if !empty(PKG_OPTIONS:Mlibsecret)
+.include "../../security/libsecret/buildlink3.mk"
+PLIST.libsecret=3D	yes
+.else
+CMAKE_ARGS+=3D	-DUSE_LIBSECRET=3DOFF
+.endif
+
diff -Naur darktable/patches/patch-CMakeLists.txt darktable-3.4.0/patches/=
patch-CMakeLists.txt
=2D-- darktable/patches/patch-CMakeLists.txt	2019-03-05 12:19:24.000000000=
 +0100
+++ darktable-3.4.0/patches/patch-CMakeLists.txt	2020-12-27 12:50:37.29815=
5607 +0100
@@ -2,13 +2,13 @@

 * Do not handle user manual to avoid additional download

=2D--- CMakeLists.txt.orig	2018-12-24 09:31:27.000000000 +0000
-+++ CMakeLists.txt
-@@ -538,7 +538,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
- include(data/supported_extensions.cmake) # this file needs to be include=
d first as it gets amended in src/
- add_subdirectory(src) # src/ needs to be before data/ so that the correc=
t CSS file gets installed
- add_subdirectory(data)
+--- CMakeLists.txt.orig	2020-12-16 09:22:52.000000000 +0100
++++ CMakeLists.txt	2020-12-27 12:48:41.359277797 +0100
+@@ -515,7 +515,6 @@
+ include(data/supported_extensions.cmake) # this file needs to be include=
d first as it gets amended in bin/
+ add_subdirectory(src "${DARKTABLE_BINDIR}") # directory needs to be ther=
e before data directory so that the correct CSS file gets installed
+ add_subdirectory(data "${DARKTABLE_DATADIR}")
 -add_subdirectory(doc)
- add_subdirectory(tools)
+ add_subdirectory(tools "${DARKTABLE_DATADIR}/tools")

  # This contains fixup_bundle
diff -Naur darktable/patches/patch-src_develop_masks_circle.c darktable-3.=
4.0/patches/patch-src_develop_masks_circle.c
=2D-- darktable/patches/patch-src_develop_masks_circle.c	1970-01-01 01:00:=
00.000000000 +0100
+++ darktable-3.4.0/patches/patch-src_develop_masks_circle.c	2020-08-11 18=
:16:33.841182210 +0200
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/develop/masks/circle.c.orig	2020-08-04 13:51:32.000000000 +0200
++++ src/develop/masks/circle.c	2020-08-11 17:56:32.691664963 +0200
+@@ -997,7 +997,7 @@
+   dt_omp_firstprivate(circpts, center, total) \
+   shared(circ)
+ #else
+-#pragma omp parallel for shared(points)
++#pragma omp parallel for shared(circ)
+ #endif
+ #endif
+   for(int n =3D 0; n < circpts / 8; n++)
diff -Naur darktable/patches/patch-src_develop_masks_ellipse.c darktable-3=
.4.0/patches/patch-src_develop_masks_ellipse.c
=2D-- darktable/patches/patch-src_develop_masks_ellipse.c	1970-01-01 01:00=
:00.000000000 +0100
+++ darktable-3.4.0/patches/patch-src_develop_masks_ellipse.c	2020-08-11 1=
8:16:48.251023981 +0200
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/develop/masks/ellipse.c.orig	2020-08-04 13:51:32.000000000 +0200
++++ src/develop/masks/ellipse.c	2020-08-11 17:59:00.871939753 +0200
+@@ -1728,7 +1728,7 @@
+   dt_omp_firstprivate(ellpts, center, ta, tb, cosa, sina) \
+   shared(ell)
+ #else
+-#pragma omp parallel for shared(points)
++#pragma omp parallel for shared(ell)
+ #endif
+ #endif
+   for(int n =3D 0; n < ellpts; n++)
+@@ -1890,7 +1890,7 @@
+   dt_omp_firstprivate(grid, bbxm, bbym, bbw, endx, endy, w) \
+   shared(buffer, points)
+ #else
+-#pragma omp parallel for shared(buffer)
++#pragma omp parallel for shared(buffer, points)
+ #endif
+ #endif
+   for(int j =3D bbym * grid; j < endy; j++)
diff -Naur geography/osm-gps-map/buildlink3.mk geography/osm-gps-map.new/b=
uildlink3.mk
=2D-- geography/osm-gps-map/buildlink3.mk	1970-01-01 01:00:00.000000000 +0=
100
+++ geography/osm-gps-map.new/buildlink3.mk	2021-01-05 12:19:20.438899318 =
+0100
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=3D	osm-gps-map
+
+.if !defined(OSM_GPS_MAP_BUILDLINK3_MK)
+OSM_GPS_MAP_BUILDLINK3_MK:=3D
+
+BUILDLINK_API_DEPENDS.osm-gps-map+=3D	osm-gps-map>=3D1.0.2
+BUILDLINK_PKGSRCDIR.osm-gps-map?=3D		../../geography/osm-gps-map
+.endif # OSM_GSP_MAP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=3D	-osm-gps-map