Author: lslezak Date: Tue Nov 9 14:59:28 2010 New Revision: 62779 URL: http://svn.opensuse.org/viewcvs/yast?rev=62779&view=rev Log: - build the soundcard database during package build - use the existing ALSA drivers, the DB is always up to date and is architecture dependent now - 2.20.0 Added: trunk/sound/data/alsa_drivers.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/alsa_drivers.rb trunk/sound/data/data_cards.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_cards.rb trunk/sound/data/data_extra_ids.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_extra_ids.rb trunk/sound/data/data_joystick.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_joystick.rb trunk/sound/data/data_mixer.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/data_mixer.rb trunk/sound/data/generate_soundcard_db.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/generate_soundcard_db.rb trunk/sound/data/sound_db_generator.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/sound_db_generator.rb trunk/sound/data/ycp_format.rb - copied unchanged from r62778, branches/tmp/lslezak/sound/data/ycp_format.rb Removed: trunk/sound/data/Makefile.generate trunk/sound/data/addons/ trunk/sound/data/alsa-module-syntax trunk/sound/data/include/ trunk/sound/data/map_indent/ trunk/sound/data/proofread_strings trunk/sound/data/sndcards.ycp trunk/sound/data/src/ trunk/sound/data/translate_strings.pl Modified: trunk/sound/ (props changed) trunk/sound/VERSION trunk/sound/data/Makefile.am trunk/sound/data/doc/README trunk/sound/package/yast2-sound.changes trunk/sound/yast2-sound.spec.in Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=62779&r1=62778&r2=62779&view=diff ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Tue Nov 9 14:59:28 2010 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/Makefile.am?rev=62779&r1=62778&r2=62779&view=diff ============================================================================== --- trunk/sound/data/Makefile.am (original) +++ trunk/sound/data/Makefile.am Tue Nov 9 14:59:28 2010 @@ -4,8 +4,17 @@ # $Id$ # -SUBDIRS = addons doc include src +SUBDIRS = doc -ydata_DATA = sndcards.ycp alsa_packages.ycp +ydata_DATA = alsa_packages.ycp sndcards.ycp -EXTRA_DIST = $(ydata_DATA) Makefile.generate alsa-module-syntax proofread_strings translate_strings.pl +sound_db_generator = alsa_drivers.rb data_cards.rb data_joystick.rb data_mixer.rb data_extra_ids.rb generate_soundcard_db.rb sound_db_generator.rb ycp_format.rb + +sndcards.ycp: $(sound_db_generator) + ./generate_soundcard_db.rb > sndcards.ycp +# verify the validity (syntax check) + ycpc -E -q sndcards.ycp + +CLEANFILES = sndcards.ycp + +EXTRA_DIST = alsa_packages.ycp $(sound_db_generator) Modified: trunk/sound/data/doc/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/doc/README?rev=62779&r1=62778&r2=62779&view=diff ============================================================================== --- trunk/sound/data/doc/README (original) +++ trunk/sound/data/doc/README Tue Nov 9 14:59:28 2010 @@ -1,22 +1,17 @@ -you need to have alsa 0.9 or newer installed. -don't forget to set 'export Y2DIR=.' when generating database +The sound card databe is generated automatically during +package build using drivers from kernel-default package. file description: -README this file -idlist.ycp autogenerated file from /lib/modules/ver#/modules.generic_string - contains map with vendor_id and device_id keys for searching - for the appropriate kernel module. leaves are indices to - module_index map that is contained in modules_index.ycp -gen_card_list.ycp script that generates the cardlist.ycp database -gen_id_list.ycp script that generates the idlist.ycp database -gen_opt_list.ycp script that generates the modlist.ycp databse -idlist.ycp autogenerated map: for each module index contains list of - card labels (used for manual card addition) -include/gen_routines.ycp common routines for generating database -modlist.ycp autogenerated map: for each module as a key contains - a map as value, where important info about the module - is stored. -module_index.ycp manually generated database: used for saveing space in - idlist.ycp database. +README this file +alsa_drivers.rb collects data from drivers +alsa_packages.ycp static data - extra packages for drivers +data_cards.rb static data - sound card names +data_extra_ids.rb static data - extra PCI ids for drivers +data_joystick.rb static data - joystick data +data_mixer.rb static data - mixer settings for specific drivers +generate_soundcard_db.rb creates the database +sndcards.ycp generated sound card database +sound_db_generator.rb collects all data for database +ycp_format.rb helper - Ruby to YCP conversion Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=62779&r1=62778&r2=62779&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Tue Nov 9 14:59:28 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Nov 9 13:54:33 UTC 2010 - lslezak@suse.cz + +- build the soundcard database during package build - use + the existing ALSA drivers, the DB is always up to date + and is architecture dependent now +- 2.20.0 + +------------------------------------------------------------------- Thu Oct 14 12:32:32 UTC 2010 - lslezak@suse.cz - make the joystick dialog label better translatable in RTL Modified: trunk/sound/yast2-sound.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/yast2-sound.spec.in?rev=62779&r1=62778&r2=62779&view=diff ============================================================================== --- trunk/sound/yast2-sound.spec.in (original) +++ trunk/sound/yast2-sound.spec.in Tue Nov 9 14:59:28 2010 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL v2 or later -BuildRequires: alsa-devel gcc-c++ doxygen perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: alsa-devel gcc-c++ doxygen perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite kernel-default ruby # GetInstArgs::automatic_configuration Requires: yast2 >= 2.16.46 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org