[arch-commits] Commit in alsa-utils/repos (3 files)

[Tobias Powalowski]

    Date: Monday, September 7, 2009 @ 04:30:46
  Author: tpowa
Revision: 51310

Merged revisions 51309 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/alsa-utils/trunk

........
  r51309 | tpowa | 2009-09-07 10:30:08 +0200 (Mo, 07 Sep 2009) | 2 lines
  
  upgpkg: alsa-utils 1.0.21-1
      bump to new version
........

Modified:
  alsa-utils/repos/extra-x86_64/	(properties)
  alsa-utils/repos/extra-x86_64/PKGBUILD
Deleted:
  alsa-utils/repos/extra-x86_64/alsactl-init-fix-headphone.patch

----------------------------------+
 PKGBUILD                         |   15 ++++++---------
 alsactl-init-fix-headphone.patch |   35 -----------------------------------
 2 files changed, 6 insertions(+), 44 deletions(-)


Property changes on: alsa-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /alsa-utils/trunk:1-42043
   + /alsa-utils/trunk:1-51309

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-07 08:30:08 UTC (rev 51309)
+++ extra-x86_64/PKGBUILD	2009-09-07 08:30:46 UTC (rev 51310)
@@ -1,34 +1,31 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=alsa-utils
-pkgver=1.0.20
-pkgrel=2
+pkgver=1.0.21
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
 #can not use >=$pkgver due to use of letters in alsa-lib update versioning
-depends=("alsa-lib>1.0.19.99" 'dialog' 'pciutils' 'ncurses')
+depends=("alsa-lib>1.0.20.99" 'dialog' 'pciutils' 'ncurses')
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
         alsa
         alsaconf.patch
-        alsa.conf.d
-        alsactl-init-fix-headphone.patch)
+        alsa.conf.d)
 backup=(etc/conf.d/alsa)
 
 build() {
   cd $startdir/src/$pkgname-${pkgver}
   patch -Np1 -i ../alsaconf.patch || return 1
-  patch -Np1 -i ../alsactl-init-fix-headphone.patch || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install
   install -D -m755 ../alsa $startdir/pkg/etc/rc.d/alsa
   install -D -m644 ../alsa.conf.d $startdir/pkg/etc/conf.d/alsa
 }
-md5sums=('6837e673ef19da96d8bd2f9e18cd9574'
+md5sums=('3672287c2608040d111ce45495ba7602'
          '9dff78913b13b10e67c4195e90395ed2'
          '434102eb210cc452e3dfd2a4a9841881'
-         '93089f0d8872078939f76dd2acaebc2b'
-         '7ac2e3ddf559c7383806c6f5844ad583')
+         '93089f0d8872078939f76dd2acaebc2b')

Deleted: extra-x86_64/alsactl-init-fix-headphone.patch
===================================================================
--- extra-x86_64/alsactl-init-fix-headphone.patch	2009-09-07 08:30:08 UTC (rev 51309)
+++ extra-x86_64/alsactl-init-fix-headphone.patch	2009-09-07 08:30:46 UTC (rev 51310)
@@ -1,35 +0,0 @@
-From 0d3aeb969592134f7749bd21fd2f641eb13d7090 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex at perex.cz>
-Date: Fri, 15 May 2009 12:37:48 +0200
-Subject: [PATCH] alsactl: fixed Headphone Playback Volume setting in default rules
-
-Signed-off-by: Jaroslav Kysela <perex at perex.cz>
----
- alsactl/init/default |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/alsactl/init/default b/alsactl/init/default
-index c9aa7cc..af0f94f 100644
---- a/alsactl/init/default
-+++ b/alsactl/init/default
-@@ -46,7 +46,7 @@ CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \
-   CTL{values}="on"
- 
- CTL{reset}="mixer"
--CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end"
-+CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
- # if master volume control is present, turn headphone volume to max
- ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
- ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
-@@ -101,7 +101,7 @@ CTL{name}="DAC Playback Switch",PROGRAM=="__ctl_search", \
-   CTL{values}="on"
- 
- CTL{reset}="mixer"
--CTL{name}="Synth Playback Volume",,PROGRAM=="__ctl_search", \
-+CTL{name}="Synth Playback Volume",PROGRAM=="__ctl_search", \
-   CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
- CTL{name}="Synth Playback Switch",PROGRAM=="__ctl_search", \
-   CTL{values}="on"
--- 
-1.5.5.1
-