From 5ab48565a879b43e4beac7ae7761d27fe23bd06508ae813de14b9bb3a2dda3c7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:48:02 +0000 Subject: [PATCH] converted link to branch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=15 --- alsa-utils-1.0.21.tar.bz2 | 3 -- alsa-utils-1.0.22.tar.bz2 | 3 ++ alsa-utils-git-fixes.diff | 74 --------------------------------------- alsa-utils.changes | 11 ++++++ alsa-utils.spec | 11 +++--- 5 files changed, 20 insertions(+), 82 deletions(-) delete mode 100644 alsa-utils-1.0.21.tar.bz2 create mode 100644 alsa-utils-1.0.22.tar.bz2 delete mode 100644 alsa-utils-git-fixes.diff diff --git a/alsa-utils-1.0.21.tar.bz2 b/alsa-utils-1.0.21.tar.bz2 deleted file mode 100644 index 8fbaada..0000000 --- a/alsa-utils-1.0.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6df349518b930714ca4664d8aaaf3ea949de1e33bcfd3df8ee7e0446b3c357a6 -size 1074700 diff --git a/alsa-utils-1.0.22.tar.bz2 b/alsa-utils-1.0.22.tar.bz2 new file mode 100644 index 0000000..ab7735e --- /dev/null +++ b/alsa-utils-1.0.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95133815d2c1c11396d75951b4db253b8c3010ea4c352cfa9fcd7d122cbd8d13 +size 1075216 diff --git a/alsa-utils-git-fixes.diff b/alsa-utils-git-fixes.diff deleted file mode 100644 index f4e7625..0000000 --- a/alsa-utils-git-fixes.diff +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/alsactl/init/default b/alsactl/init/default -index 8653ec6..a2069e3 100644 ---- a/alsactl/init/default -+++ b/alsactl/init/default -@@ -39,7 +39,7 @@ CTL{reset}="mixer" - CTL{name}="Front Playback Volume",PROGRAM!="__ctl_search",GOTO="front0_end" - # if master volume control is present, turn front volume to max - ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="front0_end" --ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="front0_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="front0_end" - CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" - LABEL="front0_end" - CTL{name}="Front Playback Switch",PROGRAM=="__ctl_search", \ -@@ -49,15 +49,30 @@ CTL{reset}="mixer" - 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" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end" - CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" - LABEL="headphone0_end" - CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \ - CTL{values}="on" - - CTL{reset}="mixer" --CTL{name}="Speaker Playback Volume",PROGRAM=="__ctl_search", \ -- CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" -+CTL{name}="Headphone Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search",\ -+ GOTO="headphone1_end" -+# if master volume control is present, turn headphone volume to max -+ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone1_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone1_end" -+CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" -+LABEL="headphone1_end" -+CTL{name}="Headphone Playback Switch",CTL{index}="1",PROGRAM=="__ctl_search", \ -+ CTL{values}="on" -+ -+CTL{reset}="mixer" -+CTL{name}="Sepaker Playback Volume",PROGRAM!="__ctl_search",GOTO="speaker0_end" -+# if master volume control is present, turn speaker volume to max -+ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="speaker0_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="speaker0_end" -+CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" -+LABEL="speaker0_end" - CTL{name}="Speaker Playback Switch",PROGRAM=="__ctl_search", \ - CTL{values}="on" - -@@ -72,7 +87,7 @@ CTL{name}="PCM Playback Volume",PROGRAM!="__ctl_search", \ - CTL{name}="PCM Volume",PROGRAM!="__ctl_search", GOTO="pcm0_end" - # if master volume control is present, turn PCM volume to max - ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm0_end" --ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm0_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm0_end" - # exception - some HDA codecs have shifted dB range - CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm0_end" - CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm0_end" -@@ -86,7 +101,7 @@ CTL{name}="PCM Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search", \ - CTL{name}="PCM Volume",PROGRAM!="__ctl_search",GOTO="pcm1_end" - # if master volume control is present, turn PCM volume to max - ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm1_end" --ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm1_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="pcm1_end" - # exception - some HDA codecs have shifted dB range - CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="pcm1_end" - CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm1_end" -@@ -125,7 +140,7 @@ CTL{reset}="mixer" - CTL{name}="CD Playback Volume",PROGRAM!="__ctl_search", GOTO="cd0_end" - # if master volume control is present, turn CD volume to max - ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="cd0_end" --ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="cd0_end" -+ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="cd0_end" - # exception - some HDA codecs have shifted dB range - CTL{dBmin}=="-34.50dB",CTL{dBmax}=="12.00dB",CTL{values}="0dB",GOTO="cd0_end" - CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="cd0_end" diff --git a/alsa-utils.changes b/alsa-utils.changes index dad3705..127ef76 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Dec 18 17:37:24 CET 2009 - tiwai@suse.de + +- set AUTOMAKE_JOBS for parallel automake + +------------------------------------------------------------------- +Fri Dec 18 17:20:34 CET 2009 - tiwai@suse.de + +- updated to version 1.0.22: + * including previous fixes + ------------------------------------------------------------------- Wed Sep 2 14:52:56 CEST 2009 - tiwai@suse.de diff --git a/alsa-utils.spec b/alsa-utils.spec index 07fc64b..9b9b307 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -20,17 +20,17 @@ Name: alsa-utils BuildRequires: alsa-devel ncurses-devel xmlto -%define package_version 1.0.21 -License: GPL v2 or later +%define package_version 1.0.22 +License: GPLv2+ Group: Productivity/Multimedia/Sound/Players Provides: alsa-conf Requires: dialog pciutils AutoReqProv: on Summary: Advanced Linux Sound Architecture Utilities Version: 1.0.21 -Release: 2 +Release: 3 Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 -Patch: alsa-utils-git-fixes.diff +# Patch: alsa-utils-git-fixes.diff Patch1: alsa-utils-gettext-version-removal.diff # Patch2: alsa-utils-po-pre-patch.diff Url: http://www.alsa-project.org/ @@ -54,12 +54,13 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am # fix po changes in tarball first # %patch2 -p1 # rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* -%patch -p1 +# %patch -p1 %if %suse_version < 1020 %patch1 -p1 %endif %build +export AUTOMAKE_JOBS=%{?jobs:%jobs} %if %suse_version < 1020 gettextize -f %endif