| 1 |
commit: 261a921cc8f554cf80ba5b054a885b96a0ad77a9 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 28 15:37:01 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 28 15:37:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261a921c |
| 7 |
|
| 8 |
media-libs/libogg: fix libdir in installed M4 macro |
| 9 |
|
| 10 |
Most consumers seem to work around this fine nowdays, |
| 11 |
but we should still fix the macro. |
| 12 |
|
| 13 |
See: https://gitlab.xiph.org/xiph/ogg/-/issues/1917 |
| 14 |
Bug: https://bugs.gentoo.org/464486 |
| 15 |
Bug: https://bugs.gentoo.org/499978 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 18 |
|
| 19 |
media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch | 13 +++++++++++++ |
| 20 |
.../libogg/{libogg-1.3.4.ebuild => libogg-1.3.4-r1.ebuild} | 5 +++++ |
| 21 |
2 files changed, 18 insertions(+) |
| 22 |
|
| 23 |
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 |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..144557b3add |
| 26 |
--- /dev/null |
| 27 |
+++ b/media-libs/libogg/files/libogg-1.3.4-libdir-m4.patch |
| 28 |
@@ -0,0 +1,13 @@ |
| 29 |
+diff --git a/ogg.m4 b/ogg.m4 |
| 30 |
+index 17235da..22956ef 100644 |
| 31 |
+--- a/ogg.m4 |
| 32 |
++++ b/ogg.m4 |
| 33 |
+@@ -21,7 +21,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile |
| 34 |
+ elif test "x$ogg_prefix" != "x" ; then |
| 35 |
+ OGG_LIBS="-L$ogg_prefix/lib" |
| 36 |
+ elif test "x$prefix" != "xNONE" ; then |
| 37 |
+- OGG_LIBS="-L$prefix/lib" |
| 38 |
++ OGG_LIBS="-L${libdir}" |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
+ if test "x$ogg_prefix" != "xno" ; then |
| 42 |
|
| 43 |
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild |
| 44 |
similarity index 93% |
| 45 |
rename from media-libs/libogg/libogg-1.3.4.ebuild |
| 46 |
rename to media-libs/libogg/libogg-1.3.4-r1.ebuild |
| 47 |
index 2ad33bdb445..ff4eab24e62 100644 |
| 48 |
--- a/media-libs/libogg/libogg-1.3.4.ebuild |
| 49 |
+++ b/media-libs/libogg/libogg-1.3.4-r1.ebuild |
| 50 |
@@ -2,6 +2,7 @@ |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
EAPI=7 |
| 54 |
+ |
| 55 |
inherit multilib-minimal |
| 56 |
|
| 57 |
DESCRIPTION="the Ogg media file format library" |
| 58 |
@@ -15,6 +16,10 @@ IUSE="static-libs" |
| 59 |
|
| 60 |
DOCS=( AUTHORS CHANGES ) |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch |
| 64 |
+) |
| 65 |
+ |
| 66 |
MULTILIB_WRAPPED_HEADERS=( |
| 67 |
/usr/include/ogg/config_types.h |
| 68 |
) |
Archives