commit alsa for openSUSE:Factory
Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Thu Jan 22 16:43:07 CET 2009. -------- --- alsa/alsa.changes 2009-01-14 09:40:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2009-01-22 14:00:07.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 22 13:59:24 CET 2009 - tiwai@suse.de + +- updated to version 1.0.19: + * including previous patches +- fix build without math support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-lib-1.0.18.tar.bz2 alsa-lib-conf-path-check-fix.diff alsa-lib-ice1724-spdif-fix.diff alsa-lib-meter-plugin-segfault-fix.diff alsa-lib-softvol-access-refine-fix.diff New: ---- alsa-lib-1.0.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.j22013/_old 2009-01-22 16:42:51.000000000 +0100 +++ /var/tmp/diff_new_pack.j22013/_new 2009-01-22 16:42:51.000000000 +0100 @@ -20,7 +20,7 @@ Name: alsa BuildRequires: doxygen -%define package_version 1.0.18 +%define package_version 1.0.19 License: GPL v2 or later Group: System/Libraries Requires: alsa-utils @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.18 -Release: 11 +Release: 13 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -51,10 +51,6 @@ Source33: alsa-info.sh Source34: alsa-init.sh Patch: alsa-lib-git-fixes.diff -Patch1: alsa-lib-ice1724-spdif-fix.diff -Patch2: alsa-lib-meter-plugin-segfault-fix.diff -Patch3: alsa-lib-softvol-access-refine-fix.diff -Patch4: alsa-lib-conf-path-check-fix.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -127,10 +123,6 @@ %prep %setup -q -n alsa-lib-%{package_version} %patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build # build alsa-lib @@ -252,6 +244,10 @@ %{_datadir}/alsa %changelog +* Thu Jan 22 2009 tiwai@suse.de +- updated to version 1.0.19: + * including previous patches +- fix build without math support * Tue Jan 13 2009 olh@suse.de - obsolete old -XXbit packages (bnc#437293) * Mon Jan 12 2009 tiwai@suse.de ++++++ alsa-lib-1.0.18.tar.bz2 -> alsa-lib-1.0.19.tar.bz2 ++++++ ++++ 3502 lines of diff (skipped) ++++++ alsa-lib-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.j22013/_old 2009-01-22 16:42:54.000000000 +0100 +++ /var/tmp/diff_new_pack.j22013/_new 2009-01-22 16:42:54.000000000 +0100 @@ -1,94 +1,57 @@ -diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c -index ef277de..8d6aae8 100644 ---- a/src/mixer/simple_none.c -+++ b/src/mixer/simple_none.c -@@ -809,14 +809,14 @@ static int simple_update(snd_mixer_elem_t *melem) - if (caps & (SM_CAP_GSWITCH|SM_CAP_CSWITCH)) - caps |= SM_CAP_CSWITCH_JOIN; - if (caps & (SM_CAP_GVOLUME|SM_CAP_CVOLUME)) -- caps |= SM_CAP_PVOLUME_JOIN; -+ caps |= SM_CAP_CVOLUME_JOIN; - if (pchannels > 1 || cchannels > 1) { - if (simple->ctls[CTL_SINGLE].elem && - simple->ctls[CTL_SINGLE].values > 1) { - if (caps & SM_CAP_GSWITCH) -- caps &= ~SM_CAP_PSWITCH_JOIN; -+ caps &= ~(SM_CAP_PSWITCH_JOIN|SM_CAP_CSWITCH_JOIN); - else -- caps &= ~SM_CAP_PVOLUME_JOIN; -+ caps &= ~(SM_CAP_PVOLUME_JOIN|SM_CAP_CVOLUME_JOIN); - } - if (simple->ctls[CTL_GLOBAL_ROUTE].elem || - (simple->ctls[CTL_GLOBAL_SWITCH].elem && -@@ -946,6 +946,8 @@ static int base_len(const char *name, selem_ctl_type_t *type) - static int _snd_mixer_selem_set_volume(snd_mixer_elem_t *elem, int dir, snd_mixer_selem_channel_id_t channel, long value) - { - selem_none_t *s = snd_mixer_elem_get_private(elem); -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - if ((unsigned int) channel >= s->str[dir].channels) - return 0; - if (value < s->str[dir].min || value > s->str[dir].max) -@@ -1064,6 +1066,8 @@ static int get_volume_ops(snd_mixer_elem_t *elem, int dir, - snd_mixer_selem_channel_id_t channel, long *value) - { - selem_none_t *s = snd_mixer_elem_get_private(elem); -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - if ((unsigned int) channel >= s->str[dir].channels) - return -EINVAL; - *value = s->str[dir].vol[channel]; -@@ -1158,6 +1162,8 @@ static int get_dB_range_ops(snd_mixer_elem_t *elem, int dir, - selem_none_t *s = snd_mixer_elem_get_private(elem); - selem_ctl_t *c; +diff --git a/configure.in b/configure.in +index 9a71d95..ea6a8a0 100644 +--- a/configure.in ++++ b/configure.in +@@ -367,6 +367,7 @@ AC_ARG_ENABLE(seq, + AC_ARG_ENABLE(alisp, + AS_HELP_STRING([--disable-alisp], [disable the alisp component]), + [build_alisp="$enableval"], [build_alisp="yes"]) ++test "$softfloat" = "yes" && build_alisp="no" + AC_ARG_ENABLE(old-symbols, + AS_HELP_STRING([--disable-old-symbols], [disable old obsoleted symbols]), + [keep_old_symbols="$enableval"], [keep_old_symbols="yes"]) +@@ -474,6 +475,7 @@ fi + + if test "$softfloat" = "yes"; then + build_pcm_lfloat="no" ++ build_pcm_ladspa="no" + fi -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - c = get_selem_ctl(s, dir); - if (! c) - return -EINVAL; -@@ -1199,6 +1205,8 @@ static int get_dB_ops(snd_mixer_elem_t *elem, - int err; - long volume, db_gain; + AM_CONDITIONAL(BUILD_PCM_PLUGIN, test x$build_pcm_plugin = xyes) +diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am +index f73871f..bad0944 100644 +--- a/modules/mixer/simple/Makefile.am ++++ b/modules/mixer/simple/Makefile.am +@@ -21,11 +21,11 @@ smixer_sbase_la_LIBADD = ../../../src/libasound.la -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - c = get_selem_ctl(s, dir); - if (! c) - return -EINVAL; -@@ -1216,6 +1224,8 @@ static int get_switch_ops(snd_mixer_elem_t *elem, int dir, - snd_mixer_selem_channel_id_t channel, int *value) - { - selem_none_t *s = snd_mixer_elem_get_private(elem); -+ if (s->selem.caps & SM_CAP_GSWITCH) -+ dir = SM_PLAY; - if ((unsigned int) channel >= s->str[dir].channels) - return -EINVAL; - *value = !!(s->str[dir].sw & (1 << channel)); -@@ -1240,6 +1250,8 @@ static int ask_dB_vol_ops(snd_mixer_elem_t *elem, int dir, - selem_none_t *s = snd_mixer_elem_get_private(elem); - selem_ctl_t *c; + smixer_ac97_la_SOURCES = ac97.c sbasedl.c + smixer_ac97_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED) +-smixer_ac97_la_LIBADD = ../../../src/libasound.la ++smixer_ac97_la_LIBADD = ../../../src/libasound.la -ldl -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - c = get_selem_ctl(s, dir); - if (! c) - return -EINVAL; -@@ -1255,6 +1267,8 @@ static int set_dB_ops(snd_mixer_elem_t *elem, int dir, - long value; - int err; + smixer_hda_la_SOURCES = hda.c sbasedl.c + smixer_hda_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED) +-smixer_hda_la_LIBADD = ../../../src/libasound.la ++smixer_hda_la_LIBADD = ../../../src/libasound.la -ldl -+ if (s->selem.caps & SM_CAP_GVOLUME) -+ dir = SM_PLAY; - c = get_selem_ctl(s, dir); - if (! c) - return -EINVAL; -@@ -1269,6 +1283,8 @@ static int set_switch_ops(snd_mixer_elem_t *elem, int dir, - { - int changed; - selem_none_t *s = snd_mixer_elem_get_private(elem); -+ if (s->selem.caps & SM_CAP_GSWITCH) -+ dir = SM_PLAY; - if (dir == SM_PLAY) { - if (! (s->selem.caps & (SM_CAP_GSWITCH|SM_CAP_PSWITCH))) - return -EINVAL; + if BUILD_PYTHON + smixer_python_la_SOURCES = python.c +diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c +index 0f4dd3a..4802200 100644 +--- a/src/mixer/simple_none.c ++++ b/src/mixer/simple_none.c +@@ -1450,7 +1450,14 @@ static int simple_add1(snd_mixer_class_t *class, const char *name, + } + if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN) + return 0; ++#ifdef HAVE_SOFT_FLOAT ++ /* up to 256 channels */ ++ for (n = 1; n < 256; n++) ++ if (n * n == values) ++ break; ++#else + n = sqrt((double)values); ++#endif + if (n * n != values) + return 0; + values = n; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de