Hello community,
here is the log from the commit of package alsa-plugins for openSUSE:Factory
checked in at Fri Apr 23 01:34:13 CEST 2010.
--------
--- alsa-plugins/alsa-plugins.changes 2010-03-08 14:43:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2010-04-19 10:46:15.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 19 10:40:26 CEST 2010 - tiwai@suse.de
+
+- updated to version 1.0.23:
+ * including previous fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
alsa-plugins-1.0.22.tar.bz2
alsa-plugins-git-fixes.diff
New:
----
alsa-plugins-1.0.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-plugins.spec ++++++
--- /var/tmp/diff_new_pack.qbW3hU/_old 2010-04-23 01:33:41.000000000 +0200
+++ /var/tmp/diff_new_pack.qbW3hU/_new 2010-04-23 01:33:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package alsa-plugins (Version 1.0.22)
+# spec file for package alsa-plugins (Version 1.0.23)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -34,12 +34,12 @@
%if %build_speex
BuildRequires: speex-devel
%endif
-%define package_version 1.0.22
+%define package_version 1.0.23
Url: http://www.alsa-project.org/
Summary: Extra Plug-Ins for the ALSA Library
-Version: 1.0.22
-Release: 3
-License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
+Version: 1.0.23
+Release: 1
+License: LGPLv2.1+
Group: System/Libraries
AutoReqProv: on
%ifarch x86_64 s390x
@@ -49,7 +49,7 @@
Source1: asound-pulse.conf
Source2: alsa-pulse.conf
Source3: baselibs.conf
-Patch: alsa-plugins-git-fixes.diff
+# Patch: alsa-plugins-git-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -164,7 +164,7 @@
%prep
%setup -q -n %{name}-%{package_version}
-%patch -p1
+# %patch -p1
%build
export AUTOMAKE_JOBS=%{?jobs:%jobs}
++++++ alsa-plugins-1.0.22.tar.bz2 -> alsa-plugins-1.0.23.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.0.22/configure new/alsa-plugins-1.0.23/configure
--- old/alsa-plugins-1.0.22/configure 2009-12-16 16:28:29.000000000 +0100
+++ new/alsa-plugins-1.0.23/configure 2010-04-16 13:18:56.000000000 +0200
@@ -2302,7 +2302,7 @@
# Define the identity of the package.
PACKAGE=alsa-plugins
- VERSION=1.0.22
+ VERSION=1.0.23
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.0.22/configure.in new/alsa-plugins-1.0.23/configure.in
--- old/alsa-plugins-1.0.22/configure.in 2009-12-16 16:18:55.000000000 +0100
+++ new/alsa-plugins-1.0.23/configure.in 2010-04-16 13:11:10.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
AC_INIT(oss/pcm_oss.c)
-AM_INIT_AUTOMAKE(alsa-plugins, 1.0.22)
+AM_INIT_AUTOMAKE(alsa-plugins, 1.0.23)
AC_PREFIX_DEFAULT(/usr)
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.0.22/usb_stream/pcm_usb_stream.c new/alsa-plugins-1.0.23/usb_stream/pcm_usb_stream.c
--- old/alsa-plugins-1.0.22/usb_stream/pcm_usb_stream.c 2009-12-16 16:18:55.000000000 +0100
+++ new/alsa-plugins-1.0.23/usb_stream/pcm_usb_stream.c 2010-04-16 13:11:10.000000000 +0200
@@ -1,7 +1,7 @@
/*
* PCM - USB_STREAM plugin
*
- * Copyright (c) 2008 by Karsten Wiese
+ * Copyright (c) 2008, 2010 by Karsten Wiese
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -48,6 +48,8 @@
#define VDBG(f, ...)
#endif
+#define FRAME_SIZE 6
+
#define LCARD 32
struct user_usb_stream {
char card[LCARD];
@@ -70,6 +72,8 @@
unsigned periods_done;
unsigned channels;
+ snd_pcm_uframes_t period_size;
+ unsigned int rate;
} snd_pcm_us_t;
static struct user_usb_stream *uus;
@@ -177,7 +181,7 @@
VDBG("");
us_cfg.version = USB_STREAM_INTERFACE_VERSION;
- us_cfg.frame_size = 6;
+ us_cfg.frame_size = FRAME_SIZE;
us_cfg.sample_rate = io->rate;
us_cfg.period_frames = io->period_size;
@@ -256,8 +260,11 @@
static int snd_pcm_us_stop(snd_pcm_ioplug_t *io)
{
snd_pcm_us_t *us = io->private_data;
- VDBG("%u", us->uus->s->periods_done);
+ if (!us->uus->s)
+ return 0;
+
+ VDBG("%u", us->uus->s->periods_done);
if (io->stream == SND_PCM_STREAM_PLAYBACK)
memset(us->uus->write_area, 0, us->uus->s->write_size);
@@ -370,6 +377,10 @@
};
int err;
+ unsigned int rate_min = us->rate ? us->rate : 44100,
+ rate_max = us->rate ? us->rate : 96000,
+ period_bytes_min = us->period_size ? FRAME_SIZE * us->period_size : 128,
+ period_bytes_max = us->period_size ? FRAME_SIZE * us->period_size : 64*4096;
if ((err = snd_pcm_ioplug_set_param_list(&us->io, SND_PCM_IOPLUG_HW_ACCESS,
ARRAY_SIZE(access_list), access_list)) < 0 ||
@@ -378,9 +389,9 @@
(err = snd_pcm_ioplug_set_param_minmax(&us->io, SND_PCM_IOPLUG_HW_CHANNELS,
us->channels, us->channels)) < 0 ||
(err = snd_pcm_ioplug_set_param_minmax(&us->io, SND_PCM_IOPLUG_HW_RATE,
- 44100, 96000)) < 0 ||
+ rate_min, rate_max)) < 0 ||
(err = snd_pcm_ioplug_set_param_minmax(&us->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES,
- 128, 64*4096)) < 0 ||
+ period_bytes_min, period_bytes_max)) < 0 ||
(err = snd_pcm_ioplug_set_param_minmax(&us->io, SND_PCM_IOPLUG_HW_PERIODS,
2, 2)) < 0)
return err;
@@ -390,7 +401,9 @@
static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name,
const char *card,
- snd_pcm_stream_t stream, int mode)
+ snd_pcm_stream_t stream, int mode,
+ snd_pcm_uframes_t period_size,
+ unsigned int rate)
{
snd_pcm_us_t *us;
int err;
@@ -421,6 +434,8 @@
snd_hwdep_poll_descriptors(us->hwdep, &us->pfd, 1);
us->channels = 2;
+ us->period_size = period_size;
+ us->rate = rate;
us->io.version = SND_PCM_IOPLUG_VERSION;
us->io.name = "ALSA <-> USB_STREAM PCM I/O Plugin";
@@ -455,6 +470,7 @@
snd_config_iterator_t i, next;
const char *card;
int err;
+ long period_size = 0, rate = 0;
snd_config_for_each(i, next, conf) {
snd_config_t *n = snd_config_iterator_entry(i);
@@ -472,11 +488,27 @@
snd_config_get_string(n, &card);
continue;
}
+ if (strcmp(id, "period_size") == 0) {
+ if (snd_config_get_type(n) != SND_CONFIG_TYPE_INTEGER) {
+ SNDERR("Invalid type for %s", id);
+ return -EINVAL;
+ }
+ snd_config_get_integer(n, &period_size);
+ continue;
+ }
+ if (strcmp(id, "rate") == 0) {
+ if (snd_config_get_type(n) != SND_CONFIG_TYPE_INTEGER) {
+ SNDERR("Invalid type for %s", id);
+ return -EINVAL;
+ }
+ snd_config_get_integer(n, &rate);
+ continue;
+ }
SNDERR("Unknown field %s", id);
return -EINVAL;
}
- err = snd_pcm_us_open(pcmp, name, card, stream, mode);
+ err = snd_pcm_us_open(pcmp, name, card, stream, mode, period_size, rate);
return err;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.0.22/version new/alsa-plugins-1.0.23/version
--- old/alsa-plugins-1.0.22/version 2009-12-16 16:28:35.000000000 +0100
+++ new/alsa-plugins-1.0.23/version 2010-04-16 13:19:02.000000000 +0200
@@ -1 +1 @@
-1.0.22
+1.0.23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org