Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/, media-sound/alsa-utils/files/
Date: Thu, 20 Feb 2020 15:49:47
Message-Id: 1582213773.b874f477016d1d4e4eecd72e3ac2c7b73050c1a9.polynomial-c@gentoo
1 commit: b874f477016d1d4e4eecd72e3ac2c7b73050c1a9
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 20 15:47:32 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 20 15:49:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b874f477
7
8 media-sound/alsa-utils: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/alsa-utils/Manifest | 3 -
14 media-sound/alsa-utils/alsa-utils-1.1.2.ebuild | 73 ------
15 media-sound/alsa-utils/alsa-utils-1.1.6.ebuild | 73 ------
16 media-sound/alsa-utils/alsa-utils-1.1.9.ebuild | 78 -------
17 ...fix-invalid-comparison-of-64-bit-storage-.patch | 249 ---------------------
18 media-sound/alsa-utils/files/alsasound.initd-r6 | 87 -------
19 6 files changed, 563 deletions(-)
20
21 diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
22 index e317f7bc46e..532eb02ac71 100644
23 --- a/media-sound/alsa-utils/Manifest
24 +++ b/media-sound/alsa-utils/Manifest
25 @@ -1,6 +1,3 @@
26 -DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
27 -DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
28 DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
29 -DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
30 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
31 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
32
33 diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
34 deleted file mode 100644
35 index ced234f3433..00000000000
36 --- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
37 +++ /dev/null
38 @@ -1,73 +0,0 @@
39 -# Copyright 1999-2020 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -inherit eutils systemd udev
44 -
45 -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
46 -HOMEPAGE="https://alsa-project.org/"
47 -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0.9"
51 -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
52 -IUSE="bat doc +libsamplerate +ncurses nls selinux"
53 -
54 -CDEPEND=">=media-libs/alsa-lib-${PV}
55 - libsamplerate? ( media-libs/libsamplerate )
56 - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
57 - bat? ( sci-libs/fftw:= )"
58 -DEPEND="${CDEPEND}
59 - virtual/pkgconfig
60 - doc? ( app-text/xmlto )"
61 -RDEPEND="${CDEPEND}
62 - selinux? ( sec-policy/selinux-alsa )"
63 -
64 -src_configure() {
65 - local myconf
66 - use doc || myconf='--disable-xmlto'
67 -
68 - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
69 - econf \
70 - --disable-maintainer-mode \
71 - $(use_enable bat) \
72 - $(use_enable libsamplerate alsaloop) \
73 - $(use_enable nls) \
74 - $(use_enable ncurses alsamixer) \
75 - --disable-alsaconf \
76 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
77 - --with-udev-rules-dir="$(get_udevdir)"/rules.d \
78 - ${myconf}
79 -}
80 -
81 -src_install() {
82 - default
83 - dodoc seq/*/README.*
84 -
85 - newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
86 - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
87 -
88 - insinto /etc/modprobe.d
89 - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
90 -
91 - keepdir /var/lib/alsa
92 -
93 - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
94 - # scan directory /usr/share/alsa/ucm: No such file or directory
95 - # alsaucm: unable to obtain card list: No such file or directory
96 - keepdir /usr/share/alsa/ucm
97 -}
98 -
99 -pkg_postinst() {
100 - if [[ -z ${REPLACING_VERSIONS} ]]; then
101 - elog
102 - elog "To take advantage of the init script, and automate the process of"
103 - elog "saving and restoring sound-card mixer levels you should"
104 - elog "add alsasound to the boot runlevel. You can do this as"
105 - elog "root like so:"
106 - elog "# rc-update add alsasound boot"
107 - ewarn
108 - ewarn "The ALSA core should be built into the kernel or loaded through other"
109 - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
110 - fi
111 -}
112
113 diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
114 deleted file mode 100644
115 index 757dbfdfeb7..00000000000
116 --- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
117 +++ /dev/null
118 @@ -1,73 +0,0 @@
119 -# Copyright 1999-2020 Gentoo Authors
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=6
123 -inherit systemd udev
124 -
125 -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
126 -HOMEPAGE="https://alsa-project.org/"
127 -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
128 -
129 -LICENSE="GPL-2"
130 -SLOT="0.9"
131 -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
132 -IUSE="bat doc +libsamplerate +ncurses nls selinux"
133 -
134 -CDEPEND=">=media-libs/alsa-lib-${PV}
135 - libsamplerate? ( media-libs/libsamplerate )
136 - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
137 - bat? ( sci-libs/fftw:= )"
138 -DEPEND="${CDEPEND}
139 - virtual/pkgconfig
140 - doc? ( app-text/xmlto )"
141 -RDEPEND="${CDEPEND}
142 - selinux? ( sec-policy/selinux-alsa )"
143 -
144 -src_configure() {
145 - local myeconfargs=(
146 - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
147 - --disable-alsaconf
148 - --disable-maintainer-mode
149 - --with-asound-state-dir="${EPREFIX}"/var/lib/alsa
150 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
151 - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
152 - $(use_enable bat)
153 - $(use_enable libsamplerate alsaloop)
154 - $(use_enable ncurses alsamixer)
155 - $(use_enable nls)
156 - $(usex doc '' --disable-xmlto)
157 - )
158 - econf "${myeconfargs[@]}"
159 -}
160 -
161 -src_install() {
162 - default
163 - dodoc seq/*/README.*
164 -
165 - newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
166 - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
167 -
168 - insinto /etc/modprobe.d
169 - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
170 -
171 - keepdir /var/lib/alsa
172 -
173 - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
174 - # scan directory /usr/share/alsa/ucm: No such file or directory
175 - # alsaucm: unable to obtain card list: No such file or directory
176 - keepdir /usr/share/alsa/ucm
177 -}
178 -
179 -pkg_postinst() {
180 - if [[ -z ${REPLACING_VERSIONS} ]]; then
181 - elog
182 - elog "To take advantage of the init script, and automate the process of"
183 - elog "saving and restoring sound-card mixer levels you should"
184 - elog "add alsasound to the boot runlevel. You can do this as"
185 - elog "root like so:"
186 - elog "# rc-update add alsasound boot"
187 - ewarn
188 - ewarn "The ALSA core should be built into the kernel or loaded through other"
189 - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
190 - fi
191 -}
192
193 diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
194 deleted file mode 100644
195 index 280d4466e12..00000000000
196 --- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
197 +++ /dev/null
198 @@ -1,78 +0,0 @@
199 -# Copyright 1999-2019 Gentoo Authors
200 -# Distributed under the terms of the GNU General Public License v2
201 -
202 -EAPI=7
203 -inherit systemd udev
204 -
205 -DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
206 -HOMEPAGE="https://alsa-project.org/"
207 -SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
208 -
209 -LICENSE="GPL-2"
210 -SLOT="0.9"
211 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86"
212 -IUSE="bat doc +libsamplerate +ncurses nls selinux"
213 -
214 -CDEPEND=">=media-libs/alsa-lib-${PV}
215 - libsamplerate? ( media-libs/libsamplerate )
216 - ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
217 - bat? ( sci-libs/fftw:= )"
218 -DEPEND="${CDEPEND}
219 - doc? ( app-text/xmlto )"
220 -RDEPEND="${CDEPEND}
221 - selinux? ( sec-policy/selinux-alsa )"
222 -BDEPEND="virtual/pkgconfig"
223 -
224 -PATCHES=(
225 - "${FILESDIR}"/${PN}-1.1.8-missing_header.patch
226 - "${FILESDIR}"/${P}-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
227 -)
228 -
229 -src_configure() {
230 - local myeconfargs=(
231 - # --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
232 - --disable-alsaconf
233 - --disable-maintainer-mode
234 - --with-asound-state-dir="${EPREFIX}"/var/lib/alsa
235 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
236 - --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
237 - $(use_enable bat)
238 - $(use_enable libsamplerate alsaloop)
239 - $(use_enable ncurses alsamixer)
240 - $(use_enable nls)
241 - $(usex doc '' --disable-xmlto)
242 - )
243 - econf "${myeconfargs[@]}"
244 -}
245 -
246 -src_install() {
247 - default
248 - dodoc seq/*/README.*
249 -
250 - newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
251 - newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
252 -
253 - insinto /etc/modprobe.d
254 - newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
255 -
256 - keepdir /var/lib/alsa
257 -
258 - # ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
259 - # scan directory /usr/share/alsa/ucm: No such file or directory
260 - # alsaucm: unable to obtain card list: No such file or directory
261 - keepdir /usr/share/alsa/ucm
262 -}
263 -
264 -pkg_postinst() {
265 - if [[ -z ${REPLACING_VERSIONS} ]]; then
266 - elog
267 - elog "To take advantage of the init script, and automate the process of"
268 - elog "saving and restoring sound-card mixer levels you should"
269 - elog "add alsasound to the boot runlevel. You can do this as"
270 - elog "root like so:"
271 - elog "# rc-update add alsasound boot"
272 - ewarn
273 - ewarn "The ALSA core should be built into the kernel or loaded through other"
274 - ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
275 - fi
276 -}
277
278 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
279 deleted file mode 100644
280 index 65435839973..00000000000
281 --- a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
282 +++ /dev/null
283 @@ -1,249 +0,0 @@
284 -From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001
285 -From: Takashi Sakamoto <o-takashi@××××××××××.jp>
286 -Date: Sun, 28 Jul 2019 13:48:50 +0900
287 -Subject: [PATCH] axfer: test: fix invalid comparison of 64 bit storage in
288 - ILP32 data type
289 -
290 -In system V ABIs with ILP32 data model, bit shift for '1ul' can brings
291 -undefined behaviour when the calculation result is over 32 bit width.
292 -
293 -This commit fixes the bug.
294 -
295 -Reported-by: Rolf Eike Beer <eike@×××××××.de>
296 -Reference: https://bugs.gentoo.org/681652
297 -Reference: https://github.com/alsa-project/alsa-utils/issues/23
298 -Signed-off-by: Takashi Sakamoto <o-takashi@××××××××××.jp>
299 -Signed-off-by: Takashi Iwai <tiwai@××××.de>
300 ----
301 - axfer/test/container-test.c | 142 ++++++++++++++++++------------------
302 - axfer/test/generator.c | 4 +-
303 - axfer/test/mapper-test.c | 24 +++---
304 - 3 files changed, 85 insertions(+), 85 deletions(-)
305 -
306 -diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c
307 -index 0e2e6e9..9b30ae3 100644
308 ---- a/axfer/test/container-test.c
309 -+++ b/axfer/test/container-test.c
310 -@@ -172,82 +172,82 @@ int main(int argc, const char *argv[])
311 - {
312 - static const uint64_t sample_format_masks[] = {
313 - [CONTAINER_FORMAT_RIFF_WAVE] =
314 -- (1ul << SND_PCM_FORMAT_U8) |
315 -- (1ul << SND_PCM_FORMAT_S16_LE) |
316 -- (1ul << SND_PCM_FORMAT_S16_BE) |
317 -- (1ul << SND_PCM_FORMAT_S24_LE) |
318 -- (1ul << SND_PCM_FORMAT_S24_BE) |
319 -- (1ul << SND_PCM_FORMAT_S32_LE) |
320 -- (1ul << SND_PCM_FORMAT_S32_BE) |
321 -- (1ul << SND_PCM_FORMAT_FLOAT_LE) |
322 -- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
323 -- (1ul << SND_PCM_FORMAT_FLOAT64_LE) |
324 -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
325 -- (1ul << SND_PCM_FORMAT_MU_LAW) |
326 -- (1ul << SND_PCM_FORMAT_A_LAW) |
327 -- (1ul << SND_PCM_FORMAT_S24_3LE) |
328 -- (1ul << SND_PCM_FORMAT_S24_3BE) |
329 -- (1ul << SND_PCM_FORMAT_S20_3LE) |
330 -- (1ul << SND_PCM_FORMAT_S20_3BE) |
331 -- (1ul << SND_PCM_FORMAT_S18_3LE) |
332 -- (1ul << SND_PCM_FORMAT_S18_3BE),
333 -+ (1ull << SND_PCM_FORMAT_U8) |
334 -+ (1ull << SND_PCM_FORMAT_S16_LE) |
335 -+ (1ull << SND_PCM_FORMAT_S16_BE) |
336 -+ (1ull << SND_PCM_FORMAT_S24_LE) |
337 -+ (1ull << SND_PCM_FORMAT_S24_BE) |
338 -+ (1ull << SND_PCM_FORMAT_S32_LE) |
339 -+ (1ull << SND_PCM_FORMAT_S32_BE) |
340 -+ (1ull << SND_PCM_FORMAT_FLOAT_LE) |
341 -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
342 -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) |
343 -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
344 -+ (1ull << SND_PCM_FORMAT_MU_LAW) |
345 -+ (1ull << SND_PCM_FORMAT_A_LAW) |
346 -+ (1ull << SND_PCM_FORMAT_S24_3LE) |
347 -+ (1ull << SND_PCM_FORMAT_S24_3BE) |
348 -+ (1ull << SND_PCM_FORMAT_S20_3LE) |
349 -+ (1ull << SND_PCM_FORMAT_S20_3BE) |
350 -+ (1ull << SND_PCM_FORMAT_S18_3LE) |
351 -+ (1ull << SND_PCM_FORMAT_S18_3BE),
352 - [CONTAINER_FORMAT_AU] =
353 -- (1ul << SND_PCM_FORMAT_S8) |
354 -- (1ul << SND_PCM_FORMAT_S16_BE) |
355 -- (1ul << SND_PCM_FORMAT_S32_BE) |
356 -- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
357 -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
358 -- (1ul << SND_PCM_FORMAT_MU_LAW) |
359 -- (1ul << SND_PCM_FORMAT_A_LAW),
360 -+ (1ull << SND_PCM_FORMAT_S8) |
361 -+ (1ull << SND_PCM_FORMAT_S16_BE) |
362 -+ (1ull << SND_PCM_FORMAT_S32_BE) |
363 -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
364 -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
365 -+ (1ull << SND_PCM_FORMAT_MU_LAW) |
366 -+ (1ull << SND_PCM_FORMAT_A_LAW),
367 - [CONTAINER_FORMAT_VOC] =
368 -- (1ul << SND_PCM_FORMAT_U8) |
369 -- (1ul << SND_PCM_FORMAT_S16_LE) |
370 -- (1ul << SND_PCM_FORMAT_MU_LAW) |
371 -- (1ul << SND_PCM_FORMAT_A_LAW),
372 -+ (1ull << SND_PCM_FORMAT_U8) |
373 -+ (1ull << SND_PCM_FORMAT_S16_LE) |
374 -+ (1ull << SND_PCM_FORMAT_MU_LAW) |
375 -+ (1ull << SND_PCM_FORMAT_A_LAW),
376 - [CONTAINER_FORMAT_RAW] =
377 -- (1ul << SND_PCM_FORMAT_S8) |
378 -- (1ul << SND_PCM_FORMAT_U8) |
379 -- (1ul << SND_PCM_FORMAT_S16_LE) |
380 -- (1ul << SND_PCM_FORMAT_S16_BE) |
381 -- (1ul << SND_PCM_FORMAT_U16_LE) |
382 -- (1ul << SND_PCM_FORMAT_U16_BE) |
383 -- (1ul << SND_PCM_FORMAT_S24_LE) |
384 -- (1ul << SND_PCM_FORMAT_S24_BE) |
385 -- (1ul << SND_PCM_FORMAT_U24_LE) |
386 -- (1ul << SND_PCM_FORMAT_U24_BE) |
387 -- (1ul << SND_PCM_FORMAT_S32_LE) |
388 -- (1ul << SND_PCM_FORMAT_S32_BE) |
389 -- (1ul << SND_PCM_FORMAT_U32_LE) |
390 -- (1ul << SND_PCM_FORMAT_U32_BE) |
391 -- (1ul << SND_PCM_FORMAT_FLOAT_LE) |
392 -- (1ul << SND_PCM_FORMAT_FLOAT_BE) |
393 -- (1ul << SND_PCM_FORMAT_FLOAT64_LE) |
394 -- (1ul << SND_PCM_FORMAT_FLOAT64_BE) |
395 -- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
396 -- (1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
397 -- (1ul << SND_PCM_FORMAT_MU_LAW) |
398 -- (1ul << SND_PCM_FORMAT_A_LAW) |
399 -- (1ul << SND_PCM_FORMAT_S24_3LE) |
400 -- (1ul << SND_PCM_FORMAT_S24_3BE) |
401 -- (1ul << SND_PCM_FORMAT_U24_3LE) |
402 -- (1ul << SND_PCM_FORMAT_U24_3BE) |
403 -- (1ul << SND_PCM_FORMAT_S20_3LE) |
404 -- (1ul << SND_PCM_FORMAT_S20_3BE) |
405 -- (1ul << SND_PCM_FORMAT_U20_3LE) |
406 -- (1ul << SND_PCM_FORMAT_U20_3BE) |
407 -- (1ul << SND_PCM_FORMAT_S18_3LE) |
408 -- (1ul << SND_PCM_FORMAT_S18_3BE) |
409 -- (1ul << SND_PCM_FORMAT_U18_3LE) |
410 -- (1ul << SND_PCM_FORMAT_U18_3BE) |
411 -- (1ul << SND_PCM_FORMAT_DSD_U8) |
412 -- (1ul << SND_PCM_FORMAT_DSD_U16_LE) |
413 -- (1ul << SND_PCM_FORMAT_DSD_U32_LE) |
414 -- (1ul << SND_PCM_FORMAT_DSD_U16_BE) |
415 -- (1ul << SND_PCM_FORMAT_DSD_U32_BE),
416 -+ (1ull << SND_PCM_FORMAT_S8) |
417 -+ (1ull << SND_PCM_FORMAT_U8) |
418 -+ (1ull << SND_PCM_FORMAT_S16_LE) |
419 -+ (1ull << SND_PCM_FORMAT_S16_BE) |
420 -+ (1ull << SND_PCM_FORMAT_U16_LE) |
421 -+ (1ull << SND_PCM_FORMAT_U16_BE) |
422 -+ (1ull << SND_PCM_FORMAT_S24_LE) |
423 -+ (1ull << SND_PCM_FORMAT_S24_BE) |
424 -+ (1ull << SND_PCM_FORMAT_U24_LE) |
425 -+ (1ull << SND_PCM_FORMAT_U24_BE) |
426 -+ (1ull << SND_PCM_FORMAT_S32_LE) |
427 -+ (1ull << SND_PCM_FORMAT_S32_BE) |
428 -+ (1ull << SND_PCM_FORMAT_U32_LE) |
429 -+ (1ull << SND_PCM_FORMAT_U32_BE) |
430 -+ (1ull << SND_PCM_FORMAT_FLOAT_LE) |
431 -+ (1ull << SND_PCM_FORMAT_FLOAT_BE) |
432 -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE) |
433 -+ (1ull << SND_PCM_FORMAT_FLOAT64_BE) |
434 -+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
435 -+ (1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
436 -+ (1ull << SND_PCM_FORMAT_MU_LAW) |
437 -+ (1ull << SND_PCM_FORMAT_A_LAW) |
438 -+ (1ull << SND_PCM_FORMAT_S24_3LE) |
439 -+ (1ull << SND_PCM_FORMAT_S24_3BE) |
440 -+ (1ull << SND_PCM_FORMAT_U24_3LE) |
441 -+ (1ull << SND_PCM_FORMAT_U24_3BE) |
442 -+ (1ull << SND_PCM_FORMAT_S20_3LE) |
443 -+ (1ull << SND_PCM_FORMAT_S20_3BE) |
444 -+ (1ull << SND_PCM_FORMAT_U20_3LE) |
445 -+ (1ull << SND_PCM_FORMAT_U20_3BE) |
446 -+ (1ull << SND_PCM_FORMAT_S18_3LE) |
447 -+ (1ull << SND_PCM_FORMAT_S18_3BE) |
448 -+ (1ull << SND_PCM_FORMAT_U18_3LE) |
449 -+ (1ull << SND_PCM_FORMAT_U18_3BE) |
450 -+ (1ull << SND_PCM_FORMAT_DSD_U8) |
451 -+ (1ull << SND_PCM_FORMAT_DSD_U16_LE) |
452 -+ (1ull << SND_PCM_FORMAT_DSD_U32_LE) |
453 -+ (1ull << SND_PCM_FORMAT_DSD_U16_BE) |
454 -+ (1ull << SND_PCM_FORMAT_DSD_U32_BE),
455 - };
456 - static const uint64_t access_mask =
457 -- (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
458 -- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED);
459 -+ (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
460 -+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED);
461 - struct test_generator gen = {0};
462 - struct container_trial *trial;
463 - int i;
464 -diff --git a/axfer/test/generator.c b/axfer/test/generator.c
465 -index cdea2c9..bde8c5f 100644
466 ---- a/axfer/test/generator.c
467 -+++ b/axfer/test/generator.c
468 -@@ -220,7 +220,7 @@ static int test_sample_format(struct test_generator *gen,
469 - int err = 0;
470 -
471 - for (i = 0; i <= SND_PCM_FORMAT_LAST; ++i) {
472 -- if (!((1ul << i) & gen->sample_format_mask))
473 -+ if (!((1ull << i) & gen->sample_format_mask))
474 - continue;
475 -
476 - err = test_samples_per_frame(gen, access, i);
477 -@@ -237,7 +237,7 @@ static int test_access(struct test_generator *gen)
478 - int err = 0;
479 -
480 - for (i = 0; i <= SND_PCM_ACCESS_LAST; ++i) {
481 -- if (!((1ul << i) & gen->access_mask))
482 -+ if (!((1ull << i) & gen->access_mask))
483 - continue;
484 -
485 - err = test_sample_format(gen, i);
486 -diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c
487 -index 6b24d54..f0376c7 100644
488 ---- a/axfer/test/mapper-test.c
489 -+++ b/axfer/test/mapper-test.c
490 -@@ -396,13 +396,13 @@ int main(int argc, const char *argv[])
491 - {
492 - // Test 8/16/18/20/24/32/64 bytes per sample.
493 - static const uint64_t sample_format_mask =
494 -- (1ul << SND_PCM_FORMAT_U8) |
495 -- (1ul << SND_PCM_FORMAT_S16_LE) |
496 -- (1ul << SND_PCM_FORMAT_S18_3LE) |
497 -- (1ul << SND_PCM_FORMAT_S20_3LE) |
498 -- (1ul << SND_PCM_FORMAT_S24_LE) |
499 -- (1ul << SND_PCM_FORMAT_S32_LE) |
500 -- (1ul << SND_PCM_FORMAT_FLOAT64_LE);
501 -+ (1ull << SND_PCM_FORMAT_U8) |
502 -+ (1ull << SND_PCM_FORMAT_S16_LE) |
503 -+ (1ull << SND_PCM_FORMAT_S18_3LE) |
504 -+ (1ull << SND_PCM_FORMAT_S20_3LE) |
505 -+ (1ull << SND_PCM_FORMAT_S24_LE) |
506 -+ (1ull << SND_PCM_FORMAT_S32_LE) |
507 -+ (1ull << SND_PCM_FORMAT_FLOAT64_LE);
508 - uint64_t access_mask;
509 - struct test_generator gen = {0};
510 - struct mapper_trial *trial;
511 -@@ -451,13 +451,13 @@ int main(int argc, const char *argv[])
512 - goto end;
513 - }
514 -
515 -- access_mask = 1ul << access;
516 -+ access_mask = 1ull << access;
517 - verbose = true;
518 - } else {
519 -- access_mask = (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
520 -- (1ul << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
521 -- (1ul << SND_PCM_ACCESS_RW_INTERLEAVED) |
522 -- (1ul << SND_PCM_ACCESS_RW_NONINTERLEAVED);
523 -+ access_mask = (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
524 -+ (1ull << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
525 -+ (1ull << SND_PCM_ACCESS_RW_INTERLEAVED) |
526 -+ (1ull << SND_PCM_ACCESS_RW_NONINTERLEAVED);
527 - verbose = false;
528 - }
529 -
530 ---
531 -2.21.0
532 -
533
534 diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
535 deleted file mode 100644
536 index f80a3518f3e..00000000000
537 --- a/media-sound/alsa-utils/files/alsasound.initd-r6
538 +++ /dev/null
539 @@ -1,87 +0,0 @@
540 -#!/sbin/openrc-run
541 -# Copyright 1999-2016 Gentoo Foundation
542 -# Distributed under the terms of the GNU General Public License v2
543 -
544 -alsastatedir=/var/lib/alsa
545 -alsascrdir=/etc/alsa.d
546 -alsahomedir=/var/run/alsasound
547 -
548 -extra_commands="save restore"
549 -
550 -depend() {
551 - need localmount
552 - after bootmisc modules isapnp coldplug hotplug
553 -}
554 -
555 -restore() {
556 - ebegin "Restoring Mixer Levels"
557 -
558 - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
559 -
560 - if [ ! -r "${alsastatedir}/asound.state" ] ; then
561 - ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
562 - eend 0
563 - return 0
564 - fi
565 -
566 - local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
567 - local CARDNUM
568 - for cardnum in ${cards}; do
569 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2
570 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2
571 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2
572 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2
573 - alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
574 - || ewarn "Errors while restoring defaults, ignoring"
575 - done
576 -
577 - for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
578 - [ -e "${ossfile}" ] || continue
579 - # We use cat because I'm not sure if cp works properly on /proc
580 - local procfile=${ossfile##${alsastatedir}/oss}
581 - procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
582 - if [ -e /proc/asound/"${procfile}"/oss ] ; then
583 - cat "${ossfile}" > /proc/asound/"${procfile}"/oss
584 - fi
585 - done
586 -
587 - eend 0
588 -}
589 -
590 -save() {
591 - ebegin "Storing ALSA Mixer Levels"
592 -
593 - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
594 -
595 - mkdir -p "${alsastatedir}"
596 - if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
597 - eerror "Error saving levels."
598 - eend 1
599 - return 1
600 - fi
601 -
602 - for ossfile in /proc/asound/card*/pcm*/oss; do
603 - [ -e "${ossfile}" ] || continue
604 - local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
605 - device="$(echo "${device}" | sed -e 's,/,_,g')"
606 - mkdir -p "${alsastatedir}/oss/"
607 - cp "${ossfile}" "${alsastatedir}/oss/${device}"
608 - done
609 -
610 - eend 0
611 -}
612 -
613 -start() {
614 - if [ "${RESTORE_ON_START}" = "yes" ]; then
615 - restore
616 - fi
617 -
618 - return 0
619 -}
620 -
621 -stop() {
622 - if [ "${SAVE_ON_STOP}" = "yes" ]; then
623 - save
624 - fi
625 - return 0
626 -}