From nobody Fri Jan 27 22:45:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P3XjY6nwkz3b6vs; Fri, 27 Jan 2023 22:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P3XjY6N77z3Gk9; Fri, 27 Jan 2023 22:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674859553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UNgza2yHkc7+NkJD5bxWpwORAobPD1uaQU5ZZF2LEM4=; b=s+5EuGFrNJviBVZPpf87KCTqzdflAXKTouQmzK+TT0CwIs6zQNPGeOcH33GsSSOTFa454d s6D+TXwph2LLoBw7sk63PhdWTkceXTOPdlN/qZCVb+D2e1hy6WyPWdhwDUAjpMhoSrwy+m bDKXwGuCAmoPP0oFKmDHm7b1O8cH4vj/0JFPtvm6Ici1SPfzq/jVDJA410b2juW4TpCImC ZxZSXd1Af/wHLMFVbRD2HS7D6wtJ7r23hijXbrDknWU1ZMd/OYICj6BLh/SwcVstyCI0jD FJCni80XgFaGZl4tZtGEKkNzwyJ0X0UbLPA2l2e1ZLcr0saa+BeBu9rciqpxrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674859553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UNgza2yHkc7+NkJD5bxWpwORAobPD1uaQU5ZZF2LEM4=; b=Z1w+Wk39kHX7fWj0878oe6odncE0vQbSZRJxw/094BSkc8Tx32ekmP3sUdQ2Oyff0WxO9+ yskN29UiPekqQa5+4rP5ZA0Cv8kvJInjkXk2lpF4dMblY46ZOohRk/HT8Y/zPhrE33FQc3 /mED2q2ADdZHNjvtNu6iKGUDvUNdBKslO/gdjBxvPUnw4xc1NuDgtl/kdkKx4hsTUkaQMR l2uB6NDkz8QxwudFH6hhhVIlNMrtV6rwWVHekrG4CKCKRZ9mdGj3sg41uKcmWLPzCro0UR I1Kzmp4Ql0ZbdGE0OQ4B3YBuYjZrQh6gzR0MgZ4wmu3Y6zO770H+R9ld+pE1ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674859553; a=rsa-sha256; cv=none; b=azlYGsF3gxw1hzkR26+NavKcIWDe295FfgxqHB59B2Dt05Xxmb+eDPsO6paSoi6sYp+Sx4 s/hQkk+W35SqghQWteBLA+bGRlPuu2RNGuxO6wkzipkeaB3weOB0mNJAh8ZFENlbRQdWBz kvllbVDL+JmDEEmub3WMadSKHm7DAJnyB1WTpjmXkHszk58ow6hdG4Z5l9XMmk19DqkgbL /BYbuGSGAGBR6EozAE1a3vPwbjjO5MV1iXgs+PfhRQcdPA6tcPhqhWBQAN2xXCEytfTKKh 138ERu28uYNY8hA/drkvA3qWyeeY1IH/czOR6zRuLlwSIXLozfpk3UfL79L1MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P3XjY5Rm6zR0h; Fri, 27 Jan 2023 22:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30RMjrY6013742; Fri, 27 Jan 2023 22:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RMjr3q013741; Fri, 27 Jan 2023 22:45:53 GMT (envelope-from git) Date: Fri, 27 Jan 2023 22:45:53 GMT Message-Id: <202301272245.30RMjr3q013741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 8570aa6d0ebb - main - graphics/darktable: Remove several options previously enabled by default List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8570aa6d0ebbed4bca317182a31e25f4d4942c2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2023-01-27 20:37:09 +0000 Commit: Jean-Sébastien Pédron 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 .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