| 1 |
commit: f24dec544560c7e8d7f495ef7872f72e15a5c678 |
| 2 |
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 30 19:11:50 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 19:54:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24dec54 |
| 7 |
|
| 8 |
media-plugins/alsa-plugins: Clean up unnecessary sed |
| 9 |
|
| 10 |
Drop remaining sed from #410261 and change installed conf file instead. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/410261 |
| 13 |
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/25271 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild | 7 +------ |
| 18 |
media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild | 7 +------ |
| 19 |
media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild | 5 ----- |
| 20 |
media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf | 2 +- |
| 21 |
4 files changed, 3 insertions(+), 18 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild |
| 24 |
index e5d2ab885c4d..b6e088bd7f06 100644 |
| 25 |
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild |
| 26 |
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2021 Gentoo Authors |
| 29 |
+# Copyright 1999-2022 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=7 |
| 33 |
@@ -78,11 +78,6 @@ multilib_src_install_all() { |
| 34 |
doins "${FILESDIR}"/pulse-default.conf |
| 35 |
insinto /usr/share/alsa/alsa.conf.d |
| 36 |
doins "${FILESDIR}"/51-pulseaudio-probe.conf |
| 37 |
- # bug #410261, comment 5+ |
| 38 |
- # seems to work fine without any path |
| 39 |
- sed \ |
| 40 |
- -e "s:/usr/lib/alsa-lib/::" \ |
| 41 |
- -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 |
| 42 |
dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ |
| 43 |
/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 |
| 44 |
fi |
| 45 |
|
| 46 |
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild |
| 47 |
index a11e006b4711..3b7332e08747 100644 |
| 48 |
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild |
| 49 |
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild |
| 50 |
@@ -1,4 +1,4 @@ |
| 51 |
-# Copyright 1999-2021 Gentoo Authors |
| 52 |
+# Copyright 1999-2022 Gentoo Authors |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
|
| 55 |
EAPI=7 |
| 56 |
@@ -78,11 +78,6 @@ multilib_src_install_all() { |
| 57 |
doins "${FILESDIR}"/pulse-default.conf |
| 58 |
insinto /usr/share/alsa/alsa.conf.d |
| 59 |
doins "${FILESDIR}"/51-pulseaudio-probe.conf |
| 60 |
- # bug #410261, comment 5+ |
| 61 |
- # seems to work fine without any path |
| 62 |
- sed \ |
| 63 |
- -e "s:/usr/lib/alsa-lib/::" \ |
| 64 |
- -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 |
| 65 |
dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ |
| 66 |
/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 |
| 67 |
fi |
| 68 |
|
| 69 |
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild |
| 70 |
index 9fa566182fda..9a24661c71e9 100644 |
| 71 |
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild |
| 72 |
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild |
| 73 |
@@ -78,11 +78,6 @@ multilib_src_install_all() { |
| 74 |
doins "${FILESDIR}"/pulse-default.conf |
| 75 |
insinto /usr/share/alsa/alsa.conf.d |
| 76 |
doins "${FILESDIR}"/51-pulseaudio-probe.conf |
| 77 |
- # bug #410261, comment 5+ |
| 78 |
- # seems to work fine without any path |
| 79 |
- sed \ |
| 80 |
- -e "s:/usr/lib/alsa-lib/::" \ |
| 81 |
- -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 |
| 82 |
dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ |
| 83 |
/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 |
| 84 |
fi |
| 85 |
|
| 86 |
diff --git a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf |
| 87 |
index c2272c85b072..68f3f994025f 100644 |
| 88 |
--- a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf |
| 89 |
+++ b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf |
| 90 |
@@ -2,7 +2,7 @@ |
| 91 |
# default output for applications using alsa when pulseaudio is running. |
| 92 |
|
| 93 |
hook_func.pulse_load_if_running { |
| 94 |
- lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so" |
| 95 |
+ lib "libasound_module_conf_pulse.so" |
| 96 |
func "conf_pulse_hook_load_if_running" |
| 97 |
} |
Archives