Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/chromaprint/
Date: Tue, 05 Apr 2022 04:57:25
Message-Id: 1649134629.201ced25113b6d18370fc1b8edf777e9a7ad105b.sam@gentoo
1 commit: 201ced25113b6d18370fc1b8edf777e9a7ad105b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 5 04:57:01 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 5 04:57:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201ced25
7
8 media-libs/chromaprint: fix tools installation
9
10 Closes: https://bugs.gentoo.org/835808
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../{chromaprint-1.5.1-r1.ebuild => chromaprint-1.5.1-r2.ebuild} | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
17 similarity index 86%
18 rename from media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild
19 rename to media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
20 index 41f811d616ad..49d6e8970741 100644
21 --- a/media-libs/chromaprint/chromaprint-1.5.1-r1.ebuild
22 +++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
23 @@ -34,14 +34,14 @@ multilib_src_configure() {
24 local mycmakeargs=(
25 -DBUILD_TESTS=$(usex test)
26
27 + -DBUILD_TOOLS=$(multilib_native_usex tools)
28 -DFFT_LIB=$(usex tools 'avfft' 'fftw3')
29 -
30 - $(usev tools '-DAUDIO_PROCESSOR_LIB="swresample"')
31 -
32 + #-DAUDIO_PROCESSOR_LIB="swresample"
33 + $(multilib_native_usex tools '-DAUDIO_PROCESSOR_LIB=swresample' '')
34 # Automagicallyish looks for ffmpeg, but there's no point
35 # even doing the check unless we're building with tools
36 # (=> without fftw3, and with ffmpeg).
37 - -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=$(usex !tools)
38 + -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=$(multilib_native_usex !tools)
39 )
40
41 cmake_src_configure