summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-05-01 20:52:42 +0100
committerSam James <sam@gentoo.org>2022-05-01 20:52:42 +0100
commit8505ba6d4d94a2aa5e6358edb32f31d5f8098401 (patch)
treee707873ee327f02db17b341fbe2b5b68b3756370 /media-video
parentmedia-video/pipewire: Drop alsa-plugins[pulseaudio] blocker (diff)
downloadgentoo-8505ba6d4d94a2aa5e6358edb32f31d5f8098401.tar.gz
gentoo-8505ba6d4d94a2aa5e6358edb32f31d5f8098401.tar.bz2
gentoo-8505ba6d4d94a2aa5e6358edb32f31d5f8098401.zip
media-video/pipewire: respect prefix for 99-pipewire-default-hook.conf
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/pipewire/files/99-pipewire-default-hook.conf6
-rw-r--r--media-video/pipewire/pipewire-0.3.51-r1.ebuild1
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.