From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
Date: Sat, 25 Mar 2023 04:08:43 +0000 (UTC) [thread overview]
Message-ID: <1679717151.e46f341c307105de27df5f04c715433d25f1d3bd.sam@gentoo> (raw)
commit: e46f341c307105de27df5f04c715433d25f1d3bd
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Mar 24 17:39:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 04:05:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46f341c
sci-astronomy/siril: fix build without OpenMP
Closes: https://bugs.gentoo.org/902833
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30333
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/siril/files/siril-1.2-openmp.patch | 19 +++++++++++++++++++
sci-astronomy/siril/siril-1.2.0_beta1.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch b/sci-astronomy/siril/files/siril-1.2-openmp.patch
new file mode 100644
index 000000000000..eba90448f422
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-openmp.patch
@@ -0,0 +1,19 @@
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Mar 2023 18:24:26 +0100
+Subject: [PATCH] Add ifdef around openmp function
+Bug: https://bugs.gentoo.org/902833
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/482
+
+--- a/src/algos/quantize.c
++++ b/src/algos/quantize.c
+@@ -1396,8 +1396,10 @@ row of the image.
+ #pragma omp parallel num_threads(threads) if (threads>1)
+ #endif
+ {
++#ifdef _OPENMP
+ if (threads > 1 && omp_get_num_threads() != threads)
+ siril_debug_print("actual number of threads: %d of %d requested (level %d)\n", omp_get_num_threads(), threads, omp_get_level());
++#endif
+ float *rowpix, v1;
+ double mean, stdev;
+ float *differences;
diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index 45dd80e9e5b2..e02693c80ab7 100644
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
next reply other threads:[~2023-03-25 4:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-25 4:08 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-16 9:47 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/ Joonas Niilola
2023-10-27 3:20 Sam James
2023-03-25 7:16 Sam James
2023-01-04 5:50 Sam James
2022-07-30 8:19 Sam James
2022-07-15 8:38 Joonas Niilola
2022-05-16 5:26 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1679717151.e46f341c307105de27df5f04c715433d25f1d3bd.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox