From nobody Thu Jul 21 16:21:05 2022 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 4Lpd9F62V7z4X04Q; Thu, 21 Jul 2022 16:21:05 +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 4Lpd9F5P5Fz4Lll; Thu, 21 Jul 2022 16:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658420465; 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=iySxUF8lCZnLzocJVVe3WiSXPxZb+fPpSMj0gAOyQJI=; b=lr1MJ4gutKmU1gF9WlRZ7WPUq+HdLRojAXWGX3qJjGwfb7j05gXOk723u9E3We3yI4Fh0P tyy1O1KqIq8IkVBT4juIlTWsh9VtGd8oB5VIxpQ9qy9T9+yM4hDLzvQlL5C/LMcbtg22MB JIlUPD0D8tQAFhpOPs9WkTcrGrx29VIEn/5t3qs5X63Xh1hezP90Bwa05QR3SA1/quJptS nsUtDh+oiEmu4ND9Vp2NL05kntjSdGwMopploVvyIoOAczidcNTzl3qoDl8DuWBF4SVqe/ +s2kizjWt+fT24DADEodWPe6K57fknINMYFZx3Bl79lzcvyLYLq69okiSZjUYw== 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 4Lpd9F4Rp2zShQ; Thu, 21 Jul 2022 16:21:05 +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 26LGL50m016532; Thu, 21 Jul 2022 16:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LGL5XV016531; Thu, 21 Jul 2022 16:21:05 GMT (envelope-from git) Date: Thu, 21 Jul 2022 16:21:05 GMT Message-Id: <202207211621.26LGL5XV016531@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: d2568da0a50b - main - graphics/darktable*: reinstate LTO option 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2568da0a50ba5fde8754a0fe6ff7ad89ee23df5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658420465; 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=iySxUF8lCZnLzocJVVe3WiSXPxZb+fPpSMj0gAOyQJI=; b=LR9TbTBh03igm24tU+9UsjW0hy4DQGUNjm/I5HdODh6QjBWMj1QFjhCjdYWYzKbNW59Yq7 TFD1Aml41zm7yYfwDj4Nuj+3dvvX5iRNByhCooUTxOIIkPXGmd2rwLpjkfGGShtZvdvkHR trx9Ygjzf0bzdZHz/rVOhZ3E9FdLRFdvv4RHhrIJ//sFoOnjvfZ8KN5O2wMsKZl1DMVPCV reOmnygMKStmSHVoXVulP0LoIitLVJrultaYgxsFekI0i7zPIg5MElLKR6J/D22iVambwf dDTr4jgZxJzRSLwqAuxpUb+CuHrhvd+qN7NQtAiMbfzJI4Ji1xf+IuMWJ/Lhiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658420465; a=rsa-sha256; cv=none; b=oEFo35ysVDhGaF8pbWERsE+91Olgans1bdTeUvEf0M9qVzBnBbC3WVkjDeENdHmSJ6F+QF f1LHuyLfST0k9BUSA+0AwODjszdDdMf0DkP7zkdZMPGMJN8aHb5Xum0hpq2VhxV3zZBj4P fuicTAWBrZHxjVj5S2kW1iyECsFRfzuj0QwI0c6vpaGRsN3IDAlI/++9idqkSJmdeMGRH0 +r1yL9+TSv/CXD8sYoqTn7xszpvIM6NxBk1/J5cGkG7qHCA/rt9rH257yBD2t2mESs/KrL lq9rhGQJjSAAEY+SqtY9AG1ffHzpY6cmkamCr/SDKHmaO2gdA6f2zKHL3Wr/Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2568da0a50ba5fde8754a0fe6ff7ad89ee23df5 commit d2568da0a50ba5fde8754a0fe6ff7ad89ee23df5 Author: Matthias Andree AuthorDate: 2022-07-21 16:19:58 +0000 Commit: Matthias Andree 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)