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/libheif/
Date: Tue, 16 Aug 2022 01:39:45
Message-Id: 1660613950.477b7bfe0e87aa72022fc686fe8697d9923638ad.sam@gentoo
1 commit: 477b7bfe0e87aa72022fc686fe8697d9923638ad
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 16 01:39:10 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 16 01:39:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477b7bfe
7
8 media-libs/libheif: unbundle catch
9
10 Not going to the hassle of fixing w/ 3 yet though.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 media-libs/libheif/libheif-1.12.0-r3.ebuild | 12 +++++++++++-
15 media-libs/libheif/libheif-9999.ebuild | 12 +++++++++++-
16 2 files changed, 22 insertions(+), 2 deletions(-)
17
18 diff --git a/media-libs/libheif/libheif-1.12.0-r3.ebuild b/media-libs/libheif/libheif-1.12.0-r3.ebuild
19 index 08b2005689dd..f6505de170a5 100644
20 --- a/media-libs/libheif/libheif-1.12.0-r3.ebuild
21 +++ b/media-libs/libheif/libheif-1.12.0-r3.ebuild
22 @@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
23 REQUIRED_USE="test? ( go )"
24 RESTRICT="!test? ( test )"
25
26 -BDEPEND="test? ( dev-lang/go )"
27 +BDEPEND="
28 + test? (
29 + <dev-cpp/catch-3
30 + dev-lang/go
31 + )
32 +"
33 DEPEND="
34 media-libs/dav1d:=[${MULTILIB_USEDEP}]
35 media-libs/libde265:=[${MULTILIB_USEDEP}]
36 @@ -46,6 +51,11 @@ src_prepare() {
37
38 sed -i -e 's:-Werror::' configure.ac || die
39
40 + if use test ; then
41 + rm tests/catch.hpp || die
42 + ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
43 + fi
44 +
45 eautoreconf
46
47 # prevent "stat heif-test.go: no such file or directory"
48
49 diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
50 index e7ee0500a762..457096c4b4e2 100644
51 --- a/media-libs/libheif/libheif-9999.ebuild
52 +++ b/media-libs/libheif/libheif-9999.ebuild
53 @@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
54 REQUIRED_USE="test? ( go )"
55 RESTRICT="!test? ( test )"
56
57 -BDEPEND="test? ( dev-lang/go )"
58 +BDEPEND="
59 + test? (
60 + <dev-cpp/catch-3
61 + dev-lang/go
62 + )
63 +"
64 DEPEND="
65 media-libs/dav1d:=[${MULTILIB_USEDEP}]
66 media-libs/libde265:=[${MULTILIB_USEDEP}]
67 @@ -45,6 +50,11 @@ src_prepare() {
68
69 sed -i -e 's:-Werror::' configure.ac || die
70
71 + if use test ; then
72 + rm tests/catch.hpp || die
73 + ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
74 + fi
75 +
76 eautoreconf
77
78 # prevent "stat heif-test.go: no such file or directory"