From nobody Fri Nov 10 01:40:50 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 4SRM3R3Sk3z50NqP; Fri, 10 Nov 2023 01:40:51 +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 4SRM3R0fQxz3L3q; Fri, 10 Nov 2023 01:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699580451; 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=eOPeMI3EFvqmXvBX5Ph/tW9R58y4mJ1BBiiffPKLCFo=; b=i/uGnnXym8PYNhMUzZ/SZmuNsutcRumWbkg5mQoBb4nomOabQGnFG26ZSp0YhINF461eHu S9MmWt7BSpNXPfnJ5gr0Xb420SIV2eG5QfN/SYT+x6pZRHpu9YVHjFRLLidqWMHI0WUx9A OTgiokLgcD45+wr3IcBSvNVRMSorle+G5zcDbL9I6kUh1gQqFbSEYBVJw6ZSkty1hZUV89 vIfRDEWJOGhCvBp/wAXuwNghRR+zVkFqf9SLXgauRHhvj2noXWBbNep/s7qHjo3B5Bfqf9 jFrvvdzXsudEjCYfFIEVxKSFNnECCy5mMMupCzcAU3hlDAN9daAV4uLiQNcKZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699580451; 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=eOPeMI3EFvqmXvBX5Ph/tW9R58y4mJ1BBiiffPKLCFo=; b=t6stlKniK8msr1SzGj/b6BQJADkFBEHrMAG5X9WPnzFrzuCprTtfGyy6R8TDBd2AJaLvUA fozQzjckcWVpUmtJIpAE9uxorEjWBsWleNtmm/4d5tCyijMaxoal2J24iRyws5rQhD8Xan qAO7VWiWTGMmxkeH9Rqatul+W2gGfn7yJmFN6Bfz5zoyt19xf5I/gJw42QFWYdvrZ4wTBQ E4SrbQZezTfDLRRpBvKvyQ+/rSGPyJObcI+8Aj0N/VzK0il22auCBDoGs35hY7ho4oUhYL PsBMMujvXV1vpQ+gZXzol8MH5cmFdkWOwAZxUBUYm5LjFEHYg5QhW8qnKTxUJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699580451; a=rsa-sha256; cv=none; b=wqu062BoRU6UBiXsNpgxvyEMgxa/FFMu57eCgdvrCMNZ/zW78wg3GRLgE6HjPhJb8NdhDJ 3buxTLkMQtF8lewTFjqcGNvQFiX9o/qmyBZgFBNRPtkokYeJpp8U0+CkbqvKvK8DomQS4t OT0zmsHa8RbrLE1xjbhOP9bUFagMHu8uwlNrmh7VUuqbqObYwNozdlXY5Vc8M1T9Hva6Fo RaJ3noXYVLA6wgeJWZg37ne7dq6AYgOgYBS2L/yDpUOmH9dk1xuP+uxh6gOrlzZ1IFWKzT /5rkc7Uod1gjXBBNI9hFSWeDGnCwAIX/Qs18VcYmhPjCOgH4eRq7fW5tVj9aZA== 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 4SRM3Q6q8wzf4H; Fri, 10 Nov 2023 01:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA1eoGL076299; Fri, 10 Nov 2023 01:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA1eoQL076296; Fri, 10 Nov 2023 01:40:50 GMT (envelope-from git) Date: Fri, 10 Nov 2023 01:40:50 GMT Message-Id: <202311100140.3AA1eoQL076296@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: 79d7fc53b463 - main - graphics/rawtherapee: Revert "drop USE_GCC..." 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: 79d7fc53b463b8175d366a1547926488f72fccd5 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=79d7fc53b463b8175d366a1547926488f72fccd5 commit 79d7fc53b463b8175d366a1547926488f72fccd5 Author: Matthias Andree AuthorDate: 2023-11-10 01:38:29 +0000 Commit: Matthias Andree CommitDate: 2023-11-10 01:40:31 +0000 graphics/rawtherapee: Revert "drop USE_GCC..." This reverts commit fff0cd6cf3ae5141f7f588e27b8e71839ee742be. Caused regressions on the build of too many FreeBSD versions, as Reported by: pkg-fallout@ MFH: 2023Q4 --- graphics/rawtherapee/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index b6c4b7731919..0a0525b52192 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -1,6 +1,6 @@ PORTNAME= rawtherapee PORTVERSION= 5.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ @@ -25,15 +25,27 @@ LIB_DEPENDS= \ libsigc-2.0.so:devel/libsigc++20 \ libtiff.so:graphics/tiff -USES= cmake desktop-file-utils compiler:c++11-lang gnome \ +USES= cmake desktop-file-utils compiler:gcc-c++11-lib gnome \ jpeg localbase:ldflags pkgconfig tar:xz # Binutils required for LTO (base ar/nm/ld/ranlib don't work) USE_BINUTILS= yes +# As of 2019-09-29, this port is known to be miscompiled by clang90 +# (SIGSEGV or SIBGUS). +# So we shall stick to a modern GCC for now, +# XXX FIXME note that rawtherapee is somewhat sensitive +# versus compiler details so we may need to pin GCC 9.x +# or a version range. +USE_GCC= yes + USE_GNOME= gtkmm30 librsvg2 -_LTO_FLAGS= -flto=thin +_LTO_FLAGS= -flto=${MAKE_JOBS_NUMBER} +# gcc needs -flto=${MAKE_JOBS_NUMBER} for parallel link (fixed in GCC 10?) +# and does not understand -flto=thin +# +# llvm/clang needs -flto=thin and will automatically parallelize the link # Fix : # 11.x has binutils that don't accept a --plugin option, @@ -52,8 +64,9 @@ CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DDATADIR="${DATADIR}" \ -DCACHE_NAME_SUFFIX="" \ -Wno-dev \ + -DCMAKE_AR:FILEPATH=${_AR} \ + -DCMAKE_RANLIB:FILEPATH=${_RANLIB} \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW - # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default # any more. The CMP0056 policy must be explicitly set to NEW to ensure # linker flags are passed. Else -lomp is not found with clang.