Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opus/files/, media-libs/opus/
Date: Fri, 28 May 2021 15:37:37
Message-Id: 1622216227.72a8f02430736c23ef9b60a47dd83ee945578d9b.soap@gentoo
1 commit: 72a8f02430736c23ef9b60a47dd83ee945578d9b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 28 15:37:07 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 15:37:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a8f024
7
8 media-libs/opus: 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 Signed-off-by: Sam James <sam <AT> gentoo.org>
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 media-libs/opus/files/opus-1.3.1-libdir-macro.patch | 11 +++++++++++
17 media-libs/opus/opus-1.3.1-r2.ebuild | 6 +++++-
18 2 files changed, 16 insertions(+), 1 deletion(-)
19
20 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
21 new file mode 100644
22 index 00000000000..4f57e54ddf0
23 --- /dev/null
24 +++ b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
25 @@ -0,0 +1,11 @@
26 +--- a/opus.m4
27 ++++ b/opus.m4
28 +@@ -22,7 +22,7 @@ AC_ARG_ENABLE(opustest,AC_HELP_STRING([--disable-opustest],[Do not try to compil
29 + elif test "x$opus_prefix" != "x" ; then
30 + OPUS_LIBS="-L$opus_prefix/lib"
31 + elif test "x$prefix" != "xNONE" ; then
32 +- OPUS_LIBS="-L$prefix/lib"
33 ++ OPUS_LIBS="-L${libdir}"
34 + fi
35 +
36 + if test "x$opus_prefix" != "xno" ; then
37
38 diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
39 index 08cffd6f0a3..ce65edada36 100644
40 --- a/media-libs/opus/opus-1.3.1-r2.ebuild
41 +++ b/media-libs/opus/opus-1.3.1-r2.ebuild
42 @@ -20,6 +20,10 @@ BDEPEND="doc? (
43 media-gfx/graphviz
44 )"
45
46 +PATCHES=(
47 + "${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
48 +)
49 +
50 multilib_src_configure() {
51 local myeconfargs=(
52 $(use_enable custom-modes)
53 @@ -33,7 +37,7 @@ multilib_src_configure() {
54 # bug #752069
55 for i in "${INTRINSIC_FLAGS}" ; do
56 use ${i} && myeconfargs+=( --enable-intrinsics ) && break
57 - done || myeconfargs+=( --disable-intrinsics )
58 + done || myeconfargs+=( --disable-intrinsics )
59
60 if is-flagq -ffast-math || is-flagq -Ofast; then
61 myeconfargs+=( "--enable-float-approx" )