[gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/
@ 2016-03-31 20:30 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-03-31 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     933de72a61a2ac6a967a69f0b3ff436e6144bd21
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 19:54:19 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 20:29:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933de72a

media-sound/alsa-utils: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/alsa-utils/Manifest                    |  2 -
 media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild  | 76 --------------------
 media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild | 79 --------------------
 media-sound/alsa-utils/alsa-utils-1.0.28.ebuild    | 76 --------------------
 .../files/alsa-utils-1.0.28-aplay-return.patch     | 45 ------------
 .../files/alsa-utils-1.0.28-mixer-proto.patch      | 24 -------
 .../files/alsa-utils-1.0.28-monitor-proto.patch    | 24 -------
 .../files/alsa-utils-1.0.28-va-end.patch           | 39 ----------
 media-sound/alsa-utils/files/alsasound.initd-r5    | 83 ----------------------
 9 files changed, 448 deletions(-)

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 2a85b3a..370aed6 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-utils-1.0.27.2.tar.bz2 1143802 SHA256 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea SHA512 c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6 WHIRLPOOL 9e95c37f307498bb9a7829fd721bf54888f3fe9ec78f014702cc26493e81369a44b571f1f5e65b3e32dbde926f97ab1152e22cf66fdff17be209e61ae34d9d46
-DIST alsa-utils-1.0.28.tar.bz2 1146887 SHA256 f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc SHA512 faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786 WHIRLPOOL d58587d9f302f3f1a7ab4de45c3889ce82e5be782e4aa9a953c39a908a4693e99c8ea9aeeb5669f0f606d980983beb7d5fc53e4c76ce1bb76500c7c2bcb45013
 DIST alsa-utils-1.0.29.tar.bz2 1154497 SHA256 5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b SHA512 0d83805aa7b1c975524cc5ecd4aa6eb36126bc434458f9e9475e4bd1b14bbb4bf9691096ca7973342a3798e97a361451c078f4595f8f4275db64d6b443ca5928 WHIRLPOOL ccad5115148045e0c5f139d70306e801e250aa3946f60d9cd0a47c84c72f6d8689e53105030589309c98ddd4a7b871bb8dc03f00fcc3d46cc3e08c4718299407
 DIST alsa-utils-1.1.0.tar.bz2 1181085 SHA256 3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1 SHA512 c61f056959feba015bb4a6f49980c4beb6a0c34be09e7196864583897ea86373b593a8807999a07df9c87a3a0c714075b9aae516752e83a946d0d60bc8f90f98 WHIRLPOOL 50d8e1506fb9f969b3dfcd618933efbeda6f938c3350eccf99526fb8329afd1ea4381ff1a548590f0f9bae12bdb63c1e8ab068641743d52b3ba609eae2d337e5
 DIST alsa-utils-1.1.1.tar.bz2 1186408 SHA256 89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041 SHA512 3af1e43cb2eab7e5119d83036ab6f4eeb106b66b4a57122cc8df243b6dbda90d39a0290a2af3a904b4929e2d90e8fcded9eda2a38bae1fd8e371a6d7a043376e WHIRLPOOL ea7daaf4055469dd5cb128abbe9a986e2b99b27c59d964041a92e82667e520adadb1e87d38bfa83d5b8ffbc382d7d9401c9d4887ca19546e4d1f34ba1cf7d705

diff --git a/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild
deleted file mode 100644
index 6a5a8b5..0000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-1.0.27.1
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_prepare() {
-	epatch_user
-}
-
-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 libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README TODO seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r5 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.0.28-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
deleted file mode 100644
index 4f24db5..0000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-aplay-return.patch
-	epatch "${FILESDIR}"/${P}-va-end.patch
-	epatch "${FILESDIR}"/${P}-{mixer,monitor}-proto.patch
-	epatch_user
-}
-
-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 libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		"$(systemd_with_unitdir)" \
-		--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.0.28.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
deleted file mode 100644
index 62ca437..0000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_prepare() {
-	epatch_user
-}
-
-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 libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README TODO 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/files/alsa-utils-1.0.28-aplay-return.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
deleted file mode 100644
index e257888..0000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://crbug.com/433899
-
-From 8f361d83cfcb39887f5fc591633e68d9448e3425 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 1 Oct 2014 15:43:57 +0200
-Subject: [PATCH [alsa-utils]] Revert "aplay: fix pcm_read() return value"
-
-This reverts commit 8aa13eec80eac312e4b99423909387660fb99b8f.
-
-The semantics for pcm_read() and pcm_readv() was changed, but the
-callers expect the exact frame count as requested. It's possible
-to fix callers, but the fix is more complicated than to revert the
-change. Note that '-d' processing was broken in some cases.
-
-Note: The reverted commit allows that the return value might be
-greater than requested (see the first condition in read routines).
----
- aplay/aplay.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 30d3f31..e58e1bc 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount)
- 			data += r * bits_per_frame / 8;
- 		}
- 	}
--	return result;
-+	return rcount;
- }
- 
- static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
-@@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
- 			count -= r;
- 		}
- 	}
--	return result;
-+	return rcount;
- }
- 
- /*
--- 
-2.1.3
-

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
deleted file mode 100644
index fdd26c3..0000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 25 Jun 2014 10:49:23 +0200
-Subject: [PATCH [alsa-utils]] alsamixer: include missing mixer_controls.h
-
----
- alsamixer/mainloop.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
-index 351f57f..79d81a9 100644
---- a/alsamixer/mainloop.c
-+++ b/alsamixer/mainloop.c
-@@ -29,6 +29,7 @@
- #include "widget.h"
- #include "mixer_widget.h"
- #include "mixer_display.h"
-+#include "mixer_controls.h"
- #include "mainloop.h"
- 
- static WINDOW *curses_initialized;
--- 
-2.1.3
-

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
deleted file mode 100644
index 55d93f8..0000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 74e5d57c999f8afed4f87046dcac84f6709b9196 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 24 Sep 2014 10:46:02 +0200
-Subject: [PATCH [alsa-utils]] alsactl: aded missing monitor() prototype
-
----
- alsactl/alsactl.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h
-index bd9bf23..4f969ec 100644
---- a/alsactl/alsactl.h
-+++ b/alsactl/alsactl.h
-@@ -31,6 +31,7 @@ int save_state(const char *file, const char *cardname);
- int load_state(const char *file, const char *initfile, const char *cardname,
- 	       int do_init);
- int power(const char *argv[], int argc);
-+int monitor(const char *name);
- int state_daemon(const char *file, const char *cardname, int period,
- 		 const char *pidfile);
- int state_daemon_kill(const char *pidfile, const char *cmd);
--- 
-2.1.3
-

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
deleted file mode 100644
index a4153bd..0000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 89a4f490bd974e454d82942100f241bb1a2270f3 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 24 Sep 2014 10:52:17 +0200
-Subject: [PATCH [alsa-utils]] =?UTF-8?q?alsactl:=20coverity=20-=20missing?=
- =?UTF-8?q?=5Fva=5Fend=20=E2=80=93=20va=5Fend=20was=20not=20called=20for?=
- =?UTF-8?q?=20"ap"?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- alsactl/utils.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index b5d183c..304df7c 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -157,8 +157,8 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...)
- 		fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
- 		vfprintf(stderr, fmt, ap);
- 		putc('\n', stderr);
--		va_end(ap);
- 	}
-+	va_end(ap);
- }
- 
- void dbg_(const char *fcn, long line, const char *fmt, ...)
-@@ -174,6 +174,6 @@ void dbg_(const char *fcn, long line, const char *fmt, ...)
- 		fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
- 		vfprintf(stderr, fmt, ap);
- 		putc('\n', stderr);
--		va_end(ap);
- 	}
-+	va_end(ap);
- }
--- 
-2.1.3
-

diff --git a/media-sound/alsa-utils/files/alsasound.initd-r5 b/media-sound/alsa-utils/files/alsasound.initd-r5
deleted file mode 100644
index fdb081f..0000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r5
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/runscript
-# $Id$
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	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 -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"
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/
@ 2017-05-18 11:44 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-05-18 11:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3cef1a9b08081c25ded99cf9acb33fe8cca8e7a3
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 11:43:53 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 18 11:43:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cef1a9b

media-sound/alsa-utils: Removed old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/alsa-utils/Manifest                    |  1 -
 media-sound/alsa-utils/alsa-utils-1.0.29.ebuild    | 76 ----------------------
 .../files/alsa-utils-1.0.29-cross-compile.patch    | 44 -------------
 3 files changed, 121 deletions(-)

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b0165327f5a..ccdb2cbd061 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,4 +1,3 @@
-DIST alsa-utils-1.0.29.tar.bz2 1154497 SHA256 5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b SHA512 0d83805aa7b1c975524cc5ecd4aa6eb36126bc434458f9e9475e4bd1b14bbb4bf9691096ca7973342a3798e97a361451c078f4595f8f4275db64d6b443ca5928 WHIRLPOOL ccad5115148045e0c5f139d70306e801e250aa3946f60d9cd0a47c84c72f6d8689e53105030589309c98ddd4a7b871bb8dc03f00fcc3d46cc3e08c4718299407
 DIST alsa-utils-1.1.2.tar.bz2 1193140 SHA256 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14 WHIRLPOOL 353d636271fd4354e7a7b986c08a3eabdb91bb8239b3d14a2163dea095dee010cd777276901c11df58a4fcba24680770512df4784e446a63941224f9ee79f632
 DIST alsa-utils-1.1.3.tar.bz2 1201424 SHA256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c SHA512 a0a00578e7f7ed8441628757048412813a0345f0a3f2e085cda7a881ae3c6e22f7cf1e5119f8200e2e4340e42152b91aa5bdc20646b8422adc74ba00e4c59363 WHIRLPOOL 10f1f8f5b7a659dc7ba79c934076eafbbd72f4892b571660a6224fc1061b4e893e2f5a937187a4eb50f2e982c07e097c965a88052451218adcde2e5cd3bfb6f9
 DIST alsa-utils-1.1.4.tar.bz2 1202047 SHA256 a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d SHA512 96852b3f5b57d7d9078a20881f28311543d446b69c80450179823a225089df7306456991890a7ef37672c1f55e9c386a7731c94e125504dcda2c88a674c8b4c7 WHIRLPOOL f09be2aeb3402b580ba103cfacb854b4fd55c2c19bfcfb7e56d4b924add5eb17d4fcb523cf7d85482728da8d8cfde0033cf205a7f9e53225a9b7a4a59a906f28

diff --git a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
deleted file mode 100644
index beeceea574a..00000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	epatch_user
-}
-
-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 libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		"$(systemd_with_unitdir)" \
-		--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/files/alsa-utils-1.0.29-cross-compile.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
deleted file mode 100644
index 45aa8a9c3c7..00000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-fix from upstream
-
-From c0130c8ec22a89960d9304297a904a2a14979506 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Thu, 8 Oct 2015 12:14:05 -0400
-Subject: [PATCH alsa-utils] build: Do not try to detect cross-compiler
-
-cross compilers are passed via path may not be a gcc based cross
-compiler in such cases this check fails and try's to force gcc based
-cross compiler detection, This code is a convenience that limits the
-build system.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- configure.ac | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8c2d1a5..79a9aaf 100644
---- a/configure
-+++ b/configure
-@@ -6192,21 +6192,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
- 
- 
- 
--if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";
--then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross-compiler" >&5
--$as_echo_n "checking for cross-compiler... " >&6; }
--
--  which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
--  which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \
--  && CC=${target_cpu}-${target-os}-gcc
--  which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \
--  && CC=${target_cpu}-${target_vendor}-${target_os}-gcc
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
--$as_echo "$CC" >&6; }
--fi
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/
@ 2019-06-30 12:37 Pacho Ramos
  0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2019-06-30 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2e6f547bbfb261f1e13dacd1ba441b554480aa1e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 12:11:11 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 12:36:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6f547b

media-sound/alsa-utils: Use /run instead of /var/run

Closes: https://bugs.gentoo.org/685304
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 media-sound/alsa-utils/alsa-utils-1.1.9.ebuild  |  2 +-
 media-sound/alsa-utils/files/alsasound.initd-r8 | 87 +++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
index bcc1f868e6d..bfb1938f52b 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
@@ -48,7 +48,7 @@ src_install() {
 	default
 	dodoc seq/*/README.*
 
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
 	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
 
 	insinto /etc/modprobe.d

