diff options
| author |   Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2022-04-30 22:11:50 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-05-01 20:54:17 +0100 |
| commit | f24dec544560c7e8d7f495ef7872f72e15a5c678 (patch) | |
| tree | a34875eed058b375994c4b05ce9d7da8a0d9513f /media-plugins | |
| parent | dev-libs/intel-compute-runtime: enable buildins compilation (diff) | |
| download | gentoo-f24dec544560c7e8d7f495ef7872f72e15a5c678.tar.gz gentoo-f24dec544560c7e8d7f495ef7872f72e15a5c678.tar.bz2 gentoo-f24dec544560c7e8d7f495ef7872f72e15a5c678.zip | |
media-plugins/alsa-plugins: Clean up unnecessary sed
Drop remaining sed from #410261 and change installed conf file instead.
Bug: https://bugs.gentoo.org/410261
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25271
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-plugins')
4 files changed, 3 insertions, 18 deletions
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild index e5d2ab885c4d..b6e088bd7f06 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -78,11 +78,6 @@ multilib_src_install_all() { doins "${FILESDIR}"/pulse-default.conf insinto /usr/share/alsa/alsa.conf.d doins "${FILESDIR}"/51-pulseaudio-probe.conf - # bug #410261, comment 5+ - # seems to work fine without any path - sed \ - -e "s:/usr/lib/alsa-lib/::" \ - -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 fi diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild index a11e006b4711..3b7332e08747 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -78,11 +78,6 @@ multilib_src_install_all() { doins "${FILESDIR}"/pulse-default.conf insinto /usr/share/alsa/alsa.conf.d doins "${FILESDIR}"/51-pulseaudio-probe.conf - # bug #410261, comment 5+ - # seems to work fine without any path - sed \ - -e "s:/usr/lib/alsa-lib/::" \ - -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 fi diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild index 9fa566182fda..9a24661c71e9 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild @@ -78,11 +78,6 @@ multilib_src_install_all() { doins "${FILESDIR}"/pulse-default.conf insinto /usr/share/alsa/alsa.conf.d doins "${FILESDIR}"/51-pulseaudio-probe.conf - # bug #410261, comment 5+ - # seems to work fine without any path - sed \ - -e "s:/usr/lib/alsa-lib/::" \ - -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 fi diff --git a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf index c2272c85b072..68f3f994025f 100644 --- a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf +++ b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf @@ -2,7 +2,7 @@ # default output for applications using alsa when pulseaudio is running. hook_func.pulse_load_if_running { - lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so" + lib "libasound_module_conf_pulse.so" func "conf_pulse_hook_load_if_running" } |