commit:     72a8f02430736c23ef9b60a47dd83ee945578d9b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 15:37:07 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 28 15:37:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a8f024

media-libs/opus: fix libdir in installed M4 macro

Most consumers seem to work around this fine nowdays,
but we should still fix the macro.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/opus/files/opus-1.3.1-libdir-macro.patch | 11 +++++++++++
 media-libs/opus/opus-1.3.1-r2.ebuild                |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/media-libs/opus/files/opus-1.3.1-libdir-macro.patch 
b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
new file mode 100644
index 00000000000..4f57e54ddf0
--- /dev/null
+++ b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
@@ -0,0 +1,11 @@
+--- a/opus.m4
++++ b/opus.m4
+@@ -22,7 +22,7 @@ 
AC_ARG_ENABLE(opustest,AC_HELP_STRING([--disable-opustest],[Do not try to compil
+   elif test "x$opus_prefix" != "x" ; then
+     OPUS_LIBS="-L$opus_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OPUS_LIBS="-L$prefix/lib"
++    OPUS_LIBS="-L${libdir}"
+   fi
+ 
+   if test "x$opus_prefix" != "xno" ; then

diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild 
b/media-libs/opus/opus-1.3.1-r2.ebuild
index 08cffd6f0a3..ce65edada36 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -20,6 +20,10 @@ BDEPEND="doc? (
                media-gfx/graphviz
        )"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
+)
+
 multilib_src_configure() {
        local myeconfargs=(
                $(use_enable custom-modes)
@@ -33,7 +37,7 @@ multilib_src_configure() {
        # bug #752069
        for i in "${INTRINSIC_FLAGS}" ; do
                use ${i} && myeconfargs+=( --enable-intrinsics ) && break
-       done ||  myeconfargs+=( --disable-intrinsics )
+       done || myeconfargs+=( --disable-intrinsics )
 
        if is-flagq -ffast-math || is-flagq -Ofast; then
                myeconfargs+=( "--enable-float-approx" )

Reply via email to