diff options
author | Sam James <sam@gentoo.org> | 2021-05-28 17:37:01 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2021-05-28 17:37:01 +0200 |
commit | 261a921cc8f554cf80ba5b054a885b96a0ad77a9 (patch) | |
tree | 3d35ae360abfc11e0b8180ae8f263aff0516c84c /media-libs/libogg | |
parent | profiles/arch/riscv: use-mask unkeyworded optional deps of distcc (diff) | |
download | gentoo-261a921cc8f554cf80ba5b054a885b96a0ad77a9.tar.gz gentoo-261a921cc8f554cf80ba5b054a885b96a0ad77a9.tar.bz2 gentoo-261a921cc8f554cf80ba5b054a885b96a0ad77a9.zip |
media-libs/libogg: fix libdir in installed M4 macro
Most consumers seem to work around this fine nowdays,
but we should still fix the macro.
See: https://gitlab.xiph.org/xiph/ogg/-/issues/1917
Bug: https://bugs.gentoo.org/464486
Bug: https://bugs.gentoo.org/499978
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-libs/libogg')
-rw-r--r-- | media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch | 13 | ||||
-rw-r--r-- | media-libs/libogg/libogg-1.3.4-r1.ebuild (renamed from media-libs/libogg/libogg-1.3.4.ebuild) | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch new file mode 100644 index 000000000000..144557b3add7 --- /dev/null +++ b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch @@ -0,0 +1,13 @@ +diff --git a/ogg.m4 b/ogg.m4 +index 17235da..22956ef 100644 +--- a/ogg.m4 ++++ b/ogg.m4 +@@ -21,7 +21,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile + elif test "x$ogg_prefix" != "x" ; then + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE" ; then +- OGG_LIBS="-L$prefix/lib" ++ OGG_LIBS="-L${libdir}" + fi + + if test "x$ogg_prefix" != "xno" ; then diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild index 2ad33bdb4457..ff4eab24e624 100644 --- a/media-libs/libogg/libogg-1.3.4.ebuild +++ b/media-libs/libogg/libogg-1.3.4-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit multilib-minimal DESCRIPTION="the Ogg media file format library" @@ -15,6 +16,10 @@ IUSE="static-libs" DOCS=( AUTHORS CHANGES ) +PATCHES=( + "${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch +) + MULTILIB_WRAPPED_HEADERS=( /usr/include/ogg/config_types.h ) |