commit: 261a921cc8f554cf80ba5b054a885b96a0ad77a9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 28 15:37:01 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri May 28 15:37:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261a921c
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 <AT> gentoo.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch | 13 +++++++++++++ .../libogg/{libogg-1.3.4.ebuild => libogg-1.3.4-r1.ebuild} | 5 +++++ 2 files changed, 18 insertions(+) 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 00000000000..144557b3add --- /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 similarity index 93% rename from media-libs/libogg/libogg-1.3.4.ebuild rename to media-libs/libogg/libogg-1.3.4-r1.ebuild index 2ad33bdb445..ff4eab24e62 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 )
