commit: b967eb307b953d2153101bf7777d9ebcf5682a0e Author: Mike Frysinger <vapier <AT> chromium <DOT> org> AuthorDate: Fri Mar 5 02:28:25 2021 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sat Mar 6 00:03:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b967eb30
media-libs/libavif: fix libdir setting in the .pc file Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> .../libavif/files/libavif-0.9.0-pkg-config.patch | 28 ++++++++++++++++++++++ ...ibavif-0.9.0.ebuild => libavif-0.9.0-r1.ebuild} | 4 ++++ 2 files changed, 32 insertions(+) diff --git a/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch new file mode 100644 index 00000000000..b1238b32177 --- /dev/null +++ b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch @@ -0,0 +1,28 @@ +https://github.com/AOMediaCodec/libavif/pull/532 + +From 4ce461df9109f0b05a05aa01e1e1538663b2bc9b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vap...@gentoo.org> +Date: Thu, 4 Mar 2021 21:20:33 -0500 +Subject: [PATCH] libavif.pc: respect libdir setting + +Do not hardcode "lib" as that is often the wrong path with multilib. +On an x86_64 system for example, it should actually be "lib64". +--- + libavif.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavif.pc.cmake b/libavif.pc.cmake +index 006539b14782..4ef2c8a97b57 100644 +--- a/libavif.pc.cmake ++++ b/libavif.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=${prefix}/lib ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: @PROJECT_NAME@ +-- +2.30.0 + diff --git a/media-libs/libavif/libavif-0.9.0.ebuild b/media-libs/libavif/libavif-0.9.0-r1.ebuild similarity index 97% rename from media-libs/libavif/libavif-0.9.0.ebuild rename to media-libs/libavif/libavif-0.9.0-r1.ebuild index c00246430f4..f2801c49a9c 100644 --- a/media-libs/libavif/libavif-0.9.0.ebuild +++ b/media-libs/libavif/libavif-0.9.0-r1.ebuild @@ -27,6 +27,10 @@ BDEPEND="virtual/pkgconfig" REQUIRED_USE="|| ( aom dav1d )" +PATCHES=( + "${FILESDIR}/${P}-pkg-config.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON