git: 8570aa6d0ebb - main - graphics/darktable: Remove several options previously enabled by default
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Jan 2023 22:45:53 UTC
The branch main has been updated by dumbbell:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8570aa6d0ebbed4bca317182a31e25f4d4942c2f
commit 8570aa6d0ebbed4bca317182a31e25f4d4942c2f
Author: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
AuthorDate: 2023-01-27 20:37:09 +0000
Commit: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
CommitDate: 2023-01-27 22:34:47 +0000
graphics/darktable: Remove several options previously enabled by default
They all contribute to the full experience of Darktable and I never take
the time to test the port without these options. Let's simplify the port
then.
The only default option left is `PRINT`. Many users are probably not
printing their photos, so leave the possibility to turn this off.
---
graphics/darktable/Makefile | 56 ++++++++++++++------------------------------
graphics/darktable/pkg-plist | 34 +++++++++++++--------------
2 files changed, 35 insertions(+), 55 deletions(-)
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index a3e9b8035647..29424e6de815 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -18,24 +18,31 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
po4a-translate:textproc/po4a \
xsltproc:textproc/libxslt \
bash:shells/bash
-LIB_DEPENDS= libcolord-gtk.so:graphics/colord-gtk \
+LIB_DEPENDS= libavif.so:graphics/libavif \
+ libcolord-gtk.so:graphics/colord-gtk \
libcolord.so:graphics/colord \
libcurl.so:ftp/curl \
libexiv2.so:graphics/exiv2 \
+ libgphoto2.so:graphics/libgphoto2 \
libharfbuzz.so:print/harfbuzz \
+ libheif.so:graphics/libheif \
libicui18n.so:devel/icu \
libImath.so:math/Imath \
libjasper.so:graphics/jasper \
libjson-glib-1.0.so:devel/json-glib \
liblcms2.so:graphics/lcms2 \
liblensfun.so:graphics/lensfun \
+ libOpenEXR.so:graphics/openexr \
+ libopenjp2.so:graphics/openjpeg \
+ libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map \
libpng.so:graphics/png \
libpugixml.so:textproc/pugixml \
libsoup-2.4.so:devel/libsoup \
- libtiff.so:graphics/tiff
+ libtiff.so:graphics/tiff \
+ libwebp.so:graphics/webp
USES= cmake compiler:gcc-c++11-lib desktop-file-utils gl gnome jpeg \
- llvm:14,build perl5 pkgconfig sdl shebangfix sqlite \
+ llvm:14,build lua:54 perl5 pkgconfig sdl shebangfix sqlite \
tar:xz xorg
USE_GL= gl
USE_GNOME= cairo gtk30 intltool librsvg2 libxml2
@@ -47,51 +54,34 @@ SHEBANG_FILES= tools/*.sh
USE_GCC= yes
-CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 \
- -DBUILD_CMSTEST:BOOL=ON \
- -DUSE_KWALLET:BOOL=ON
+CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1
-CFLAGS+= -fopenmp
+CMAKE_BOOL+= BUILD_CMSTEST USE_AVIF USE_CAMERA_SUPPORT USE_HEIF \
+ USE_KWALLET USE_LUA USE_MAP USE_OPENEXR USE_OPENJPEG \
+ USE_WEBP RAWSPEED_ENABLE_LTO
+
+CFLAGS+= -fopenmp -I${LOCALBASE}/include/Imath
LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
-OPTIONS_DEFINE= AVIF DOCS GEO GPHOTO GMIC GRAPHMAGICK HEIF LIBSECRET LTO \
- LUA NLS OPENEXR OPENJPEG PRINT TOOLS WEBP
-OPTIONS_DEFAULT= AVIF GEO GPHOTO HEIF LTO LUA OPENEXR OPENJPEG PRINT WEBP
+OPTIONS_DEFINE= DOCS GMIC GRAPHMAGICK LIBSECRET NLS PRINT TOOLS
+OPTIONS_DEFAULT= PRINT
OPTIONS_SUB= yes
-GEO_DESC= Support geotagging
GMIC_DESC= Support G'Mic-compressed LUT in lut3d
LIBSECRET_DESC= Support libsecret as password backend
TOOLS_DESC= Install additional scripts
-AVIF_LIB_DEPENDS= libavif.so:graphics/libavif
-AVIF_CMAKE_BOOL= USE_AVIF
-
-GEO_LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
-GEO_CMAKE_BOOL= USE_MAP
-
GMIC_LIB_DEPENDS= libgmic.so:graphics/gmic
GMIC_CMAKE_BOOL= USE_GMIC
-GPHOTO_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
-GPHOTO_CMAKE_BOOL= USE_CAMERA_SUPPORT
-
GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
GRAPHMAGICK_CMAKE_BOOL= USE_GRAPHICSMAGICK
-HEIF_LIB_DEPENDS= libheif.so:graphics/libheif
-HEIF_CMAKE_BOOL= USE_HEIF
-
LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret
LIBSECRET_CMAKE_BOOL= USE_LIBSECRET
-LTO_CMAKE_BOOL= RAWSPEED_ENABLE_LTO
-
-LUA_USES= lua:54
-LUA_CMAKE_BOOL= USE_LUA
-
# FIXME: Even with NLS turned off, darktable(1) is still linked to
# libintl.so.
NLS_USES= gettext
@@ -99,22 +89,12 @@ NLS_USES_OFF= gettext-runtime
NLS_CMAKE_BOOL= USE_NLS
NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl
-OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr
-OPENEXR_CMAKE_BOOL= USE_OPENEXR
-OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath
-
-OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
-OPENJPEG_CMAKE_BOOL= USE_OPENJPEG
-
PRINT_LIB_DEPENDS= libcups.so:print/cups
PRINT_CMAKE_BOOL= BUILD_PRINT
TOOLS_BUILD_DEPENDS= exiftool:graphics/p5-Image-ExifTool
TOOLS_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool
-WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
-WEBP_CMAKE_BOOL= USE_WEBP
-
.include <bsd.port.options.mk>
.if ${ARCH} == aarch64
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index 1d906524068a..ab5725c69897 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -6,18 +6,18 @@ bin/darktable-cmstest
bin/darktable-generate-cache
bin/darktable-rs-identify
lib/darktable/libdarktable.so
-%%AVIF%%lib/darktable/plugins/imageio/format/libavif.so
+lib/darktable/plugins/imageio/format/libavif.so
lib/darktable/plugins/imageio/format/libcopy.so
-%%OPENEXR%%lib/darktable/plugins/imageio/format/libexr.so
-%%OPENJPEG%%lib/darktable/plugins/imageio/format/libj2k.so
+lib/darktable/plugins/imageio/format/libexr.so
+lib/darktable/plugins/imageio/format/libj2k.so
lib/darktable/plugins/imageio/format/libjpeg.so
lib/darktable/plugins/imageio/format/libpdf.so
lib/darktable/plugins/imageio/format/libpfm.so
lib/darktable/plugins/imageio/format/libpng.so
lib/darktable/plugins/imageio/format/libppm.so
lib/darktable/plugins/imageio/format/libtiff.so
-%%WEBP%%lib/darktable/plugins/imageio/format/libwebp.so
-%%LUA%%lib/darktable/plugins/imageio/format/libxcf.so
+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/libgallery.so
@@ -81,7 +81,7 @@ lib/darktable/plugins/liblowpass.so
lib/darktable/plugins/liblut3d.so
lib/darktable/plugins/libmask_manager.so
lib/darktable/plugins/libmonochrome.so
-%%LUA%%lib/darktable/plugins/libnegadoctor.so
+lib/darktable/plugins/libnegadoctor.so
lib/darktable/plugins/libnlmeans.so
lib/darktable/plugins/liboverexposed.so
lib/darktable/plugins/libprofile_gamma.so
@@ -109,7 +109,7 @@ lib/darktable/plugins/libvignette.so
lib/darktable/plugins/libwatermark.so
lib/darktable/plugins/libzonesystem.so
lib/darktable/plugins/lighttable/libbackgroundjobs.so
-%%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so
+lib/darktable/plugins/lighttable/libcamera.so
lib/darktable/plugins/lighttable/libcollect.so
lib/darktable/plugins/lighttable/libcolorlabels.so
lib/darktable/plugins/lighttable/libcolorpicker.so
@@ -121,7 +121,7 @@ lib/darktable/plugins/lighttable/libfilmstrip.so
lib/darktable/plugins/lighttable/libfilter.so
lib/darktable/plugins/lighttable/libfiltering.so
lib/darktable/plugins/lighttable/libgamepad.so
-%%GEO%%lib/darktable/plugins/lighttable/libgeotagging.so
+lib/darktable/plugins/lighttable/libgeotagging.so
lib/darktable/plugins/lighttable/libglobal_toolbox.so
lib/darktable/plugins/lighttable/libhinter.so
lib/darktable/plugins/lighttable/libhistogram.so
@@ -129,12 +129,12 @@ lib/darktable/plugins/lighttable/libhistory.so
lib/darktable/plugins/lighttable/libimage.so
lib/darktable/plugins/lighttable/libimage_infos.so
lib/darktable/plugins/lighttable/libimport.so
-%%LUA%%lib/darktable/plugins/lighttable/libioporder.so
+lib/darktable/plugins/lighttable/libioporder.so
lib/darktable/plugins/lighttable/liblighttable_mode.so
-%%GPHOTO%%lib/darktable/plugins/lighttable/liblive_view.so
-%%GEO%%lib/darktable/plugins/lighttable/liblocation.so
-%%GEO%%lib/darktable/plugins/lighttable/libmap_locations.so
-%%GEO%%lib/darktable/plugins/lighttable/libmap_settings.so
+lib/darktable/plugins/lighttable/liblive_view.so
+lib/darktable/plugins/lighttable/liblocation.so
+lib/darktable/plugins/lighttable/libmap_locations.so
+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
@@ -155,10 +155,10 @@ lib/darktable/plugins/lighttable/libviewswitcher.so
lib/darktable/views/libdarkroom.so
lib/darktable/views/libknight.so
lib/darktable/views/liblighttable.so
-%%GEO%%lib/darktable/views/libmap.so
+lib/darktable/views/libmap.so
%%PRINT%%lib/darktable/views/libprint.so
lib/darktable/views/libslideshow.so
-%%GPHOTO%%lib/darktable/views/libtethering.so
+lib/darktable/views/libtethering.so
share/man/man1/darktable-cli.1.gz
share/man/man1/darktable-cltest.1.gz
share/man/man1/darktable-cmstest.1.gz
@@ -226,8 +226,8 @@ share/applications/darktable.desktop
%%NO_OPENCL%%%%DATADIR%%/kernels/sharpen.cl
%%NO_OPENCL%%%%DATADIR%%/kernels/soften.cl
%%DATADIR%%/latex/photobook.cls
-%%LUA%%%%DATADIR%%/lua/darktable/debug.lua
-%%LUA%%%%DATADIR%%/luarc
+%%DATADIR%%/lua/darktable/debug.lua
+%%DATADIR%%/luarc
%%DATADIR%%/noiseprofiles.json
%%DATADIR%%/pixmaps/dt_logo_128x128.png
%%DATADIR%%/pixmaps/dt_text.svg