Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
Date: Sat, 05 Sep 2020 10:09:06
Message-Id: 1599300538.4312bd73b0f1f01f656820a241658b78e6fd42e8.voyageur@gentoo
1 commit: 4312bd73b0f1f01f656820a241658b78e6fd42e8
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 5 10:08:48 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 5 10:08:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4312bd73
7
8 media-gfx/nvidia-texture-tools: add some build options
9
10 Use recommended upstream options for shared flag
11 libsquish has build options for sse2 and openmp
12 Disable old gconf schema installation (triggers sandbox failure)
13
14 Closes: https://bugs.gentoo.org/740430
15 Package-Manager: Portage-3.0.5, Repoman-3.0.1
16 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
17
18 .../nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild | 13 +++++++++++--
19 1 file changed, 11 insertions(+), 2 deletions(-)
20
21 diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
22 index 335938d3103..b2db5d4e20c 100644
23 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
24 +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
25 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz ->
26 LICENSE="MIT"
27 SLOT="0"
28 KEYWORDS="~amd64 ~x86"
29 -IUSE=""
30 +IUSE="cpu_flags_x86_sse2 openmp"
31
32 RDEPEND="
33 media-libs/ilmbase:=
34 @@ -29,11 +29,20 @@ DEPEND="${RDEPEND}
35 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
36 DOCS=( ChangeLog README.md )
37
38 +pkg_pretend() {
39 + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
40 + tc-has-openmp || die "Please switch to an openmp compatible compiler"
41 + fi
42 +}
43 +
44 src_configure() {
45 # May be able to restore CUDA, but needs an old gcc
46 local mycmakeargs=(
47 -DCUDA_FOUND=OFF
48 - -DNVTT_SHARED=TRUE
49 + -DGCONFTOOL2=OFF
50 + -DNVTT_SHARED=0
51 + -DBUILD_SQUISH_WITH_OPENMP=$(usex openmp)
52 + -DBUILD_SQUISH_WITH_SSE2=$(usex cpu_flags_x86_sse2)
53 )
54 cmake_src_configure
55 }