summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2021-03-04 21:28:25 -0500
committerMike Frysinger <vapier@gentoo.org>2021-03-05 19:03:46 -0500
commitb967eb307b953d2153101bf7777d9ebcf5682a0e (patch)
treec3aff1fe00cfc0e366e218b73cb15858659d3414 /media-libs/libavif
parentgames-util/lutris: sort deps (diff)
downloadgentoo-b967eb307b953d2153101bf7777d9ebcf5682a0e.tar.gz
gentoo-b967eb307b953d2153101bf7777d9ebcf5682a0e.tar.bz2
gentoo-b967eb307b953d2153101bf7777d9ebcf5682a0e.zip
media-libs/libavif: fix libdir setting in the .pc file
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'media-libs/libavif')
-rw-r--r--media-libs/libavif/files/libavif-0.9.0-pkg-config.patch28
-rw-r--r--media-libs/libavif/libavif-0.9.0-r1.ebuild (renamed from media-libs/libavif/libavif-0.9.0.ebuild)4
2 files changed, 32 insertions, 0 deletions
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 000000000000..b1238b321770
--- /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 <vapier@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
index c00246430f4a..f2801c49a9c0 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