| 1 |
commit: 8505ba6d4d94a2aa5e6358edb32f31d5f8098401 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 19:52:42 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 19:52:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8505ba6d |
| 7 |
|
| 8 |
media-video/pipewire: respect prefix for 99-pipewire-default-hook.conf |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
media-video/pipewire/files/99-pipewire-default-hook.conf | 6 +++--- |
| 13 |
media-video/pipewire/pipewire-0.3.51-r1.ebuild | 1 + |
| 14 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/pipewire/files/99-pipewire-default-hook.conf b/media-video/pipewire/files/99-pipewire-default-hook.conf |
| 17 |
index 172de5c27f60..7145accea809 100644 |
| 18 |
--- a/media-video/pipewire/files/99-pipewire-default-hook.conf |
| 19 |
+++ b/media-video/pipewire/files/99-pipewire-default-hook.conf |
| 20 |
@@ -1,15 +1,15 @@ |
| 21 |
# Load pipewire configuration at conf hook processing time. This allows to |
| 22 |
# override pulseaudio defaults configuration which is also applied via hook. |
| 23 |
# |
| 24 |
-# Note since hooks are run after /etc/asound.conf and ~/.asoundrc are applied, |
| 25 |
+# Note since hooks are run after @GENTOO_PORTAGE_EPREFIX@/etc/asound.conf and ~/.asoundrc are applied, |
| 26 |
# we load these again here make sure that user configuration takes precedence. |
| 27 |
|
| 28 |
@hooks [ |
| 29 |
{ |
| 30 |
func load |
| 31 |
files [ |
| 32 |
- "/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf" |
| 33 |
- "/etc/asound.conf" |
| 34 |
+ "@GENTOO_PORTAGE_EPREFIX@/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf" |
| 35 |
+ "@GENTOO_PORTAGE_EPREFIX@/etc/asound.conf" |
| 36 |
"~/.asoundrc" |
| 37 |
] |
| 38 |
errors false |
| 39 |
|
| 40 |
diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild b/media-video/pipewire/pipewire-0.3.51-r1.ebuild |
| 41 |
index b22860800f14..c28ecc739f33 100644 |
| 42 |
--- a/media-video/pipewire/pipewire-0.3.51-r1.ebuild |
| 43 |
+++ b/media-video/pipewire/pipewire-0.3.51-r1.ebuild |
| 44 |
@@ -240,6 +240,7 @@ multilib_src_install_all() { |
| 45 |
# Install pipewire conf loader hook |
| 46 |
insinto /usr/share/alsa/alsa.conf.d |
| 47 |
doins "${FILESDIR}"/99-pipewire-default-hook.conf |
| 48 |
+ eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf |
| 49 |
|
| 50 |
# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 |
| 51 |
# And the current dosym8 -r implementation is likely affected by the same issue, too. |
Archives