diff --git a/media-sound/alsa-utils/files/alsasound.initd-r8 b/media-sound/alsa-utils/files/alsasound.initd-r8
new file mode 100644
index 00000000000..2fe2347c377
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r8
@@ -0,0 +1,87 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+alsahomedir=/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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/
@ 2019-09-14  1:28 Matt Turner
  0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2019-09-14  1:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9678a57328cc2064f340bdcbd69bf4bf01554e29
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 01:25:24 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 01:25:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9678a573

media-sound/alsa-utils: Add patch to fix tests

Closes: https://bugs.gentoo.org/681652
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-sound/alsa-utils/alsa-utils-1.1.9.ebuild     |   1 +
 ...fix-invalid-comparison-of-64-bit-storage-.patch | 249 +++++++++++++++++++++
 2 files changed, 250 insertions(+)

diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
index bfb1938f52b..e6ea03b67b5 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
@@ -25,6 +25,7 @@ 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() {

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
new file mode 100644
index 00000000000..65435839973
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
@@ -0,0 +1,249 @@
+From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001
+From: Takashi Sakamoto <o-takashi@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 <eike@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-takashi@sakamocchi.jp>
+Signed-off-by: Takashi Iwai <tiwai@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
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/
@ 2025-02-06 22:03 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-02-06 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     1b93e143543df348c34ad8c5e581823f3a5c53b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 22:00:05 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 22:02:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b93e143

media-sound/alsa-utils: install systemd units unconditionally, fix uninit var

Per the small file policy and for determinism.

Closes: https://bugs.gentoo.org/948469
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/alsa-utils/alsa-utils-1.2.13-r2.ebuild | 102 +++++++++++++++++++++
 ....13-install-systemd-units-unconditionally.patch |  16 ++++
 .../files/alsa-utils-1.2.13-uninit-var.patch       |  29 ++++++
 3 files changed, 147 insertions(+)

diff --git a/media-sound/alsa-utils/alsa-utils-1.2.13-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.13-r2.ebuild
new file mode 100644
index 000000000000..9d9a0e66bd42
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.13-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
+
+DEPEND="
+	>=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ieee1394? ( media-libs/libffado )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
+	bat? ( sci-libs/fftw:= )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-alsa )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+	"${FILESDIR}"/${P}-udev-restore.patch
+	"${FILESDIR}"/${P}-amdgpu-restore.patch
+	"${FILESDIR}"/${P}-uninit-var.patch
+	"${FILESDIR}"/${PN}-1.2.13-install-systemd-units-unconditionally.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for the systemd units patch
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
+
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #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)
+		$(usev !doc '--disable-xmlto')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; 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
+}
+
+pkg_postrm() {
+	udev_reload
+}

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-install-systemd-units-unconditionally.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-install-systemd-units-unconditionally.patch
new file mode 100644
index 000000000000..8c26fa51819e
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-install-systemd-units-unconditionally.patch
@@ -0,0 +1,16 @@
+Install systemd unit files unconditionally rather than automagically
+based on whether systemd is installed at the time.
+
+Bug: https://bugs.gentoo.org/948469
+--- a/configure.ac
++++ b/configure.ac
+@@ -419,8 +419,7 @@ AC_ARG_WITH([systemdsystemunitdir],
+ if test "x$with_systemdsystemunitdir" != xno; then
+         AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ fi
+-AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_min_systemd" = "yes" \
+-        -a -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno])
+ 
+ AC_ARG_WITH([asound-state-dir],
+         AS_HELP_STRING([--with-asound-state-dir=DIR], [Directory to place asound.state file in]),

diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.13-uninit-var.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.13-uninit-var.patch
new file mode 100644
index 000000000000..d0b8fe1a46b6
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.13-uninit-var.patch
@@ -0,0 +1,29 @@
+https://github.com/alsa-project/alsa-utils/commit/242e00573ab0e8d40c95f9a8a19dc0085379d171
+
+From 242e00573ab0e8d40c95f9a8a19dc0085379d171 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 3 Feb 2025 20:28:58 +0100
+Subject: [PATCH] arecordmidi2: fix unitialization variable error in
+ read_ump_raw()
+
+Variable v should be initialized from the first word in the buffer.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ seq/aplaymidi2/arecordmidi2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/seq/aplaymidi2/arecordmidi2.c b/seq/aplaymidi2/arecordmidi2.c
+index 68a9d7d0a..467af6539 100644
+--- a/seq/aplaymidi2/arecordmidi2.c
++++ b/seq/aplaymidi2/arecordmidi2.c
+@@ -351,7 +351,7 @@ static int read_ump_raw(FILE *file, uint32_t *buf)
+ 
+ 	if (fread(buf, 4, 1, file) != 1)
+ 		return 0;
+-	v = be32toh(v);
++	v = be32toh(*buf);
+ 	num = snd_ump_packet_length(snd_ump_msg_hdr_type(v));
+ 	for (i = 1; i < num; i++) {
+ 		if (fread(buf + i, 4, 1, file) != 1)
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-02-06 22:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-18 11:44 [gentoo-commits] repo/gentoo:master commit in: media-sound/alsa-utils/files/, media-sound/alsa-utils/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2025-02-06 22:03 Sam James
2019-09-14  1:28 Matt Turner
2019-06-30 12:37 Pacho Ramos
2016-03-31 20:30 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox