diff options
Diffstat (limited to 'main/alsa-utils')
| -rw-r--r-- | main/alsa-utils/APKBUILD | 26 | ||||
| -rw-r--r-- | main/alsa-utils/alsa.initd | 4 |
2 files changed, 21 insertions, 9 deletions
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD index 84297bdd6d..d7263e6aec 100644 --- a/main/alsa-utils/APKBUILD +++ b/main/alsa-utils/APKBUILD @@ -1,27 +1,31 @@ +# Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alsa-utils pkgver=1.0.23 -pkgrel=1 +pkgrel=3 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" url="http://www.alsa-project.org" arch="all" license="GPL" makedepends="alsa-lib-dev pciutils-dev ncurses-dev" depends="dialog" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc alsaconf" source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 alsaconf.patch alsa.initd alsa.confd " +_builddir="$srcdir"/$pkgname-$pkgver + prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -Np1 -i ../alsaconf.patch || return 1 + cd "$_builddir" +# patch -Np1 -i ../alsaconf.patch || return 1 + return 0 } build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr \ --disable-xmlto \ --disable-nls \ @@ -30,12 +34,20 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install install -D -m755 ../alsa.initd "$pkgdir"/etc/init.d/alsa install -D -m644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa } + +alsaconf() { + arch="noarch" + depends="alsa-utils bash" + cd "$_builddir" + install -D -m755 alsaconf/alsaconf "$subpkgdir"/usr/bin/alsaconf +} + md5sums="cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2 5e65f278b5a77e3ee2821ad955c4cd91 alsaconf.patch -4a66dad46d5366e05098cde97f3d37b5 alsa.initd +219cd8b7b3e250895550b1d60cfc219f alsa.initd 85b1f1e759fe5953eca329237f4ac256 alsa.confd" diff --git a/main/alsa-utils/alsa.initd b/main/alsa-utils/alsa.initd index c11861896f..19d0e488e3 100644 --- a/main/alsa-utils/alsa.initd +++ b/main/alsa-utils/alsa.initd @@ -15,13 +15,13 @@ depend() { load_modules() { # List of drivers for each card. - local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" + local DRIVERS="$(modprobe | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" # Fall back on the automated aliases if we don't have ALSA configured properly... if [ -z "${DRIVERS}" ] && \ ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." - DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" + DRIVERS="$(modprobe | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" if [ -z "${DRIVERS}" ] ; then eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" fi |