git: d2568da0a50b - main - graphics/darktable*: reinstate LTO option

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d2568da0a50ba5fde8754a0fe6ff7ad89ee23df5

commit d2568da0a50ba5fde8754a0fe6ff7ad89ee23df5
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2022-07-21 16:19:58 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2022-07-21 16:20:56 +0000

    graphics/darktable*: reinstate LTO option
    
    reverting change from my commit d8e040b643256
    
    This change fixes amd64 12.3, 13.0, 13.1.
    
    Bump PORTREVISION.
---
 graphics/darktable/Makefile   | 12 ++++--------
 graphics/darktable40/Makefile |  7 ++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 8c944e58fe0c..d4790aef4525 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	darktable
 PORTVERSION=	3.8.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
@@ -32,14 +32,8 @@ 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
-# switched back to USES=cmake, and LTO can be re-enabled.
 USES=		cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg \
 		perl5 pkgconfig sdl shebangfix sqlite tar:xz xorg
-OPTIONS_EXCLUDE=LTO
 USE_GL=		gl
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
@@ -59,7 +53,7 @@ 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 LUA OPENEXR OPENJPEG PRINT WEBP
+OPTIONS_DEFAULT=	AVIF GEO GPHOTO HEIF LTO LUA OPENEXR OPENJPEG PRINT WEBP
 OPTIONS_SUB=		yes
 
 GEO_DESC=		Support geotagging
@@ -138,6 +132,8 @@ CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 LD=		${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	ld.lld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	llvm-objcopy=${LOCALBASE}/bin/llvm-objcopy${LLVM_DEFAULT}
+BINARY_ALIAS+=	llvm-ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT}
+BINARY_ALIAS+=	llvm-ranlib=${LOCALBASE}/bin/llvm-ranlib${LLVM_DEFAULT}
 .endif
 
 # work around CMAKE/CCACHE flaw (cmake stomps over ccache)
diff --git a/graphics/darktable40/Makefile b/graphics/darktable40/Makefile
index 15dfd5539b07..9eb2ecdfaa21 100644
--- a/graphics/darktable40/Makefile
+++ b/graphics/darktable40/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	darktable
 PORTVERSION=	4.0.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 PKGNAMESUFFIX=	40
@@ -56,8 +56,7 @@ 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 LUA OPENEXR OPENJPEG PRINT WEBP
-OPTIONS_EXCLUDE=	LTO # it might be OK on 13.1 and later Tier-1, but breaks on 13.0 and 12.x
+OPTIONS_DEFAULT=	AVIF GEO GPHOTO HEIF LTO LUA OPENEXR OPENJPEG PRINT WEBP
 OPTIONS_SUB=		yes
 
 GEO_DESC=		Support geotagging
@@ -136,6 +135,8 @@ CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 LD=		${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	ld.lld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	llvm-objcopy=${LOCALBASE}/bin/llvm-objcopy${LLVM_DEFAULT}
+BINARY_ALIAS+=	llvm-ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT}
+BINARY_ALIAS+=	llvm-ranlib=${LOCALBASE}/bin/llvm-ranlib${LLVM_DEFAULT}
 .endif
 
 # work around CMAKE/CCACHE flaw (cmake stomps over ccache)