Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/chromaprint/
Date: Thu, 22 Apr 2021 11:10:58
Message-Id: 1619089846.59532dc8f0358caf3b99b3d5a5461975eaabaafd.fordfrog@gentoo
1 commit: 59532dc8f0358caf3b99b3d5a5461975eaabaafd
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 22 11:10:28 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 22 11:10:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59532dc8
7
8 media-libs/chromaprint: fixed running tests in 1.5.0
9
10 Closes: https://bugs.gentoo.org/754255
11 Closes: https://bugs.gentoo.org/720852
12 Package-Manager: Portage-3.0.18, Repoman-3.0.3
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 media-libs/chromaprint/chromaprint-1.5.0.ebuild | 7 ++++---
16 1 file changed, 4 insertions(+), 3 deletions(-)
17
18 diff --git a/media-libs/chromaprint/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
19 index 443f5af521e..c80eaf9bc0d 100644
20 --- a/media-libs/chromaprint/chromaprint-1.5.0.ebuild
21 +++ b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
22 @@ -1,10 +1,11 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28
29 CMAKE_ECLASS=cmake
30 GTEST_VERSION="1.10.0"
31 +GTEST_DIR_VERSION="1.10.x"
32 inherit cmake-multilib
33
34 DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
35 @@ -30,7 +31,7 @@ DOCS=( NEWS.txt README.md )
36 S="${WORKDIR}/${PN}-v${PV}"
37
38 multilib_src_configure() {
39 - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
40 + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
41 local mycmakeargs=(
42 -DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
43 -DBUILD_TESTS=$(usex test ON OFF)
44 @@ -41,5 +42,5 @@ multilib_src_configure() {
45 }
46
47 multilib_src_test() {
48 - emake check
49 + cd tests && (./all_tests || die "Tests failed")
50 }