From owner-dev-commits-ports-main@freebsd.org Tue Aug 3 12:45:21 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C10C9638787; Tue, 3 Aug 2021 12:45:21 +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 4GfF2n4qJJz3t8y; Tue, 3 Aug 2021 12:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8E32C13647; Tue, 3 Aug 2021 12:45:21 +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 173CjLDM011206; Tue, 3 Aug 2021 12:45:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 173CjL1Y011205; Tue, 3 Aug 2021 12:45:21 GMT (envelope-from git) Date: Tue, 3 Aug 2021 12:45:21 GMT Message-Id: <202108031245.173CjL1Y011205@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: d8e040b64325 - main - graphics/darktable: various build fixes for 3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8e040b64325678ba6c2636db3030459cd5115ea Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 12:45:21 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8e040b64325678ba6c2636db3030459cd5115ea commit d8e040b64325678ba6c2636db3030459cd5115ea Author: Matthias Andree AuthorDate: 2021-08-03 11:36:27 +0000 Commit: Matthias Andree CommitDate: 2021-08-03 12:43:06 +0000 graphics/darktable: various build fixes for 3.6.0 - add missing LIB_DEPENDS on print/harfbuzz and devel/icu, found missing by: make stage-qa - make pkg-plist complete, misses some files, found missing by: make check-plist - disable LTO option for now (OPTIONS_EXCLUDE=LTO), since the workaround for cmake 3.21 regressions around static libraries (which darktable uses) is USES=cmake:noninja - but the RawSpeed library embedded into darktable requires ninja for LTO builds. Approved by: Jean-Sébastien Pédron (dumbbell@, maintainer) --- graphics/darktable/Makefile | 12 ++++++++---- graphics/darktable/pkg-plist | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 13d1441728a9..5331de1e4287 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -22,6 +22,8 @@ LIB_DEPENDS= libcolord-gtk.so:graphics/colord-gtk \ libcolord.so:graphics/colord \ libcurl.so:ftp/curl \ libexiv2.so:graphics/exiv2 \ + libharfbuzz.so:print/harfbuzz \ + libicui18n.so:devel/icu \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ @@ -30,12 +32,14 @@ LIB_DEPENDS= libcolord-gtk.so:graphics/colord-gtk \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff -# Fix build against cmake-3.21: the ninja generator in 3.21 suffers a regression -# (see https://gitlab.kitware.com/cmake/cmake/-/issues/22487) appending an invalid -# "-Wl,--no-as-needed" to the linker arguments for static libraries. -# Once this regression has been fixed upstream, this can be switch back to USES=cmake +# Fix build against cmake-3.21: the ninja generator in 3.21 suffers a +# regression (see https://gitlab.kitware.com/cmake/cmake/-/issues/22487) +# appending an invalid "-Wl,--no-as-needed" to the linker arguments for static +# libraries. Once this regression has been fixed upstream, this can be +# switched back to USES=cmake, and LTO can be re-enabled. USES= cmake:noninja compiler:c++14-lang desktop-file-utils gl gnome jpeg \ perl5 pkgconfig shebangfix sqlite tar:xz xorg +OPTIONS_EXCLUDE=LTO USE_GL= glu USE_GNOME= cairo gtk30 intltool librsvg2 libxml2 INSTALLS_ICONS= yes diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist index 4fb7bb4e2fd3..71c436ffa64a 100644 --- a/graphics/darktable/pkg-plist +++ b/graphics/darktable/pkg-plist @@ -32,12 +32,15 @@ lib/darktable/plugins/libbilateral.so lib/darktable/plugins/libbloom.so lib/darktable/plugins/libborders.so lib/darktable/plugins/libcacorrect.so +lib/darktable/plugins/libcacorrectrgb.so +lib/darktable/plugins/libcensorize.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 lib/darktable/plugins/libcolorbalance.so +lib/darktable/plugins/libcolorbalancergb.so lib/darktable/plugins/libcolorchecker.so lib/darktable/plugins/libcolorcontrast.so lib/darktable/plugins/libcolorcorrection.so @@ -48,6 +51,7 @@ lib/darktable/plugins/libcolorout.so lib/darktable/plugins/libcolorreconstruct.so lib/darktable/plugins/libcolortransfer.so lib/darktable/plugins/libcolorzones.so +lib/darktable/plugins/libcrop.so lib/darktable/plugins/libdefringe.so lib/darktable/plugins/libdemosaic.so lib/darktable/plugins/libdenoiseprofile.so @@ -182,12 +186,16 @@ share/applications/darktable.desktop %%NO_OPENCL%%%%DATADIR%%/kernels/bilateral.cl %%NO_OPENCL%%%%DATADIR%%/kernels/blendop.cl %%NO_OPENCL%%%%DATADIR%%/kernels/bloom.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/channelmixer.cl %%NO_OPENCL%%%%DATADIR%%/kernels/colorreconstruction.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/colorspace.h %%NO_OPENCL%%%%DATADIR%%/kernels/colorspaces.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/color_conversion.h %%NO_OPENCL%%%%DATADIR%%/kernels/common.h %%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_markesteijn.cl %%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_other.cl %%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_ppg.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_rcd.cl %%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_vng.cl %%NO_OPENCL%%%%DATADIR%%/kernels/denoiseprofile.cl %%NO_OPENCL%%%%DATADIR%%/kernels/dwt.cl @@ -395,11 +403,15 @@ share/icons/hicolor/scalable/apps/darktable-3.svg share/icons/hicolor/scalable/apps/darktable.svg %%NLS%%share/locale/af/LC_MESSAGES/darktable.mo %%NLS%%share/locale/de/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/eo/LC_MESSAGES/darktable.mo %%NLS%%share/locale/es/LC_MESSAGES/darktable.mo %%NLS%%share/locale/fr/LC_MESSAGES/darktable.mo %%NLS%%share/locale/he/LC_MESSAGES/darktable.mo %%NLS%%share/locale/hu/LC_MESSAGES/darktable.mo %%NLS%%share/locale/it/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/nl/LC_MESSAGES/darktable.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/darktable.mo %%NLS%%share/locale/ru/LC_MESSAGES/darktable.mo %%NLS%%share/locale/sl/LC_MESSAGES/darktable.mo +%%NLS%%share/locale/uk/LC_MESSAGES/darktable.mo +share/metainfo/darktable.appdata.xml