From owner-dev-commits-ports-main@freebsd.org Tue Aug 3 12:45:22 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 DAD0563878C; Tue, 3 Aug 2021 12:45:22 +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 4GfF2p5SBjz3tFX; Tue, 3 Aug 2021 12:45:22 +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 A4025134CC; Tue, 3 Aug 2021 12:45:22 +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 173CjM2O011230; Tue, 3 Aug 2021 12:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 173CjMHM011229; Tue, 3 Aug 2021 12:45:22 GMT (envelope-from git) Date: Tue, 3 Aug 2021 12:45:22 GMT Message-Id: <202108031245.173CjMHM011229@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: 95511f1b0cb0 - main - graphics/darktable: resolve G'Mic inconsistency 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: 95511f1b0cb095bf62a60b0d3986d7159234fb9d 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:23 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=95511f1b0cb095bf62a60b0d3986d7159234fb9d commit 95511f1b0cb095bf62a60b0d3986d7159234fb9d Author: Matthias Andree AuthorDate: 2021-08-03 11:39:24 +0000 Commit: Matthias Andree CommitDate: 2021-08-03 12:44:18 +0000 graphics/darktable: resolve G'Mic inconsistency The build will automatically pick up G'Mic if available, leading to inconsistent builds between systems. Make it an explicit OPTION which defaults to off, since only the lut3d module uses it and only to read .gmz G'Mic-compressed LUT files. Approved by: Jean-Sébastien Pédron (dumbbell@, maintainer) --- graphics/darktable/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 5331de1e4287..aece69468581 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -57,18 +57,22 @@ LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/} -OPTIONS_DEFINE= DOCS GEO GPHOTO GRAPHMAGICK LIBAVIF LIBSECRET LTO LUA \ - NLS OPENEXR OPENJPEG PRINT TOOLS WEBP +OPTIONS_DEFINE= DOCS GEO GPHOTO GMIC GRAPHMAGICK LIBAVIF LIBSECRET LTO \ + LUA NLS OPENEXR OPENJPEG PRINT TOOLS WEBP OPTIONS_DEFAULT= GEO GPHOTO LUA OPENEXR OPENJPEG PRINT WEBP OPTIONS_SUB= yes GEO_DESC= Support geotagging +GMIC_DESC= Support G'Mic-compressed LUT in lut3d LIBAVIF_DESC= Support encoding and decoding .avif files LIBSECRET_DESC= Support libsecret as password backend GEO_LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map GEO_CMAKE_OFF= -DUSE_MAP:BOOL=OFF +GMIC_LIB_DEPENDS= libgmic.so:graphics/gmic +GMIC_CMAKE_OFF= -DUSE_GMIC:BOOL=OFF + GPHOTO_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 GPHOTO_CMAKE_OFF= -DUSE_CAMERA_SUPPORT:BOOL=OFF