Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2014-03-16 08:05:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2013-06-18 09:57:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2014-03-16 08:05:03.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 11 11:10:14 CET 2014 - ti...@suse.de + +- Backport upstream fix for RME AIO AEB: + 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.Z8TZGQ/_old 2014-03-16 08:05:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Z8TZGQ/_new 2014-03-16 08:05:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package alsa-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,20 @@ # +%define package_version 1.0.27 # -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 %define have_gtk3 1 %else %define have_gtk3 0 %endif - Name: alsa-tools -BuildRequires: alsa-devel -BuildRequires: fdupes -BuildRequires: fltk-devel -BuildRequires: gcc-c++ -BuildRequires: gtk2-devel -BuildRequires: libtool -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -%if %{have_gtk3} -BuildRequires: gtk3-devel -%endif -%define package_version 1.0.27 -Url: http://www.alsa-project.org/ +Version: 1.0.27 +Release: 0 Summary: Various ALSA Tools License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities -Version: 1.0.27 -Release: 0 -Requires: alsa-firmware -Requires: fxload +Url: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/tools/alsa-tools-%{package_version}.tar.bz2 Source1: README.SuSE Source2: sbipatches.tar.bz2 @@ -58,10 +44,24 @@ Patch4: 0004-Fix-build-errors-caused-by-Werror-format-security.patch Patch5: 0005-Add-AM_MAINTAINER_MODE-enable-macro-to-all-configure.patch Patch6: 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch +Patch7: 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch # build fixes Patch100: alsa-tools-desktop-fix.dif Patch101: alsa-tools-no_m4_dir.dif +BuildRequires: alsa-devel +BuildRequires: fdupes +BuildRequires: fltk-devel +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: libtool +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +Requires: alsa-firmware +Requires: fxload BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{have_gtk3} +BuildRequires: gtk3-devel +%endif %description Various tools for ALSA including DSP loaders. @@ -95,6 +95,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # build fixes %patch100 -p1 %patch101 -p1 @@ -119,7 +120,7 @@ ) done # compile as10k1 examples -make -C as10k1/examples dsp +make -C as10k1/examples dsp %{?_smp_mflags} %install ALL_PACKS="envy24control seq/sbiload hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1 hwmixvolume hda-verb" @@ -131,48 +132,48 @@ %endif for d in $ALL_PACKS; do (cd $d - make DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR=%{buildroot} install %{?_smp_mflags} ) done -rm -f $RPM_BUILD_ROOT%{_libdir}/liblo10k1.la +rm -f %{buildroot}%{_libdir}/liblo10k1.la # remove obsolete hotplug files -rm -rf $RPM_BUILD_ROOT/etc/hotplug +rm -rf %{buildroot}%{_sysconfdir}/hotplug # install pixmaps -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp hdspmixer/pixmaps/hdspmixer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp hdspconf/pixmaps/hdspconf.png $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_datadir}/pixmaps +cp %{SOURCE7} %{buildroot}%{_datadir}/pixmaps +cp %{SOURCE8} %{buildroot}%{_datadir}/pixmaps +cp hdspmixer/pixmaps/hdspmixer.png %{buildroot}%{_datadir}/pixmaps +cp hdspconf/pixmaps/hdspconf.png %{buildroot}%{_datadir}/pixmaps # install desktop files %suse_update_desktop_file -i envy24control AudioVideo Mixer GTK %suse_update_desktop_file -i rmedigicontrol AudioVideo Mixer GTK %suse_update_desktop_file hdspconf AudioVideo Utility %suse_update_desktop_file hdspmixer AudioVideo Mixer # install documents -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p %{buildroot}%{_docdir}/%{name} for d in $ALL_PACKS; do (cd $d n=${d##*/} - mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/$n + mkdir -p %{buildroot}%{_docdir}/%{name}/$n for f in AUTHORS COPYING* ChangeLog NEWS README* TODO; do test -s $f || continue - install -c -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/$n + install -c -m 0644 $f %{buildroot}%{_docdir}/%{name}/$n done ) done # extra doc for ld10k1 -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/README $RPM_BUILD_ROOT%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}/ld10k1/doc -cp ld10k1/doc/*_usage $RPM_BUILD_ROOT%{_docdir}/%{name}/ld10k1/doc +mkdir -p %{buildroot}%{_docdir}/%{name}/ld10k1/doc +cp ld10k1/doc/README %{buildroot}%{_docdir}/%{name}/ld10k1/doc +cp ld10k1/doc/*.txt %{buildroot}%{_docdir}/%{name}/ld10k1/doc +cp ld10k1/doc/*_usage %{buildroot}%{_docdir}/%{name}/ld10k1/doc # opl3 sounds -mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/opl3 -install -c -m 0644 *.o3 *.sb $RPM_BUILD_ROOT%{_datadir}/sounds/opl3 +mkdir -p %{buildroot}%{_datadir}/sounds/opl3 +install -c -m 0644 *.o3 *.sb %{buildroot}%{_datadir}/sounds/opl3 (cd as10k1 -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/as10k1/examples -cp examples/*.asm examples/*.emu10k1 $RPM_BUILD_ROOT%{_docdir}/%{name}/as10k1/examples +mkdir -p %{buildroot}%{_docdir}/%{name}/as10k1/examples +cp examples/*.asm examples/*.emu10k1 %{buildroot}%{_docdir}/%{name}/as10k1/examples ) -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} %post -p /sbin/ldconfig ++++++ 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch ++++++ >From f3c2688f9d1220cde0a66732985b286b5875f1d5 Mon Sep 17 00:00:00 2001 From: Adrian Knoth <a...@drcomp.erfurt.thur.de> Date: Sat, 4 Jan 2014 21:38:23 +0100 Subject: [PATCH] hdspmixer: Add support for RME AIO AEB boards AIO allows to connect Analogue Extension Boards (4in/4out). Provide those channels in hdspmixer, too. The channel maps were copied from the driver, hence the changed casing in the comments. Signed-off-by: Adrian Knoth <a...@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <ti...@suse.de> --- hdspmixer/src/HDSPMixerCard.cxx | 18 +++++----- hdspmixer/src/HDSPMixerOutput.cxx | 28 +++++++++------ hdspmixer/src/HDSPMixerSelector.cxx | 24 ++++++++----- hdspmixer/src/HDSPMixerWindow.cxx | 12 +++---- hdspmixer/src/channelmap.cxx | 68 +++++++++++++++++++++---------------- hdspmixer/src/channelmap.h | 6 ++-- 6 files changed, 89 insertions(+), 67 deletions(-) diff --git a/hdspmixer/src/HDSPMixerCard.cxx b/hdspmixer/src/HDSPMixerCard.cxx index 78b88b65eee8..ce40ba7ce827 100644 --- a/hdspmixer/src/HDSPMixerCard.cxx +++ b/hdspmixer/src/HDSPMixerCard.cxx @@ -348,9 +348,9 @@ void HDSPMixerCard::adjustSettings() { switch (speed_mode) { case 0: // SS - channels_input = 14; - channels_playback = 16; - channels_output = 16; /* SS 2xAnalog+2xAES+2xSPDIF+4xADAT+2xHeadphones */ + channels_input = 18; + channels_playback = 20; + channels_output = 20; /* SS 2xAnalog+2xAES+2xSPDIF+8xADAT+2xHeadphones+4xAEB */ channel_map_input = channel_map_aio_in_ss; channel_map_playback = channel_map_aio_out_ss; dest_map = dest_map_aio_ss; @@ -358,9 +358,9 @@ void HDSPMixerCard::adjustSettings() { meter_map_playback = channel_map_aio_out_ss; break; case 1: // DS - channels_input = 10; - channels_playback = 12; - channels_output = 12; /* DS 2xAnalog+2xAES+2xSPDIF+4xADAT(SMUX)+2xHeadphones */ + channels_input = 14; + channels_playback = 16; + channels_output = 16; /* DS 2xAnalog+2xAES+2xSPDIF+4xADAT(SMUX)+2xHeadphones+4xAEB */ channel_map_input = channel_map_aio_in_ds; channel_map_playback = channel_map_aio_out_ds; dest_map = dest_map_aio_ds; @@ -368,9 +368,9 @@ void HDSPMixerCard::adjustSettings() { meter_map_playback = channel_map_aio_out_ds; break; case 2: // QS - channels_input = 8; - channels_playback = 10; - channels_output = 10; /* QS 2xAnalog+2xAES+2xSPDIF+2xADAT(SMUX)+2xHeadphones */ + channels_input = 12; + channels_playback = 14; + channels_output = 14; /* QS 2xAnalog+2xAES+2xSPDIF+2xADAT(SMUX)+2xHeadphones+4xAEB */ channel_map_input = channel_map_aio_in_qs; channel_map_playback = channel_map_aio_out_qs; dest_map = dest_map_aio_qs; diff --git a/hdspmixer/src/HDSPMixerOutput.cxx b/hdspmixer/src/HDSPMixerOutput.cxx index 5a88f41065e9..0053fe0724c1 100644 --- a/hdspmixer/src/HDSPMixerOutput.cxx +++ b/hdspmixer/src/HDSPMixerOutput.cxx @@ -87,51 +87,57 @@ static char const *labels_rpm_input[5] = { "Mic" }; -static char const *labels_aio_ss_input[14] = { +static char const *labels_aio_ss_input[18] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", "A 1", "A 2", "A 3", "A 4", - "A 5", "A 6", "A 7", "A 8" + "A 5", "A 6", "A 7", "A 8", + "AEB 1", "AEB 2", "AEB 3," "AEB 4" }; -static char const *labels_aio_ss_playback[16] = { +static char const *labels_aio_ss_playback[20] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", "A 1", "A 2", "A 3", "A 4", "A 5", "A 6", "A 7", "A 8", - "PH.L", "PH.R" + "PH.L", "PH.R", + "AEB 1", "AEB 2", "AEB 3", "AEB 4" }; -static char const *labels_aio_ds_input[10] = { +static char const *labels_aio_ds_input[14] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", - "A 1", "A 2", "A 3", "A 4" + "A 1", "A 2", "A 3", "A 4", + "AEB 1", "AEB 2", "AEB 3", "AEB 4" }; -static char const *labels_aio_ds_playback[12] = { +static char const *labels_aio_ds_playback[16] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", "A 1", "A 2", "A 3", "A 4", - "PH.L", "PH.R" + "PH.L", "PH.R", + "AEB 1", "AEB 2", "AEB 3", "AEB 4" }; -static char const *labels_aio_qs_input[8] = { +static char const *labels_aio_qs_input[12] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", - "A 1", "A 2" + "A 1", "A 2", + "AEB 1", "AEB 2", "AEB 3", "AEB 4" }; -static char const *labels_aio_qs_playback[10] = { +static char const *labels_aio_qs_playback[14] = { "AN 1", "AN 2", "SP.L", "SP.R", "AES.L", "AES.R", "A 1", "A 2", "PH.L", "PH.R", + "AEB 1", "AEB 2", "AEB 3", "AEB 4" }; diff --git a/hdspmixer/src/HDSPMixerSelector.cxx b/hdspmixer/src/HDSPMixerSelector.cxx index 084c80d524eb..3dcbad352f11 100644 --- a/hdspmixer/src/HDSPMixerSelector.cxx +++ b/hdspmixer/src/HDSPMixerSelector.cxx @@ -81,28 +81,34 @@ static char const *destinations_raydat_qs[6] = { }; -static char const *destinations_aio_ss[8] = { +static char const *destinations_aio_ss[10] = { "AN 1+2", "AES", "SPDIF", "A 1+2", "A 3+4", "A 5+6", "A 7+8", - "Phones" + "Phones", + "AEB 1+2", + "AEB 3+4" }; -static char const *destinations_aio_ds[6] = { +static char const *destinations_aio_ds[8] = { "AN 1+2", "AES", "SPDIF", "A 1+2", "A 3+4", - "Phones" + "Phones", + "AEB 1+2", + "AEB 3+4" }; -static char const *destinations_aio_qs[5] = { +static char const *destinations_aio_qs[7] = { "AN 1+2", "AES", "SPDIF", "A 1+2", - "Phones" + "Phones", + "AEB 1+2", + "AEB 3+4" }; static char const *destinations_mf_ss[10] = { @@ -318,15 +324,15 @@ void HDSPMixerSelector::setLabels() } else if (HDSPeAIO == type) { switch (sm) { case 0: - max_dest = 8; + max_dest = 10; destinations = destinations_aio_ss; break; case 1: - max_dest = 6; + max_dest = 8; destinations = destinations_aio_ds; break; case 2: - max_dest = 5; + max_dest = 7; destinations = destinations_aio_qs; break; } diff --git a/hdspmixer/src/HDSPMixerWindow.cxx b/hdspmixer/src/HDSPMixerWindow.cxx index e1fe18c8301e..342efb2b857f 100644 --- a/hdspmixer/src/HDSPMixerWindow.cxx +++ b/hdspmixer/src/HDSPMixerWindow.cxx @@ -753,12 +753,12 @@ void HDSPMixerWindow::restoreDefaults(int card) num_modes = 3; break; case HDSPeAIO: - chnls[0] = 14; - chnls[1] = 10; - chnls[2] = 8; - maxdest[0] = 8; - maxdest[1] = 6; - maxdest[2] = 5; + chnls[0] = 18; + chnls[1] = 14; + chnls[2] = 12; + maxdest[0] = 10; + maxdest[1] = 8; + maxdest[2] = 7; num_modes = 3; break; case HDSPeRayDAT: diff --git a/hdspmixer/src/channelmap.cxx b/hdspmixer/src/channelmap.cxx index e3ca15c1694c..b7bdded7ff19 100644 --- a/hdspmixer/src/channelmap.cxx +++ b/hdspmixer/src/channelmap.cxx @@ -247,38 +247,44 @@ char channel_map_raydat_qs[HDSPM_MAX_CHANNELS] = { // HDSPe AIO -char dest_map_aio_ss[8] = { +char dest_map_aio_ss[10] = { 0, // Analogue 8, // AES 10, // SPDIF 12, 14, 16, 18, // ADAT - 6 // Phones + 6, // Phones + 2, // AEB 1+2 + 4 // AEB 3+4 }; -char dest_map_aio_ds[6] = { +char dest_map_aio_ds[8] = { 0, // Analogue 8, // AES 10, // SPDIF 12, 16, // ADAT - 6 // Phones + 6, // Phones + 2, // AEB 1+2 + 4 // AEB 3+4 }; -char dest_map_aio_qs[5] = { +char dest_map_aio_qs[7] = { 0, // Analogue 8, // AES 10, // SPDIF 12, // ADAT - 6 // Phone + 6, // Phone + 2, // AEB 1+2 + 4 // AEB 3+4 }; char channel_map_aio_in_ss[HDSPM_MAX_CHANNELS] = { 0, 1, /* line in */ - 8, 9, /* AES in, */ - 10, 11, /* SPDIF in */ + 8, 9, /* aes in, */ + 10, 11, /* spdif in */ 12, 13, 14, 15, 16, 17, 18, 19, /* ADAT in */ - -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + 2, 3, 4, 5, /* AEB */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -288,11 +294,12 @@ char channel_map_aio_in_ss[HDSPM_MAX_CHANNELS] = { char channel_map_aio_out_ss[HDSPM_MAX_CHANNELS] = { 0, 1, /* line out */ - 8, 9, /* AES out */ - 10, 11, /* SPDIF out */ + 8, 9, /* aes out */ + 10, 11, /* spdif out */ 12, 13, 14, 15, 16, 17, 18, 19, /* ADAT out */ 6, 7, /* phone out */ - -1, -1, -1, -1, -1, -1, -1, -1, + 2, 3, 4, 5, /* AEB */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -302,10 +309,11 @@ char channel_map_aio_out_ss[HDSPM_MAX_CHANNELS] = { char channel_map_aio_in_ds[HDSPM_MAX_CHANNELS] = { 0, 1, /* line in */ - 8, 9, /* AES in */ - 10, 11, /* SPDIF in */ - 12, 14, 16, 18, /* ADAT in */ - -1, -1, -1, -1, -1, -1, + 8, 9, /* aes in */ + 10, 11, /* spdif in */ + 12, 14, 16, 18, /* adat in */ + 2, 3, 4, 5, /* AEB */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -316,11 +324,11 @@ char channel_map_aio_in_ds[HDSPM_MAX_CHANNELS] = { char channel_map_aio_out_ds[HDSPM_MAX_CHANNELS] = { 0, 1, /* line out */ - 8, 9, /* AES out */ - 10, 11, /* SPDIF out */ - 12, 14, 16, 18, /* ADAT out */ + 8, 9, /* aes out */ + 10, 11, /* spdif out */ + 12, 14, 16, 18, /* adat out */ 6, 7, /* phone out */ - -1, -1, -1, -1, + 2, 3, 4, 5, /* AEB */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -331,10 +339,11 @@ char channel_map_aio_out_ds[HDSPM_MAX_CHANNELS] = { char channel_map_aio_in_qs[HDSPM_MAX_CHANNELS] = { 0, 1, /* line in */ - 8, 9, /* AES in */ - 10, 11, /* SPDIF in */ - 12, 16, /* ADAT in */ - -1, -1, -1, -1, -1, -1, -1, -1, + 8, 9, /* aes in */ + 10, 11, /* spdif in */ + 12, 16, /* adat in */ + 2, 3, 4, 5, /* AEB */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -345,11 +354,12 @@ char channel_map_aio_in_qs[HDSPM_MAX_CHANNELS] = { char channel_map_aio_out_qs[HDSPM_MAX_CHANNELS] = { 0, 1, /* line out */ - 8, 9, /* AES out */ - 10, 11, /* SPDIF out */ - 12, 16, /* ADAT out */ + 8, 9, /* aes out */ + 10, 11, /* spdif out */ + 12, 16, /* adat out */ 6, 7, /* phone out */ - -1, -1, -1, -1, -1, -1, + 2, 3, 4, 5, /* AEB */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/hdspmixer/src/channelmap.h b/hdspmixer/src/channelmap.h index 51b69ce2eeae..854e5a152011 100644 --- a/hdspmixer/src/channelmap.h +++ b/hdspmixer/src/channelmap.h @@ -112,12 +112,12 @@ extern char channel_map_raydat_qs[HDSPM_MAX_CHANNELS]; // HDSPe AIO -extern char dest_map_aio_ss[8]; +extern char dest_map_aio_ss[10]; -extern char dest_map_aio_ds[6]; +extern char dest_map_aio_ds[8]; -extern char dest_map_aio_qs[5]; +extern char dest_map_aio_qs[7]; extern char channel_map_aio_in_ss[HDSPM_MAX_CHANNELS]; -- 1.9.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org