commit alsa for openSUSE:12.2
Hello community,
here is the log from the commit of package alsa for openSUSE:12.2 checked in at
2012-08-04 08:59:56
Comparing /work/SRC/openSUSE:12.2/alsa (Old)
and /work/SRC/openSUSE:12.2/.alsa.new (New)
Package is alsa, Maintainer is ti...@suse.com
Changes:
--- /work/SRC/openSUSE:12.2/alsa/alsa.changes 2012-07-02 10:42:56.0
+0200
+++ /work/SRC/openSUSE:12.2/.alsa.new/alsa.changes 2012-08-04
09:00:00.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 5 10:11:35 CEST 2012 - ti...@suse.de
+
+- Fix useless assert in hctl, backport from upstream
+
+---
New:
0016-hctl-Remove-a-useless-assert.patch
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.mOml95/_old 2012-08-04 09:00:09.0 +0200
+++ /var/tmp/diff_new_pack.mOml95/_new 2012-08-04 09:00:09.0 +0200
@@ -68,6 +68,7 @@
Patch13:0013-tlv-improve-robustness-of-raw-value-ranges.patch
Patch14:0014-conf-Add-more-USB-devices-to-S-PDIF-blacklist.patch
Patch15:0015-Fix-the-binary-compatibility-of-ext-ctl-plugin-with-.patch
+Patch16:0016-hctl-Remove-a-useless-assert.patch
Patch99:alsa-lib-doxygen-avoid-crash-for-11.3.diff
Url:http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -133,6 +134,7 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
%if %suse_version == 1130
%patch99 -p1
%endif
++ 0016-hctl-Remove-a-useless-assert.patch ++
From 86e27cdbf119440101a850e1b44baebfefe863ca Mon Sep 17 00:00:00 2001
From: Martin Sandsmark martin.sandsm...@kde.org
Date: Thu, 5 Jul 2012 09:40:07 +0200
Subject: [PATCH] hctl: Remove a useless assert
The case where the element is unavailable (for example gone away since
the event was created) is handled beneath.
See also bug 5471.
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5471
Signed-off-by: Takashi Iwai ti...@suse.de
---
src/control/hcontrol.c |1 -
1 file changed, 1 deletion(-)
diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
index 8ffc434..ee1d907 100644
--- a/src/control/hcontrol.c
+++ b/src/control/hcontrol.c
@@ -761,7 +761,6 @@ static int snd_hctl_handle_event(snd_hctl_t *hctl,
snd_ctl_event_t *event)
if (event-data.elem.mask (SNDRV_CTL_EVENT_MASK_VALUE |
SNDRV_CTL_EVENT_MASK_INFO)) {
elem = snd_hctl_find_elem(hctl, event-data.elem.id);
- assert(elem);
if (!elem)
return -ENOENT;
res = snd_hctl_elem_throw_event(elem, event-data.elem.mask
--
1.7.10.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit alsa for openSUSE:12.2
Hello community,
here is the log from the commit of package alsa for openSUSE:12.2 checked in at
2012-07-01 20:58:54
Comparing /work/SRC/openSUSE:12.2/alsa (Old)
and /work/SRC/openSUSE:12.2/.alsa.new (New)
Package is alsa, Maintainer is ti...@suse.com
Changes:
--- /work/SRC/openSUSE:12.2/alsa/alsa.changes 2012-06-26 17:44:46.0
+0200
+++ /work/SRC/openSUSE:12.2/.alsa.new/alsa.changes 2012-07-02
10:42:56.0 +0200
@@ -1,0 +2,13 @@
+Thu Jun 28 17:04:59 CEST 2012 - ti...@suse.de
+
+- Use a special modprobe config for loading OSS and sequencer
+ modules automatically (bnc#768361,bnc#768352,bnc#757484,
+ bnc#767738)
+- Remove the automatic module loading part from alsasound init
+ script since modprobe does it now
+- Set LOAD_SEQUENCER=no and LOAD_OSS_EMUL_MODULES=no as default;
+ these were already disabled on 12.1 with systemd.
+ This is only for new installations. Users upgrading from old
+ distros aren't affected.
+
+---
New:
50-alsa.conf
install-snd-module
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.B4H5DG/_old 2012-07-02 10:42:57.0 +0200
+++ /var/tmp/diff_new_pack.B4H5DG/_new 2012-07-02 10:42:57.0 +0200
@@ -50,6 +50,8 @@
Source32: all_notes_off.mid
Source33: alsa-info.sh
Source34: alsa-init.sh
+Source40: 50-alsa.conf
+Source41: install-snd-module
# Patch: alsa-lib-git-fixes.diff
Patch1: 0001-conf-pcm-Add-support-for-Echo3G-devices.-Thanks-to-u.patch
Patch2: 0002-USB-Audio-Blacklist-iec958-for-some-USB-devices.patch
@@ -202,6 +204,13 @@
install -c -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/etc/udev/rules.d
%endif
#
+# modprobe config and the module install script for loading OSS-emulation
+# and sequencer modules automatically
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
+install -c -m 0644 %{S:40} $RPM_BUILD_ROOT/etc/modprobe.d
+mkdir -p $RPM_BUILD_ROOT/sbin
+install -c -m 0755 %{S:41} $RPM_BUILD_ROOT/sbin
+#
# install template to update rc.config and sysconfig files:
# (updating the actual files is done in the %post-script)
#
@@ -243,6 +252,8 @@
%defattr(-, root, root)
%doc %{_docdir}/%{name}
/etc/init.d/*
+/etc/modprobe.d
+/sbin/*
%{_sbindir}/*
%{_bindir}/*
/usr/lib/all_notes_off.*
++ 50-alsa.conf ++
install snd /sbin/install-snd-module snd $CMDLINE_OPTS
install snd-pcm /sbin/install-snd-module snd-pcm $CMDLINE_OPTS
install snd-seq /sbin/install-snd-module snd-seq $CMDLINE_OPTS
++ alsasound ++
--- /var/tmp/diff_new_pack.B4H5DG/_old 2012-07-02 10:42:57.0 +0200
+++ /var/tmp/diff_new_pack.B4H5DG/_new 2012-07-02 10:42:57.0 +0200
@@ -61,21 +61,6 @@
asoundcfg=/var/lib/alsa/asound.state
aconnect=/usr/bin/aconnect
-#
-# insert sequencer modules
-#
-load_sequencer() {
- test $LOAD_SEQUENCER = yes modprobe -q snd-seq
- if [ x$LOAD_SEQUENCER = xyes -a -r /proc/asound/seq/drivers ]; then
-OLDIFS=$IFS
-IFS=,
-while read t x c; do
- /sbin/modprobe $t
-done /proc/asound/seq/drivers
-IFS=$OLDIFS
- fi
-}
-
get_drivers() {
/sbin/modprobe -c | \
grep -E ^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]] | sort -u | \
@@ -109,21 +94,11 @@
#
# rest of start action
#
-start_rest() {
- load_sequencer
- if [ x$LOAD_OSS_EMUL_MODULES = xyes ]; then
-/sbin/modprobe snd-pcm-oss
-test x$LOAD_OSS_SEQ_MODULE = xyes /sbin/modprobe snd-seq-oss
- fi
-}
# manual load and force to store the status
start_all() {
echo -n Starting sound driver
-load_modules start_rest
-# hack - in case the mixer isn't restored
-# this shouldn't be needed anymore since udev cares
-# (sleep 1; $alsactl -F -f $asoundcfg restore /dev/null 21)
+load_modules
rc_status -r
}
@@ -196,7 +171,6 @@
$alsactl -F -f $asoundcfg restore /dev/null 21
;;
esac
- start_rest
else
start_all
fi
++ install-snd-module ++
#!/bin/sh
/sbin/modprobe --ignore-install $@ || exit $?
. /etc/sysconfig/sound
case $1 in
snd)
/sbin/modprobe --quiet --use-blacklist snd-ioctl32
test $LOAD_OSS_EMUL_MODULES = yes \
/sbin/modprobe --quiet --use-blacklist snd-mixer-oss
test $LOAD_SEQUENCER = yes \
/sbin/modprobe --quiet --use-blacklist snd-seq
;;
snd-pcm|snd_pcm)
test $LOAD_OSS_EMUL_MODULES = yes \
/sbin/modprobe --quiet --use-blacklist snd-pcm-oss
;;
snd-seq|snd_seq)
if [ -r /proc/asound/seq/drivers ]; then
OLDIFS=$IFS
IFS=,
while read t x c; do
commit alsa for openSUSE:12.2
Hello community,
here is the log from the commit of package alsa for openSUSE:12.2 checked in at
2012-06-26 17:44:44
Comparing /work/SRC/openSUSE:12.2/alsa (Old)
and /work/SRC/openSUSE:12.2/.alsa.new (New)
Package is alsa, Maintainer is ti...@suse.com
Changes:
--- /work/SRC/openSUSE:12.2/alsa/alsa.changes 2012-06-25 15:15:06.0
+0200
+++ /work/SRC/openSUSE:12.2/.alsa.new/alsa.changes 2012-06-26
17:44:46.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun 25 23:18:07 CEST 2012 - ti...@suse.de
+
+- Fix the backward compatibility of ext_ctl plugin (bnc#768742)
+
+---
New:
0015-Fix-the-binary-compatibility-of-ext-ctl-plugin-with-.patch
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.mia6kv/_old 2012-06-26 17:44:46.0 +0200
+++ /var/tmp/diff_new_pack.mia6kv/_new 2012-06-26 17:44:46.0 +0200
@@ -65,6 +65,7 @@
Patch12:0012-pcm_dsnoop-comment-fall-through-in-next-case.patch
Patch13:0013-tlv-improve-robustness-of-raw-value-ranges.patch
Patch14:0014-conf-Add-more-USB-devices-to-S-PDIF-blacklist.patch
+Patch15:0015-Fix-the-binary-compatibility-of-ext-ctl-plugin-with-.patch
Patch99:alsa-lib-doxygen-avoid-crash-for-11.3.diff
Url:http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -129,6 +130,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%if %suse_version == 1130
%patch99 -p1
%endif
++ 0015-Fix-the-binary-compatibility-of-ext-ctl-plugin-with-.patch ++
From 52160de21ee6a710a746b0881d9581994d039123 Mon Sep 17 00:00:00 2001
From: Takashi Iwai ti...@suse.de
Date: Mon, 25 Jun 2012 23:16:14 +0200
Subject: [PATCH] Fix the binary compatibility of ext-ctl plugin with protocol
1.0.0
Signed-off-by: Takashi Iwai ti...@suse.de
---
include/control_external.h |9 +
src/control/control_ext.c |3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/control_external.h b/include/control_external.h
index 5392ea6..e98f4d6 100644
--- a/include/control_external.h
+++ b/include/control_external.h
@@ -125,16 +125,17 @@ struct snd_ctl_ext {
* control handle filled by #snd_ctl_ext_create()
*/
snd_ctl_t *handle;
+
+ int nonblock; /** non-block mode; read-only */
+ int subscribed; /** events subscribed; read-only */
+
/**
-* optional TLV data for the control.
+* optional TLV data for the control (since protocol 1.0.1)
*/
union {
snd_ctl_ext_tlv_rw_t *c;
const unsigned int *p;
} tlv;
-
- int nonblock; /** non-block mode; read-only */
- int subscribed; /** events subscribed; read-only */
};
/** Callback table of ext */
diff --git a/src/control/control_ext.c b/src/control/control_ext.c
index cc30766..56552fa 100644
--- a/src/control/control_ext.c
+++ b/src/control/control_ext.c
@@ -706,7 +706,8 @@ int snd_ctl_ext_create(snd_ctl_ext_t *ext, const char
*name, int mode)
snd_ctl_t *ctl;
int err;
- if (ext-version != SND_CTL_EXT_VERSION) {
+ if (ext-version SNDRV_PROTOCOL_VERSION(1, 0, 0) ||
+ ext-version SND_CTL_EXT_VERSION) {
SNDERR(ctl_ext: Plugin version mismatch\n);
return -ENXIO;
}
--
1.7.10.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
