From nobody Fri Jan 21 17:15:15 2022 X-Original-To: dev-commits-ports-main@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 E9A921976211; Fri, 21 Jan 2022 17:15:16 +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 4JgQxH4tn9z3thN; Fri, 21 Jan 2022 17:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642785316; 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=ia4LW2XEROiWLpdnk+ORaDyGdxJGzGbg97FA/eXDjCw=; b=Nv5i/KqMqjIVLzaDt+pOe3v8Hcrdpmz21oubBl+kC/Fr9I6WqFGL9cX2u1Z60uTdivGSHr 5k8ifiylTDsaNfKCbZYfjopXMn8k1eKybUS5eUt9xIAeRFmdRA9l9ebqg7tagSOU2fsS5R Ze/Y05Kh5WLYBm+ik3ARiF2RaD6QSE1q0H2FvHn4nz/RJig8ELn8fBkRXKhNjdjmfYzx5M gJkc5aZiWgGiDawSrEFn17OVHEdnACZqp4/51gkNbITmFSs42LeHSMIhGCGMG0jl1k8SAG AFFuYdA2AS96yH/vbWaqgeT07BPCU6kZnxE2WoqL0slf2KN9SC72wM4kVxKAeg== 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 43DF61F762; Fri, 21 Jan 2022 17:15:15 +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 20LHFF4H088293; Fri, 21 Jan 2022 17:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20LHFFGr088292; Fri, 21 Jan 2022 17:15:15 GMT (envelope-from git) Date: Fri, 21 Jan 2022 17:15:15 GMT Message-Id: <202201211715.20LHFFGr088292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 1ce05fa8c786 - main - graphics/art: Add workaround for OpenMP-related crash when OPENMP=yes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 1ce05fa8c786ebde753b240789e4a30b484cda29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642785316; 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=ia4LW2XEROiWLpdnk+ORaDyGdxJGzGbg97FA/eXDjCw=; b=AgIfoxtTkxv4JVR2DNMer2zAQJULV8jt84/8NyvyddH6pMTWLvhxT5Wy1RmuP9yttyww4b U+7IOEJo2S3DDwXen1P/E9d//NkA9sl6djv1S7TyQi+fTmbRhHgvrZrGqcF8+dQe22B8Xe d3smh/1DveAZ+zghgTO8lDKlSQS0/xEo91u7cc1RUZ7GIjy7n5cOmNIUSwZVkaw9fqH4aq xFVIwXiTj7wlCHreNLPgYOkd5bIzsODDtxkZl7iXaYzIj2E+hWYFl0tIktT3TzuDpth+z/ eYey0AziTqcYkMHK+5lxnliFGKKvIzwLAC8ckdiWEpVIe9MN5QSGqxakpS05/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642785316; a=rsa-sha256; cv=none; b=nejo5MJ6NJynSyekVWmfB2EtAEvxnfd1rrzFKcueBmBUFgJcBLzyiEP/WLHRbOVOH/P6YG l3yDUehYMVVbD8tdFvLBsxsbMiJhTP3MUMrFKTMN7onp0SYbpuNUaZypwJHm67stvFW//k SBnsFy83NDtB/CMnmUf39HUlab34fciGUXcigW4DYphzC8GiNThWqDF6Rn5plhwjl9FqKl WPt8ytGeCmKPXar9HmawxrddvVyZtu7yf1J9Dv96/OwsiUhrN9NKmFJnTi57q4wVQYNJ4w 4+Op5iNw0taSs+z5Rf8/8kFdoout0ahUE6LQxziqzIUVxb+AsVJhGJwAyarr0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ce05fa8c786ebde753b240789e4a30b484cda29 commit 1ce05fa8c786ebde753b240789e4a30b484cda29 Author: Yuri Victorovich AuthorDate: 2022-01-21 17:06:26 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-21 17:14:38 +0000 graphics/art: Add workaround for OpenMP-related crash when OPENMP=yes --- 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 75e268f76027..f2e9330ac193 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 @@ -33,10 +34,9 @@ USE_XORG= x11 EXTRACT_CMD= gtar 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