Hi,
this updates darktable to the latest version.
The current darktable is broken:
$ darktable
(process:71741): libsoup-ERROR **: 13:55:36.734: libsoup3 symbols detected.
Using libsoup2 and libsoup3 in the same process is not supported.
Trace/BPT trap
$
This happens because darktable pulls in geo/osm-gps-map, which is built
with libsoup3 now, while darktable requires libsoup2.
# Port changes:
- removed geo/osm-gps-map (and therefore maps support)
- added -DDONT_USE_INTERNAL_LIBRAW=ON; The bundled version works fine, but why
build it twice, when we have it in ports anyway.
- update MODLUA_VERSION to lua5.4, otherwise it uses the bundled lua5.4
- added WANTLIB: cups, raw, SDL2
- added LIB_DEPENDS: print/cups,-libs, graphics/libraw, devel/sdl2
- updated patches (new fix: swap32 renamed to oswap32 because we have a
similar named function in /usr/include/endian.h)
There's a bit of churn because I sorted the libs.
# Software changes:
Quite a lot with close to 5k commits.
https://github.com/darktable-org/darktable/releases/tag/release-4.2.1
https://github.com/darktable-org/darktable/releases/tag/release-4.2.0
https://github.com/darktable-org/darktable/releases/tag/release-4.1.0
https://github.com/darktable-org/darktable/releases/tag/release-4.0.1
https://github.com/darktable-org/darktable/releases/tag/release-4.0.0
https://github.com/darktable-org/darktable/releases/tag/release-3.9.0
https://github.com/darktable-org/darktable/releases/tag/release-3.8.1
https://github.com/darktable-org/darktable/releases/tag/release-3.8.0
https://github.com/darktable-org/darktable/releases/tag/release-3.7.0
Note for testers:
Please do cp -r ~/.config/darktable ~/.config/darktable.backup
Darktable will upgrade the library and configuration files.
Afterwards they will be incompatible with older versions.
Comments / OKs?
Best Regards,
Stefan
Index: graphics/darktable/Makefile
===
RCS file: /cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.116
diff -u -p -u -p -r1.116 Makefile
--- graphics/darktable/Makefile 24 Apr 2023 11:40:43 - 1.116
+++ graphics/darktable/Makefile 7 May 2023 11:52:21 -
@@ -2,11 +2,10 @@ ONLY_FOR_ARCHS= amd64 aarch64
COMMENT= virtual lighttable and darkroom for photographers
-V= 3.6.1
+V= 4.2.1
DISTNAME= darktable-$V
PORTROACH= limitw:1,even skipv:release-$V
EXTRACT_SUFX= .tar.xz
-REVISION= 0
CATEGORIES=graphics x11
@@ -15,46 +14,52 @@ HOMEPAGE= https://www.darktable.org/
# GPLv3+
PERMIT_PACKAGE=Yes
-WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += GraphicsMagick ICE Iex-3_1 IlmThread-3_1
-WANTLIB += Imath-3_1 SM X11 Xext Xrandr atk-1.0 avif c cairo cairo-gobject
-WANTLIB += curl exiv2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port gthread-2.0
-WANTLIB += gtk-3 harfbuzz intl jpeg json-glib-1.0 lcms2 lensfun
-WANTLIB += m openjp2 osmgpsmap-1.0 pango-1.0 pangocairo-1.0 png
-WANTLIB += pugixml rsvg-2 secret-1 soup-2.4 sqlite3 tiff webp
-WANTLIB += xml2 z OpenEXR-3_1 icudata icui18n icuuc
+WANTLIB = ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} GraphicsMagick ICE
+WANTLIB += Iex-3_1 IlmThread-3_1 Imath-3_1 OpenEXR-3_1 SDL2 SM X11 Xext
+WANTLIB += Xrandr atk-1.0 avif c cairo cairo-gobject cups curl exiv2
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gphoto2 gphoto2_port gthread-2.0 gtk-3 harfbuzz
+WANTLIB += heif icudata icui18n icuuc intl jpeg json-glib-1.0 jxl
+WANTLIB += jxl_threads lcms2 lensfun m openjp2 pango-1.0 pangocairo-1.0
+WANTLIB += png pugixml raw rsvg-2 secret-1 soup-2.4 sqlite3 tiff webp
+WANTLIB += webpmux xml2 z
+
MASTER_SITES=
https://github.com/darktable-org/darktable/releases/download/release-$V/
MODULES= devel/cmake \
lang/lua \
textproc/intltool
-MODLUA_VERSION=5.3
+
+MODLUA_VERSION=5.4
# TLS, modern C++
COMPILER = base-clang
-BUILD_DEPENDS= sysutils/coreutils \
- graphics/p5-Image-ExifTool \
+BUILD_DEPENDS= graphics/p5-Image-ExifTool \
shells/bash \
+ sysutils/coreutils \
textproc/libxslt
+
RUN_DEPENDS= devel/desktop-file-utils \
graphics/p5-Image-ExifTool \
x11/gtk+4,-guic
+
LIB_DEPENDS= devel/gettext,-runtime \
devel/json-glib \
devel/libsoup \
- geo/osm-gps-map \
- graphics/GraphicsMagick \
+ devel/sdl2 \
graphics/exiv2>=0.22 \
+ graphics/GraphicsMagick \
graphics/lcms2 \
+ graphics/lensfun \
graphics/libavif \
graphics/libgphoto2>=2.5.0 \
- graphics/lensfun \
+ graphics/libraw \
graphics/openexr \
graphics/openjp2 \
