Hello community, here is the log from the commit of package emu-tools checked in at Sun Nov 19 16:58:38 CET 2006. -------- --- arch/i386/emu-tools/emu-tools.changes 2006-01-25 21:44:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/emu-tools/emu-tools.changes 2006-11-19 14:07:24.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 19 14:06:30 CET 2006 - drahn@suse.de + +- fix two definitions [#139350] + +------------------------------------------------------------------- New: ---- emu-tools-0.9.4-define-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emu-tools.spec ++++++ --- /var/tmp/diff_new_pack.stp5kE/_old 2006-11-19 16:58:08.000000000 +0100 +++ /var/tmp/diff_new_pack.stp5kE/_new 2006-11-19 16:58:08.000000000 +0100 @@ -1,34 +1,35 @@ # # spec file for package emu-tools (Version 0.9.4) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: emu-tools -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Hardware/Other URL: http://opensource.creative.com/ Requires: aumix Autoreqprov: on -Summary: Tools for setting up the emu10k1 kernel module +Summary: Tools for Setting Up the emu10k1 Kernel Module Version: 0.9.4 -Release: 561 +Release: 589 Source: emu-tools-%{version}.tar.gz Source1: README.SuSE Patch0: emu-tools-%{version}.diff Patch1: emu-tools-%{version}-multiline.diff Patch2: emu-tools-%{version}-label.diff +Patch3: emu-tools-%{version}-define-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides some tools for setting features of the emu10k1 -kernel module (for SB!Live soundcards). +kernel module (for SB!Live sound cards). @@ -42,6 +43,7 @@ %patch0 %patch1 %patch2 +%patch3 cp %{S:1} . %build @@ -82,6 +84,8 @@ %doc /usr/share/man/man1/emu-dspmgr.1.gz %changelog -n emu-tools +* Sun Nov 19 2006 - drahn@suse.de +- fix two definitions [#139350] * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Sep 29 2005 - dmueller@suse.de @@ -110,9 +114,9 @@ /dev/ entries. - Added two new surround sound decoders - Added new options to emu-config: --I prints out info on the card and driver --B Add/Remove 12dB gain from Analog Front speakers --f set output spdif frequency rate on Audigy cards + -I prints out info on the card and driver + -B Add/Remove 12dB gain from Analog Front speakers + -f set output spdif frequency rate on Audigy cards - Added Audigy support for -d and -a options - Improvements to emu-script, a few new options added. - added command line argument overiding for emu-script (details in ++++++ emu-tools-0.9.4-define-fix.diff ++++++ --- as10k1/macro.c +++ as10k1/macro.c @@ -75,6 +75,8 @@ //initialize macro use: i=0; + done=0; + old=0; if(macro_depth+1> MAX_MAC_DEPTH) as_exit("Error exceeded maximum number of recursive macro calls"); --- mixer/emu-dspmgr.c +++ mixer/emu-dspmgr.c @@ -80,7 +80,7 @@ struct dsp_patch_manager *mgr = state->input; static char gpr[DSP_GPR_NAME_SIZE]; static char patch[DSP_PATCH_NAME_SIZE]; - static char line[10]; + static char line[15]; static int io=-1,input[DSP_NUM_INPUTS],output[DSP_NUM_OUTPUTS], num_in=0,num_out=0, placement=0; int ret; __s32 value; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org