commit: 477b7bfe0e87aa72022fc686fe8697d9923638ad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 01:39:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 01:39:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477b7bfe
media-libs/libheif: unbundle catch
Not going to the hassle of fixing w/ 3 yet though.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libheif/libheif-1.12.0-r3.ebuild | 12 +++++++++++-
media-libs/libheif/libheif-9999.ebuild | 12 +++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/media-libs/libheif/libheif-1.12.0-r3.ebuild
b/media-libs/libheif/libheif-1.12.0-r3.ebuild
index 08b2005689dd..f6505de170a5 100644
--- a/media-libs/libheif/libheif-1.12.0-r3.ebuild
+++ b/media-libs/libheif/libheif-1.12.0-r3.ebuild
@@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
REQUIRED_USE="test? ( go )"
RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-lang/go )"
+BDEPEND="
+ test? (
+ <dev-cpp/catch-3
+ dev-lang/go
+ )
+"
DEPEND="
media-libs/dav1d:=[${MULTILIB_USEDEP}]
media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -46,6 +51,11 @@ src_prepare() {
sed -i -e 's:-Werror::' configure.ac || die
+ if use test ; then
+ rm tests/catch.hpp || die
+ ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp
tests/catch.hpp || die
+ fi
+
eautoreconf
# prevent "stat heif-test.go: no such file or directory"
diff --git a/media-libs/libheif/libheif-9999.ebuild
b/media-libs/libheif/libheif-9999.ebuild
index e7ee0500a762..457096c4b4e2 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
REQUIRED_USE="test? ( go )"
RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-lang/go )"
+BDEPEND="
+ test? (
+ <dev-cpp/catch-3
+ dev-lang/go
+ )
+"
DEPEND="
media-libs/dav1d:=[${MULTILIB_USEDEP}]
media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -45,6 +50,11 @@ src_prepare() {
sed -i -e 's:-Werror::' configure.ac || die
+ if use test ; then
+ rm tests/catch.hpp || die
+ ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp
tests/catch.hpp || die
+ fi
+
eautoreconf
# prevent "stat heif-test.go: no such file or directory"
