From: "Nick Sarnie" <sarnex@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
Date: Sun, 15 Sep 2019 15:24:31 +0000 (UTC) [thread overview]
Message-ID: <1568561046.d2acd255464a0f374c31dc5905756003b25ee8d1.sarnex@gentoo> (raw)
commit: d2acd255464a0f374c31dc5905756003b25ee8d1
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 15:24:06 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 15:24:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d2acd255
app-emulation/faudio: Sync with ::gentoo and port to 9999
Fixes: https://bugs.gentoo.org/693404
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
app-emulation/faudio/faudio-19.06.ebuild | 6 +++---
app-emulation/faudio/faudio-9999.ebuild | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 295da56..a8490f1 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
@@ -70,8 +70,8 @@ multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
cmake-utils_src_install
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
- > "${T}/faudio.pc" \
+ sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
|| die "sed failed"
insinto "/usr/$(get_libdir)/pkgconfig"
doins "${T}/faudio.pc"
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index bd6b12f..a8490f1 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# shellcheck disable=SC2034
@@ -52,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
@@ -70,8 +70,8 @@ multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
cmake-utils_src_install
- sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
- > "${T}/faudio.pc" \
+ sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
|| die "sed failed"
insinto "/usr/$(get_libdir)/pkgconfig"
doins "${T}/faudio.pc"
next reply other threads:[~2019-09-15 15:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-15 15:24 Nick Sarnie [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-10 0:20 [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/ Nick Sarnie
2019-10-01 1:16 Nick Sarnie
2019-06-16 14:19 Nick Sarnie
2019-03-17 14:14 Nick Sarnie
2019-03-16 20:47 Nick Sarnie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1568561046.d2acd255464a0f374c31dc5905756003b25ee8d1.sarnex@gentoo \
--to=sarnex@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox