commit: b874f477016d1d4e4eecd72e3ac2c7b73050c1a9 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Feb 20 15:47:32 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Feb 20 15:49:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b874f477
media-sound/alsa-utils: Removed old Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-sound/alsa-utils/Manifest | 3 - media-sound/alsa-utils/alsa-utils-1.1.2.ebuild | 73 ------ media-sound/alsa-utils/alsa-utils-1.1.6.ebuild | 73 ------ media-sound/alsa-utils/alsa-utils-1.1.9.ebuild | 78 ------- ...fix-invalid-comparison-of-64-bit-storage-.patch | 249 --------------------- media-sound/alsa-utils/files/alsasound.initd-r6 | 87 ------- 6 files changed, 563 deletions(-) diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index e317f7bc46e..532eb02ac71 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -1,6 +1,3 @@ -DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14 -DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58 DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9 -DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild deleted file mode 100644 index ced234f3433..00000000000 --- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils systemd udev - -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="bat doc +libsamplerate +ncurses nls selinux" - -CDEPEND=">=media-libs/alsa-lib-${PV} - libsamplerate? ( media-libs/libsamplerate ) - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) - bat? ( sci-libs/fftw:= )" -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( app-text/xmlto )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-alsa )" - -src_configure() { - local myconf - use doc || myconf='--disable-xmlto' - - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214 - econf \ - --disable-maintainer-mode \ - $(use_enable bat) \ - $(use_enable libsamplerate alsaloop) \ - $(use_enable nls) \ - $(use_enable ncurses alsamixer) \ - --disable-alsaconf \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-udev-rules-dir="$(get_udevdir)"/rules.d \ - ${myconf} -} - -src_install() { - default - dodoc seq/*/README.* - - newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound - - insinto /etc/modprobe.d - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf - - keepdir /var/lib/alsa - - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not - # scan directory /usr/share/alsa/ucm: No such file or directory - # alsaucm: unable to obtain card list: No such file or directory - keepdir /usr/share/alsa/ucm -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "To take advantage of the init script, and automate the process of" - elog "saving and restoring sound-card mixer levels you should" - elog "add alsasound to the boot runlevel. You can do this as" - elog "root like so:" - elog "# rc-update add alsasound boot" - ewarn - ewarn "The ALSA core should be built into the kernel or loaded through other" - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." - fi -} diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild deleted file mode 100644 index 757dbfdfeb7..00000000000 --- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd udev - -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="bat doc +libsamplerate +ncurses nls selinux" - -CDEPEND=">=media-libs/alsa-lib-${PV} - libsamplerate? ( media-libs/libsamplerate ) - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) - bat? ( sci-libs/fftw:= )" -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( app-text/xmlto )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-alsa )" - -src_configure() { - local myeconfargs=( - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214 - --disable-alsaconf - --disable-maintainer-mode - --with-asound-state-dir="${EPREFIX}"/var/lib/alsa - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - $(use_enable bat) - $(use_enable libsamplerate alsaloop) - $(use_enable ncurses alsamixer) - $(use_enable nls) - $(usex doc '' --disable-xmlto) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - dodoc seq/*/README.* - - newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound - - insinto /etc/modprobe.d - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf - - keepdir /var/lib/alsa - - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not - # scan directory /usr/share/alsa/ucm: No such file or directory - # alsaucm: unable to obtain card list: No such file or directory - keepdir /usr/share/alsa/ucm -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "To take advantage of the init script, and automate the process of" - elog "saving and restoring sound-card mixer levels you should" - elog "add alsasound to the boot runlevel. You can do this as" - elog "root like so:" - elog "# rc-update add alsasound boot" - ewarn - ewarn "The ALSA core should be built into the kernel or loaded through other" - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." - fi -} diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild deleted file mode 100644 index 280d4466e12..00000000000 --- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd udev - -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86" -IUSE="bat doc +libsamplerate +ncurses nls selinux" - -CDEPEND=">=media-libs/alsa-lib-${PV} - libsamplerate? ( media-libs/libsamplerate ) - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) - bat? ( sci-libs/fftw:= )" -DEPEND="${CDEPEND} - doc? ( app-text/xmlto )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-alsa )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.8-missing_header.patch - "${FILESDIR}"/${P}-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch -) - -src_configure() { - local myeconfargs=( - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214 - --disable-alsaconf - --disable-maintainer-mode - --with-asound-state-dir="${EPREFIX}"/var/lib/alsa - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d - $(use_enable bat) - $(use_enable libsamplerate alsaloop) - $(use_enable ncurses alsamixer) - $(use_enable nls) - $(usex doc '' --disable-xmlto) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - dodoc seq/*/README.* - - newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound - - insinto /etc/modprobe.d - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf - - keepdir /var/lib/alsa - - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not - # scan directory /usr/share/alsa/ucm: No such file or directory - # alsaucm: unable to obtain card list: No such file or directory - keepdir /usr/share/alsa/ucm -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "To take advantage of the init script, and automate the process of" - elog "saving and restoring sound-card mixer levels you should" - elog "add alsasound to the boot runlevel. You can do this as" - elog "root like so:" - elog "# rc-update add alsasound boot" - ewarn - ewarn "The ALSA core should be built into the kernel or loaded through other" - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils." - fi -} diff --git a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch b/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch deleted file mode 100644 index 65435839973..00000000000 --- a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch +++ /dev/null @@ -1,249 +0,0 @@ -From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001 -From: Takashi Sakamoto <o-taka...@sakamocchi.jp> -Date: Sun, 28 Jul 2019 13:48:50 +0900 -Subject: [PATCH] axfer: test: fix invalid comparison of 64 bit storage in - ILP32 data type - -In system V ABIs with ILP32 data model, bit shift for '1ul' can brings -undefined behaviour when the calculation result is over 32 bit width. - -This commit fixes the bug. - -Reported-by: Rolf Eike Beer <e...@sf-mail.de> -Reference: https://bugs.gentoo.org/681652 -Reference: https://github.com/alsa-project/alsa-utils/issues/23 -Signed-off-by: Takashi Sakamoto <o-taka...@sakamocchi.jp> -Signed-off-by: Takashi Iwai <ti...@suse.de> ---- - axfer/test/container-test.c | 142 ++++++++++++++++++------------------ - axfer/test/generator.c | 4 +- - axfer/test/mapper-test.c | 24 +++--- - 3 files changed, 85 insertions(+), 85 deletions(-) - -diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c -index 0e2e6e9..9b30ae3 100644 ---- a/axfer/test/container-test.c -+++ b/axfer/test/container-test.c -@@ -172,82 +172,82 @@ int main(int argc, const char *argv[]) - { - static const uint64_t sample_format_masks[] = { - [CONTAINER_FORMAT_RIFF_WAVE] = -- (1ul << SND_PCM_FORMAT_U8) | -- (1ul << SND_PCM_FORMAT_S16_LE) | -- (1ul << SND_PCM_FORMAT_S16_BE) | -- (1ul << SND_PCM_FORMAT_S24_LE) | -- (1ul << SND_PCM_FORMAT_S24_BE) | -- (1ul << SND_PCM_FORMAT_S32_LE) | -- (1ul << SND_PCM_FORMAT_S32_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT_LE) | -- (1ul << SND_PCM_FORMAT_FLOAT_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_LE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) | -- (1ul << SND_PCM_FORMAT_MU_LAW) | -- (1ul << SND_PCM_FORMAT_A_LAW) | -- (1ul << SND_PCM_FORMAT_S24_3LE) | -- (1ul << SND_PCM_FORMAT_S24_3BE) | -- (1ul << SND_PCM_FORMAT_S20_3LE) | -- (1ul << SND_PCM_FORMAT_S20_3BE) | -- (1ul << SND_PCM_FORMAT_S18_3LE) | -- (1ul << SND_PCM_FORMAT_S18_3BE), -+ (1ull << SND_PCM_FORMAT_U8) | -+ (1ull << SND_PCM_FORMAT_S16_LE) | -+ (1ull << SND_PCM_FORMAT_S16_BE) | -+ (1ull << SND_PCM_FORMAT_S24_LE) | -+ (1ull << SND_PCM_FORMAT_S24_BE) | -+ (1ull << SND_PCM_FORMAT_S32_LE) | -+ (1ull << SND_PCM_FORMAT_S32_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT_LE) | -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) | -+ (1ull << SND_PCM_FORMAT_MU_LAW) | -+ (1ull << SND_PCM_FORMAT_A_LAW) | -+ (1ull << SND_PCM_FORMAT_S24_3LE) | -+ (1ull << SND_PCM_FORMAT_S24_3BE) | -+ (1ull << SND_PCM_FORMAT_S20_3LE) | -+ (1ull << SND_PCM_FORMAT_S20_3BE) | -+ (1ull << SND_PCM_FORMAT_S18_3LE) | -+ (1ull << SND_PCM_FORMAT_S18_3BE), - [CONTAINER_FORMAT_AU] = -- (1ul << SND_PCM_FORMAT_S8) | -- (1ul << SND_PCM_FORMAT_S16_BE) | -- (1ul << SND_PCM_FORMAT_S32_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) | -- (1ul << SND_PCM_FORMAT_MU_LAW) | -- (1ul << SND_PCM_FORMAT_A_LAW), -+ (1ull << SND_PCM_FORMAT_S8) | -+ (1ull << SND_PCM_FORMAT_S16_BE) | -+ (1ull << SND_PCM_FORMAT_S32_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) | -+ (1ull << SND_PCM_FORMAT_MU_LAW) | -+ (1ull << SND_PCM_FORMAT_A_LAW), - [CONTAINER_FORMAT_VOC] = -- (1ul << SND_PCM_FORMAT_U8) | -- (1ul << SND_PCM_FORMAT_S16_LE) | -- (1ul << SND_PCM_FORMAT_MU_LAW) | -- (1ul << SND_PCM_FORMAT_A_LAW), -+ (1ull << SND_PCM_FORMAT_U8) | -+ (1ull << SND_PCM_FORMAT_S16_LE) | -+ (1ull << SND_PCM_FORMAT_MU_LAW) | -+ (1ull << SND_PCM_FORMAT_A_LAW), - [CONTAINER_FORMAT_RAW] = -- (1ul << SND_PCM_FORMAT_S8) | -- (1ul << SND_PCM_FORMAT_U8) | -- (1ul << SND_PCM_FORMAT_S16_LE) | -- (1ul << SND_PCM_FORMAT_S16_BE) | -- (1ul << SND_PCM_FORMAT_U16_LE) | -- (1ul << SND_PCM_FORMAT_U16_BE) | -- (1ul << SND_PCM_FORMAT_S24_LE) | -- (1ul << SND_PCM_FORMAT_S24_BE) | -- (1ul << SND_PCM_FORMAT_U24_LE) | -- (1ul << SND_PCM_FORMAT_U24_BE) | -- (1ul << SND_PCM_FORMAT_S32_LE) | -- (1ul << SND_PCM_FORMAT_S32_BE) | -- (1ul << SND_PCM_FORMAT_U32_LE) | -- (1ul << SND_PCM_FORMAT_U32_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT_LE) | -- (1ul << SND_PCM_FORMAT_FLOAT_BE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_LE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) | -- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) | -- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) | -- (1ul << SND_PCM_FORMAT_MU_LAW) | -- (1ul << SND_PCM_FORMAT_A_LAW) | -- (1ul << SND_PCM_FORMAT_S24_3LE) | -- (1ul << SND_PCM_FORMAT_S24_3BE) | -- (1ul << SND_PCM_FORMAT_U24_3LE) | -- (1ul << SND_PCM_FORMAT_U24_3BE) | -- (1ul << SND_PCM_FORMAT_S20_3LE) | -- (1ul << SND_PCM_FORMAT_S20_3BE) | -- (1ul << SND_PCM_FORMAT_U20_3LE) | -- (1ul << SND_PCM_FORMAT_U20_3BE) | -- (1ul << SND_PCM_FORMAT_S18_3LE) | -- (1ul << SND_PCM_FORMAT_S18_3BE) | -- (1ul << SND_PCM_FORMAT_U18_3LE) | -- (1ul << SND_PCM_FORMAT_U18_3BE) | -- (1ul << SND_PCM_FORMAT_DSD_U8) | -- (1ul << SND_PCM_FORMAT_DSD_U16_LE) | -- (1ul << SND_PCM_FORMAT_DSD_U32_LE) | -- (1ul << SND_PCM_FORMAT_DSD_U16_BE) | -- (1ul << SND_PCM_FORMAT_DSD_U32_BE), -+ (1ull << SND_PCM_FORMAT_S8) | -+ (1ull << SND_PCM_FORMAT_U8) | -+ (1ull << SND_PCM_FORMAT_S16_LE) | -+ (1ull << SND_PCM_FORMAT_S16_BE) | -+ (1ull << SND_PCM_FORMAT_U16_LE) | -+ (1ull << SND_PCM_FORMAT_U16_BE) | -+ (1ull << SND_PCM_FORMAT_S24_LE) | -+ (1ull << SND_PCM_FORMAT_S24_BE) | -+ (1ull << SND_PCM_FORMAT_U24_LE) | -+ (1ull << SND_PCM_FORMAT_U24_BE) | -+ (1ull << SND_PCM_FORMAT_S32_LE) | -+ (1ull << SND_PCM_FORMAT_S32_BE) | -+ (1ull << SND_PCM_FORMAT_U32_LE) | -+ (1ull << SND_PCM_FORMAT_U32_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT_LE) | -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) | -+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) | -+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) | -+ (1ull << SND_PCM_FORMAT_MU_LAW) | -+ (1ull << SND_PCM_FORMAT_A_LAW) | -+ (1ull << SND_PCM_FORMAT_S24_3LE) | -+ (1ull << SND_PCM_FORMAT_S24_3BE) | -+ (1ull << SND_PCM_FORMAT_U24_3LE) | -+ (1ull << SND_PCM_FORMAT_U24_3BE) | -+ (1ull << SND_PCM_FORMAT_S20_3LE) | -+ (1ull << SND_PCM_FORMAT_S20_3BE) | -+ (1ull << SND_PCM_FORMAT_U20_3LE) | -+ (1ull << SND_PCM_FORMAT_U20_3BE) | -+ (1ull << SND_PCM_FORMAT_S18_3LE) | -+ (1ull << SND_PCM_FORMAT_S18_3BE) | -+ (1ull << SND_PCM_FORMAT_U18_3LE) | -+ (1ull << SND_PCM_FORMAT_U18_3BE) | -+ (1ull << SND_PCM_FORMAT_DSD_U8) | -+ (1ull << SND_PCM_FORMAT_DSD_U16_LE) | -+ (1ull << SND_PCM_FORMAT_DSD_U32_LE) | -+ (1ull << SND_PCM_FORMAT_DSD_U16_BE) | -+ (1ull << SND_PCM_FORMAT_DSD_U32_BE), - }; - static const uint64_t access_mask = -- (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) | -- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED); -+ (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) | -+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED); - struct test_generator gen = {0}; - struct container_trial *trial; - int i; -diff --git a/axfer/test/generator.c b/axfer/test/generator.c -index cdea2c9..bde8c5f 100644 ---- a/axfer/test/generator.c -+++ b/axfer/test/generator.c -@@ -220,7 +220,7 @@ static int test_sample_format(struct test_generator *gen, - int err = 0; - - for (i = 0; i <= SND_PCM_FORMAT_LAST; ++i) { -- if (!((1ul << i) & gen->sample_format_mask)) -+ if (!((1ull << i) & gen->sample_format_mask)) - continue; - - err = test_samples_per_frame(gen, access, i); -@@ -237,7 +237,7 @@ static int test_access(struct test_generator *gen) - int err = 0; - - for (i = 0; i <= SND_PCM_ACCESS_LAST; ++i) { -- if (!((1ul << i) & gen->access_mask)) -+ if (!((1ull << i) & gen->access_mask)) - continue; - - err = test_sample_format(gen, i); -diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c -index 6b24d54..f0376c7 100644 ---- a/axfer/test/mapper-test.c -+++ b/axfer/test/mapper-test.c -@@ -396,13 +396,13 @@ int main(int argc, const char *argv[]) - { - // Test 8/16/18/20/24/32/64 bytes per sample. - static const uint64_t sample_format_mask = -- (1ul << SND_PCM_FORMAT_U8) | -- (1ul << SND_PCM_FORMAT_S16_LE) | -- (1ul << SND_PCM_FORMAT_S18_3LE) | -- (1ul << SND_PCM_FORMAT_S20_3LE) | -- (1ul << SND_PCM_FORMAT_S24_LE) | -- (1ul << SND_PCM_FORMAT_S32_LE) | -- (1ul << SND_PCM_FORMAT_FLOAT64_LE); -+ (1ull << SND_PCM_FORMAT_U8) | -+ (1ull << SND_PCM_FORMAT_S16_LE) | -+ (1ull << SND_PCM_FORMAT_S18_3LE) | -+ (1ull << SND_PCM_FORMAT_S20_3LE) | -+ (1ull << SND_PCM_FORMAT_S24_LE) | -+ (1ull << SND_PCM_FORMAT_S32_LE) | -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE); - uint64_t access_mask; - struct test_generator gen = {0}; - struct mapper_trial *trial; -@@ -451,13 +451,13 @@ int main(int argc, const char *argv[]) - goto end; - } - -- access_mask = 1ul << access; -+ access_mask = 1ull << access; - verbose = true; - } else { -- access_mask = (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) | -- (1ul << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) | -- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED) | -- (1ul << SND_PCM_ACCESS_RW_NONINTERLEAVED); -+ access_mask = (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) | -+ (1ull << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) | -+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED) | -+ (1ull << SND_PCM_ACCESS_RW_NONINTERLEAVED); - verbose = false; - } - --- -2.21.0 - diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6 deleted file mode 100644 index f80a3518f3e..00000000000 --- a/media-sound/alsa-utils/files/alsasound.initd-r6 +++ /dev/null @@ -1,87 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -alsastatedir=/var/lib/alsa -alsascrdir=/etc/alsa.d -alsahomedir=/var/run/alsasound - -extra_commands="save restore" - -depend() { - need localmount - after bootmisc modules isapnp coldplug hotplug -} - -restore() { - ebegin "Restoring Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - if [ ! -r "${alsastatedir}/asound.state" ] ; then - ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" - eend 0 - return 0 - fi - - local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" - local CARDNUM - for cardnum in ${cards}; do - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ - || ewarn "Errors while restoring defaults, ignoring" - done - - for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do - [ -e "${ossfile}" ] || continue - # We use cat because I'm not sure if cp works properly on /proc - local procfile=${ossfile##${alsastatedir}/oss} - procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" - if [ -e /proc/asound/"${procfile}"/oss ] ; then - cat "${ossfile}" > /proc/asound/"${procfile}"/oss - fi - done - - eend 0 -} - -save() { - ebegin "Storing ALSA Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - mkdir -p "${alsastatedir}" - if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then - eerror "Error saving levels." - eend 1 - return 1 - fi - - for ossfile in /proc/asound/card*/pcm*/oss; do - [ -e "${ossfile}" ] || continue - local device=${ossfile##/proc/asound/} ; device=${device%%/oss} - device="$(echo "${device}" | sed -e 's,/,_,g')" - mkdir -p "${alsastatedir}/oss/" - cp "${ossfile}" "${alsastatedir}/oss/${device}" - done - - eend 0 -} - -start() { - if [ "${RESTORE_ON_START}" = "yes" ]; then - restore - fi - - return 0 -} - -stop() { - if [ "${SAVE_ON_STOP}" = "yes" ]; then - save - fi - return 0 -}
