Author: lslezak Date: Tue Jul 31 09:33:20 2007 New Revision: 39821 URL: http://svn.opensuse.org/viewcvs/yast?rev=39821&view=rev Log: - use 'Apple PowerPC' for all PowerPC models (#295616) - updated sound card DB - fixed formatting error message in audio-agent - 2.15.9 Modified: trunk/sound/VERSION trunk/sound/agent-audio/src/AudioAgent.cc trunk/sound/agent-audio/src/OSSAudio.cc trunk/sound/data/addons/card_addons.ycp trunk/sound/data/addons/mod_addons.ycp trunk/sound/data/sndcards.ycp trunk/sound/package/yast2-sound.changes Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Tue Jul 31 09:33:20 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/sound/agent-audio/src/AudioAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/agent-audio/src/AudioAgent.cc?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/agent-audio/src/AudioAgent.cc (original) +++ trunk/sound/agent-audio/src/AudioAgent.cc Tue Jul 31 09:33:20 2007 @@ -116,7 +116,7 @@ + value->toString().c_str() + ") passed to Write(): .audio" + path->toString().c_str(); - y2error(error.c_str()); + y2error("Error: %s", error.c_str()); return YCPBoolean(false); } Modified: trunk/sound/agent-audio/src/OSSAudio.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/agent-audio/src/OSSAudio.cc?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/agent-audio/src/OSSAudio.cc (original) +++ trunk/sound/agent-audio/src/OSSAudio.cc Tue Jul 31 09:33:20 2007 @@ -115,7 +115,7 @@ + string(mixerfile) + "' : " + string(strerror(errno))).c_str(); - y2error(error.c_str()); + y2error("Error: %s", error.c_str()); return YCPBoolean(false); } @@ -123,7 +123,7 @@ string error = string("ioctl failed : ") + strerror(errno); close(mixer_fd); - y2error(error.c_str()); + y2error("Error: %s", error.c_str()); return YCPBoolean(false); } Modified: trunk/sound/data/addons/card_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/addons/card_addons.ycp?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/data/addons/card_addons.ycp (original) +++ trunk/sound/data/addons/card_addons.ycp Tue Jul 31 09:33:20 2007 @@ -288,14 +288,8 @@ ["snd-opti93x", "HOT-245, Shuttle"], ["snd-opti93x", "82C931/3, OPTi"], ["snd-pdaudiocf", "PDAudio-CF, Sound Core"], - ["snd-powermac", "PowerBook, Apple"], - ["snd-powermac", "PowerMac, Apple"], - ["snd-powermac", "iBook, Apple"], - ["snd-powermac", "iMac, Apple"], - ["snd-aoa", "PowerBook (Layout ID), Apple"], - ["snd-aoa", "PowerMac (Layout ID), Apple"], - ["snd-aoa", "iBook (Layout ID), Apple"], - ["snd-aoa", "iMac (Layout ID), Apple"], + ["snd-powermac", "PowerPC, Apple"], + ["snd-aoa", "PowerPC (Layout ID), Apple"], ["snd-rme32", "Digi32 PRO, RME"], ["snd-rme32", "Digi32, RME"], ["snd-rme32", "Digi32/8, RME"], Modified: trunk/sound/data/addons/mod_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/addons/mod_addons.ycp?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/data/addons/mod_addons.ycp (original) +++ trunk/sound/data/addons/mod_addons.ycp Tue Jul 31 09:33:20 2007 @@ -1,7 +1,7 @@ $[ "snd-powermac": $[ - "description" : "PowerMac on-board", + "description" : "Apple PowerPC on-board", "params": $[ "snd_enable_beep": @@ -14,6 +14,6 @@ ], "snd-aoa": $[ - "description" : "Apple on-board (Layout ID)" + "description" : "Apple PowerPC on-board (Layout ID)" ], ] Modified: trunk/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/sndcards.ycp?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/data/sndcards.ycp (original) +++ trunk/sound/data/sndcards.ycp Tue Jul 31 09:33:20 2007 @@ -1,4 +1,4 @@ -/* this file is automatically generated for kernel version 2.6.20-rc4-git2-3-default*/ +/* this file is automatically generated for kernel version 2.6.22.1-6-default*/ { textdomain "sound_db"; @@ -530,16 +530,10 @@ "CS5536, AMD" ], 100 : [ - "PowerBook, Apple", - "PowerMac, Apple", - "iBook, Apple", - "iMac, Apple" + "PowerPC, Apple" ], 101 : [ - "PowerBook (Layout ID), Apple", - "PowerMac (Layout ID), Apple", - "iBook (Layout ID), Apple", - "iMac (Layout ID), Apple" + "PowerPC (Layout ID), Apple" ] ], "indices" : $[ @@ -597,9 +591,9 @@ 18487 : 17, 26677 : 17, 26678 : 17, - 30002 : 16, + 30002 : 69, 30007 : 17, - 30258 : 16, + 30258 : 69, 32805 : 17, 32823 : 17, 38966 : 17, @@ -665,7 +659,9 @@ 17275 : 78, 17283 : 78, 31001 : 78, - 31035 : 78 + 31035 : 78, + 38412 : 78, + 43520 : 78 ], 4107 : $[ 46 : 81 @@ -744,7 +740,13 @@ 1098 : 78, 1099 : 78, 1372 : 78, - 1373 : 78 + 1373 : 78, + 1908 : 78, + 1909 : 78, + 1910 : 78, + 1911 : 78, + 2044 : 78, + 2045 : 78 ], 4334 : $[ 16320 : 54, @@ -842,8 +844,8 @@ 8704 : 48 ], 15892 : $[ - 2340 : 49, - 2341 : 49, + 2340 : 50, + 2341 : 50, 2353 : 51 ], 16389 : $[ @@ -914,7 +916,7 @@ 39064 : 53 ], 65535 : $[ - 65535 : 45 + 65535 : 16 ], 197633 : $[ 196624 : 100, @@ -1074,13 +1076,13 @@ ] ], "snd-ad1848" : $[ - "description" : "AD1848/AD1847/CS4248", + "description" : "Generic AD1848/AD1847/CS4248", "params" : $[ "dma1" : $[ "allows" : "{{0,1},{3},{5,7}}", "descr" : [ _("DMA1 # for %1 driver."), - "AD1848" + "Generic AD1848/AD1847/CS4248" ], "dialog" : "list" ], @@ -1088,7 +1090,7 @@ "allows" : "{{5},{7},{9},{10,12},{14,15}}", "descr" : [ _("IRQ # for %1 driver."), - "AD1848" + "Generic AD1848/AD1847/CS4248" ], "dialog" : "list" ], @@ -1097,7 +1099,7 @@ "base" : "16", "descr" : [ _("Port # for %1 driver."), - "AD1848" + "Generic AD1848/AD1847/CS4248" ] ], "thinkpad" : $[ @@ -1208,7 +1210,7 @@ ] ], "snd-aoa" : $[ - "description" : "Apple on-board (Layout ID)" + "description" : "Apple PowerPC on-board (Layout ID)" ], "snd-atiixp" : $[ "description" : "ATI IXP AC97 controller", @@ -1496,7 +1498,7 @@ "allows" : "{{0,1},{3},{5,7}}", "descr" : [ _("DMA1 # for %1 driver."), - "CS4231" + "Generic CS4231" ], "dialog" : "list" ], @@ -1504,7 +1506,7 @@ "allows" : "{{0,1},{3},{5,7}}", "descr" : [ _("DMA2 # for %1 driver."), - "CS4231" + "Generic CS4231" ], "dialog" : "list" ], @@ -1512,7 +1514,7 @@ "allows" : "{{5},{7},{9},{10,12},{14,15}}", "descr" : [ _("IRQ # for %1 driver."), - "CS4231" + "Generic CS4231" ], "dialog" : "list" ], @@ -1520,7 +1522,7 @@ "allows" : "{{5},{7},{9},{10,12},{14,15}}", "descr" : [ _("MPU-401 IRQ # for %1 driver."), - "CS4231" + "Generic CS4231" ], "dialog" : "list" ], @@ -1529,7 +1531,7 @@ "base" : "16", "descr" : [ _("MPU-401 port # for %1 driver."), - "CS4231" + "Generic CS4231" ] ], "port" : $[ @@ -1537,7 +1539,7 @@ "base" : "16", "descr" : [ _("Port # for %1 driver."), - "CS4231" + "Generic CS4231" ] ] ] @@ -1914,7 +1916,7 @@ ] ], "snd-es1688" : $[ - "description" : "ESS ESx688 AudioDrive", + "description" : "Generic ESS ES1688/ES688 AudioDrive", "joystick" : $[ "GAMEPORT_MODULE" : "ns558" ], @@ -1923,7 +1925,7 @@ "allows" : "{{0,1},{3}}", "descr" : [ _("8-bit DMA # for %1 driver."), - "ESx688" + "Generic ESS ES1688/ES688 AudioDrive" ], "dialog" : "list" ], @@ -1931,7 +1933,7 @@ "allows" : "{{5},{7},{9},{10,12},{14,15}}", "descr" : [ _("IRQ # for %1 driver."), - "ESx688" + "Generic ESS ES1688/ES688 AudioDrive" ], "dialog" : "list" ], @@ -1939,7 +1941,7 @@ "allows" : "{{5},{7},{9},{10,12},{14,15}}", "descr" : [ _("MPU-401 IRQ # for %1 driver."), - "ESx688" + "Generic ESS ES1688/ES688 AudioDrive" ], "dialog" : "list" ], @@ -1948,7 +1950,7 @@ "base" : "16", "descr" : [ _("MPU-401 port # for %1 driver."), - "ESx688" + "Generic ESS ES1688/ES688 AudioDrive" ] ], "port" : $[ @@ -1956,7 +1958,7 @@ "base" : "16", "descr" : [ _("Port # for %1 driver."), - "ESx688" + "Generic ESS ES1688/ES688 AudioDrive" ] ] ] @@ -2143,14 +2145,14 @@ "allows" : "{{14,32}}", "descr" : [ _("GF1 channels for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ] ], "dma1" : $[ "allows" : "{{1},{3},{5},{6},{7}}", "descr" : [ _("DMA1 # for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ], "dialog" : "list" ], @@ -2158,7 +2160,7 @@ "allows" : "{{1},{3},{5},{6},{7}}", "descr" : [ _("DMA2 # for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ], "dialog" : "list" ], @@ -2166,7 +2168,7 @@ "allows" : "{{3},{5},{9},{11},{12},{15}}", "descr" : [ _("IRQ # for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ], "dialog" : "list" ], @@ -2174,21 +2176,21 @@ "allows" : "{{0,31}}", "descr" : [ _("Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ] ], "pcm_channels" : $[ "allows" : "{{2,16}}", "descr" : [ _("Reserved PCM channels for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ] ], "port" : $[ "allows" : "{{0x220,0x260,0x10}}", "descr" : [ _("Port # for %1 driver."), - "GUS Classic" + "Gravis UltraSound Classic" ], "dialog" : "list" ] @@ -2204,14 +2206,14 @@ "allows" : "{{14,32}}", "descr" : [ _("GF1 channels for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ] ], "dma1" : $[ "allows" : "{{0,1},{3},{5,7}}", "descr" : [ _("GF1 DMA # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2219,7 +2221,7 @@ "allows" : "{{0,1},{3}}", "descr" : [ _("8-bit DMA # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2227,7 +2229,7 @@ "allows" : "{{2},{3},{5},{9},{11},{12},{15}}", "descr" : [ _("GF1 IRQ # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2235,7 +2237,7 @@ "allows" : "{{0x210,0x270,0x10}}", "descr" : [ _("GF1 port # for %1 driver "), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2243,7 +2245,7 @@ "allows" : "{{5},{7},{9},{10}}", "descr" : [ _("IRQ # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2251,14 +2253,14 @@ "allows" : "{{0,31}}", "descr" : [ _("Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ] ], "mpu_irq" : $[ "allows" : "{{5},{7},{9},{10}}", "descr" : [ _("MPU-401 IRQ # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2266,7 +2268,7 @@ "allows" : "{{0x300,0x320,0x10}}", "descr" : [ _("MPU-401 port # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ], @@ -2274,14 +2276,14 @@ "allows" : "{{2,16}}", "descr" : [ _("Reserved PCM channels for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ] ], "port" : $[ "allows" : "{{0x220,0x260,0x20}}", "descr" : [ _("Port # for %1 driver."), - "GUS Extreme" + "Gravis UltraSound Extreme" ], "dialog" : "list" ] @@ -3068,7 +3070,7 @@ ] ], "snd-powermac" : $[ - "description" : "PowerMac on-board", + "description" : "Apple PowerPC on-board", "params" : $[ "snd_enable_beep" : $[ "allows" : "{{0},{1}}", @@ -3761,14 +3763,8 @@ "AD1889" ], "Apple" : [ - "PowerBook", - "PowerMac", - "iBook", - "iMac", - "PowerBook (Layout ID)", - "PowerMac (Layout ID)", - "iBook (Layout ID)", - "iMac (Layout ID)" + "PowerPC", + "PowerPC (Layout ID)" ], "AudioExecl" : [ "AV 510", Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=39821&r1=39820&r2=39821&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Jul 31 09:33:20 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 31 08:07:49 CEST 2007 - lslezak@suse.cz + +- use 'Apple PowerPC' for all PowerPC models (#295616) +- updated sound card DB +- fixed formatting error message in audio-agent +- 2.15.9 + +------------------------------------------------------------------- Wed Jun 6 15:01:09 CEST 2007 - lslezak@suse.cz - removed empty index.html file -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org