Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/
Date: Sat, 14 May 2022 21:30:43
Message-Id: 1652563813.cc1873206d3ed3507221a9fdba01f6702c447ee7.soap@gentoo
1 commit: cc1873206d3ed3507221a9fdba01f6702c447ee7
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:13 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc187320
7
8 media-gfx/luminance-hdr: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild | 16 +++++++++-------
13 media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild | 14 ++++++++------
14 2 files changed, 17 insertions(+), 13 deletions(-)
15
16 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
17 index 0a3b97a457c2..fe779b1d1abb 100644
18 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
19 +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -56,6 +56,14 @@ PATCHES=(
27 )
28
29 pkg_pretend() {
30 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
31 +}
32 +
33 +pkg_setup() {
34 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
35 +}
36 +
37 +src_configure() {
38 if use cpu_flags_x86_sse2 ; then
39 append-flags -msse2
40 else
41 @@ -63,12 +71,6 @@ pkg_pretend() {
42 die "SSE2 support missing"
43 fi
44
45 - if use openmp ; then
46 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
47 - fi
48 -}
49 -
50 -src_configure() {
51 local mycmakeargs=(
52 $(cmake_use_find_package fits CFITSIO)
53 -DUSE_OPENMP="$(usex openmp)"
54
55 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
56 index 063d91bee932..03ff1211b910 100644
57 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
58 +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
59 @@ -57,6 +57,14 @@ PATCHES=(
60 )
61
62 pkg_pretend() {
63 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
64 +}
65 +
66 +pkg_setup() {
67 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
68 +}
69 +
70 +src_configure() {
71 if use cpu_flags_x86_sse2 ; then
72 append-flags -msse2
73 else
74 @@ -64,14 +72,8 @@ pkg_pretend() {
75 die "SSE2 support missing"
76 fi
77
78 - if use openmp ; then
79 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
80 - fi
81 -
82 append-flags -std=c++17
83 -}
84
85 -src_configure() {
86 local mycmakeargs=(
87 $(cmake_use_find_package fits CFITSIO)
88 -DUSE_OPENMP="$(usex openmp)"