commit: 8505ba6d4d94a2aa5e6358edb32f31d5f8098401
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 19:52:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 1 19:52:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8505ba6d
media-video/pipewire: respect prefix for 99-pipewire-default-hook.conf
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/pipewire/files/99-pipewire-default-hook.conf | 6 +++---
media-video/pipewire/pipewire-0.3.51-r1.ebuild | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/media-video/pipewire/files/99-pipewire-default-hook.conf
b/media-video/pipewire/files/99-pipewire-default-hook.conf
index 172de5c27f60..7145accea809 100644
--- a/media-video/pipewire/files/99-pipewire-default-hook.conf
+++ b/media-video/pipewire/files/99-pipewire-default-hook.conf
@@ -1,15 +1,15 @@
# Load pipewire configuration at conf hook processing time. This allows to
# override pulseaudio defaults configuration which is also applied via hook.
#
-# Note since hooks are run after /etc/asound.conf and ~/.asoundrc are applied,
+# Note since hooks are run after @GENTOO_PORTAGE_EPREFIX@/etc/asound.conf and
~/.asoundrc are applied,
# we load these again here make sure that user configuration takes precedence.
@hooks [
{
func load
files [
- "/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf"
- "/etc/asound.conf"
+
"@GENTOO_PORTAGE_EPREFIX@/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf"
+ "@GENTOO_PORTAGE_EPREFIX@/etc/asound.conf"
"~/.asoundrc"
]
errors false
diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild
b/media-video/pipewire/pipewire-0.3.51-r1.ebuild
index b22860800f14..c28ecc739f33 100644
--- a/media-video/pipewire/pipewire-0.3.51-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.51-r1.ebuild
@@ -240,6 +240,7 @@ multilib_src_install_all() {
# Install pipewire conf loader hook
insinto /usr/share/alsa/alsa.conf.d
doins "${FILESDIR}"/99-pipewire-default-hook.conf
+ eprefixify
"${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
# These will break if someone has /etc that is a symbolic link
to a subfolder! See #724222
# And the current dosym8 -r implementation is likely affected
by the same issue, too.
