| 1 |
commit: 2f4920ceed44312716ce5ba4850b26ce3e89b875 |
| 2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 2 09:03:16 2019 +0000 |
| 4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 7 13:35:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4920ce |
| 7 |
|
| 8 |
app-emulation/faudio: fix prefix installation for 19.06 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.70, Repoman-2.3.16 |
| 11 |
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/faudio/faudio-19.06.ebuild | 7 +++++-- |
| 14 |
app-emulation/faudio/files/faudio.pc | 2 +- |
| 15 |
2 files changed, 6 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild |
| 18 |
index 295da563249..82959acb733 100644 |
| 19 |
--- a/app-emulation/faudio/faudio-19.06.ebuild |
| 20 |
+++ b/app-emulation/faudio/faudio-19.06.ebuild |
| 21 |
@@ -52,7 +52,7 @@ multilib_src_configure() { |
| 22 |
"-DXNASONG=$(usex xnasong ON OFF)" |
| 23 |
) |
| 24 |
if use ffmpeg; then |
| 25 |
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" ) |
| 26 |
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" ) |
| 27 |
fi |
| 28 |
cmake-utils_src_configure |
| 29 |
} |
| 30 |
@@ -70,7 +70,10 @@ multilib_src_install() { |
| 31 |
# FIXME: do we want to install the FAudio tools? |
| 32 |
cmake-utils_src_install |
| 33 |
|
| 34 |
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \ |
| 35 |
+ sed -e \ |
| 36 |
+ "s@%LIB%@$(get_libdir)@g" \ |
| 37 |
+ "s@%PREFIX%@${EPREFIX}/usr@g" \ |
| 38 |
+ "${FILESDIR}/faudio.pc" \ |
| 39 |
> "${T}/faudio.pc" \ |
| 40 |
|| die "sed failed" |
| 41 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 42 |
|
| 43 |
diff --git a/app-emulation/faudio/files/faudio.pc b/app-emulation/faudio/files/faudio.pc |
| 44 |
index c632922c1f6..cdb3bf49e64 100644 |
| 45 |
--- a/app-emulation/faudio/files/faudio.pc |
| 46 |
+++ b/app-emulation/faudio/files/faudio.pc |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-prefix=/usr |
| 49 |
+prefix=%PREFIX% |
| 50 |
exec_prefix=${prefix} |
| 51 |
libdir=${prefix}/%LIB% |
| 52 |
includedir=${prefix}/include/FAudio |
Archives