From nobody Tue Feb 1 03:10:55 2022 X-Original-To: dev-commits-ports-branches@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 82CB219A5C9A; Tue, 1 Feb 2022 03:10:56 +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 4Jnqh0210pz4ZQx; Tue, 1 Feb 2022 03:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643685056; 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=9hyZD8T2HY7aT2TYDRcGafYyO/N4zlG87ldbRrtRvZk=; b=CLYz+Bs0jFlgVS/kTH6OrcM2TOuPZBmfRa+mAFnRvChH2dEFLMNbAapHzQCWEGBHoCZrVI MA/YHagcBnAzLNM8TrTMBYz47h4hjm8LyjcUrbbffjDFRJoyjIfH1nfUfnj4CJrvXl662u kgEs4/iewVm2uJF+mSciCl/bMnO7LEkhrnLJ969KitLE73lHWB9WBsiczvM/m/6zZWJSD2 wypkOoxrtcOxL0lKWeyyZToMBSW2mqr9azGEgqJPUt3aKFGNG6GFNHS6iuihLMSIhTJIQS Zd48yDJod/mXy9t93lq36/OI20hCaYHrR/gOaRmqDgltTlopc6gS1jmCdNVEQg== 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 1632179E; Tue, 1 Feb 2022 03:10:56 +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 2113AtSf070535; Tue, 1 Feb 2022 03:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2113Atb5070534; Tue, 1 Feb 2022 03:10:55 GMT (envelope-from git) Date: Tue, 1 Feb 2022 03:10:55 GMT Message-Id: <202202010310.2113Atb5070534@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 5415585035d8 - 2022Q1 - graphics/art: Add workaround for OpenMP-related crash when OPENMP=yes List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 5415585035d8f6b3c70e7fc4adc0df599da66957 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643685056; 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=9hyZD8T2HY7aT2TYDRcGafYyO/N4zlG87ldbRrtRvZk=; b=eoWYTzx7v6d9/0/ivY7dGhtpmAApfm438xl/mJL4DfHvsWQsur+41+7qjVFMmVYfSyAclh pXyjQe99YVoHMUi4ICO36akVAhnTPAmFKpqlNG4pai/pSXLIu6MztE0JrZVMtlIzclTdVe Topc+VnMiv3wm9bKvZhsmuyEFbkCoj7XeowrldRYSiJTeOeqqewvO9NimOujOyRfpod3sz W5sWMUXV1uTrFpaO/ndVBNoc4KtGxoN2KLYPmDvJ5zrkqKd6lI4YPRStUZljQ1Gy06dMgz E+K5CrNB2TAS+286x6cao027Z37ngFu12bely6E8sGsQyqL66LzEDYCOBq5M/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643685056; a=rsa-sha256; cv=none; b=LcxfzqmVidpin8vwz3M4vw55y+lr7iMmdKGUUWRux9zjfFhUAX2pSi/nrz6AwErSU58f3X cNSw8290l8nnLtT+163SB77Z+MMsWpjd2fk2iXjKvwlmUHZQV5h2CeKLnJDbzCt7zNEvJI S0g+sRyMdmEdkgfiug83TnUASh1Q79fc8TqCZ34lEri4sYUDyJXamE/fVdx59X3DF+qW6M IzaJNTWaShKGOIjngaF6buIJXDzdRnLDa/Jm8+pzkQM/hfKElqbTYoisajCQpMYcVqRN3B Uglq25Oj5zLGxaSYoa72ByjZH2EwQk4YPxk+HD/e5mYRHw7N3I4JJf9tG8oxew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5415585035d8f6b3c70e7fc4adc0df599da66957 commit 5415585035d8f6b3c70e7fc4adc0df599da66957 Author: Yuri Victorovich AuthorDate: 2022-01-21 17:06:26 +0000 Commit: Yuri Victorovich CommitDate: 2022-02-01 03:10:49 +0000 graphics/art: Add workaround for OpenMP-related crash when OPENMP=yes (cherry picked from commit 1ce05fa8c786ebde753b240789e4a30b484cda29) --- graphics/art/Makefile | 4 ++-- graphics/art/files/patch-rtgui_main-cli.cc | 13 +++++++++++++ graphics/art/files/patch-rtgui_main.cc | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/graphics/art/Makefile b/graphics/art/Makefile index cd2160b6dace..ec1b28ccf2d6 100644 --- a/graphics/art/Makefile +++ b/graphics/art/Makefile @@ -1,5 +1,6 @@ PORTNAME= art DISTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/agriggio/art/downloads/ PKGNAMESUFFIX= -raw-image-editor @@ -35,10 +36,9 @@ EXTRACT_CMD= gtar INSTALLS_ICONS= yes OPTIONS_DEFINE= OPENMP -OPTIONS_DEFAULT= # OPENMP +OPTIONS_DEFAULT= OPENMP OPENMP_CMAKE_BOOL= OPTION_OMP -OPENMP_BROKEN= OpenMP multithreading is broken, see https://bitbucket.org/agriggio/art/issues/227 post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ART diff --git a/graphics/art/files/patch-rtgui_main-cli.cc b/graphics/art/files/patch-rtgui_main-cli.cc new file mode 100644 index 000000000000..9352255b9360 --- /dev/null +++ b/graphics/art/files/patch-rtgui_main-cli.cc @@ -0,0 +1,13 @@ +- workaround for https://bitbucket.org/agriggio/art/issues/227 caused by https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261360 + +--- rtgui/main-cli.cc.orig 2022-01-20 17:13:45 UTC ++++ rtgui/main-cli.cc +@@ -121,6 +121,8 @@ std::pair dontLoadCache(int argc, char **a + + int main (int argc, char **argv) + { ++ setenv("LIBOMP_NUM_HIDDEN_HELPER_THREADS", "0", 1); ++ + #ifdef WITH_MIMALLOC + mi_version(); + #endif diff --git a/graphics/art/files/patch-rtgui_main.cc b/graphics/art/files/patch-rtgui_main.cc new file mode 100644 index 000000000000..a0f2b59ca423 --- /dev/null +++ b/graphics/art/files/patch-rtgui_main.cc @@ -0,0 +1,13 @@ +- workaround for https://bitbucket.org/agriggio/art/issues/227 caused by https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261360 + +--- rtgui/main.cc.orig 2022-01-20 17:14:43 UTC ++++ rtgui/main.cc +@@ -370,6 +370,8 @@ void show_gimp_plugin_info_dialog(Gtk::Window *parent) + + int main (int argc, char **argv) + { ++ setenv("LIBOMP_NUM_HIDDEN_HELPER_THREADS", "0", 1); ++ + #ifdef WITH_MIMALLOC + mi_version(); + #endif