diff -Nru alsa-utils-1.0.25/ABOUT-NLS alsa-utils-1.0.27.1/ABOUT-NLS --- alsa-utils-1.0.25/ABOUT-NLS 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/ABOUT-NLS 2013-05-21 08:50:34.000000000 +0000 @@ -18,35 +18,7 @@ available translations. They tell how people wanting to contribute and work on translations can contact the appropriate team. - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters +1.1 INSTALL Matters =================== Some packages are "localizable" when properly installed; the programs @@ -56,36 +28,19 @@ By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. Installers may use special +options at configuration time for changing the default behaviour. The +command: - ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. +will _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. +probably detect the previously built and installed `libintl' library +and will decide to use it. If not, you may have to to use the +`--with-libintl-prefix' option to tell `configure' where to look for it. Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -96,13 +51,16 @@ `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package +1.2 Using This Package ====================== As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). @@ -145,7 +103,7 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams +1.3 Translating Teams ===================== For the Free Translation Project to be a success, we need interested @@ -153,8 +111,7 @@ able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -168,911 +125,1125 @@ _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. -1.5 Available Packages +1.4 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of July -2006. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of June +2010. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - GNUnet | [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | [] | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | - gnuedu | | - gnulib | [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | | - gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | [] () | - gtkam | [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] | - iso_639 | [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] [] | - mysecretdiary | [] [] | - nano | [] [] () [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | | - pilot-qof | [] | - psmisc | [] | - pwdutils | | - python | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - silky | | - skencil | [] () | - sketch | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16 - - es et eu fa fi fr ga gl gu he hi hr hu id is it + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca +--------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | + a2ps | [] [] | aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnucash-glossary | [] [] | - gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | - skencil | [] [] | - sketch | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] [] [] | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53 - - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +--------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | bfd | | - bibshelf | [] | + bibshelf | [] | binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | cflow | | - clisp | [] | - console-tools | | - coreutils | [] | + clisp | | + coreutils | [] [] | cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | gas | | - gawk | [] [] | - gbiff | [] | - gcal | | + gawk | [] [] | + gcal | [] | gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | gnubiff | | - gnucash | () () | - gnucash-glossary | [] | + gnucash | [] | gnuedu | | - gnulib | [] [] [] [] | + gnulib | | + gnunet | | gnunet-gtk | | gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-filemanager | [] | - gpe-go | [] [] | - gpe-login | [] [] | - gpe-ownerinfo | [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] | - gpe-today | [] | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | gpe-todo | | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] | - gretl | | - gsasl | [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | gutenprint | | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_1 | [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | | + jwhois | | + kbd | | + keytouch | [] | keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | libextractor | | - libgpewidget | [] | + libgnutls | | + libgpewidget | | libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | shishi | | - silky | [] | skencil | | - sketch | | solfege | | + solfege-manual | | soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | + sp | | + sysstat | | + tar | [] | + texinfo | | tin | | - tp-robot | [] | - tuxpaint | [] | unicode-han-tra... | | unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | +--------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3 + af am an ar as ast az be be@latin bg bn_IN bs ca + 6 0 1 2 3 19 1 10 3 28 3 1 38 + + crh cs da de el en en_GB en_ZA eo es et eu fa + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] | + flex | [] [] | + freedink | [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] | + gjay | [] | + gliv | [] [] [] | + glunarclock | [] [] | + gnubiff | () | + gnucash | [] () () () () | + gnuedu | [] [] | + gnulib | [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] () [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] | + gsasl | [] | + gss | | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] () [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] | + help2man | [] | + hylafax | [] [] | + idutils | [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] [] [] [] () [] [] [] () | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] | + iso_639 | [] [] [] [] () [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | [] [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] [] | + keytouch-keyboa... | [] | + klavaro | [] [] [] [] | + latrine | [] () | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] | + linkdr | [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] | + mkisofs | | + myserver | | + nano | [] [] [] | + opcodes | [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] | + psmisc | [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] | + wyslij-po | | + xchat | [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + crh cs da de el en en_GB en_ZA eo es et eu fa + 5 64 105 117 18 1 8 0 28 89 18 19 0 + + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] [] | + bibshelf | [] [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] | + cflow | [] [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] [] | + gjay | [] | + gliv | [] () | + glunarclock | [] [] [] [] | + gnubiff | () [] () | + gnucash | () () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | [] () [] [] [] [] | + iso_639 | [] () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] [] | + keytouch-editor | [] [] [] [] [] | + keytouch-keyboa... | [] [] [] [] [] | + klavaro | [] [] | + latrine | [] [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] [] | + linkdr | [] [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] [] | + myserver | | + nano | [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +----------------------------------------------------+ + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] [] [] [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - GNUnet | [] | 2 - a2ps | [] [] [] | 19 - aegis | | 0 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 14 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 - bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 16 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 4 - clisp | | 6 - console-tools | [] [] | 5 - coreutils | [] [] | 17 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - error | [] [] [] [] | 18 - fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 - flex | [] [] | 15 - fslint | [] | 9 - gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 - gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 26 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 - gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] [] [] | 19 - gpe-clock | [] [] [] [] | 20 - gpe-conf | [] [] | 14 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 19 - gpe-filemanager | [] | 5 - gpe-go | [] [] | 14 - gpe-login | [] [] [] [] [] | 20 - gpe-ownerinfo | [] [] [] [] | 20 - gpe-package | [] | 5 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 19 - gpe-taskmanager | [] [] [] | 19 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 20 - gpe-todo | [] | 6 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 - gramadoir | [] | 7 - grep | [] [] [] [] | 33 - gretl | | 4 - gsasl | [] [] | 6 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] | 18 - gstreamer | [] [] [] | 17 - gtick | [] | 11 - gtkam | [] | 13 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 39 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] | 15 - iso_3166_1 | [] [] | 20 - iso_3166_2 | | 2 - iso_3166_3 | [] [] | 9 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | | 2 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 - libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] | 4 - libidn | [] [] | 10 - lifelines | | 4 - lilypond | | 2 - lingoteach | [] | 6 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailutils | [] | 8 - make | [] [] [] | 20 - man-db | [] | 6 - minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 15 - nano_1_0 | [] [] [] | 18 - opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 - pwdutils | [] | 3 - python | | 0 - qof | [] | 2 - radius | [] | 6 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 23 - sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 - skencil | [] | 7 - sketch | | 6 - solfege | | 2 - soundtracker | [] [] | 9 - sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 19 - texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] [] | 12 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 14 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 29 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () [] () | 10 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 26 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] | 24 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 7 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 14 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] [] | 17 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 - wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 - xchat | [] [] [] [] | 28 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 + xkeyboard-config | [] [] [] | 22 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1085,12 +1256,12 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If July 2006 seems to be old, you may fetch a more recent copy of + If June 2010 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. +`http://translationproject.org/extra/matrix.html'. -1.6 Using `gettext' in new packages +1.5 Using `gettext' in new packages =================================== If you are writing a freely available program and want to @@ -1106,6 +1277,6 @@ Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff -Nru alsa-utils-1.0.25/INSTALL alsa-utils-1.0.27.1/INSTALL --- alsa-utils-1.0.25/INSTALL 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/INSTALL 2013-05-21 08:48:28.000000000 +0000 @@ -24,11 +24,11 @@ header file asoundlib.h in $prefix/include/alsa directory (usually in /usr/include/alsa directory). -Compilation from HG sources +Compilation from git sources --------------------------- You need also GNU packages autoconf and automake installed in your system -to compile HG (Mercurial) sources of alsa-utils package. +to compile git sources of alsa-utils package. For compilation you can use these commands: @@ -40,7 +40,7 @@ ./configure make -The included hgcompile script does this job for you. +The included gitcompile script does this job for you. Note: Some automake packages have missing aclocal program. Use newer version in the case. diff -Nru alsa-utils-1.0.25/Makefile.in alsa-utils-1.0.27.1/Makefile.in --- alsa-utils-1.0.25/Makefile.in 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,8 +60,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/alsaconf/po/Makefile.in \ $(top_srcdir)/configure ABOUT-NLS COPYING ChangeLog INSTALL \ - TODO config.guess config.rpath config.sub depcomp install-sh \ - missing + TODO config.guess config.rpath config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -70,22 +85,31 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = include alsactl alsaucm utils m4 po alsamixer amixer \ amidi alsaconf aplay iecset speaker-test alsaloop seq DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -113,9 +137,14 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -140,6 +169,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -160,11 +190,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -175,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -189,6 +226,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -257,9 +295,9 @@ all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -286,21 +324,21 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): alsaconf/po/Makefile: $(top_builddir)/config.status $(top_srcdir)/alsaconf/po/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -310,7 +348,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -324,37 +366,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -363,6 +374,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -426,8 +441,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -463,13 +502,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -501,36 +537,36 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -541,8 +577,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -552,7 +588,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -562,6 +598,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -585,13 +622,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -622,10 +667,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -707,24 +757,25 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am \ + install-data-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic cscope cscopelist cscopelist-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am rpm: dist diff -Nru alsa-utils-1.0.25/aclocal.m4 alsa-utils-1.0.27.1/aclocal.m4 --- alsa-utils-1.0.25/aclocal.m4 2012-01-25 09:43:49.000000000 +0000 +++ alsa-utils-1.0.27.1/aclocal.m4 2013-05-21 08:50:35.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.2 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,11 +13,11 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) dnl Configure Paths for Alsa dnl Some modifications by Richard Boulton @@ -78,6 +78,7 @@ AC_MSG_RESULT($ALSA_LIBS) dnl Check for a working version of libasound that is of the right version. +if test "x$enable_alsatest" = "xyes"; then min_alsa_version=ifelse([$1], ,0.1.1,$1) AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) no_alsa="" @@ -131,6 +132,7 @@ alsa_found=no] ) AC_LANG_RESTORE +fi dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. if test "x$enable_alsatest" = "xyes"; then @@ -161,7 +163,60 @@ ]) +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -189,7 +244,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -202,7 +260,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -211,34 +268,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -280,16 +334,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -297,43 +352,45 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [$4]) +_PKG_TEXT]) + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .]) + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.12.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -349,22 +406,24 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.12.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -383,7 +442,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -409,22 +468,21 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -443,16 +501,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 17 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -462,7 +519,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -475,12 +532,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -488,8 +546,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -528,16 +587,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -546,16 +605,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -603,7 +662,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -613,28 +672,34 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -653,7 +718,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -665,21 +730,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -697,7 +760,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -705,28 +768,15 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 19 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -772,31 +822,41 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -807,28 +867,35 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -856,12 +923,14 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -875,9 +944,9 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -898,15 +967,55 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 7 + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MAKE_INCLUDE() # ----------------- @@ -925,7 +1034,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -952,14 +1061,13 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -989,22 +1097,29 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 3 + # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME to be removed in Automake 1.13. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -1021,13 +1136,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1035,13 +1150,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1054,22 +1169,18 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 9 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1080,32 +1191,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1115,43 +1234,61 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1160,24 +1297,24 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1188,10 +1325,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1199,7 +1337,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in diff -Nru alsa-utils-1.0.25/alsaconf/Makefile.in alsa-utils-1.0.27.1/alsaconf/Makefile.in --- alsa-utils-1.0.25/alsaconf/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaconf/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,6 +87,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" SCRIPTS = $(sbin_SCRIPTS) SOURCES = @@ -82,6 +104,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -120,6 +147,8 @@ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -144,6 +173,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -164,11 +194,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -179,6 +214,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -193,6 +230,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -255,7 +293,7 @@ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -280,17 +318,20 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): alsaconf: $(top_builddir)/config.status $(srcdir)/alsaconf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -318,17 +359,15 @@ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sbindir)" && rm -f $$files + dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -338,7 +377,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -352,37 +395,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -391,6 +403,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -454,6 +470,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -464,10 +494,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -502,13 +532,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -546,10 +573,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -629,22 +661,24 @@ uninstall-man: uninstall-man8 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-sbinSCRIPTS install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-man uninstall-man8 uninstall-sbinSCRIPTS + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-man \ + uninstall-man8 uninstall-sbinSCRIPTS install-man8: diff -Nru alsa-utils-1.0.25/alsactl/90-alsa-restore.rules alsa-utils-1.0.27.1/alsactl/90-alsa-restore.rules --- alsa-utils-1.0.25/alsactl/90-alsa-restore.rules 2012-01-25 09:44:00.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/90-alsa-restore.rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ - RUN+="/usr/sbin/alsactl restore $attr{number}" diff -Nru alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in alsa-utils-1.0.27.1/alsactl/90-alsa-restore.rules.in --- alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/90-alsa-restore.rules.in 2013-05-21 08:48:28.000000000 +0000 @@ -1,2 +1,8 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ - RUN+="@sbindir@/alsactl restore $attr{number}" +ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" +GOTO="alsa_restore_end" + +LABEL="alsa_restore_go" +TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}" +TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}" + +LABEL="alsa_restore_end" diff -Nru alsa-utils-1.0.25/alsactl/Makefile.am alsa-utils-1.0.27.1/alsactl/Makefile.am --- alsa-utils-1.0.25/alsactl/Makefile.am 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/Makefile.am 2013-05-21 08:48:28.000000000 +0000 @@ -7,26 +7,25 @@ endif EXTRA_DIST=alsactl.1 alsactl_init.xml -alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c -alsactl_CFLAGS=$(AM_CFLAGS) -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" +alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c +alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c -dist_udevrules_DATA = \ - 90-alsa-restore.rules - if HAVE_SYSTEMD systemdsystemunit_DATA = \ - alsa-store.service \ - alsa-restore.service + alsa-state.service \ + alsa-restore.service \ + alsa-store.service install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \ $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \ - rm -f alsa-restore.service && \ - $(LN_S) ../alsa-restore.service alsa-restore.service ) + rm -f alsa-state.service alsa-restore.service && \ + $(LN_S) ../alsa-state.service alsa-state.service && \ + $(LN_S) ../alsa-restore.service alsa-restore.service) ( cd $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants && \ rm -f alsa-store.service && \ $(LN_S) ../alsa-store.service alsa-store.service ) @@ -34,25 +33,32 @@ endif edit = \ - $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ + < $< > $@ || rm $@ -alsa-store.service: alsa-store.service.in +alsa-state.service: alsa-state.service.in $(edit) alsa-restore.service: alsa-restore.service.in $(edit) +alsa-store.service: alsa-store.service.in + $(edit) + 90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) EXTRA_DIST += \ - alsa-store.service.in \ + alsa-state.service.in \ alsa-restore.service.in \ + alsa-store.service.in \ 90-alsa-restore.rules.in CLEANFILES = \ - alsa-store.service \ + alsa-state.service \ alsa-restore.service \ + alsa-store.service \ 90-alsa-restore.rules %.7: %.xml diff -Nru alsa-utils-1.0.25/alsactl/Makefile.in alsa-utils-1.0.27.1/alsactl/Makefile.in --- alsa-utils-1.0.25/alsactl/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +55,8 @@ sbin_PROGRAMS = alsactl$(EXEEXT) @USE_XMLTO_TRUE@am__append_1 = alsactl_init.7 subdir = alsactl -DIST_COMMON = $(dist_udevrules_DATA) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -55,11 +71,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(udevrulesdir)" \ - "$(DESTDIR)$(systemdsystemunitdir)" + "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)" PROGRAMS = $(sbin_PROGRAMS) am_alsactl_OBJECTS = alsactl-alsactl.$(OBJEXT) alsactl-state.$(OBJEXT) \ - alsactl-utils.$(OBJEXT) alsactl-init_parse.$(OBJEXT) + alsactl-lock.$(OBJEXT) alsactl-utils.$(OBJEXT) \ + alsactl-init_parse.$(OBJEXT) alsactl-daemon.$(OBJEXT) alsactl_OBJECTS = $(am_alsactl_OBJECTS) alsactl_LDADD = $(LDADD) alsactl_LINK = $(CCLD) $(alsactl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -81,6 +97,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -102,11 +123,17 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 man7dir = $(mandir)/man7 NROFF = nroff MANS = $(man_MANS) -DATA = $(dist_udevrules_DATA) $(systemdsystemunit_DATA) +DATA = $(systemdsystemunit_DATA) HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -143,6 +170,8 @@ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -167,6 +196,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -187,11 +217,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -202,6 +237,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -216,6 +253,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -273,31 +311,33 @@ xmlto = @xmlto@ SUBDIRS = init man_MANS = alsactl.1 $(am__append_1) -EXTRA_DIST = alsactl.1 alsactl_init.xml alsa-store.service.in \ - alsa-restore.service.in 90-alsa-restore.rules.in -alsactl_SOURCES = alsactl.c state.c utils.c init_parse.c -alsactl_CFLAGS = $(AM_CFLAGS) -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" +EXTRA_DIST = alsactl.1 alsactl_init.xml alsa-state.service.in \ + alsa-restore.service.in alsa-store.service.in \ + 90-alsa-restore.rules.in +alsactl_SOURCES = alsactl.c state.c lock.c utils.c init_parse.c daemon.c +alsactl_CFLAGS = $(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c -dist_udevrules_DATA = \ - 90-alsa-restore.rules - @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ -@HAVE_SYSTEMD_TRUE@ alsa-store.service \ -@HAVE_SYSTEMD_TRUE@ alsa-restore.service +@HAVE_SYSTEMD_TRUE@ alsa-state.service \ +@HAVE_SYSTEMD_TRUE@ alsa-restore.service \ +@HAVE_SYSTEMD_TRUE@ alsa-store.service edit = \ - $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ + < $< > $@ || rm $@ CLEANFILES = \ - alsa-store.service \ + alsa-state.service \ alsa-restore.service \ + alsa-store.service \ 90-alsa-restore.rules all: all-recursive .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,15 +362,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -364,7 +407,7 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -alsactl$(EXEEXT): $(alsactl_OBJECTS) $(alsactl_DEPENDENCIES) +alsactl$(EXEEXT): $(alsactl_OBJECTS) $(alsactl_DEPENDENCIES) $(EXTRA_alsactl_DEPENDENCIES) @rm -f alsactl$(EXEEXT) $(alsactl_LINK) $(alsactl_OBJECTS) $(alsactl_LDADD) $(LIBS) @@ -375,7 +418,9 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-alsactl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-daemon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-init_parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-lock.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-state.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-utils.Po@am__quote@ @@ -421,6 +466,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-state.obj `if test -f 'state.c'; then $(CYGPATH_W) 'state.c'; else $(CYGPATH_W) '$(srcdir)/state.c'; fi` +alsactl-lock.o: lock.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-lock.o -MD -MP -MF $(DEPDIR)/alsactl-lock.Tpo -c -o alsactl-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alsactl-lock.Tpo $(DEPDIR)/alsactl-lock.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lock.c' object='alsactl-lock.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c + +alsactl-lock.obj: lock.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-lock.obj -MD -MP -MF $(DEPDIR)/alsactl-lock.Tpo -c -o alsactl-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alsactl-lock.Tpo $(DEPDIR)/alsactl-lock.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lock.c' object='alsactl-lock.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi` + alsactl-utils.o: utils.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-utils.o -MD -MP -MF $(DEPDIR)/alsactl-utils.Tpo -c -o alsactl-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alsactl-utils.Tpo $(DEPDIR)/alsactl-utils.Po @@ -448,13 +507,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='init_parse.c' object='alsactl-init_parse.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-init_parse.obj `if test -f 'init_parse.c'; then $(CYGPATH_W) 'init_parse.c'; else $(CYGPATH_W) '$(srcdir)/init_parse.c'; fi` + +alsactl-daemon.o: daemon.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-daemon.o -MD -MP -MF $(DEPDIR)/alsactl-daemon.Tpo -c -o alsactl-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alsactl-daemon.Tpo $(DEPDIR)/alsactl-daemon.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daemon.c' object='alsactl-daemon.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c + +alsactl-daemon.obj: daemon.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-daemon.obj -MD -MP -MF $(DEPDIR)/alsactl-daemon.Tpo -c -o alsactl-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/alsactl-daemon.Tpo $(DEPDIR)/alsactl-daemon.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daemon.c' object='alsactl-daemon.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-daemon.obj `if test -f 'daemon.c'; then $(CYGPATH_W) 'daemon.c'; else $(CYGPATH_W) '$(srcdir)/daemon.c'; fi` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -483,16 +563,21 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man7: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)" - @list=''; test -n "$(man7dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.7[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man7dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.7[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -521,33 +606,14 @@ sed -n '/\.7[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man7dir)" && rm -f $$files; } -install-dist_udevrulesDATA: $(dist_udevrules_DATA) - @$(NORMAL_INSTALL) - test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" - @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ - done - -uninstall-dist_udevrulesDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(udevrulesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(udevrulesdir)" && rm -f $$files + dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) install-systemdsystemunitDATA: $(systemdsystemunit_DATA) @$(NORMAL_INSTALL) - test -z "$(systemdsystemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -561,17 +627,15 @@ @$(NORMAL_UNINSTALL) @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(systemdsystemunitdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(systemdsystemunitdir)" && rm -f $$files + dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -581,7 +645,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -595,37 +663,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -634,6 +671,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -697,6 +738,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -707,10 +762,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -745,13 +800,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -776,7 +828,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -789,10 +841,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -828,8 +885,7 @@ info-am: -install-data-am: install-dist_udevrulesDATA install-man \ - install-systemdsystemunitDATA +install-data-am: install-man install-systemdsystemunitDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -875,32 +931,33 @@ ps-am: -uninstall-am: uninstall-dist_udevrulesDATA uninstall-man \ - uninstall-sbinPROGRAMS uninstall-systemdsystemunitDATA +uninstall-am: uninstall-man uninstall-sbinPROGRAMS \ + uninstall-systemdsystemunitDATA uninstall-man: uninstall-man1 uninstall-man7 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am \ + install-data-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-sbinPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook \ - install-dist_udevrulesDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-man7 install-pdf install-pdf-am install-ps \ - install-ps-am install-sbinPROGRAMS install-strip \ + clean-sbinPROGRAMS cscopelist cscopelist-recursive ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-man7 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sbinPROGRAMS install-strip \ install-systemdsystemunitDATA installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-dist_udevrulesDATA \ - uninstall-man uninstall-man1 uninstall-man7 \ - uninstall-sbinPROGRAMS uninstall-systemdsystemunitDATA + uninstall uninstall-am uninstall-man uninstall-man1 \ + uninstall-man7 uninstall-sbinPROGRAMS \ + uninstall-systemdsystemunitDATA @HAVE_SYSTEMD_TRUE@install-data-hook: @@ -908,18 +965,22 @@ @HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \ @HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \ -@HAVE_SYSTEMD_TRUE@ rm -f alsa-restore.service && \ -@HAVE_SYSTEMD_TRUE@ $(LN_S) ../alsa-restore.service alsa-restore.service ) +@HAVE_SYSTEMD_TRUE@ rm -f alsa-state.service alsa-restore.service && \ +@HAVE_SYSTEMD_TRUE@ $(LN_S) ../alsa-state.service alsa-state.service && \ +@HAVE_SYSTEMD_TRUE@ $(LN_S) ../alsa-restore.service alsa-restore.service) @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants && \ @HAVE_SYSTEMD_TRUE@ rm -f alsa-store.service && \ @HAVE_SYSTEMD_TRUE@ $(LN_S) ../alsa-store.service alsa-store.service ) -alsa-store.service: alsa-store.service.in +alsa-state.service: alsa-state.service.in $(edit) alsa-restore.service: alsa-restore.service.in $(edit) +alsa-store.service: alsa-store.service.in + $(edit) + 90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) diff -Nru alsa-utils-1.0.25/alsactl/alsa-restore.service.in alsa-utils-1.0.27.1/alsactl/alsa-restore.service.in --- alsa-utils-1.0.25/alsactl/alsa-restore.service.in 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsa-restore.service.in 2013-05-21 08:48:28.000000000 +0000 @@ -1,7 +1,13 @@ +# +# Note that two different ALSA card state management schemes exist and they +# can be switched using a file exist check - /etc/alsa/state-daemon.conf . +# + [Unit] Description=Restore Sound Card State +ConditionPathExists=!@daemonswitch@ DefaultDependencies=no -After=sysinit.target +After=alsa-state.service Before=shutdown.target Conflicts=shutdown.target diff -Nru alsa-utils-1.0.25/alsactl/alsa-state.service.in alsa-utils-1.0.27.1/alsactl/alsa-state.service.in --- alsa-utils-1.0.25/alsactl/alsa-state.service.in 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsa-state.service.in 2013-05-21 08:48:28.000000000 +0000 @@ -0,0 +1,17 @@ +# +# Note that two different ALSA card state management schemes exist and they +# can be switched using a file exist check - /etc/alsa/state-daemon.conf . +# + +[Unit] +Description=Manage Sound Card State (restore and store) +ConditionPathExists=@daemonswitch@ +DefaultDependencies=no +After=sysinit.target +Before=shutdown.target +Conflicts=shutdown.target + +[Service] +Type=simple +ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon +ExecStop=-@sbindir@/alsactl -s rkill save_and_quit diff -Nru alsa-utils-1.0.25/alsactl/alsa-store.service.in alsa-utils-1.0.27.1/alsactl/alsa-store.service.in --- alsa-utils-1.0.25/alsactl/alsa-store.service.in 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsa-store.service.in 2013-05-21 08:48:28.000000000 +0000 @@ -1,5 +1,11 @@ +# +# Note that two different ALSA card state management schemes exist and they +# can be switched using a file exist check - /etc/alsa/state-daemon.conf . +# + [Unit] Description=Store Sound Card State +ConditionPathExists=!@daemonswitch@ DefaultDependencies=no Before=shutdown.target diff -Nru alsa-utils-1.0.25/alsactl/alsactl.1 alsa-utils-1.0.27.1/alsactl/alsactl.1 --- alsa-utils-1.0.25/alsactl/alsactl.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsactl.1 2013-05-21 08:48:28.000000000 +0000 @@ -1,4 +1,4 @@ -.TH ALSACTL 1 "15 May 2001" +.TH ALSACTL 1 "05 Apr 2013" .SH NAME alsactl \- advanced controls for ALSA soundcard driver @@ -21,9 +21,19 @@ configuration file. If restoring fails (eventually partly), the init action is called. +\fInrestore\fP is like \fIrestore\fP, but it notifies also the daemon +to do new rescan for available soundcards. + \fIinit\fP tries to initialize all devices to a default state. If device is not known, error code 99 is returned. +\fIdaemon\fP manages to save periodically the sound state. + +\fIrdaemon\fP like \fIdaemon\fP but restore the sound state at first. + +\fIkill\fP notifies the daemon to do the specified operation (quit, +rescan, save_and_quit). + If no soundcards are specified, setup for all cards will be saved or loaded. @@ -85,10 +95,34 @@ useful for "boot" scripts). .TP -\fI\-i, \-\-initfile\fP #=# +\fI\-i, \-\-initfile\fP The configuration file for init. By default, PREFIX/share/alsa/init/00main is used. +.TP +\fI\-p, \-\-period\fP +The store period in seconds for the daemon command. + +.TP +\fI\-e, \-\-pid-file\fP +The pathname to store the process-id file in the HDB UUCP format (ASCII). + +.TP +\fI\-b, \-\-background\fP +Run the task in background. + +.TP +\fI\-s, \-\-syslog\fP +Use syslog for messages. + +.TP +\fI\-n, \-\-nice\fP +Set the process priority (see 'man nice') + +.TP +\fI\-c, \-\-sched-idle\fP +Set the process scheduling policy to idle (SCHED_IDLE). + .SH FILES \fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the \fB\-f\fP flag) is used to store current settings for your @@ -107,7 +141,8 @@ \fB amixer(1), alsamixer(1), -aplay(1) +aplay(1), +alsactl_init(7) \fP .SH BUGS diff -Nru alsa-utils-1.0.25/alsactl/alsactl.c alsa-utils-1.0.27.1/alsactl/alsactl.c --- alsa-utils-1.0.25/alsactl/alsactl.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsactl.c 2013-05-21 08:48:28.000000000 +0000 @@ -27,67 +27,143 @@ #include #include #include +#include +#include #include #include "alsactl.h" #ifndef SYS_ASOUNDRC #define SYS_ASOUNDRC "/var/lib/alsa/asound.state" #endif +#ifndef SYS_PIDFILE +#define SYS_PIDFILE "/var/run/alsactl.pid" +#endif int debugflag = 0; int force_restore = 1; int ignore_nocards = 0; +int do_lock = 0; +int use_syslog = 0; char *command; char *statefile = NULL; +#define TITLE 0x0100 +#define HEADER 0x0200 +#define FILEARG 0x0400 +#define ENVARG 0x0800 +#define INTARG 0x1000 +#define EMPCMD 0x2000 +#define CARDCMD 0x4000 +#define KILLCMD 0x8000 + +struct arg { + int sarg; + char *larg; + char *comment; +}; + +static struct arg args[] = { +{ TITLE, NULL, "Usage: alsactl command" }, +{ HEADER, NULL, "global options:" }, +{ 'h', "help", "this help" }, +{ 'd', "debug", "debug mode" }, +{ 'v', "version", "print version of this program" }, +{ HEADER, NULL, "Available state options:" }, +{ FILEARG | 'f', "file", "configuration file (default " SYS_ASOUNDRC ")" }, +{ 'l', "lock", "use file locking to serialize concurrent access" }, +{ 'F', "force", "try to restore the matching controls as much as possible" }, +{ 0, NULL, " (default mode)" }, +{ 'g', "ignore", "ignore 'No soundcards found' error" }, +{ 'P', "pedantic", "do not restore mismatching controls (old default)" }, +{ 'I', "no-init-fallback", "" }, +{ 0, NULL, "don't initialize even if restore fails" }, +{ FILEARG | 'r', "runstate", "save restore and init state to this file (only errors)" }, +{ 0, NULL, " default settings is 'no file set'" }, +{ 'R', "remove", "remove runstate file at first, otherwise append errors" }, +{ INTARG | 'p', "period", "store period in seconds for the daemon command" }, +{ FILEARG | 'e', "pid-file", "pathname for the process id (daemon mode)" }, +{ HEADER, NULL, "Available init options:" }, +{ ENVARG | 'E', "env", "set environment variable for init phase (NAME=VALUE)" }, +{ FILEARG | 'i', "initfile", "main configuation file for init phase" }, +{ 0, NULL, " (default " DATADIR "/init/00main)" }, +{ 'b', "background", "run daemon in background" }, +{ 's', "syslog", "use syslog for messages" }, +{ INTARG | 'n', "nice", "set the process priority (see 'man nice')" }, +{ 'c', "sched-idle", "set the process scheduling policy to idle (SCHED_IDLE)" }, +{ HEADER, NULL, "Available commands:" }, +{ CARDCMD, "store", "save current driver setup for one or each soundcards" }, +{ EMPCMD, NULL, " to configuration file" }, +{ CARDCMD, "restore", "load current driver setup for one or each soundcards" }, +{ EMPCMD, NULL, " from configuration file" }, +{ CARDCMD, "nrestore", "like restore, but notify the daemon to rescan soundcards" }, +{ CARDCMD, "init", "initialize driver to a default state" }, +{ CARDCMD, "daemon", "store state periodically for one or each soundcards" }, +{ CARDCMD, "rdaemon", "like daemon but do the state restore at first" }, +{ KILLCMD, "kill", "notify daemon to quit, rescan or save_and_quit" }, +{ 0, NULL, NULL } +}; + static void help(void) { - printf("Usage: alsactl command\n"); - printf("\nAvailable global options:\n"); - printf(" -h,--help this help\n"); - printf(" -d,--debug debug mode\n"); - printf(" -v,--version print version of this program\n"); - printf("\nAvailable state options:\n"); - printf(" -f,--file # configuration file (default " SYS_ASOUNDRC ")\n"); - printf(" -F,--force try to restore the matching controls as much as possible\n"); - printf(" (default mode)\n"); - printf(" -g,--ignore ignore 'No soundcards found' error\n"); - printf(" -P,--pedantic do not restore mismatching controls (old default)\n"); - printf(" -I,--no-init-fallback\n" - " don't initialize even if restore fails\n"); - printf(" -r,--runstate # save restore and init state to this file (only errors)\n"); - printf(" default settings is 'no file set'\n"); - printf(" -R,--remove remove runstate file at first, otherwise append errors\n"); - printf("\nAvailable init options:\n"); - printf(" -E,--env #=# set environment variable for init phase (NAME=VALUE)\n"); - printf(" -i,--initfile # main configuation file for init phase (default " DATADIR "/init/00main)\n"); - printf("\n"); - printf("\nAvailable commands:\n"); - printf(" store save current driver setup for one or each soundcards\n"); - printf(" to configuration file\n"); - printf(" restore load current driver setup for one or each soundcards\n"); - printf(" from configuration file\n"); - printf(" init initialize driver to a default state\n"); + struct arg *n = args, *a; + char *larg, sa[4], buf[32]; + int sarg; + + sa[0] = '-'; + sa[2] = ','; + sa[3] = '\0'; + while (n->comment) { + a = n; + n++; + sarg = a->sarg; + if (sarg & (HEADER|TITLE)) { + printf("%s%s\n", (sarg & HEADER) != 0 ? "\n" : "", + a->comment); + continue; + } + buf[0] = '\0'; + larg = a->larg; + if (sarg & (EMPCMD|CARDCMD|KILLCMD)) { + if (sarg & CARDCMD) + strcat(buf, ""); + else if (sarg & KILLCMD) + strcat(buf, ""); + printf(" %-8s %-6s %s\n", larg ? larg : "", + buf, a->comment); + continue; + } + sa[1] = a->sarg; + sprintf(buf, "%s%s%s", sa[1] ? sa : "", + larg ? "--" : "", larg ? larg : ""); + if (sarg & ENVARG) + strcat(buf, " #=#"); + else if (sarg & (FILEARG|INTARG)) + strcat(buf, " #"); + printf(" %-15s %s\n", buf, a->comment); + } +} + +#define NO_NICE (-100000) + +static void do_nice(int use_nice, int sched_idle) +{ + struct sched_param sched_param; + + if (use_nice != NO_NICE && nice(use_nice) < 0) + error("nice(%i): %s", use_nice, strerror(errno)); + if (sched_idle) { + if (sched_getparam(0, &sched_param) >= 0) { + sched_param.sched_priority = 0; + if (!sched_setscheduler(0, SCHED_RR, &sched_param)) + error("sched_setparam failed: %s", strerror(errno)); + } else { + error("sched_getparam failed: %s", strerror(errno)); + } + } } int main(int argc, char *argv[]) { - static const struct option long_option[] = - { - {"help", 0, NULL, 'h'}, - {"file", 1, NULL, 'f'}, - {"env", 1, NULL, 'E'}, - {"initfile", 1, NULL, 'i'}, - {"no-init-fallback", 0, NULL, 'I'}, - {"force", 0, NULL, 'F'}, - {"ignore", 0, NULL, 'g'}, - {"pedantic", 0, NULL, 'P'}, - {"runstate", 0, NULL, 'r'}, - {"remove", 0, NULL, 'R'}, - {"debug", 0, NULL, 'd'}, - {"version", 0, NULL, 'v'}, - {NULL, 0, NULL, 0}, - }; static const char *const devfiles[] = { "/dev/snd/controlC", "/dev/snd/pcmC", @@ -97,25 +173,64 @@ }; char *cfgfile = SYS_ASOUNDRC; char *initfile = DATADIR "/init/00main"; + char *pidfile = SYS_PIDFILE; char *cardname, ncardname[16]; + char *cmd; const char *const *tmp; int removestate = 0; int init_fallback = 1; /* new default behavior */ - int res; + int period = 5*60; + int background = 0; + int daemoncmd = 0; + int use_nice = NO_NICE; + int sched_idle = 0; + struct arg *a; + struct option *o; + int i, j, k, res; + struct option *long_option; + char *short_option; + long_option = calloc(ARRAY_SIZE(args), sizeof(struct option)); + if (long_option == NULL) + exit(EXIT_FAILURE); + short_option = malloc(128); + if (short_option == NULL) { + free(long_option); + exit(EXIT_FAILURE); + } + for (i = j = k = 0; i < ARRAY_SIZE(args); i++) { + a = &args[i]; + if ((a->sarg & 0xff) == 0) + continue; + o = &long_option[j]; + o->name = a->larg; + o->has_arg = (a->sarg & (ENVARG|FILEARG|INTARG)) != 0; + o->flag = NULL; + o->val = a->sarg & 0xff; + j++; + short_option[k++] = o->val; + if (o->has_arg) + short_option[k++] = ':'; + } + short_option[k] = '\0'; command = argv[0]; while (1) { int c; - if ((c = getopt_long(argc, argv, "hdvf:FgE:i:IPr:R", long_option, NULL)) < 0) + if ((c = getopt_long(argc, argv, short_option, long_option, + NULL)) < 0) break; switch (c) { case 'h': help(); - return EXIT_SUCCESS; + res = EXIT_SUCCESS; + goto out; case 'f': cfgfile = optarg; break; + case 'l': + do_lock = 1; + break; case 'F': force_restore = 1; break; @@ -125,7 +240,8 @@ case 'E': if (putenv(optarg)) { fprintf(stderr, "environment string '%s' is wrong\n", optarg); - return EXIT_FAILURE; + res = EXIT_FAILURE; + goto out; } break; case 'i': @@ -143,24 +259,56 @@ case 'P': force_restore = 0; break; + case 'p': + period = atoi(optarg); + if (period < 10) + period = 5*60; + else if (period > 24*60*60) + period = 24*60*60; + break; + case 'e': + pidfile = optarg; + break; + case 'b': + background = 1; + break; + case 's': + use_syslog = 1; + break; + case 'n': + use_nice = atoi(optarg); + if (use_nice < -20) + use_nice = -20; + else if (use_nice > 19) + use_nice = 19; + break; + case 'c': + sched_idle = 1; + break; case 'd': debugflag = 1; break; case 'v': printf("alsactl version " SND_UTIL_VERSION_STR "\n"); - return EXIT_SUCCESS; + res = EXIT_SUCCESS; + goto out; case '?': // error msg already printed help(); - return EXIT_FAILURE; - break; + res = EXIT_FAILURE; + goto out; default: // should never happen fprintf(stderr, "Invalid option '%c' (%d) not handled??\n", c, c); } } + free(short_option); + short_option = NULL; + free(long_option); + long_option = NULL; if (argc - optind <= 0) { fprintf(stderr, "alsactl: Specify command...\n"); - return 0; + res = 0; + goto out; } cardname = argc - optind > 1 ? argv[optind + 1] : NULL; @@ -174,20 +322,62 @@ } } - if (!strcmp(argv[optind], "init")) { + /* the global system file should be always locked */ + if (strcmp(cfgfile, SYS_ASOUNDRC) == 0) + do_lock = 1; + + /* when running in background, use syslog for reports */ + if (background) { + use_syslog = 1; + daemon(0, 0); + } + + cmd = argv[optind]; + daemoncmd = strcmp(cmd, "daemon") == 0 || strcmp(cmd, "rdaemon") == 0; + + if (use_syslog) { + openlog("alsactl", LOG_CONS|LOG_PID, LOG_DAEMON); + if (daemoncmd) + syslog(LOG_INFO, "alsactl " SND_UTIL_VERSION_STR " daemon started"); + } + + if (!strcmp(cmd, "init")) { res = init(initfile, cardname); - } else if (!strcmp(argv[optind], "store")) { + snd_config_update_free_global(); + } else if (!strcmp(cmd, "store")) { res = save_state(cfgfile, cardname); - } else if (!strcmp(argv[optind], "restore")) { + } else if (!strcmp(cmd, "restore") || + !strcmp(cmd, "rdaemon") || + !strcmp(cmd, "nrestore")) { if (removestate) remove(statefile); res = load_state(cfgfile, initfile, cardname, init_fallback); + if (!strcmp(cmd, "rdaemon")) { + do_nice(use_nice, sched_idle); + res = state_daemon(cfgfile, cardname, period, pidfile); + } + if (!strcmp(cmd, "nrestore")) + res = state_daemon_kill(pidfile, "rescan"); + } else if (!strcmp(cmd, "daemon")) { + do_nice(use_nice, sched_idle); + res = state_daemon(cfgfile, cardname, period, pidfile); + } else if (!strcmp(cmd, "kill")) { + res = state_daemon_kill(pidfile, cardname); } else { - fprintf(stderr, "alsactl: Unknown command '%s'...\n", - argv[optind]); + fprintf(stderr, "alsactl: Unknown command '%s'...\n", cmd); res = -ENODEV; } snd_config_update_free_global(); + if (use_syslog) { + if (daemoncmd) + syslog(LOG_INFO, "alsactl daemon stopped"); + closelog(); + } return res < 0 ? -res : 0; + +out: + free(short_option); + free(long_option); + return res; } diff -Nru alsa-utils-1.0.25/alsactl/alsactl.h alsa-utils-1.0.27.1/alsactl/alsactl.h --- alsa-utils-1.0.25/alsactl/alsactl.h 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsactl.h 2013-05-21 08:48:28.000000000 +0000 @@ -1,77 +1,37 @@ extern int debugflag; extern int force_restore; extern int ignore_nocards; +extern int do_lock; +extern int use_syslog; extern char *command; extern char *statefile; -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define info(...) do {\ - fprintf(stdout, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stdout, __VA_ARGS__); \ - putc('\n', stdout); \ -} while (0) -#else -#define info(args...) do {\ - fprintf(stdout, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stdout, ##args); \ - putc('\n', stdout); \ -} while (0) -#endif - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define error(...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - putc('\n', stderr); \ -} while (0) -#else -#define error(args...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, ##args); \ - putc('\n', stderr); \ -} while (0) -#endif - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define cerror(cond, ...) do {\ - if (cond || debugflag) { \ - fprintf(stderr, "%s%s: %s:%d: ", debugflag ? "WARNING: " : "", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - putc('\n', stderr); \ - } \ -} while (0) -#else -#define cerror(cond, args...) do {\ - if (cond || debugflag) { \ - fprintf(stderr, "%s%s: %s:%d: ", debugflag ? "WARNING: " : "", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, ##args); \ - putc('\n', stderr); \ - } \ -} while (0) -#endif +void info_(const char *fcn, long line, const char *fmt, ...); +void error_(const char *fcn, long line, const char *fmt, ...); +void cerror_(const char *fcn, long line, int cond, const char *fmt, ...); +void dbg_(const char *fcn, long line, const char *fmt, ...); #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define dbg(...) do {\ - if (!debugflag) break; \ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - putc('\n', stderr); \ -} while (0) +#define info(...) do { info_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) +#define error(...) do { error_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) +#define cerror(cond, ...) do { cerror_(__FUNCTION__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) +#define dbg(...) do { dbg_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) #else -#define dbg(args...) do {\ - if (!debugflag) break; \ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ - fprintf(stderr, ##args); \ - putc('\n', stderr); \ -} while (0) +#define info(args...) do { info_(__FUNCTION__, __LINE__, ##args); } while (0) +#define error(args...) do { error_(__FUNCTION__, __LINE__, ##args); } while (0) +#define cerror(cond, ...) do { error_(__FUNCTION__, __LINE__, (cond) != 0, ##args); } while (0) +#define dbg(args...) do { dbg_(__FUNCTION__, __LINE__, ##args); } while (0) #endif int init(const char *file, const char *cardname); +int state_lock(const char *file, int lock, int timeout); int save_state(const char *file, const char *cardname); int load_state(const char *file, const char *initfile, const char *cardname, int do_init); int power(const char *argv[], int argc); -int generate_names(const char *cfgfile); +int state_daemon(const char *file, const char *cardname, int period, + const char *pidfile); +int state_daemon_kill(const char *pidfile, const char *cmd); /* utils */ @@ -92,3 +52,5 @@ return -1; return c; } + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0]) diff -Nru alsa-utils-1.0.25/alsactl/alsactl_init.xml alsa-utils-1.0.27.1/alsactl/alsactl_init.xml --- alsa-utils-1.0.25/alsactl/alsactl_init.xml 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/alsactl_init.xml 2013-05-21 08:48:28.000000000 +0000 @@ -474,7 +474,15 @@ - Include specified filename or all files in specified directory + Include the specified filename or files in specified directory. + + + When a directory is specified, only the files with the + extension ".conf" are read. + Also they are read in the alphabetical order. + Thus it's highly recommended to use some number prefix + (e.g. "01-something.conf") to assure the order of execucions. + diff -Nru alsa-utils-1.0.25/alsactl/daemon.c alsa-utils-1.0.27.1/alsactl/daemon.c --- alsa-utils-1.0.25/alsactl/daemon.c 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/daemon.c 2013-05-21 08:48:28.000000000 +0000 @@ -0,0 +1,458 @@ +/* + * Advanced Linux Sound Architecture Control Program + * Copyright (c) by Jaroslav Kysela + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "aconfig.h" +#include "version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "alsactl.h" + +struct id_list { + snd_ctl_elem_id_t **list; + int size; +}; + +struct card { + int index; + int pfds; + snd_ctl_t *handle; + struct id_list whitelist; + struct id_list blacklist; +}; + +static int quit = 0; +static int rescan = 0; +static int save_now = 0; + +static void signal_handler_quit(int sig) +{ + quit = 1; + signal(sig, signal_handler_quit); +} + +static void signal_handler_save_and_quit(int sig) +{ + quit = save_now = 1; + signal(sig, signal_handler_quit); +} + +static void signal_handler_rescan(int sig) +{ + rescan = 1; + signal(sig, signal_handler_rescan); +} + +static void free_list(struct id_list *list) +{ + int i; + + for (i = 0; i < list->size; i++) + free(list->list[i]); + free(list->list); +} + +static void card_free(struct card **card) +{ + struct card *c = *card; + + free_list(&c->blacklist); + free_list(&c->whitelist); + if (c->handle) + snd_ctl_close(c->handle); + free(c); + *card = NULL; +} + +static void add_card(struct card ***cards, int *count, const char *cardname) +{ + struct card *card, **cc; + int i, index, findex; + char device[16]; + + index = snd_card_get_index(cardname); + if (index < 0) + return; + for (i = 0, findex = -1; i < *count; i++) { + if ((*cards)[i] == NULL) { + findex = i; + } else { + if ((*cards)[i]->index == index) + return; + } + } + card = calloc(1, sizeof(*card)); + if (card == NULL) + return; + card->index = index; + sprintf(device, "hw:%i", index); + if (snd_ctl_open(&card->handle, device, SND_CTL_READONLY|SND_CTL_NONBLOCK) < 0) { + card_free(&card); + return; + } + card->pfds = snd_ctl_poll_descriptors_count(card->handle); + if (card->pfds < 0) { + card_free(&card); + return; + } + if (snd_ctl_subscribe_events(card->handle, 1) < 0) { + card_free(&card); + return; + } + if (findex >= 0) { + (*cards)[findex] = card; + } else { + cc = realloc(*cards, sizeof(void *) * (*count + 1)); + if (cc == NULL) { + card_free(&card); + return; + } + cc[*count] = card; + *count = *count + 1; + *cards = cc; + } +} + +static void add_cards(struct card ***cards, int *count) +{ + int card = -1; + char cardname[16]; + + while (1) { + if (snd_card_next(&card) < 0) + break; + if (card < 0) + break; + if (card >= 0) { + sprintf(cardname, "%i", card); + add_card(cards, count, cardname); + } + } +} + +static int compare_ids(snd_ctl_elem_id_t *id1, snd_ctl_elem_id_t *id2) +{ + if (id1 == NULL || id2 == NULL) + return 0; + return snd_ctl_elem_id_get_interface(id1) == snd_ctl_elem_id_get_interface(id2) && + snd_ctl_elem_id_get_index(id1) == snd_ctl_elem_id_get_index(id2) && + strcmp(snd_ctl_elem_id_get_name(id1), snd_ctl_elem_id_get_name(id2)) == 0 && + snd_ctl_elem_id_get_device(id1) == snd_ctl_elem_id_get_device(id2) && + snd_ctl_elem_id_get_subdevice(id1) == snd_ctl_elem_id_get_subdevice(id2); +} + +static int in_list(struct id_list *list, snd_ctl_elem_id_t *id) +{ + int i; + snd_ctl_elem_id_t *id1; + + for (i = 0; i < list->size; i++) { + id1 = list->list[i]; + if (id1 == NULL) + continue; + if (compare_ids(id, id1)) + return 1; + } + return 0; +} + +static void remove_from_list(struct id_list *list, snd_ctl_elem_id_t *id) +{ + int i; + + for (i = 0; i < list->size; i++) { + if (compare_ids(id, list->list[i])) { + free(list->list[i]); + list->list[i] = NULL; + } + } +} + +static void add_to_list(struct id_list *list, snd_ctl_elem_id_t *id) +{ + snd_ctl_elem_id_t *id1; + snd_ctl_elem_id_t **n; + int i; + + if (snd_ctl_elem_id_malloc(&id1)) + return; + snd_ctl_elem_id_copy(id1, id); + for (i = 0; i < list->size; i++) { + if (list->list[i] == NULL) { + list->list[i] = id1; + return; + } + } + n = realloc(list->list, sizeof(void *) * (list->size + 1)); + if (n == NULL) + return; + n[list->size] = id1; + list->size++; + list->list = n; +} + +static int check_lists(struct card *card, snd_ctl_elem_id_t *id) +{ + snd_ctl_elem_info_t *info; + snd_ctl_elem_info_alloca(&info); + + if (in_list(&card->blacklist, id)) + return 0; + if (in_list(&card->whitelist, id)) + return 1; + snd_ctl_elem_info_set_id(info, id); + if (snd_ctl_elem_info(card->handle, info) < 0) + return 0; + if (snd_ctl_elem_info_is_writable(info) || + snd_ctl_elem_info_is_tlv_writable(info)) { + add_to_list(&card->whitelist, id); + return 1; + } else { + add_to_list(&card->blacklist, id); + return 0; + } +} + +static int card_events(struct card *card) +{ + int res = 0; + snd_ctl_event_t *ev; + snd_ctl_event_type_t type; + unsigned int mask; + snd_ctl_elem_id_t *id; + snd_ctl_event_alloca(&ev); + snd_ctl_elem_id_alloca(&id); + + while (snd_ctl_read(card->handle, ev) == 1) { + type = snd_ctl_event_get_type(ev); + if (type != SND_CTL_EVENT_ELEM) + continue; + mask = snd_ctl_event_elem_get_mask(ev); + snd_ctl_event_elem_get_id(ev, id); + if (mask == SND_CTL_EVENT_MASK_REMOVE) { + remove_from_list(&card->whitelist, id); + remove_from_list(&card->blacklist, id); + continue; + } + if (mask & SND_CTL_EVENT_MASK_INFO) { + remove_from_list(&card->whitelist, id); + remove_from_list(&card->blacklist, id); + } + if (mask & (SND_CTL_EVENT_MASK_VALUE| + SND_CTL_EVENT_MASK_ADD| + SND_CTL_EVENT_MASK_TLV)) { + if (check_lists(card, id)) + res = 1; + } + } + return res; +} + +static long read_pid_file(const char *pidfile) +{ + int fd, err; + char pid_txt[12]; + + fd = open(pidfile, O_RDONLY); + if (fd >= 0) { + err = read(fd, pid_txt, 11); + if (err != 11) + err = err < 0 ? -errno : -EIO; + close(fd); + pid_txt[11] = '\0'; + return atol(pid_txt); + } else { + return -errno; + } +} + +static int write_pid_file(const char *pidfile) +{ + int fd, err; + char pid_txt[12]; + + sprintf(pid_txt, "%10li\n", (long)getpid()); + fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0600); + if (fd >= 0) { + err = write(fd, pid_txt, 11); + if (err != 11) { + err = err < 0 ? -errno : -EIO; + unlink(pidfile); + } else { + err = 0; + } + close(fd); + } else { + err = -errno; + } + return err; +} + +int state_daemon_kill(const char *pidfile, const char *cmd) +{ + long pid; + int sig = SIGHUP; + + if (cmd == NULL) { + error("Specify kill command (quit, rescan or save_and_quit)"); + return -EINVAL; + } + if (strcmp(cmd, "rescan") == 0) + sig = SIGUSR1; + else if (strcmp(cmd, "save_and_quit") == 0) + sig = SIGUSR2; + else if (strcmp(cmd, "quit") == 0) + sig = SIGTERM; + if (sig == SIGHUP) { + error("Unknown kill command '%s'", cmd); + return -EINVAL; + } + pid = read_pid_file(pidfile); + if (pid > 0) { + if (kill(pid, sig) >= 0) + return 0; + return -errno; + } + return 0; +} + +static int check_another_instance(const char *pidfile) +{ + long pid; + + pid = read_pid_file(pidfile); + if (pid >= 0) { + /* invoke new card rescan */ + if (kill(pid, SIGUSR1) >= 0) { + usleep(1000); + pid = read_pid_file(pidfile); + if (pid >= 0) + return 1; + } + } + return 0; +} + +int state_daemon(const char *file, const char *cardname, int period, + const char *pidfile) +{ + int count = 0, pcount, psize = 0, i, j, k, changed = 0; + time_t last_write, now; + unsigned short revents; + struct card **cards = NULL; + struct pollfd *pfd = NULL, *pfdn; + + if (check_another_instance(pidfile)) + return 0; + rescan = 1; + signal(SIGABRT, signal_handler_quit); + signal(SIGTERM, signal_handler_quit); + signal(SIGINT, signal_handler_quit); + signal(SIGUSR1, signal_handler_rescan); + signal(SIGUSR2, signal_handler_save_and_quit); + write_pid_file(pidfile); + time(&last_write); + while (!quit || save_now) { + if (save_now) + goto save; + if (rescan) { + if (cardname) { + add_card(&cards, &count, cardname); + } else { + add_cards(&cards, &count); + } + snd_config_update_free_global(); + rescan = 0; + } + for (i = pcount = 0; i < count; i++) { + if (cards[i] == NULL) + continue; + pcount += cards[i]->pfds; + } + if (pcount > psize) { + pfdn = realloc(pfd, sizeof(struct pollfd) * pcount); + if (pfdn) { + psize = pcount; + pfd = pfdn; + } else { + error("No enough memory..."); + goto out; + } + } + for (i = j = 0; i < count; i++) { + if (cards[i] == NULL) + continue; + k = snd_ctl_poll_descriptors(cards[i]->handle, pfd + j, pcount - j); + if (k != cards[i]->pfds) { + error("poll prepare failed: %i", k); + goto out; + } + j += k; + } + i = poll(pfd, j, (period / 2) * 1000); + if (i < 0 && errno == EINTR) + continue; + if (i < 0) { + error("poll failed: %s", strerror(errno)); + break; + } + time(&now); + for (i = j = 0; i < count; i++) { + if (cards[i] == NULL) + continue; + k = snd_ctl_poll_descriptors_revents(cards[i]->handle, + pfd + j, cards[i]->pfds, &revents); + if (k < 0) { + error("poll post failed: %i\n", k); + goto out; + } + j += cards[i]->pfds; + if (revents & (POLLERR|POLLNVAL)) { + card_free(&cards[i]); + } else if (revents & POLLIN) { + if (card_events(cards[i])) { + /* delay the write */ + if (!changed) + last_write = now; + changed = 1; + } + } + } + if ((now - last_write >= period && changed) || save_now) { +save: + changed = save_now = 0; + save_state(file, cardname); + } + } +out: + free(pfd); + remove(pidfile); + for (i = 0; i < count; i++) + card_free(&cards[i]); + free(cards); + return 0; +} diff -Nru alsa-utils-1.0.25/alsactl/init/Makefile.in alsa-utils-1.0.27.1/alsactl/init/Makefile.in --- alsa-utils-1.0.25/alsactl/init/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/init/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,6 +67,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -72,10 +93,18 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(alsainitdir)" DATA = $(alsainit_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -100,6 +129,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -120,11 +150,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -135,6 +170,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -149,6 +186,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -214,7 +252,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -239,15 +277,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-alsainitDATA: $(alsainit_DATA) @$(NORMAL_INSTALL) - test -z "$(alsainitdir)" || $(MKDIR_P) "$(DESTDIR)$(alsainitdir)" @list='$(alsainit_DATA)'; test -n "$(alsainitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(alsainitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(alsainitdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -261,15 +302,15 @@ @$(NORMAL_UNINSTALL) @list='$(alsainit_DATA)'; test -n "$(alsainitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(alsainitdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(alsainitdir)" && rm -f $$files + dir='$(DESTDIR)$(alsainitdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -318,10 +359,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru alsa-utils-1.0.25/alsactl/init_parse.c alsa-utils-1.0.27.1/alsactl/init_parse.c --- alsa-utils-1.0.25/alsactl/init_parse.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/init_parse.c 2013-05-21 08:48:28.000000000 +0000 @@ -1278,6 +1278,13 @@ return res; } +/* return non-zero if the file name has the extension ".conf" */ +static int conf_name_filter(const struct dirent *d) +{ + char *ext = strrchr(d->d_name, '.'); + return ext && !strcmp(ext, ".conf"); +} + static int parse_line(struct space *space, char *line, size_t linesize) { char *linepos; @@ -1480,8 +1487,7 @@ if (strcasecmp(key, "INCLUDE") == 0) { char *rootdir, *go_to; const char *filename; - struct dirent *dirent; - DIR *dir; + struct stat st; int linenum; if (op != KEY_OP_ASSIGN) { Perror(space, "invalid INCLUDE operation"); @@ -1498,18 +1504,27 @@ go_to = space->go_to; filename = space->filename; linenum = space->linenum; - dir = opendir(string); - if (dir) { + if (stat(string, &st)) { + Perror(space, "invalid filename '%s'", string); + continue; + } + if (S_ISDIR(st.st_mode)) { + struct dirent **list; + int i, num; + num = scandir(string, &list, conf_name_filter, + alphasort); + if (num < 0) { + Perror(space, "invalid directory '%s'", string); + continue; + } count = strlen(string); - while ((dirent = readdir(dir)) != NULL) { - if (strcmp(dirent->d_name, ".") == 0 || - strcmp(dirent->d_name, "..") == 0) - continue; + for (i = 0; i < num; i++) { string[count] = '\0'; strlcat(string, "/", sizeof(string)); - strlcat(string, dirent->d_name, sizeof(string)); + strlcat(string, list[i]->d_name, sizeof(string)); space->go_to = NULL; space->rootdir = new_root_dir(string); + free(list[i]); if (space->rootdir) { err = parse(space, string); free(space->rootdir); @@ -1522,7 +1537,7 @@ if (err) break; } - closedir(dir); + free(list); } else { space->go_to = NULL; space->rootdir = new_root_dir(string); diff -Nru alsa-utils-1.0.25/alsactl/lock.c alsa-utils-1.0.27.1/alsactl/lock.c --- alsa-utils-1.0.25/alsactl/lock.c 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/lock.c 2013-05-21 08:48:28.000000000 +0000 @@ -0,0 +1,123 @@ +/* + * Advanced Linux Sound Architecture Control Program + * Copyright (c) by Jaroslav Kysela + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "aconfig.h" +#include "version.h" +#include +#include +#include +#include +#include +#include +#include +#include "alsactl.h" + +static int state_lock_(const char *file, int lock, int timeout) +{ + int fd = -1, err = 0; + struct flock lck; + struct stat st; + char lcktxt[12]; + char *nfile; + + if (!do_lock) + return 0; + nfile = malloc(strlen(file) + 6); + if (nfile == NULL) { + error("No enough memory..."); + return -ENOMEM; + } + strcpy(nfile, file); + strcat(nfile, ".lock"); + lck.l_type = lock ? F_WRLCK : F_UNLCK; + lck.l_whence = SEEK_SET; + lck.l_start = 0; + lck.l_len = 11; + lck.l_pid = 0; + if (lock) { + snprintf(lcktxt, sizeof(lcktxt), "%10li\n", (long)getpid()); + } else { + snprintf(lcktxt, sizeof(lcktxt), "%10s\n", ""); + } + while (fd < 0 && timeout-- > 0) { + fd = open(nfile, O_RDWR); + if (fd < 0) { + fd = open(nfile, O_RDWR|O_CREAT|O_EXCL, 0644); + if (fd < 0) { + if (errno == EBUSY || errno == EAGAIN) { + sleep(1); + timeout--; + } else { + err = -errno; + goto out; + } + } + } + } + if (fd < 0 && timeout <= 0) { + err = -EBUSY; + goto out; + } + if (fstat(fd, &st) < 0) { + err = -errno; + goto out; + } + if (st.st_size != 11) { + if (write(fd, lcktxt, 11) != 11) { + err = -EIO; + goto out; + } + if (lseek(fd, 0, SEEK_SET)) { + err = -errno; + goto out; + } + } + while (timeout > 0) { + if (fcntl(fd, F_SETLK, &lck) < 0) { + sleep(1); + timeout--; + } else { + break; + } + } + if (timeout <= 0) { + err = -EBUSY; + goto out; + } + if (write(fd, lcktxt, 11) != 11) { + err = -EIO; + goto out; + } +out: + free(nfile); + return err; +} + +int state_lock(const char *file, int lock, int timeout) +{ + int err; + + err = state_lock_(file, lock, timeout); + if (err < 0) + error("file %s %slock error: %s", file, + lock ? "" : "un", strerror(-err)); + return err; +} diff -Nru alsa-utils-1.0.25/alsactl/state.c alsa-utils-1.0.27.1/alsactl/state.c --- alsa-utils-1.0.25/alsactl/state.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/state.c 2013-05-21 08:48:28.000000000 +0000 @@ -31,9 +31,6 @@ #include "alsactl.h" -#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0]) - - static char *id_str(snd_ctl_elem_id_t *id) { static char str[128]; @@ -185,11 +182,11 @@ char *s = tlv_to_str(tlv); if (s) { err = snd_config_string_add(comment, "tlv", s); + free(s); if (err < 0) { error("snd_config_string_add: %s", snd_strerror(err)); return err; } - free(s); } } @@ -1546,6 +1543,7 @@ snd_input_t *in; snd_output_t *out; int stdio; + char *nfile = NULL; err = snd_config_top(&config); if (err < 0) { @@ -1553,13 +1551,24 @@ return err; } stdio = !strcmp(file, "-"); + if (!stdio) { + nfile = malloc(strlen(file) + 5); + if (nfile == NULL) { + error("No enough memory..."); + goto out; + } + strcpy(nfile, file); + strcat(nfile, ".new"); + if (state_lock(file, 1, 10) != 0) + goto out; + } if (!stdio && (err = snd_input_stdio_open(&in, file, "r")) >= 0) { err = snd_config_load(config, in); snd_input_close(in); #if 0 if (err < 0) { error("snd_config_load error: %s", snd_strerror(err)); - return err; + goto out; } #endif } @@ -1575,17 +1584,19 @@ if (card < 0) { if (first) { if (ignore_nocards) { - return 0; + err = 0; + goto out; } else { error("No soundcards found..."); - return -ENODEV; + err = -ENODEV; + goto out; } } break; } first = 0; if ((err = get_controls(card, config))) - return err; + goto out; } } else { int cardno; @@ -1593,26 +1604,40 @@ cardno = snd_card_get_index(cardname); if (cardno < 0) { error("Cannot find soundcard '%s'...", cardname); - return cardno; + err = cardno; + goto out; } if ((err = get_controls(cardno, config))) { - return err; + goto out; } } - if (stdio) + if (stdio) { err = snd_output_stdio_attach(&out, stdout, 0); - else - err = snd_output_stdio_open(&out, file, "w"); + } else { + err = snd_output_stdio_open(&out, nfile, "w"); + } if (err < 0) { error("Cannot open %s for writing: %s", file, snd_strerror(err)); - return -errno; + err = -errno; + goto out; } err = snd_config_save(config, out); snd_output_close(out); - if (err < 0) + if (err < 0) { error("snd_config_save: %s", snd_strerror(err)); - return 0; + } else { + err = rename(nfile, file); + if (err < 0) + error("rename failed: %s (%s)", strerror(-err), file); + } +out: + if (!stdio) + state_lock(file, 0, 10); + free(nfile); + snd_config_delete(config); + snd_config_update_free_global(); + return err; } int load_state(const char *file, const char *initfile, const char *cardname, @@ -1621,7 +1646,7 @@ int err, finalerr = 0; snd_config_t *config; snd_input_t *in; - int stdio; + int stdio, locked = 0; err = snd_config_top(&config); if (err < 0) { @@ -1629,16 +1654,21 @@ return err; } stdio = !strcmp(file, "-"); - if (stdio) + if (stdio) { err = snd_input_stdio_attach(&in, stdin, 0); - else - err = snd_input_stdio_open(&in, file, "r"); + } else { + err = state_lock(file, 1, 10); + locked = err >= 0; + err = err >= 0 ? snd_input_stdio_open(&in, file, "r") : err; + } if (err >= 0) { err = snd_config_load(config, in); snd_input_close(in); + if (locked) + state_lock(file, 0, 10); if (err < 0) { error("snd_config_load error: %s", snd_strerror(err)); - return err; + goto out; } } else { int card, first = 1; @@ -1646,13 +1676,24 @@ error("Cannot open %s for reading: %s", file, snd_strerror(err)); finalerr = err; - card = -1; + if (cardname) { + card = snd_card_get_index(cardname); + if (card < 0) { + error("Cannot find soundcard '%s'...", cardname); + err = -ENODEV; + goto out; + } + goto single; + } else { + card = -1; + } /* find each installed soundcards */ - while (1) { + while (!cardname) { if (snd_card_next(&card) < 0) break; if (card < 0) break; +single: first = 0; if (!do_init) break; @@ -1666,7 +1707,8 @@ } if (first) finalerr = 0; /* no cards, no error code */ - return finalerr; + err = finalerr; + goto out; } if (!cardname) { @@ -1681,10 +1723,12 @@ if (card < 0) { if (first) { if (ignore_nocards) { - return 0; + err = 0; + goto out; } else { error("No soundcards found..."); - return -ENODEV; + err = -ENODEV; + goto out; } } break; @@ -1711,7 +1755,8 @@ cardno = snd_card_get_index(cardname); if (cardno < 0) { error("Cannot find soundcard '%s'...", cardname); - return -ENODEV; + err = -ENODEV; + goto out; } /* do a check if controls matches state file */ if (do_init && set_controls(cardno, config, 0)) { @@ -1724,8 +1769,12 @@ if ((err = set_controls(cardno, config, 1))) { initfailed(cardno, "restore", err); if (!force_restore) - return err; + goto out; } } - return finalerr; + err = finalerr; +out: + snd_config_delete(config); + snd_config_update_free_global(); + return err; } diff -Nru alsa-utils-1.0.25/alsactl/utils.c alsa-utils-1.0.27.1/alsactl/utils.c --- alsa-utils-1.0.25/alsactl/utils.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsactl/utils.c 2013-05-21 08:48:28.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -100,3 +101,79 @@ close(fp); free(str); } + +static void syslog_(int prio, const char *fcn, long line, + const char *fmt, va_list ap) +{ + char buf[1024]; + + snprintf(buf, sizeof(buf), "%s: %s:%ld", command, fcn, line); + buf[sizeof(buf)-1] = '\0'; + vsnprintf(buf + strlen(buf), sizeof(buf)-strlen(buf), fmt, ap); + buf[sizeof(buf)-1] = '\0'; + syslog(LOG_INFO, "%s", buf); +} + +void info_(const char *fcn, long line, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (use_syslog) { + syslog_(LOG_INFO, fcn, line, fmt, ap); + } else { + fprintf(stdout, "%s: %s:%ld: ", command, fcn, line); + vfprintf(stdout, fmt, ap); + putc('\n', stdout); + } + va_end(ap); +} + +void error_(const char *fcn, long line, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (use_syslog) { + syslog_(LOG_ERR, fcn, line, fmt, ap); + } else { + fprintf(stderr, "%s: %s:%ld: ", command, fcn, line); + vfprintf(stderr, fmt, ap); + putc('\n', stderr); + } + va_end(ap); +} + +void cerror_(const char *fcn, long line, int cond, const char *fmt, ...) +{ + va_list ap; + + if (!cond && !debugflag) + return; + if (use_syslog) { + syslog_(LOG_ERR, fcn, line, fmt, ap); + } else { + va_start(ap, fmt); + fprintf(stderr, "%s: %s:%ld: ", command, fcn, line); + vfprintf(stderr, fmt, ap); + putc('\n', stderr); + va_end(ap); + } +} + +void dbg_(const char *fcn, long line, const char *fmt, ...) +{ + va_list ap; + + if (!debugflag) + return; + if (use_syslog) { + syslog_(LOG_DEBUG, fcn, line, fmt, ap); + } else { + va_start(ap, fmt); + fprintf(stderr, "%s: %s:%ld: ", command, fcn, line); + vfprintf(stderr, fmt, ap); + putc('\n', stderr); + va_end(ap); + } +} diff -Nru alsa-utils-1.0.25/alsaloop/Makefile.in alsa-utils-1.0.27.1/alsaloop/Makefile.in --- alsa-utils-1.0.25/alsaloop/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaloop/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,7 +55,7 @@ bin_PROGRAMS = alsaloop$(EXEEXT) subdir = alsaloop DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -71,6 +87,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(alsaloop_SOURCES) DIST_SOURCES = $(alsaloop_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -92,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -100,6 +127,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -124,6 +153,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -144,11 +174,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -159,6 +194,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -173,6 +210,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -239,7 +277,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -264,15 +302,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -306,7 +347,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -alsaloop$(EXEEXT): $(alsaloop_OBJECTS) $(alsaloop_DEPENDENCIES) +alsaloop$(EXEEXT): $(alsaloop_OBJECTS) $(alsaloop_DEPENDENCIES) $(EXTRA_alsaloop_DEPENDENCIES) @rm -f alsaloop$(EXEEXT) $(LINK) $(alsaloop_OBJECTS) $(alsaloop_LDADD) $(LIBS) @@ -335,11 +376,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -368,9 +416,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -421,6 +467,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -431,10 +491,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -484,10 +544,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -573,7 +638,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/alsaloop/alsaloop.1 alsa-utils-1.0.27.1/alsaloop/alsaloop.1 --- alsa-utils-1.0.25/alsaloop/alsaloop.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaloop/alsaloop.1 2013-05-21 08:48:28.000000000 +0000 @@ -1,6 +1,6 @@ .TH ALSALOOP 1 "5 Aug 2010" .SH NAME -alsaloop \- command-line PCM loopback +alsaloop \- command\-line PCM loopback .SH SYNOPSIS \fBalsaloop\fP [\fI\-option\fP] [\fIcmd\fP] .SH DESCRIPTION @@ -27,10 +27,10 @@ contains the command line options for one job. The '#' means comment and rest of line is ignored. Example: - # First line - comment, second line - first job - -C hw:1,0 -P hw:0,0 -t 50000 -T 1 - # Third line - comment, fourth line - second job - -C hw:1,1 -P hw:0,1 -t 40000 -T 2 + # First line \- comment, second line \- first job + \-C hw:1,0 \-P hw:0,0 \-t 50000 \-T 1 + # Third line \- comment, fourth line \- second job + \-C hw:1,1 \-P hw:0,1 \-t 40000 \-T 2 .TP \fI\-d\fP | \fI\-\-daemonize\fP @@ -70,7 +70,7 @@ .TP \fI\-f \fP | \fI\-\-format=\fP -Format specification (usually S16_LE S32_LE). Use -h to list all formats. +Format specification (usually S16_LE S32_LE). Use \-h to list all formats. Default format is S16_LE. .TP @@ -86,19 +86,19 @@ .TP \fI\-n\fP | \fI\-\-resample\fP -Allow rate resampling using alsa-lib. +Allow rate resampling using alsa\-lib. .TP \fI\-A \fP | \fI\-\-samplerate=\fP Use libsamplerate and choose a converter: - 0 or sincbest - best quality - 1 or sincmedium - medium quality - 2 or sincfastest - lowest quality - 3 or zerohold - hold zero samples - 4 or linear - worst quality - linear resampling - 5 or auto - choose best method + 0 or sincbest \- best quality + 1 or sincmedium \- medium quality + 2 or sincfastest \- lowest quality + 3 or zerohold \- hold zero samples + 4 or linear \- worst quality - linear resampling + 5 or auto \- choose best method .TP \fI\-B \fP | \fI\-\-buffer=\fP @@ -118,30 +118,30 @@ .TP \fI\-b\fP | \fI\-\-nblock\fP -Non-block mode (very early process wakeup). Eats more CPU. +Non\-block mode (very early process wakeup). Eats more CPU. .TP \fI\-S \fP | \fI\-\-sync=\fP Sync mode specification for capture to playback stream: - 0 or none - do not touch the stream - 1 or simple - add or remove samples to keep + 0 or none \- do not touch the stream + 1 or simple \- add or remove samples to keep both streams synchronized - 2 or captshift - use driver for the capture device + 2 or captshift \- use driver for the capture device (if supported) to compensate the rate shift - 3 or playshift - use driver for the playback device + 3 or playshift \- use driver for the playback device (if supported) to compensate the rate shift - 4 or samplerate - use samplerate library to do rate resampling - 5 or auto - automatically selects the best method + 4 or samplerate \- use samplerate library to do rate resampling + 5 or auto \- automatically selects the best method in this order: captshift, playshift, samplerate, simple .TP \fI\-T \fP | \fI\-\-thread=\fP -Thread number (-1 means create a unique thread). All jobs with same +Thread number (\-1 means create a unique thread). All jobs with same thread numbers are run within one thread. .TP @@ -155,12 +155,12 @@ Known attributes: - name - control ID name - index - control ID index - device - control ID device - subdevice - control ID subdevice - iface - control ID interface - numid - control ID numid + name \- control ID name + index \- control ID index + device \- control ID device + subdevice \- control ID subdevice + iface \- control ID interface + numid \- control ID numid .TP \fI\-O \fP | \fI\-\-ossmixer=\fP diff -Nru alsa-utils-1.0.25/alsaloop/alsaloop.c alsa-utils-1.0.27.1/alsaloop/alsaloop.c --- alsa-utils-1.0.25/alsaloop/alsaloop.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaloop/alsaloop.c 2013-05-21 08:48:28.000000000 +0000 @@ -387,7 +387,9 @@ int arg_nblock = 0; int arg_effect = 0; int arg_resample = 0; +#ifdef USE_SAMPLERATE int arg_samplerate = SRC_SINC_FASTEST + 1; +#endif int arg_sync = SYNC_TYPE_AUTO; int arg_slave = SLAVE_TYPE_AUTO; int arg_thread = 0; @@ -474,6 +476,7 @@ case 'n': arg_resample = 1; break; +#ifdef USE_SAMPLERATE case 'A': if (strcasecmp(optarg, "sincbest") == 0) arg_samplerate = SRC_SINC_BEST_QUALITY; @@ -491,6 +494,7 @@ arg_sync = SRC_SINC_FASTEST; arg_samplerate += 1; break; +#endif case 'S': if (strcasecmp(optarg, "samplerate") == 0) arg_sync = SYNC_TYPE_SAMPLERATE; @@ -610,11 +614,6 @@ loop->src_enable = arg_samplerate > 0; if (loop->src_enable) loop->src_converter_type = arg_samplerate - 1; -#else - if (arg_samplerate > 0) { - logit(LOG_CRIT, "No libsamplerate support.\n"); - exit(EXIT_FAILURE); - } #endif set_loop_time(loop, arg_loop_time); add_loop(loop); diff -Nru alsa-utils-1.0.25/alsaloop/pcmjob.c alsa-utils-1.0.27.1/alsaloop/pcmjob.c --- alsa-utils-1.0.25/alsaloop/pcmjob.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaloop/pcmjob.c 2013-05-21 08:48:28.000000000 +0000 @@ -246,15 +246,11 @@ } else { if (lhandle == lhandle->loopback->play) { val = bufsize + bufsize / 2; - if (val < (period_size * 3) / 4) - val = (period_size * 3) / 4; if (val > (buffer_size * 3) / 4) val = (buffer_size * 3) / 4; val = buffer_size - val; } else { val = bufsize / 2; - if (val < period_size / 2) - val = period_size / 2; if (val > buffer_size / 4) val = buffer_size / 4; } @@ -949,6 +945,23 @@ logit(LOG_CRIT, "%s start failed: %s\n", play->id, snd_strerror(err)); return err; } + } else if (delay1 < fill) { + diff = (fill - delay1) / play->pitch; + while (diff > 0) { + delay1 = play->buf_size - play->buf_pos; + if (verbose > 6) + snd_output_printf(loop->output, + "sync: playback short, silence filling %li / buf_count=%li\n", (long)delay1, play->buf_count); + if (delay1 > diff) + delay1 = diff; + if ((err = snd_pcm_format_set_silence(play->format, play->buf + play->buf_pos * play->channels, delay1)) < 0) + return err; + play->buf_pos += delay1; + play->buf_pos %= play->buf_size; + play->buf_count += delay1; + diff -= delay1; + } + writeit(play); } if (verbose > 5) { snd_output_printf(loop->output, "%s: xrun sync ok\n", loop->id); diff -Nru alsa-utils-1.0.25/alsamixer/Makefile.in alsa-utils-1.0.27.1/alsamixer/Makefile.in --- alsa-utils-1.0.25/alsamixer/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/Makefile.in 2013-05-21 08:50:36.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = alsamixer$(EXEEXT) subdir = alsamixer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -71,6 +88,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(alsamixer_SOURCES) DIST_SOURCES = $(alsamixer_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -92,6 +114,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -99,6 +127,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -123,6 +153,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -143,11 +174,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -158,6 +194,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -172,6 +210,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -252,7 +291,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -277,15 +316,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -319,7 +361,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -alsamixer$(EXEEXT): $(alsamixer_OBJECTS) $(alsamixer_DEPENDENCIES) +alsamixer$(EXEEXT): $(alsamixer_OBJECTS) $(alsamixer_DEPENDENCIES) $(EXTRA_alsamixer_DEPENDENCIES) @rm -f alsamixer$(EXEEXT) $(LINK) $(alsamixer_OBJECTS) $(alsamixer_LDADD) $(LIBS) @@ -360,11 +402,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -393,9 +442,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -446,6 +493,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -456,10 +517,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -509,10 +570,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -598,7 +664,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/alsamixer/alsamixer.1 alsa-utils-1.0.27.1/alsamixer/alsamixer.1 --- alsa-utils-1.0.25/alsamixer/alsamixer.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/alsamixer.1 2013-05-21 08:48:28.000000000 +0000 @@ -157,6 +157,19 @@ Please note that you might need to hit \fIESC\fP twice on some terminals since it's regarded as a prefix key. +.SH VOLUME MAPPING +In \fBalsamixer\fP, the volume is mapped to a value that is more natural +for a human ear. The mapping is designed so that the position in the +interval is proportional to the volume as a human ear would perceive +it, i.e. the position is the cubic root of the linear sample +multiplication factor. For controls with a small range (24 dB or +less), the mapping is linear in the dB values so that each step has +the same size visually. + +Only for controls without dB information, a linear mapping of the +hardware volume register values is used (this is the same algorithm as +used in the old \fBalsamixer\fP). + .SH SEE ALSO \fB amixer(1), diff -Nru alsa-utils-1.0.25/alsamixer/cli.c alsa-utils-1.0.27.1/alsamixer/cli.c --- alsa-utils-1.0.25/alsamixer/cli.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/cli.c 2013-05-21 08:48:28.000000000 +0000 @@ -115,6 +115,9 @@ int main(int argc, char *argv[]) { + if (!isatty(fileno(stdin))) + return 0; + setlocale(LC_ALL, ""); #ifdef ENABLE_NLS_IN_CURSES textdomain(PACKAGE); diff -Nru alsa-utils-1.0.25/alsamixer/mainloop.c alsa-utils-1.0.27.1/alsamixer/mainloop.c --- alsa-utils-1.0.25/alsamixer/mainloop.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/mainloop.c 2013-05-21 08:48:28.000000000 +0000 @@ -128,8 +128,15 @@ } if (!active_widget) break; - if (controls_changed) + if (controls_changed) { + controls_changed = FALSE; + create_controls(); + control_values_changed = FALSE; display_controls(); + } else if (control_values_changed) { + control_values_changed = FALSE; + display_controls(); + } } free(pollfds); } diff -Nru alsa-utils-1.0.25/alsamixer/mixer_display.c alsa-utils-1.0.27.1/alsamixer/mixer_display.c --- alsa-utils-1.0.25/alsamixer/mixer_display.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/mixer_display.c 2013-05-21 08:48:28.000000000 +0000 @@ -657,7 +657,6 @@ display_no_controls(); } display_scroll_indicators(); - controls_changed = FALSE; } void compute_controls_layout(void) diff -Nru alsa-utils-1.0.25/alsamixer/mixer_widget.c alsa-utils-1.0.27.1/alsamixer/mixer_widget.c --- alsa-utils-1.0.25/alsamixer/mixer_widget.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/mixer_widget.c 2013-05-21 08:48:28.000000000 +0000 @@ -50,6 +50,7 @@ snd_mixer_selem_id_t *current_selem_id; unsigned int current_control_flags; +bool control_values_changed; bool controls_changed; enum channel_mask { @@ -59,20 +60,15 @@ static int elem_callback(snd_mixer_elem_t *elem, unsigned int mask) { - unsigned int i; - - if (mask & (SND_CTL_EVENT_MASK_REMOVE | - SND_CTL_EVENT_MASK_INFO | - SND_CTL_EVENT_MASK_VALUE)) + if (mask == SND_CTL_EVENT_MASK_REMOVE) { controls_changed = TRUE; + } else { + if (mask & SND_CTL_EVENT_MASK_VALUE) + control_values_changed = TRUE; - if (mask & SND_CTL_EVENT_MASK_INFO) - for (i = 0; i < controls_count; ++i) - if (controls[i].elem == elem) { - controls[i].flags &= ~IS_ACTIVE; - if (snd_mixer_selem_is_active(controls[i].elem)) - controls[i].flags |= IS_ACTIVE; - } + if (mask & SND_CTL_EVENT_MASK_INFO) + controls_changed = TRUE; + } return 0; } diff -Nru alsa-utils-1.0.25/alsamixer/mixer_widget.h alsa-utils-1.0.27.1/alsamixer/mixer_widget.h --- alsa-utils-1.0.25/alsamixer/mixer_widget.h 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/alsamixer/mixer_widget.h 2013-05-21 08:48:28.000000000 +0000 @@ -24,6 +24,7 @@ extern snd_mixer_selem_id_t *current_selem_id; extern unsigned int current_control_flags; +extern bool control_values_changed; extern bool controls_changed; void create_mixer_object(struct snd_mixer_selem_regopt *selem_regopt); diff -Nru alsa-utils-1.0.25/alsaucm/Makefile.in alsa-utils-1.0.27.1/alsaucm/Makefile.in --- alsa-utils-1.0.25/alsaucm/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/alsaucm/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = alsaucm$(EXEEXT) subdir = alsaucm -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -65,10 +82,17 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(alsaucm_SOURCES) DIST_SOURCES = $(alsaucm_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -93,6 +117,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -113,11 +138,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -128,6 +158,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -142,6 +174,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -207,7 +240,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -232,15 +265,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -274,7 +310,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -alsaucm$(EXEEXT): $(alsaucm_OBJECTS) $(alsaucm_DEPENDENCIES) +alsaucm$(EXEEXT): $(alsaucm_OBJECTS) $(alsaucm_DEPENDENCIES) $(EXTRA_alsaucm_DEPENDENCIES) @rm -f alsaucm$(EXEEXT) $(LINK) $(alsaucm_OBJECTS) $(alsaucm_LDADD) $(LIBS) @@ -349,6 +385,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -399,10 +449,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -486,7 +541,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/amidi/Makefile.in alsa-utils-1.0.27.1/amidi/Makefile.in --- alsa-utils-1.0.25/amidi/Makefile.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/amidi/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = amidi$(EXEEXT) subdir = amidi -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -65,6 +82,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = amidi.c DIST_SOURCES = amidi.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -86,6 +108,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -93,6 +121,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -117,6 +147,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -137,11 +168,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -152,6 +188,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -166,6 +204,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -228,7 +267,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -253,15 +292,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -295,7 +337,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -amidi$(EXEEXT): $(amidi_OBJECTS) $(amidi_DEPENDENCIES) +amidi$(EXEEXT): $(amidi_OBJECTS) $(amidi_DEPENDENCIES) $(EXTRA_amidi_DEPENDENCIES) @rm -f amidi$(EXEEXT) $(LINK) $(amidi_OBJECTS) $(amidi_LDADD) $(LIBS) @@ -322,11 +364,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -355,9 +404,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -408,6 +455,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -418,10 +479,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -471,10 +532,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -560,7 +626,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/amidi/amidi.1 alsa-utils-1.0.27.1/amidi/amidi.1 --- alsa-utils-1.0.25/amidi/amidi.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/amidi/amidi.1 2013-05-21 08:48:28.000000000 +0000 @@ -9,7 +9,7 @@ .SH DESCRIPTION .B amidi -is a command-line utility which allows to receive and send +is a command-line utility which allows one to receive and send SysEx (system exclusive) data from/to external MIDI devices. It can also send any other MIDI commands. @@ -141,7 +141,7 @@ default rawmidi definitions .br .I /etc/asound.conf -system-wide rawmidi definitions +system\-wide rawmidi definitions .br .I ~/.asoundrc user specific rawmidi definitions diff -Nru alsa-utils-1.0.25/amixer/Makefile.am alsa-utils-1.0.27.1/amixer/Makefile.am --- alsa-utils-1.0.25/amixer/Makefile.am 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/amixer/Makefile.am 2013-05-21 08:48:28.000000000 +0000 @@ -4,7 +4,7 @@ # CFLAGS += -g -Wall bin_PROGRAMS = amixer -amixer_SOURCES = amixer.c +amixer_SOURCES = amixer.c ../alsamixer/volume_mapping.c noinst_HEADERS = amixer.h man_MANS = amixer.1 EXTRA_DIST = amixer.1 diff -Nru alsa-utils-1.0.25/amixer/Makefile.in alsa-utils-1.0.27.1/amixer/Makefile.in --- alsa-utils-1.0.25/amixer/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/amixer/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,7 +54,7 @@ bin_PROGRAMS = amixer$(EXEEXT) subdir = amixer DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -54,7 +70,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am_amixer_OBJECTS = amixer.$(OBJEXT) +am_amixer_OBJECTS = amixer.$(OBJEXT) volume_mapping.$(OBJEXT) amixer_OBJECTS = $(am_amixer_OBJECTS) amixer_LDADD = $(LDADD) amixer_DEPENDENCIES = @@ -68,6 +84,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(amixer_SOURCES) DIST_SOURCES = $(amixer_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -89,6 +110,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -97,6 +124,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -121,6 +150,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -141,11 +171,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -156,6 +191,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -170,6 +207,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -227,7 +265,7 @@ xmlto = @xmlto@ INCLUDES = -I$(top_srcdir)/include LDADD = -lm -amixer_SOURCES = amixer.c +amixer_SOURCES = amixer.c ../alsamixer/volume_mapping.c noinst_HEADERS = amixer.h man_MANS = amixer.1 EXTRA_DIST = amixer.1 @@ -235,7 +273,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -260,15 +298,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -302,7 +343,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -amixer$(EXEEXT): $(amixer_OBJECTS) $(amixer_DEPENDENCIES) +amixer$(EXEEXT): $(amixer_OBJECTS) $(amixer_DEPENDENCIES) $(EXTRA_amixer_DEPENDENCIES) @rm -f amixer$(EXEEXT) $(LINK) $(amixer_OBJECTS) $(amixer_LDADD) $(LIBS) @@ -313,6 +354,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amixer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_mapping.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -327,13 +369,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +volume_mapping.o: ../alsamixer/volume_mapping.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT volume_mapping.o -MD -MP -MF $(DEPDIR)/volume_mapping.Tpo -c -o volume_mapping.o `test -f '../alsamixer/volume_mapping.c' || echo '$(srcdir)/'`../alsamixer/volume_mapping.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/volume_mapping.Tpo $(DEPDIR)/volume_mapping.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../alsamixer/volume_mapping.c' object='volume_mapping.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o volume_mapping.o `test -f '../alsamixer/volume_mapping.c' || echo '$(srcdir)/'`../alsamixer/volume_mapping.c + +volume_mapping.obj: ../alsamixer/volume_mapping.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT volume_mapping.obj -MD -MP -MF $(DEPDIR)/volume_mapping.Tpo -c -o volume_mapping.obj `if test -f '../alsamixer/volume_mapping.c'; then $(CYGPATH_W) '../alsamixer/volume_mapping.c'; else $(CYGPATH_W) '$(srcdir)/../alsamixer/volume_mapping.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/volume_mapping.Tpo $(DEPDIR)/volume_mapping.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../alsamixer/volume_mapping.c' object='volume_mapping.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o volume_mapping.obj `if test -f '../alsamixer/volume_mapping.c'; then $(CYGPATH_W) '../alsamixer/volume_mapping.c'; else $(CYGPATH_W) '$(srcdir)/../alsamixer/volume_mapping.c'; fi` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -362,9 +425,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -415,6 +476,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -425,10 +500,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -478,10 +553,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -567,7 +647,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/amixer/amixer.1 alsa-utils-1.0.27.1/amixer/amixer.1 --- alsa-utils-1.0.25/amixer/amixer.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/amixer/amixer.1 2013-05-21 08:48:28.000000000 +0000 @@ -4,7 +4,7 @@ .SH SYNOPSIS \fBamixer\fP [\fI\-option\fP] [\fIcmd\fP] .SH DESCRIPTION -\fBamixer\fP allows command-line control of the mixer for the ALSA +\fBamixer\fP allows command\-line control of the mixer for the ALSA soundcard driver. \fBamixer\fP supports multiple soundcards. @@ -34,7 +34,7 @@ \fIset\fP or \fIsset\fP <\fISCONTROL\fP> <\fIPARAMETER\fP> ... Sets the simple mixer control contents. The parameter can be the volume either as a percentage from 0% to 100% with \fI%\fP suffix, -a dB gain with \fIdB\fP suffix (like -12.5dB), or an exact hardware value. +a dB gain with \fIdB\fP suffix (like \-12.5dB), or an exact hardware value. The dB gain can be used only for the mixer elements with available dB information. When plus(+) or minus(\-) letter is appended after @@ -96,7 +96,7 @@ \fI\-s\fP | \fI\-\-stdin\fP Read from stdin and execute the command on each line sequentially. -When this option is given, the command in command-line arguments is ignored. +When this option is given, the command in command\-line arguments is ignored. Only sset and cset are accepted. Other commands are ignored. The commands to unmatched ids are ignored without errors too. @@ -104,10 +104,21 @@ .TP \fI\-h\fP Help: show syntax. + .TP \fI\-q\fP Quiet mode. Do not show results of changes. +.TP +\fI\-R\fP +Use the raw value for evaluating the percentage representation. +This is the default mode. + +.TP +\fI\-M\fP +Use the mapped volume for evaluating the percentage representation +like \fBalsamixer\fR, to be more natural for human ear. + .SH EXAMPLES .TP @@ -117,8 +128,8 @@ capture (recording).\fR .TP -\fBamixer \-c 1 \-\- sset Master playback -20dB\fR -will set the master volume of the second card to -20dB. If the master +\fBamixer \-c 1 \-\- sset Master playback \-20dB\fR +will set the master volume of the second card to \-20dB. If the master has multiple channels, all channels are set to the same value. .TP @@ -134,8 +145,14 @@ \fBamixer \-c 2 cset numid=34 40%\fR will set the 34th soundcard element to 40% +.SH SEE ALSO +\fB +alsamixer(1) +\fP + .SH BUGS None known. + .SH AUTHOR \fBamixer\fP is by Jaroslav Kysela . This document is by Paul Winkler and Jaroslav Kysela . diff -Nru alsa-utils-1.0.25/amixer/amixer.c alsa-utils-1.0.27.1/amixer/amixer.c --- alsa-utils-1.0.25/amixer/amixer.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/amixer/amixer.c 2013-05-21 08:48:28.000000000 +0000 @@ -29,7 +29,9 @@ #include #include #include +#include #include "amixer.h" +#include "../alsamixer/volume_mapping.h" #define LEVEL_BASIC (1<<0) #define LEVEL_INACTIVE (1<<1) @@ -68,6 +70,8 @@ printf(" -i,--inactive show also inactive controls\n"); printf(" -a,--abstract L select abstraction level (none or basic)\n"); printf(" -s,--stdin Read and execute commands from stdin sequentially\n"); + printf(" -R,--raw-volume Use the raw value (default)\n"); + printf(" -M,--mapped-volume Use the mapped volume\n"); printf("\nAvailable commands:\n"); printf(" scontrols show all mixer simple controls\n"); printf(" scontents show contents of all mixer simple controls (default command)\n"); @@ -134,11 +138,6 @@ return 0; } -static const char *control_iface(snd_ctl_elem_id_t *id) -{ - return snd_ctl_elem_iface_name(snd_ctl_elem_id_get_interface(id)); -} - static const char *control_type(snd_ctl_elem_info_t *info) { return snd_ctl_elem_type_name(snd_ctl_elem_info_get_type(info)); @@ -187,9 +186,9 @@ /* Fuction to convert from volume to percentage. val = volume */ -static int convert_prange(int val, int min, int max) +static int convert_prange(long val, long min, long max) { - int range = max - min; + long range = max - min; int tmp; if (range == 0) @@ -204,110 +203,88 @@ #define convert_prange1(val, min, max) \ ceil((val) * ((max) - (min)) * 0.01 + (min)) -static const char *get_percent(int val, int min, int max) -{ - static char str[32]; - int p; +struct volume_ops { + int (*get_range)(snd_mixer_elem_t *elem, long *min, long *max); + int (*get)(snd_mixer_elem_t *elem, snd_mixer_selem_channel_id_t c, + long *value); + int (*set)(snd_mixer_elem_t *elem, snd_mixer_selem_channel_id_t c, + long value, int dir); +}; - p = convert_prange(val, min, max); - sprintf(str, "%i [%i%%]", val, p); - return str; -} +enum { VOL_RAW, VOL_DB, VOL_MAP }; -#if 0 -static const char *get_percent1(int val, int min, int max, int min_dB, int max_dB) -{ - static char str[32]; - int p, db; +struct volume_ops_set { + int (*has_volume)(snd_mixer_elem_t *elem); + struct volume_ops v[3]; +}; - p = convert_prange(val, min, max); - db = convert_db_range(val, min, max, min_dB, max_dB); - sprintf(str, "%i [%i%%] [%i.%02idB]", val, p, db / 100, abs(db % 100)); - return str; +static int set_playback_dB(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, long value, int dir) +{ + return snd_mixer_selem_set_playback_dB(elem, c, value, dir); } -#endif -static long get_integer(char **ptr, long min, long max) +static int set_capture_dB(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, long value, int dir) { - long val = min; - char *p = *ptr, *s; - - if (*p == ':') - p++; - if (*p == '\0' || (!isdigit(*p) && *p != '-')) - goto out; + return snd_mixer_selem_set_capture_dB(elem, c, value, dir); +} - s = p; - val = strtol(s, &p, 10); - if (*p == '.') { - p++; - strtol(p, &p, 10); - } - if (*p == '%') { - val = (long)convert_prange1(strtod(s, NULL), min, max); - p++; - } - val = check_range(val, min, max); - if (*p == ',') - p++; - out: - *ptr = p; - return val; +static int set_playback_raw_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long value, int dir) +{ + return snd_mixer_selem_set_playback_volume(elem, c, value); } -static long get_integer64(char **ptr, long long min, long long max) +static int set_capture_raw_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long value, int dir) { - long long val = min; - char *p = *ptr, *s; + return snd_mixer_selem_set_capture_volume(elem, c, value); +} - if (*p == ':') - p++; - if (*p == '\0' || (!isdigit(*p) && *p != '-')) - goto out; +/* FIXME: normalize to int32 space to be compatible with other types */ +#define MAP_VOL_RES (INT32_MAX / 100) - s = p; - val = strtol(s, &p, 10); - if (*p == '.') { - p++; - strtol(p, &p, 10); - } - if (*p == '%') { - val = (long long)convert_prange1(strtod(s, NULL), min, max); - p++; - } - val = check_range(val, min, max); - if (*p == ',') - p++; - out: - *ptr = p; - return val; +static int get_mapped_volume_range(snd_mixer_elem_t *elem, + long *pmin, long *pmax) +{ + *pmin = 0; + *pmax = MAP_VOL_RES; + return 0; } -struct volume_ops { - int (*get_range)(snd_mixer_elem_t *elem, long *min, long *max); - int (*get)(snd_mixer_elem_t *elem, snd_mixer_selem_channel_id_t c, - long *value); - int (*set)(snd_mixer_elem_t *elem, snd_mixer_selem_channel_id_t c, - long value); -}; - -enum { VOL_RAW, VOL_DB }; +static int get_playback_mapped_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long *value) +{ + *value = (rint)(get_normalized_playback_volume(elem, c) * MAP_VOL_RES); + return 0; +} -struct volume_ops_set { - int (*has_volume)(snd_mixer_elem_t *elem); - struct volume_ops v[2]; -}; +static int set_playback_mapped_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long value, int dir) +{ + return set_normalized_playback_volume(elem, c, + (double)value / MAP_VOL_RES, dir); +} -static int set_playback_dB(snd_mixer_elem_t *elem, - snd_mixer_selem_channel_id_t c, long value) +static int get_capture_mapped_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long *value) { - return snd_mixer_selem_set_playback_dB(elem, c, value, 0); + *value = (rint)(get_normalized_capture_volume(elem, c) * MAP_VOL_RES); + return 0; } -static int set_capture_dB(snd_mixer_elem_t *elem, - snd_mixer_selem_channel_id_t c, long value) +static int set_capture_mapped_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t c, + long value, int dir) { - return snd_mixer_selem_set_capture_dB(elem, c, value, 0); + return set_normalized_capture_volume(elem, c, + (double)value / MAP_VOL_RES, dir); } static const struct volume_ops_set vol_ops[2] = { @@ -315,29 +292,42 @@ .has_volume = snd_mixer_selem_has_playback_volume, .v = {{ snd_mixer_selem_get_playback_volume_range, snd_mixer_selem_get_playback_volume, - snd_mixer_selem_set_playback_volume }, + set_playback_raw_volume }, { snd_mixer_selem_get_playback_dB_range, snd_mixer_selem_get_playback_dB, - set_playback_dB }}, + set_playback_dB }, + { get_mapped_volume_range, + get_playback_mapped_volume, + set_playback_mapped_volume }, + }, }, { .has_volume = snd_mixer_selem_has_capture_volume, .v = {{ snd_mixer_selem_get_capture_volume_range, snd_mixer_selem_get_capture_volume, - snd_mixer_selem_set_capture_volume }, + set_capture_raw_volume }, { snd_mixer_selem_get_capture_dB_range, snd_mixer_selem_get_capture_dB, - set_capture_dB }}, + set_capture_dB }, + { get_mapped_volume_range, + get_capture_mapped_volume, + set_capture_mapped_volume }, + }, }, }; +static int std_vol_type = VOL_RAW; + static int set_volume_simple(snd_mixer_elem_t *elem, snd_mixer_selem_channel_id_t chn, char **ptr, int dir) { long val, orig, pmin, pmax; char *p = *ptr, *s; - int invalid = 0, err = 0, vol_type = VOL_RAW; + int invalid = 0, percent = 0, err = 0; + int vol_type = std_vol_type; + double scale = 1.0; + int correct = 0; if (! vol_ops[dir].has_volume(elem)) invalid = 1; @@ -347,10 +337,6 @@ if (*p == '\0' || (!isdigit(*p) && *p != '-')) goto skip; - if (! invalid && - vol_ops[dir].v[VOL_RAW].get_range(elem, &pmin, &pmax) < 0) - invalid = 1; - s = p; val = strtol(s, &p, 10); if (*p == '.') { @@ -358,32 +344,37 @@ strtol(p, &p, 10); } if (*p == '%') { - if (! invalid) - val = (long)convert_prange1(strtod(s, NULL), pmin, pmax); + percent = 1; p++; } else if (p[0] == 'd' && p[1] == 'B') { - if (! invalid) { - val = (long)(strtod(s, NULL) * 100.0); - vol_type = VOL_DB; - if (vol_ops[dir].v[vol_type].get_range(elem, &pmin, &pmax) < 0) - invalid = 1; - } + vol_type = VOL_DB; p += 2; - } + scale = 100; + } else + vol_type = VOL_RAW; + + val = (long)(strtod(s, NULL) * scale); + if (vol_ops[dir].v[vol_type].get_range(elem, &pmin, &pmax) < 0) + invalid = 1; + if (percent) + val = (long)convert_prange1(val, pmin, pmax); if (*p == '+' || *p == '-') { if (! invalid) { if (vol_ops[dir].v[vol_type].get(elem, chn, &orig) < 0) invalid = 1; - if (*p == '+') + if (*p == '+') { val = orig + val; - else + correct = 1; + } else { val = orig - val; + correct = -1; + } } p++; } if (! invalid) { val = check_range(val, pmin, pmax); - err = vol_ops[dir].v[vol_type].set(elem, chn, val); + err = vol_ops[dir].v[vol_type].set(elem, chn, val, correct); } skip: if (*p == ',') @@ -424,20 +415,12 @@ static void show_control_id(snd_ctl_elem_id_t *id) { - unsigned int index, device, subdevice; - printf("numid=%u,iface=%s,name='%s'", - snd_ctl_elem_id_get_numid(id), - control_iface(id), - snd_ctl_elem_id_get_name(id)); - index = snd_ctl_elem_id_get_index(id); - device = snd_ctl_elem_id_get_device(id); - subdevice = snd_ctl_elem_id_get_subdevice(id); - if (index) - printf(",index=%i", index); - if (device) - printf(",device=%i", device); - if (subdevice) - printf(",subdevice=%i", subdevice); + char *str; + + str = snd_ctl_ascii_elem_id_get(id); + if (str) + printf("%s", str); + free(str); } static void print_spaces(unsigned int spaces) @@ -479,7 +462,7 @@ printf("TLV size error in compound!\n"); return; } - decode_tlv(spaces + 2, tlv + idx, tlv[idx+1]); + decode_tlv(spaces + 2, tlv + idx, tlv[idx+1] + 8); idx += 2 + (tlv[1] + sizeof(unsigned int) - 1) / sizeof(unsigned int); } break; @@ -508,9 +491,9 @@ } } else { printf("min="); - print_dB(tlv[2]); + print_dB((int)tlv[2]); printf(",max="); - print_dB(tlv[3]); + print_dB((int)tlv[3]); } break; #endif @@ -548,9 +531,9 @@ } } else { printf("min="); - print_dB(tlv[2]); + print_dB((int)tlv[2]); printf(",max="); - print_dB(tlv[3]); + print_dB((int)tlv[3]); } break; #endif @@ -711,15 +694,33 @@ return 0; } +static void show_selem_volume(snd_mixer_elem_t *elem, + snd_mixer_selem_channel_id_t chn, int dir, + long min, long max) +{ + long raw, val; + vol_ops[dir].v[VOL_RAW].get(elem, chn, &raw); + if (std_vol_type == VOL_RAW) + val = convert_prange(raw, min, max); + else { + vol_ops[dir].v[std_vol_type].get(elem, chn, &val); + val = convert_prange(val, 0, MAP_VOL_RES); + } + printf(" %li [%li%%]", raw, val); + if (!vol_ops[dir].v[VOL_DB].get(elem, chn, &val)) { + printf(" ["); + print_dB(val); + printf("]"); + } +} + static int show_selem(snd_mixer_t *handle, snd_mixer_selem_id_t *id, const char *space, int level) { snd_mixer_selem_channel_id_t chn; long pmin = 0, pmax = 0; long cmin = 0, cmax = 0; - long pvol, cvol; int psw, csw; int pmono, cmono, mono_ok = 0; - long db; snd_mixer_elem_t *elem; elem = snd_mixer_find_selem(handle, id); @@ -868,13 +869,7 @@ mono_ok = 1; } if (snd_mixer_selem_has_common_volume(elem)) { - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, &pvol); - printf(" %s", get_percent(pvol, pmin, pmax)); - if (!snd_mixer_selem_get_playback_dB(elem, SND_MIXER_SCHN_MONO, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, SND_MIXER_SCHN_MONO, 0, pmin, pmax); } if (snd_mixer_selem_has_common_switch(elem)) { snd_mixer_selem_get_playback_switch(elem, SND_MIXER_SCHN_MONO, &psw); @@ -891,13 +886,7 @@ if (snd_mixer_selem_has_playback_volume(elem)) { printf(" Playback"); title = 1; - snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, &pvol); - printf(" %s", get_percent(pvol, pmin, pmax)); - if (!snd_mixer_selem_get_playback_dB(elem, SND_MIXER_SCHN_MONO, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, SND_MIXER_SCHN_MONO, 0, pmin, pmax); } } if (!snd_mixer_selem_has_common_switch(elem)) { @@ -919,13 +908,7 @@ if (snd_mixer_selem_has_capture_volume(elem)) { printf(" Capture"); title = 1; - snd_mixer_selem_get_capture_volume(elem, SND_MIXER_SCHN_MONO, &cvol); - printf(" %s", get_percent(cvol, cmin, cmax)); - if (!snd_mixer_selem_get_capture_dB(elem, SND_MIXER_SCHN_MONO, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, SND_MIXER_SCHN_MONO, 1, cmin, cmax); } } if (!snd_mixer_selem_has_common_switch(elem)) { @@ -946,13 +929,7 @@ continue; printf("%s%s:", space, snd_mixer_selem_channel_name(chn)); if (!pmono && !cmono && snd_mixer_selem_has_common_volume(elem)) { - snd_mixer_selem_get_playback_volume(elem, chn, &pvol); - printf(" %s", get_percent(pvol, pmin, pmax)); - if (!snd_mixer_selem_get_playback_dB(elem, chn, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, chn, 0, pmin, pmax); } if (!pmono && !cmono && snd_mixer_selem_has_common_switch(elem)) { snd_mixer_selem_get_playback_switch(elem, chn, &psw); @@ -964,13 +941,7 @@ if (snd_mixer_selem_has_playback_volume(elem)) { printf(" Playback"); title = 1; - snd_mixer_selem_get_playback_volume(elem, chn, &pvol); - printf(" %s", get_percent(pvol, pmin, pmax)); - if (!snd_mixer_selem_get_playback_dB(elem, chn, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, chn, 0, pmin, pmax); } } if (!snd_mixer_selem_has_common_switch(elem)) { @@ -988,13 +959,7 @@ if (snd_mixer_selem_has_capture_volume(elem)) { printf(" Capture"); title = 1; - snd_mixer_selem_get_capture_volume(elem, chn, &cvol); - printf(" %s", get_percent(cvol, cmin, cmax)); - if (!snd_mixer_selem_get_capture_dB(elem, chn, &db)) { - printf(" ["); - print_dB(db); - printf("]"); - } + show_selem_volume(elem, chn, 1, cmin, cmax); } } if (!snd_mixer_selem_has_common_switch(elem)) { @@ -1052,103 +1017,6 @@ return 0; } -static int parse_control_id(const char *str, snd_ctl_elem_id_t *id) -{ - int c, size, numid; - char *ptr; - - while (*str == ' ' || *str == '\t') - str++; - if (!(*str)) - return -EINVAL; - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER); /* default */ - while (*str) { - if (!strncasecmp(str, "numid=", 6)) { - str += 6; - numid = atoi(str); - if (numid <= 0) { - fprintf(stderr, "amixer: Invalid numid %d\n", numid); - return -EINVAL; - } - snd_ctl_elem_id_set_numid(id, atoi(str)); - while (isdigit(*str)) - str++; - } else if (!strncasecmp(str, "iface=", 6)) { - str += 6; - if (!strncasecmp(str, "card", 4)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_CARD); - str += 4; - } else if (!strncasecmp(str, "mixer", 5)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER); - str += 5; - } else if (!strncasecmp(str, "pcm", 3)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_PCM); - str += 3; - } else if (!strncasecmp(str, "rawmidi", 7)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_RAWMIDI); - str += 7; - } else if (!strncasecmp(str, "timer", 5)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_TIMER); - str += 5; - } else if (!strncasecmp(str, "sequencer", 9)) { - snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_SEQUENCER); - str += 9; - } else { - return -EINVAL; - } - } else if (!strncasecmp(str, "name=", 5)) { - char buf[64]; - str += 5; - ptr = buf; - size = 0; - if (*str == '\'' || *str == '\"') { - c = *str++; - while (*str && *str != c) { - if (size < (int)sizeof(buf)) { - *ptr++ = *str; - size++; - } - str++; - } - if (*str == c) - str++; - } else { - while (*str && *str != ',') { - if (size < (int)sizeof(buf)) { - *ptr++ = *str; - size++; - } - str++; - } - } - *ptr = '\0'; - snd_ctl_elem_id_set_name(id, buf); - } else if (!strncasecmp(str, "index=", 6)) { - str += 6; - snd_ctl_elem_id_set_index(id, atoi(str)); - while (isdigit(*str)) - str++; - } else if (!strncasecmp(str, "device=", 7)) { - str += 7; - snd_ctl_elem_id_set_device(id, atoi(str)); - while (isdigit(*str)) - str++; - } else if (!strncasecmp(str, "subdevice=", 10)) { - str += 10; - snd_ctl_elem_id_set_subdevice(id, atoi(str)); - while (isdigit(*str)) - str++; - } - if (*str == ',') { - str++; - } else { - if (*str) - return -EINVAL; - } - } - return 0; -} - static int parse_simple_id(const char *str, snd_mixer_selem_id_t *sid) { int c, size; @@ -1197,34 +1065,6 @@ return 0; } -static int get_ctl_enum_item_index(snd_ctl_t *handle, snd_ctl_elem_info_t *info, - char **ptrp) -{ - char *ptr = *ptrp; - int items, i, len; - const char *name; - - items = snd_ctl_elem_info_get_items(info); - if (items <= 0) - return -1; - - for (i = 0; i < items; i++) { - snd_ctl_elem_info_set_item(info, i); - if (snd_ctl_elem_info(handle, info) < 0) - return -1; - name = snd_ctl_elem_info_get_item_name(info); - len = strlen(name); - if (! strncmp(name, ptr, len)) { - if (! ptr[len] || ptr[len] == ',' || ptr[len] == '\n') { - ptr += len; - *ptrp = ptr; - return i; - } - } - } - return -1; -} - static int cset(int argc, char *argv[], int roflag, int keep_handle) { int err; @@ -1232,10 +1072,6 @@ snd_ctl_elem_info_t *info; snd_ctl_elem_id_t *id; snd_ctl_elem_value_t *control; - char *ptr; - unsigned int idx, count; - long tmp; - snd_ctl_elem_type_t type; snd_ctl_elem_info_alloca(&info); snd_ctl_elem_id_alloca(&id); snd_ctl_elem_value_alloca(&control); @@ -1244,7 +1080,7 @@ fprintf(stderr, "Specify a full control identifier: [[iface=,][name='name',][index=,][device=,][subdevice=]]|[numid=]\n"); return -EINVAL; } - if (parse_control_id(argv[0], id)) { + if (snd_ctl_ascii_elem_id_parse(id, argv[0])) { fprintf(stderr, "Wrong control identifier: %s\n", argv[0]); return -EINVAL; } @@ -1269,66 +1105,27 @@ } return err; } - snd_ctl_elem_info_get_id(info, id); /* FIXME: Remove it when hctl find works ok !!! */ - type = snd_ctl_elem_info_get_type(info); - count = snd_ctl_elem_info_get_count(info); - snd_ctl_elem_value_set_id(control, id); - if (!roflag) { - ptr = argv[1]; - for (idx = 0; idx < count && idx < 128 && ptr && *ptr; idx++) { - switch (type) { - case SND_CTL_ELEM_TYPE_BOOLEAN: - tmp = 0; - if (!strncasecmp(ptr, "on", 2) || !strncasecmp(ptr, "up", 2)) { - tmp = 1; - ptr += 2; - } else if (!strncasecmp(ptr, "yes", 3)) { - tmp = 1; - ptr += 3; - } else if (!strncasecmp(ptr, "toggle", 6)) { - tmp = snd_ctl_elem_value_get_boolean(control, idx); - tmp = tmp > 0 ? 0 : 1; - ptr += 6; - } else if (isdigit(*ptr)) { - tmp = atoi(ptr) > 0 ? 1 : 0; - while (isdigit(*ptr)) - ptr++; - } else { - while (*ptr && *ptr != ',') - ptr++; - } - snd_ctl_elem_value_set_boolean(control, idx, tmp); - break; - case SND_CTL_ELEM_TYPE_INTEGER: - tmp = get_integer(&ptr, - snd_ctl_elem_info_get_min(info), - snd_ctl_elem_info_get_max(info)); - snd_ctl_elem_value_set_integer(control, idx, tmp); - break; - case SND_CTL_ELEM_TYPE_INTEGER64: - tmp = get_integer64(&ptr, - snd_ctl_elem_info_get_min64(info), - snd_ctl_elem_info_get_max64(info)); - snd_ctl_elem_value_set_integer64(control, idx, tmp); - break; - case SND_CTL_ELEM_TYPE_ENUMERATED: - tmp = get_ctl_enum_item_index(handle, info, &ptr); - if (tmp < 0) - tmp = get_integer(&ptr, 0, snd_ctl_elem_info_get_items(info) - 1); - snd_ctl_elem_value_set_enumerated(control, idx, tmp); - break; - case SND_CTL_ELEM_TYPE_BYTES: - tmp = get_integer(&ptr, 0, 255); - snd_ctl_elem_value_set_byte(control, idx, tmp); - break; - default: - break; + snd_ctl_elem_value_set_id(control, id); + if ((err = snd_ctl_elem_read(handle, control)) < 0) { + if (ignore_error) + return 0; + error("Cannot read the given element from control %s\n", card); + if (! keep_handle) { + snd_ctl_close(handle); + handle = NULL; } - if (!strchr(argv[1], ',')) - ptr = argv[1]; - else if (*ptr == ',') - ptr++; + return err; + } + err = snd_ctl_ascii_value_parse(handle, control, info, argv[1]); + if (err < 0) { + if (!ignore_error) + error("Control %s parse error: %s\n", card, snd_strerror(err)); + if (!keep_handle) { + snd_ctl_close(handle); + handle = NULL; + } + return ignore_error ? 0 : err; } if ((err = snd_ctl_elem_write(handle, control)) < 0) { if (!ignore_error) @@ -1927,6 +1724,8 @@ {"version", 0, NULL, 'v'}, {"abstract", 1, NULL, 'a'}, {"stdin", 0, NULL, 's'}, + {"raw-volume", 0, NULL, 'R'}, + {"mapped-volume", 0, NULL, 'M'}, {NULL, 0, NULL, 0}, }; @@ -1934,7 +1733,7 @@ while (1) { int c; - if ((c = getopt_long(argc, argv, "hc:D:qidnva:s", long_option, NULL)) < 0) + if ((c = getopt_long(argc, argv, "hc:D:qidnva:sRM", long_option, NULL)) < 0) break; switch (c) { case 'h': @@ -1987,6 +1786,12 @@ case 's': read_stdin = 1; break; + case 'R': + std_vol_type = VOL_RAW; + break; + case 'M': + std_vol_type = VOL_MAP; + break; default: fprintf(stderr, "Invalid switch or option needs an argument.\n"); morehelp++; diff -Nru alsa-utils-1.0.25/aplay/Makefile.in alsa-utils-1.0.27.1/aplay/Makefile.in --- alsa-utils-1.0.25/aplay/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/aplay/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,7 +54,7 @@ bin_PROGRAMS = aplay$(EXEEXT) subdir = aplay DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -69,6 +85,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = aplay.c DIST_SOURCES = aplay.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -90,6 +111,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -98,6 +125,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -122,6 +151,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -142,11 +172,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -157,6 +192,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -171,6 +208,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -236,7 +274,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -261,15 +299,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -303,7 +344,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -aplay$(EXEEXT): $(aplay_OBJECTS) $(aplay_DEPENDENCIES) +aplay$(EXEEXT): $(aplay_OBJECTS) $(aplay_DEPENDENCIES) $(EXTRA_aplay_DEPENDENCIES) @rm -f aplay$(EXEEXT) $(LINK) $(aplay_OBJECTS) $(aplay_LDADD) $(LIBS) @@ -330,11 +371,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -363,9 +411,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -416,6 +462,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -426,10 +486,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -479,10 +539,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -570,7 +635,7 @@ .MAKE: install-am install-data-am install-exec-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-hook install-dvi \ diff -Nru alsa-utils-1.0.25/aplay/aplay.1 alsa-utils-1.0.27.1/aplay/aplay.1 --- alsa-utils-1.0.25/aplay/aplay.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/aplay/aplay.1 2013-05-21 08:48:28.000000000 +0000 @@ -1,6 +1,6 @@ .TH APLAY 1 "1 January 2010" .SH NAME -arecord, aplay \- command-line sound recorder and player for ALSA +arecord, aplay \- command\-line sound recorder and player for ALSA soundcard driver .SH SYNOPSIS \fBarecord\fP [\fIflags\fP] [filename] @@ -8,7 +8,7 @@ \fBaplay\fP [\fIflags\fP] [filename [filename]] ... .SH DESCRIPTION -\fBarecord\fP is a command-line soundfile recorder for the ALSA soundcard +\fBarecord\fP is a command\-line soundfile recorder for the ALSA soundcard driver. It supports several file formats and multiple soundcards with multiple devices. If recording with interleaved mode samples the file is automatically split before the 2GB filesize. @@ -81,11 +81,11 @@ Min ticks to sleep. The default is not to sleep. .TP \fI\-M, \-\-mmap\fP -Use memory-mapped (mmap) I/O mode for the audio stream. +Use memory\-mapped (mmap) I/O mode for the audio stream. If this option is not set, the read/write I/O mode will be used. .TP \fI\-N, \-\-nonblock\fP -Open the audio device in non-blocking mode. If the device is busy the program will exit immediately. +Open the audio device in non\-blocking mode. If the device is busy the program will exit immediately. If this option is not set the program will block until the audio device is available again. .TP \fI\-F, \-\-period\-time=#\fP @@ -120,8 +120,8 @@ is given twice or three times. .TP \fI\-V, \-\-vumeter=TYPE\fP -Specifies the VU-meter type, either \fIstereo\fP or \fImono\fP. -The stereo VU-meter is available only for 2-channel stereo samples +Specifies the VU\-meter type, either \fIstereo\fP or \fImono\fP. +The stereo VU\-meter is available only for 2\-channel stereo samples with interleaved format. .TP \fI\-I, \-\-separate\-channels\fP @@ -141,6 +141,17 @@ Allow interactive operation via stdin. Currently only pause/resume via space or enter key is implemented. .TP +\fI-m, \-\-chmap=ch1,ch2,...\fP +Give the channel map to override or follow. Pass channel position +strings like \fIFL\fP, \fIFR\fP, etc. + +If a device supports the override of the channel map, \fBaplay\fP +tries to pass the given channel map. +If it doesn't support the channel map override but still it provides +the channel map information, \fBaplay\fP tries to rearrange the +channel order in the buffer to match with the returned channel map +from the device. +.TP \fI\-\-disable\-resample\fP Disable automatic rate resample. .TP @@ -162,7 +173,7 @@ Minimum value is 1. .TP \fI\-\-test\-nowait\fP -Do not wait for the ring buffer--eats the whole CPU. +Do not wait for the ring buffer \(hy eats the whole CPU. .TP \fI\-\-max\-file\-time\fP While recording, when the output file has been accumulating @@ -177,13 +188,24 @@ send signals to it. .TP \fI\-\-use\-strftime\fP -When recording, interpret %-codes in the file name parameter using +When recording, interpret %\-codes in the file name parameter using the strftime facility whenever the output file is opened. The important strftime codes are: %Y is the year, %m month, %d day of the month, %H hour, %M minute and %S second. In addition, %v is the file number, starting at 1. When this option is specified, intermediate directories for the output file are created automatically. This option has no effect if \-\-separate\-channels is specified. +.TP +\fI\-\-dump\-hw\-params\fP +Dump hw_params of the device preconfigured status to stderr. The dump +lists capabilities of the selected device such as supported formats, +sampling rates, numbers of channels, period and buffer bytes/sizes/times. +For raw device hw:X this option basically lists hardware capabilities of +the soundcard. +.TP +\fI\-\-fatal\-errors\fP +Disables recovery attempts when errors (e.g. xrun) are encountered; the +aplay process instead aborts immediately. .SH SIGNALS When recording, SIGINT, SIGTERM and SIGABRT will close the output @@ -196,11 +218,11 @@ .TP \fBaplay \-c 1 \-t raw \-r 22050 \-f mu_law foobar\fR will play the raw file "foobar" as a -22050-Hz, mono, 8-bit, Mu-Law .au file. +22050\-Hz, mono, 8\-bit, Mu\-Law .au file. .TP \fBarecord \-d 10 \-f cd \-t wav \-D copy foobar.wav\fP -will record foobar.wav as a 10-second, CD-quality wave file, using the +will record foobar.wav as a 10\-second, CD\-quality wave file, using the PCM "copy" (which might be defined in the user's .asoundrc file as: .nf pcm.copy { @@ -213,14 +235,14 @@ .fi .TP -\fBarecord \-t wav \-max-file_time 30 mon.wav\fP +\fBarecord \-t wav \-\-max\-file\-time 30 mon.wav\fP Record from the default audio source in monaural, 8,000 samples per second, 8 bits per sample. Start a new file every -30 seconds. File names are mon-nn.wav, where nn increases -from 01. The file after mon-99.wav is mon-100.wav. +30 seconds. File names are mon\-nn.wav, where nn increases +from 01. The file after mon\-99.wav is mon\-100.wav. .TP -\fBarecord \-f cd \-t wav \-max-file-time 3600 --use-strftime %Y/%m/%d/listen-%H-%M-%v.wav\fP +\fBarecord \-f cd \-t wav \-\-max\-file\-time 3600 \-\-use-strftime %Y/%m/%d/listen-%H-%M-%v.wav\fP Record in stereo from the default audio source. Create a new file every hour. The files are placed in directories based on their start dates and have names which include their start times and file numbers. diff -Nru alsa-utils-1.0.25/aplay/aplay.c alsa-utils-1.0.27.1/aplay/aplay.c --- alsa-utils-1.0.25/aplay/aplay.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/aplay/aplay.c 2013-05-21 08:48:28.000000000 +0000 @@ -42,10 +42,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -54,6 +54,10 @@ #include "formats.h" #include "version.h" +#ifdef SND_CHMAP_API_VERSION +#define CONFIG_SUPPORT_CHMAP 1 +#endif + #ifndef LLONG_MAX #define LLONG_MAX 9223372036854775807LL #endif @@ -103,6 +107,7 @@ static int mmap_flag = 0; static int interleaved = 1; static int nonblock = 0; +static int in_aborting = 0; static u_char *audiobuf = NULL; static snd_pcm_uframes_t chunk_size = 0; static unsigned period_time = 0; @@ -115,6 +120,7 @@ static int monotonic = 0; static int interactive = 0; static int can_pause = 0; +static int fatal_errors = 0; static int verbose = 0; static int vumeter = VUMETER_NONE; static int buffer_pos = 0; @@ -129,6 +135,7 @@ static int use_strftime = 0; volatile static int recycle_capture_file = 0; static long term_c_lflag = -1; +static int dump_hw_params = 0; static int fd = -1; static off64_t pbrec_count = LLONG_MAX, fdcount; @@ -138,6 +145,11 @@ FILE *pidf = NULL; static int pidfile_written = 0; +#ifdef CONFIG_SUPPORT_CHMAP +static snd_pcm_chmap_t *channel_map = NULL; /* chmap to override */ +static unsigned int *hw_map = NULL; /* chmap to follow */ +#endif + /* needed prototypes */ static void done_stdin(void); @@ -212,6 +224,7 @@ "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" +"-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -223,7 +236,10 @@ " --max-file-time=# start another output file when the old file has recorded\n" " for this many seconds\n" " --process-id-file write the process ID here\n" -" --use-strftime apply the strftime facility to the output file name\n") +" --use-strftime apply the strftime facility to the output file name\n" +" --dump-hw-params dump hw_params of the device\n" +" --fatal-errors treat all errors as fatal\n" + ) , command); printf(_("Recognized sample formats are:")); for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) { @@ -232,7 +248,7 @@ printf(" %s", s); } printf(_("\nSome of these may not be available on selected hardware\n")); - printf(_("The availabled format shortcuts are:\n")); + printf(_("The available format shortcuts are:\n")); printf(_("-f cd (16 bit little endian, 44100, stereo)\n")); printf(_("-f cdr (16 bit big endian, 44100, stereo)\n")); printf(_("-f dat (16 bit little endian, 48000, stereo)\n")); @@ -368,8 +384,6 @@ static void signal_handler(int sig) { - static int in_aborting; - if (in_aborting) return; @@ -378,22 +392,14 @@ putchar('\n'); if (!quiet_mode) fprintf(stderr, _("Aborted by signal %s...\n"), strsignal(sig)); - if (stream == SND_PCM_STREAM_CAPTURE) { - if (fmt_rec_table[file_type].end) { - fmt_rec_table[file_type].end(fd); - fd = -1; - } - stream = -1; - } - if (fd > 1) { - close(fd); - fd = -1; - } - if (handle && sig != SIGABRT) { - snd_pcm_close(handle); + if (handle) + snd_pcm_abort(handle); + if (sig == SIGABRT) { + /* do not call snd_pcm_close() and abort immediately */ handle = NULL; + prg_exit(EXIT_FAILURE); } - prg_exit(EXIT_FAILURE); + signal(sig, signal_handler); } /* call on SIGUSR1 signal. */ @@ -416,13 +422,19 @@ OPT_TEST_NOWAIT, OPT_MAX_FILE_TIME, OPT_PROCESS_ID_FILE, - OPT_USE_STRFTIME + OPT_USE_STRFTIME, + OPT_DUMP_HWPARAMS, + OPT_FATAL_ERRORS, }; int main(int argc, char *argv[]) { int option_index; - static const char short_options[] = "hnlLD:qt:c:f:r:d:MNF:A:R:T:B:vV:IPCi"; + static const char short_options[] = "hnlLD:qt:c:f:r:d:MNF:A:R:T:B:vV:IPCi" +#ifdef CONFIG_SUPPORT_CHMAP + "m:" +#endif + ; static const struct option long_options[] = { {"help", 0, 0, 'h'}, {"version", 0, 0, OPT_VERSION}, @@ -461,12 +473,18 @@ {"process-id-file", 1, 0, OPT_PROCESS_ID_FILE}, {"use-strftime", 0, 0, OPT_USE_STRFTIME}, {"interactive", 0, 0, 'i'}, + {"dump-hw-params", 0, 0, OPT_DUMP_HWPARAMS}, + {"fatal-errors", 0, 0, OPT_FATAL_ERRORS}, +#ifdef CONFIG_SUPPORT_CHMAP + {"chmap", 1, 0, 'm'}, +#endif {0, 0, 0, 0} }; char *pcm_name = "default"; int tmp, err, c; int do_device_list = 0, do_pcm_list = 0; snd_pcm_info_t *info; + FILE *direction; #ifdef ENABLE_NLS setlocale(LC_ALL, ""); @@ -485,14 +503,21 @@ file_type = FORMAT_WAVE; command = "arecord"; start_delay = 1; + direction = stdout; } else if (strstr(argv[0], "aplay")) { stream = SND_PCM_STREAM_PLAYBACK; command = "aplay"; + direction = stdin; } else { error(_("command should be named either arecord or aplay")); return 1; } + if (isatty(fileno(direction)) && (argc == 1)) { + usage(command); + return 1; + } + chunk_size = -1; rhwparams.format = DEFAULT_FORMAT; rhwparams.rate = DEFAULT_SPEED; @@ -662,6 +687,21 @@ case OPT_USE_STRFTIME: use_strftime = 1; break; + case OPT_DUMP_HWPARAMS: + dump_hw_params = 1; + break; + case OPT_FATAL_ERRORS: + fatal_errors = 1; + break; +#ifdef CONFIG_SUPPORT_CHMAP + case 'm': + channel_map = snd_pcm_chmap_parse_string(optarg); + if (!channel_map) { + fprintf(stderr, _("Unable to parse channel map string: %s\n"), optarg); + return 1; + } + break; +#endif default: fprintf(stderr, _("Try `%s --help' for more information.\n"), command); return 1; @@ -776,7 +816,7 @@ { ssize_t result = 0, res; - while (count > 0) { + while (count > 0 && !in_aborting) { if ((res = read(fd, buf, count)) == 0) break; if (res < 0) @@ -843,11 +883,20 @@ WaveFmtBody *f; WaveChunkHeader *c; u_int type, len; + unsigned short format, channels; + int big_endian, native_format; if (size < sizeof(WaveHeader)) return -1; - if (h->magic != WAV_RIFF || h->type != WAV_WAVE) + if (h->magic == WAV_RIFF) + big_endian = 0; + else if (h->magic == WAV_RIFX) + big_endian = 1; + else + return -1; + if (h->type != WAV_WAVE) return -1; + if (size > sizeof(WaveHeader)) { check_wavefile_space(buffer, size - sizeof(WaveHeader), blimit); memcpy(buffer, _buffer + sizeof(WaveHeader), size - sizeof(WaveHeader)); @@ -858,7 +907,7 @@ test_wavefile_read(fd, buffer, &size, sizeof(WaveChunkHeader), __LINE__); c = (WaveChunkHeader*)buffer; type = c->type; - len = LE_INT(c->length); + len = TO_CPU_INT(c->length, big_endian); len += len % 2; if (size > sizeof(WaveChunkHeader)) memmove(buffer, buffer + sizeof(WaveChunkHeader), size - sizeof(WaveChunkHeader)); @@ -880,7 +929,8 @@ check_wavefile_space(buffer, len, blimit); test_wavefile_read(fd, buffer, &size, len, __LINE__); f = (WaveFmtBody*) buffer; - if (LE_SHORT(f->format) == WAV_FMT_EXTENSIBLE) { + format = TO_CPU_SHORT(f->format, big_endian); + if (format == WAV_FMT_EXTENSIBLE) { WaveFmtExtensibleBody *fe = (WaveFmtExtensibleBody*)buffer; if (len < sizeof(WaveFmtExtensibleBody)) { error(_("unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"), @@ -891,19 +941,20 @@ error(_("wrong format tag in extensible 'fmt ' chunk")); prg_exit(EXIT_FAILURE); } - f->format = fe->guid_format; + format = TO_CPU_SHORT(fe->guid_format, big_endian); } - if (LE_SHORT(f->format) != WAV_FMT_PCM && - LE_SHORT(f->format) != WAV_FMT_IEEE_FLOAT) { - error(_("can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"), LE_SHORT(f->format)); + if (format != WAV_FMT_PCM && + format != WAV_FMT_IEEE_FLOAT) { + error(_("can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"), format); prg_exit(EXIT_FAILURE); } - if (LE_SHORT(f->channels) < 1) { - error(_("can't play WAVE-files with %d tracks"), LE_SHORT(f->channels)); + channels = TO_CPU_SHORT(f->channels, big_endian); + if (channels < 1) { + error(_("can't play WAVE-files with %d tracks"), channels); prg_exit(EXIT_FAILURE); } - hwparams.channels = LE_SHORT(f->channels); - switch (LE_SHORT(f->bit_p_spl)) { + hwparams.channels = channels; + switch (TO_CPU_SHORT(f->bit_p_spl, big_endian)) { case 8: if (hwparams.format != DEFAULT_FORMAT && hwparams.format != SND_PCM_FORMAT_U8) @@ -911,43 +962,69 @@ hwparams.format = SND_PCM_FORMAT_U8; break; case 16: + if (big_endian) + native_format = SND_PCM_FORMAT_S16_BE; + else + native_format = SND_PCM_FORMAT_S16_LE; if (hwparams.format != DEFAULT_FORMAT && - hwparams.format != SND_PCM_FORMAT_S16_LE) - fprintf(stderr, _("Warning: format is changed to S16_LE\n")); - hwparams.format = SND_PCM_FORMAT_S16_LE; + hwparams.format != native_format) + fprintf(stderr, _("Warning: format is changed to %s\n"), + snd_pcm_format_name(native_format)); + hwparams.format = native_format; break; case 24: - switch (LE_SHORT(f->byte_p_spl) / hwparams.channels) { + switch (TO_CPU_SHORT(f->byte_p_spl, big_endian) / hwparams.channels) { case 3: + if (big_endian) + native_format = SND_PCM_FORMAT_S24_3BE; + else + native_format = SND_PCM_FORMAT_S24_3LE; if (hwparams.format != DEFAULT_FORMAT && - hwparams.format != SND_PCM_FORMAT_S24_3LE) - fprintf(stderr, _("Warning: format is changed to S24_3LE\n")); - hwparams.format = SND_PCM_FORMAT_S24_3LE; + hwparams.format != native_format) + fprintf(stderr, _("Warning: format is changed to %s\n"), + snd_pcm_format_name(native_format)); + hwparams.format = native_format; break; case 4: + if (big_endian) + native_format = SND_PCM_FORMAT_S24_BE; + else + native_format = SND_PCM_FORMAT_S24_LE; if (hwparams.format != DEFAULT_FORMAT && - hwparams.format != SND_PCM_FORMAT_S24_LE) - fprintf(stderr, _("Warning: format is changed to S24_LE\n")); - hwparams.format = SND_PCM_FORMAT_S24_LE; + hwparams.format != native_format) + fprintf(stderr, _("Warning: format is changed to %s\n"), + snd_pcm_format_name(native_format)); + hwparams.format = native_format; break; default: error(_(" can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"), - LE_SHORT(f->bit_p_spl), LE_SHORT(f->byte_p_spl), hwparams.channels); + TO_CPU_SHORT(f->bit_p_spl, big_endian), + TO_CPU_SHORT(f->byte_p_spl, big_endian), + hwparams.channels); prg_exit(EXIT_FAILURE); } break; case 32: - if (LE_SHORT(f->format) == WAV_FMT_PCM) - hwparams.format = SND_PCM_FORMAT_S32_LE; - else if (LE_SHORT(f->format) == WAV_FMT_IEEE_FLOAT) - hwparams.format = SND_PCM_FORMAT_FLOAT_LE; + if (format == WAV_FMT_PCM) { + if (big_endian) + native_format = SND_PCM_FORMAT_S32_BE; + else + native_format = SND_PCM_FORMAT_S32_LE; + hwparams.format = native_format; + } else if (format == WAV_FMT_IEEE_FLOAT) { + if (big_endian) + native_format = SND_PCM_FORMAT_FLOAT_BE; + else + native_format = SND_PCM_FORMAT_FLOAT_LE; + hwparams.format = native_format; + } break; default: error(_(" can't play WAVE-files with sample %d bits wide"), - LE_SHORT(f->bit_p_spl)); + TO_CPU_SHORT(f->bit_p_spl, big_endian)); prg_exit(EXIT_FAILURE); } - hwparams.rate = LE_INT(f->sample_fq); + hwparams.rate = TO_CPU_INT(f->sample_fq, big_endian); if (size > len) memmove(buffer, buffer + len, size - len); @@ -960,7 +1037,7 @@ test_wavefile_read(fd, buffer, &size, sizeof(WaveChunkHeader), __LINE__); c = (WaveChunkHeader*)buffer; type = c->type; - len = LE_INT(c->length); + len = TO_CPU_INT(c->length, big_endian); if (size > sizeof(WaveChunkHeader)) memmove(buffer, buffer + sizeof(WaveChunkHeader), size - sizeof(WaveChunkHeader)); size -= sizeof(WaveChunkHeader); @@ -1043,6 +1120,74 @@ } } +#ifdef CONFIG_SUPPORT_CHMAP +static int setup_chmap(void) +{ + snd_pcm_chmap_t *chmap = channel_map; + char mapped[hwparams.channels]; + snd_pcm_chmap_t *hw_chmap; + unsigned int ch, i; + int err; + + if (!chmap) + return 0; + + if (chmap->channels != hwparams.channels) { + error(_("Channel numbers don't match between hw_params and channel map")); + return -1; + } + err = snd_pcm_set_chmap(handle, chmap); + if (!err) + return 0; + + hw_chmap = snd_pcm_get_chmap(handle); + if (!hw_chmap) { + fprintf(stderr, _("Warning: unable to get channel map\n")); + return 0; + } + + if (hw_chmap->channels == chmap->channels && + !memcmp(hw_chmap, chmap, 4 * (chmap->channels + 1))) { + /* maps are identical, so no need to convert */ + free(hw_chmap); + return 0; + } + + hw_map = calloc(hwparams.channels, sizeof(int)); + if (!hw_map) { + error(_("not enough memory")); + return -1; + } + + memset(mapped, 0, sizeof(mapped)); + for (ch = 0; ch < hw_chmap->channels; ch++) { + if (chmap->pos[ch] == hw_chmap->pos[ch]) { + mapped[ch] = 1; + hw_map[ch] = ch; + continue; + } + for (i = 0; i < hw_chmap->channels; i++) { + if (!mapped[i] && chmap->pos[ch] == hw_chmap->pos[i]) { + mapped[i] = 1; + hw_map[ch] = i; + break; + } + } + if (i >= hw_chmap->channels) { + char buf[256]; + error(_("Channel %d doesn't match with hw_parmas"), ch); + snd_pcm_chmap_print(hw_chmap, sizeof(buf), buf); + fprintf(stderr, "hardware chmap = %s\n", buf); + return -1; + } + } + free(hw_chmap); + return 0; +} +#else +#define setup_chmap() 0 +#endif + static void set_params(void) { snd_pcm_hw_params_t *params; @@ -1059,6 +1204,13 @@ error(_("Broken configuration for this PCM: no configurations available")); prg_exit(EXIT_FAILURE); } + if (dump_hw_params) { + fprintf(stderr, _("HW Params of device \"%s\":\n"), + snd_pcm_name(handle)); + fprintf(stderr, "--------------------\n"); + snd_pcm_hw_params_dump(params, log); + fprintf(stderr, "--------------------\n"); + } if (mmap_flag) { snd_pcm_access_mask_t *mask = alloca(snd_pcm_access_mask_sizeof()); snd_pcm_access_mask_none(mask); @@ -1185,6 +1337,9 @@ prg_exit(EXIT_FAILURE); } + if (setup_chmap()) + prg_exit(EXIT_FAILURE); + if (verbose) snd_pcm_dump(handle, log); @@ -1230,6 +1385,10 @@ if (!interactive) return; + if (!isatty(fileno(stdin))) { + interactive = 0; + return; + } tcgetattr(fileno(stdin), &term); term_c_lflag = term.c_lflag; if (fd == fileno(stdin)) @@ -1336,6 +1495,12 @@ prg_exit(EXIT_FAILURE); } if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { + if (fatal_errors) { + error(_("fatal %s: %s"), + stream == SND_PCM_STREAM_PLAYBACK ? _("underrun") : _("overrun"), + snd_strerror(res)); + prg_exit(EXIT_FAILURE); + } if (monotonic) { #ifdef HAVE_CLOCK_GETTIME struct timespec now, diff, tstamp; @@ -1426,9 +1591,9 @@ sprintf(line + val, "| MAX"); else sprintf(line + val, "| %02i%%", maxperc); - fputs(line, stdout); + fputs(line, stderr); if (perc > 100) - printf(_(" !clip ")); + fprintf(stderr, _(" !clip ")); } static void print_vu_meter_stereo(int *perc, int *maxperc) @@ -1466,7 +1631,7 @@ memcpy(line + bar_length, tmp, 3); } line[bar_length * 2 + 6 + 2] = 0; - fputs(line, stdout); + fputs(line, stderr); } static void print_vu_meter(signed int *perc, signed int *maxperc) @@ -1604,9 +1769,9 @@ if (perc[c] > maxperc[c]) maxperc[c] = perc[c]; - putchar('\r'); + putc('\r', stderr); print_vu_meter(perc, maxperc); - fflush(stdout); + fflush(stderr); } else if(verbose==3) { printf(_("Max peak (%li samples): 0x%08x "), (long)ocount, max_peak[0]); @@ -1615,8 +1780,8 @@ putchar('#'); else putchar(' '); - printf(" %i%%\n", perc[0]); - fflush(stdout); + fprintf(stderr, " %i%%\n", perc[0]); + fflush(stderr); } } @@ -1680,6 +1845,69 @@ } /* + */ +#ifdef CONFIG_SUPPORT_CHMAP +static u_char *remap_data(u_char *data, size_t count) +{ + static u_char *tmp, *src, *dst; + static size_t tmp_size; + size_t sample_bytes = bits_per_sample / 8; + size_t step = bits_per_frame / 8; + size_t chunk_bytes; + unsigned int ch, i; + + if (!hw_map) + return data; + + chunk_bytes = count * bits_per_frame / 8; + if (tmp_size < chunk_bytes) { + free(tmp); + tmp = malloc(chunk_bytes); + if (!tmp) { + error(_("not enough memory")); + exit(1); + } + tmp_size = count; + } + + src = data; + dst = tmp; + for (i = 0; i < count; i++) { + for (ch = 0; ch < hwparams.channels; ch++) { + memcpy(dst, src + sample_bytes * hw_map[ch], + sample_bytes); + dst += sample_bytes; + } + src += step; + } + return tmp; +} + +static u_char **remap_datav(u_char **data, size_t count) +{ + static u_char **tmp; + unsigned int ch; + + if (!hw_map) + return data; + + if (!tmp) { + tmp = malloc(sizeof(*tmp) * hwparams.channels); + if (!tmp) { + error(_("not enough memory")); + exit(1); + } + for (ch = 0; ch < hwparams.channels; ch++) + tmp[ch] = data[hw_map[ch]]; + } + return tmp; +} +#else +#define remap_data(data, count) (data) +#define remap_datav(data, count) (data) +#endif + +/* * write function */ @@ -1692,6 +1920,7 @@ snd_pcm_format_set_silence(hwparams.format, data + count * bits_per_frame / 8, (chunk_size - count) * hwparams.channels); count = chunk_size; } + data = remap_data(data, count); while (count > 0) { if (test_position) do_test_position(); @@ -1734,6 +1963,7 @@ snd_pcm_format_set_silence(hwparams.format, data[channel] + offset * bits_per_sample / 8, remaining); count = chunk_size; } + data = remap_datav(data, count); while (count > 0) { unsigned int channel; void *bufs[channels]; @@ -1894,7 +2124,7 @@ return; /* not fatal error */ } snd_pcm_format_set_silence(hwparams.format, buf, chunk_size * hwparams.channels); - while (x > 0) { + while (x > 0 && !in_aborting) { l = x; if (l > chunk_size) l = chunk_size; @@ -1932,7 +2162,6 @@ u_char *data, *buf; char was_extended = 0, output = 0; u_short *sp, repeat = 0; - size_t silence; off64_t filepos = 0; #define COUNT(x) nextblock -= x; in_buffer -= x; data += x @@ -1967,7 +2196,7 @@ set_params(); in_buffer = nextblock = 0; - while (1) { + while (!in_aborting) { Fill_the_buffer: /* need this for repeat */ if (in_buffer < 32) { /* move the rest of buffer to pos 0 and fill the buf up */ @@ -2036,9 +2265,12 @@ COUNT1(1); hwparams.rate = 1000000 / (256 - hwparams.rate); set_params(); - silence = (((size_t) * sp) * 1000) / hwparams.rate; #if 0 - d_printf("Silence for %d ms\n", (int) silence); + { + size_t silence; + silence = (((size_t) * sp) * 1000) / hwparams.rate; + d_printf("Silence for %d ms\n", (int) silence); + } #endif voc_write_silence(*sp); break; @@ -2412,7 +2644,7 @@ header(rtype, name); set_params(); - while (loaded > chunk_bytes && written < count) { + while (loaded > chunk_bytes && written < count && !in_aborting) { if (pcm_write(audiobuf + written, chunk_size) <= 0) return; written += chunk_bytes; @@ -2422,7 +2654,7 @@ memmove(audiobuf, audiobuf + written, loaded); l = loaded; - while (written < count) { + while (written < count && !in_aborting) { do { c = count - written; if (c > chunk_bytes) @@ -2472,7 +2704,7 @@ name = "stdin"; } else { init_stdin(); - if ((fd = open64(name, O_RDONLY, 0)) == -1) { + if ((fd = open(name, O_RDONLY, 0)) == -1) { perror(name); prg_exit(EXIT_FAILURE); } @@ -2680,12 +2912,12 @@ { int fd; - fd = open64(name, O_WRONLY | O_CREAT, 0644); + fd = open(name, O_WRONLY | O_CREAT, 0644); if (fd == -1) { if (errno != ENOENT || !use_strftime) return -1; if (create_path(name) == 0) - fd = open64(name, O_WRONLY | O_CREAT, 0644); + fd = open(name, O_WRONLY | O_CREAT, 0644); } return fd; } @@ -2762,7 +2994,7 @@ /* capture */ fdcount = 0; - while (rest > 0 && recycle_capture_file == 0) { + while (rest > 0 && recycle_capture_file == 0 && !in_aborting) { size_t c = (rest <= (off64_t)chunk_bytes) ? (size_t)rest : chunk_bytes; size_t f = c * 8 / bits_per_frame; @@ -2789,6 +3021,9 @@ fd = -1; } + if (in_aborting) + break; + /* repeat the loop when format is raw without timelimit or * requested counts of data are recorded */ @@ -2814,7 +3049,7 @@ for (channel = 0; channel < channels; ++channel) bufs[channel] = audiobuf + vsize * channel; - while (count > 0) { + while (count > 0 && !in_aborting) { size_t c = 0; size_t expected = count / channels; if (expected > vsize) @@ -2863,7 +3098,7 @@ for (channel = 0; channel < channels; ++channel) bufs[channel] = audiobuf + vsize * channel; - while (count > 0) { + while (count > 0 && !in_aborting) { size_t rv; c = count; if (c > chunk_bytes) diff -Nru alsa-utils-1.0.25/aplay/arecord.1 alsa-utils-1.0.27.1/aplay/arecord.1 --- alsa-utils-1.0.25/aplay/arecord.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/aplay/arecord.1 2013-05-21 08:48:28.000000000 +0000 @@ -1,6 +1,6 @@ .TH APLAY 1 "1 January 2010" .SH NAME -arecord, aplay \- command-line sound recorder and player for ALSA +arecord, aplay \- command\-line sound recorder and player for ALSA soundcard driver .SH SYNOPSIS \fBarecord\fP [\fIflags\fP] [filename] @@ -8,7 +8,7 @@ \fBaplay\fP [\fIflags\fP] [filename [filename]] ... .SH DESCRIPTION -\fBarecord\fP is a command-line soundfile recorder for the ALSA soundcard +\fBarecord\fP is a command\-line soundfile recorder for the ALSA soundcard driver. It supports several file formats and multiple soundcards with multiple devices. If recording with interleaved mode samples the file is automatically split before the 2GB filesize. @@ -81,11 +81,11 @@ Min ticks to sleep. The default is not to sleep. .TP \fI\-M, \-\-mmap\fP -Use memory-mapped (mmap) I/O mode for the audio stream. +Use memory\-mapped (mmap) I/O mode for the audio stream. If this option is not set, the read/write I/O mode will be used. .TP \fI\-N, \-\-nonblock\fP -Open the audio device in non-blocking mode. If the device is busy the program will exit immediately. +Open the audio device in non\-blocking mode. If the device is busy the program will exit immediately. If this option is not set the program will block until the audio device is available again. .TP \fI\-F, \-\-period\-time=#\fP @@ -120,8 +120,8 @@ is given twice or three times. .TP \fI\-V, \-\-vumeter=TYPE\fP -Specifies the VU-meter type, either \fIstereo\fP or \fImono\fP. -The stereo VU-meter is available only for 2-channel stereo samples +Specifies the VU\-meter type, either \fIstereo\fP or \fImono\fP. +The stereo VU\-meter is available only for 2\-channel stereo samples with interleaved format. .TP \fI\-I, \-\-separate\-channels\fP @@ -141,6 +141,17 @@ Allow interactive operation via stdin. Currently only pause/resume via space or enter key is implemented. .TP +\fI-m, \-\-chmap=ch1,ch2,...\fP +Give the channel map to override or follow. Pass channel position +strings like \fIFL\fP, \fIFR\fP, etc. + +If a device supports the override of the channel map, \fBaplay\fP +tries to pass the given channel map. +If it doesn't support the channel map override but still it provides +the channel map information, \fBaplay\fP tries to rearrange the +channel order in the buffer to match with the returned channel map +from the device. +.TP \fI\-\-disable\-resample\fP Disable automatic rate resample. .TP @@ -162,7 +173,7 @@ Minimum value is 1. .TP \fI\-\-test\-nowait\fP -Do not wait for the ring buffer--eats the whole CPU. +Do not wait for the ring buffer \(hy eats the whole CPU. .TP \fI\-\-max\-file\-time\fP While recording, when the output file has been accumulating @@ -177,13 +188,24 @@ send signals to it. .TP \fI\-\-use\-strftime\fP -When recording, interpret %-codes in the file name parameter using +When recording, interpret %\-codes in the file name parameter using the strftime facility whenever the output file is opened. The important strftime codes are: %Y is the year, %m month, %d day of the month, %H hour, %M minute and %S second. In addition, %v is the file number, starting at 1. When this option is specified, intermediate directories for the output file are created automatically. This option has no effect if \-\-separate\-channels is specified. +.TP +\fI\-\-dump\-hw\-params\fP +Dump hw_params of the device preconfigured status to stderr. The dump +lists capabilities of the selected device such as supported formats, +sampling rates, numbers of channels, period and buffer bytes/sizes/times. +For raw device hw:X this option basically lists hardware capabilities of +the soundcard. +.TP +\fI\-\-fatal\-errors\fP +Disables recovery attempts when errors (e.g. xrun) are encountered; the +aplay process instead aborts immediately. .SH SIGNALS When recording, SIGINT, SIGTERM and SIGABRT will close the output @@ -196,11 +218,11 @@ .TP \fBaplay \-c 1 \-t raw \-r 22050 \-f mu_law foobar\fR will play the raw file "foobar" as a -22050-Hz, mono, 8-bit, Mu-Law .au file. +22050\-Hz, mono, 8\-bit, Mu\-Law .au file. .TP \fBarecord \-d 10 \-f cd \-t wav \-D copy foobar.wav\fP -will record foobar.wav as a 10-second, CD-quality wave file, using the +will record foobar.wav as a 10\-second, CD\-quality wave file, using the PCM "copy" (which might be defined in the user's .asoundrc file as: .nf pcm.copy { @@ -213,14 +235,14 @@ .fi .TP -\fBarecord \-t wav \-max-file_time 30 mon.wav\fP +\fBarecord \-t wav \-\-max\-file\-time 30 mon.wav\fP Record from the default audio source in monaural, 8,000 samples per second, 8 bits per sample. Start a new file every -30 seconds. File names are mon-nn.wav, where nn increases -from 01. The file after mon-99.wav is mon-100.wav. +30 seconds. File names are mon\-nn.wav, where nn increases +from 01. The file after mon\-99.wav is mon\-100.wav. .TP -\fBarecord \-f cd \-t wav \-max-file-time 3600 --use-strftime %Y/%m/%d/listen-%H-%M-%v.wav\fP +\fBarecord \-f cd \-t wav \-\-max\-file\-time 3600 \-\-use-strftime %Y/%m/%d/listen-%H-%M-%v.wav\fP Record in stereo from the default audio source. Create a new file every hour. The files are placed in directories based on their start dates and have names which include their start times and file numbers. diff -Nru alsa-utils-1.0.25/aplay/formats.h alsa-utils-1.0.27.1/aplay/formats.h --- alsa-utils-1.0.25/aplay/formats.h 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/aplay/formats.h 2013-05-21 08:48:28.000000000 +0000 @@ -60,7 +60,14 @@ #error "Wrong endian" #endif +/* Note: the following macros evaluate the parameter v twice */ +#define TO_CPU_SHORT(v, be) \ + ((be) ? BE_SHORT(v) : LE_SHORT(v)) +#define TO_CPU_INT(v, be) \ + ((be) ? BE_INT(v) : LE_INT(v)) + #define WAV_RIFF COMPOSE_ID('R','I','F','F') +#define WAV_RIFX COMPOSE_ID('R','I','F','X') #define WAV_WAVE COMPOSE_ID('W','A','V','E') #define WAV_FMT COMPOSE_ID('f','m','t',' ') #define WAV_DATA COMPOSE_ID('d','a','t','a') diff -Nru alsa-utils-1.0.25/config.guess alsa-utils-1.0.27.1/config.guess --- alsa-utils-1.0.25/config.guess 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/config.guess 2013-05-21 08:50:36.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -857,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,7 +1253,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1321,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru alsa-utils-1.0.25/config.rpath alsa-utils-1.0.27.1/config.rpath --- alsa-utils-1.0.25/config.rpath 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/config.rpath 2013-05-21 08:50:34.000000000 +0000 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2006 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ ;; esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -74,9 +74,15 @@ ;; newsos6) ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -100,7 +106,7 @@ osf3* | osf4* | osf5*) wl='-Wl,' ;; - sco3.2v5*) + rdos*) ;; solaris*) wl='-Wl,' @@ -108,11 +114,14 @@ sunos4*) wl='-Qoption ld ' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) wl='-Wl,' ;; sysv4*MP*) ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; unicos*) wl='-Wl,' ;; @@ -121,7 +130,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -129,7 +138,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -155,7 +164,7 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -179,7 +188,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -189,11 +198,11 @@ ld_shlibs=no fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -251,7 +260,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -261,7 +270,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -280,7 +289,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -323,7 +332,7 @@ ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -359,7 +368,7 @@ hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -412,18 +421,22 @@ hardcode_libdir_separator=: ;; openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; os2*) @@ -471,7 +484,7 @@ ld_shlibs=yes fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ;; sysv5* | sco3.2v5* | sco5v6*) hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' @@ -487,34 +500,52 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. +# Unlike libtool.m4, here we don't care about _all_ names of the library, but +# only about the one the linker finds when passed -lNAME. This is the last +# element of library_names_spec in libtool.m4, or possibly two of them if the +# linker has special search rules. +library_names_spec= # the last element of library_names_spec in libtool.m4 libname_spec='lib$name' case "$host_os" in aix3*) + library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) + library_names_spec='$libname$shrext' ;; amigaos*) + library_names_spec='$libname.a' ;; beos*) + library_names_spec='$libname$shrext' ;; bsdi[45]*) + library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' ;; darwin* | rhapsody*) shrext=.dylib + library_names_spec='$libname$shrext' ;; dgux*) + library_names_spec='$libname$shrext' ;; freebsd1*) ;; - kfreebsd*-gnu) - ;; freebsd* | dragonfly*) + case "$host_os" in + freebsd[123]*) + library_names_spec='$libname$shrext$versuffix' ;; + *) + library_names_spec='$libname$shrext' ;; + esac ;; gnu*) + library_names_spec='$libname$shrext' ;; hpux9* | hpux10* | hpux11*) case $host_cpu in @@ -528,10 +559,13 @@ shrext=.sl ;; esac + library_names_spec='$libname$shrext' ;; - interix3*) + interix[3-9]*) + library_names_spec='$libname$shrext' ;; irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' case "$host_os" in irix5* | nonstopux*) libsuff= shlibsuff= @@ -548,41 +582,59 @@ ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux*) + linux* | k*bsd*-gnu) + library_names_spec='$libname$shrext' ;; knetbsd*-gnu) + library_names_spec='$libname$shrext' ;; netbsd*) + library_names_spec='$libname$shrext' ;; newsos6) + library_names_spec='$libname$shrext' ;; nto-qnx*) + library_names_spec='$libname$shrext' ;; openbsd*) + library_names_spec='$libname$shrext$versuffix' ;; os2*) libname_spec='$name' shrext=.dll + library_names_spec='$libname.a' ;; osf3* | osf4* | osf5*) + library_names_spec='$libname$shrext' + ;; + rdos*) ;; solaris*) + library_names_spec='$libname$shrext' ;; sunos4*) + library_names_spec='$libname$shrext$versuffix' ;; sysv4 | sysv4.3*) + library_names_spec='$libname$shrext' ;; sysv4*MP*) + library_names_spec='$libname$shrext' ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + library_names_spec='$libname$shrext' ;; uts4*) + library_names_spec='$libname$shrext' ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -75,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -156,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +296,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,21 +367,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +411,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +788,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +903,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +991,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1147,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1218,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1318,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1358,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1501,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1525,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1540,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1573,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru alsa-utils-1.0.25/configure alsa-utils-1.0.27.1/configure --- alsa-utils-1.0.25/configure 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/configure 2013-05-21 08:50:37.000000000 +0000 @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -564,6 +584,7 @@ ac_unique_file="aplay/aplay.c" ac_default_prefix=/usr +gt_needs= # Factoring default headers for most tests. ac_includes_default="\ #include @@ -604,11 +625,12 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ALSACTL_DAEMONSWITCH +ALSACTL_PIDFILE_DIR ASOUND_STATE_DIR HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE systemdsystemunitdir -PKG_CONFIG LIBRT SND_UTIL_SUBMINOR SND_UTIL_MINOR @@ -619,10 +641,11 @@ CURSESLIB CURSESINC ncurses5_config +NCURSES_LIBS +NCURSES_CFLAGS ncursesw5_config -EGREP -GREP -CPP +NCURSESW_LIBS +NCURSESW_CFLAGS udevrulesdir USE_XMLTO_FALSE USE_XMLTO_TRUE @@ -645,6 +668,9 @@ HAVE_PCM_TRUE ALSA_LIBS ALSA_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG SED LN_S POSUB @@ -654,6 +680,9 @@ LTLIBICONV LIBICONV INTL_MACOSX_LIBS +EGREP +GREP +CPP host_os host_vendor host_cpu @@ -665,6 +694,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -678,6 +708,7 @@ LDFLAGS CFLAGS CC +XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 XGETTEXT @@ -685,7 +716,11 @@ MSGFMT_015 GMSGFMT MSGFMT +GETTEXT_MACRO_VERSION USE_NLS +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -750,6 +785,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode enable_nls enable_dependency_tracking with_gnu_ld @@ -770,6 +806,8 @@ enable_largefile with_systemdsystemunitdir with_asound_state_dir +with_alsactl_pidfile_dir +with_alsactl_daemonswitch ' ac_precious_vars='build_alias host_alias @@ -780,7 +818,13 @@ LIBS CPPFLAGS CPP -PKG_CONFIG' +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +NCURSESW_CFLAGS +NCURSESW_LIBS +NCURSES_CFLAGS +NCURSES_LIBS' # Initialize some variables set by options. @@ -1236,8 +1280,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1399,9 +1441,14 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --disable-nls do not use Native Language Support - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-rpath do not hardcode runtime library paths --disable-alsatest Do not try to compile and run a test Alsa program --disable-alsamixer Disable alsamixer compilation @@ -1423,12 +1470,16 @@ --with-librt Use librt for monotonic clock (default = yes) --with-udev-rules-dir Directory where to install udev rules to (defaults to /lib/udev/rules.d) - --with-curses libname Specify the curses library to use (default=auto) - --with-testsound=file give the path of test sound file for alsaconf + --with-curses=libname Specify the curses library to use (default=auto) + --with-testsound=file give the path of test sound file for alsaconf --with-systemdsystemunitdir=DIR Directory for systemd service files --with-asound-state-dir=DIR Directory to place asound.state file in + --with-alsactl-pidfile-dir=DIR + Directory to place alsactl.pid file in + --with-alsactl-daemonswitch=FILE + File to test for the daemon mode Some influential environment variables: CC C compiler command @@ -1440,6 +1491,18 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + NCURSESW_CFLAGS + C compiler flags for NCURSESW, overriding pkg-config + NCURSESW_LIBS + linker flags for NCURSESW, overriding pkg-config + NCURSES_CFLAGS + C compiler flags for NCURSES, overriding pkg-config + NCURSES_LIBS + linker flags for NCURSES, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1508,9 +1571,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1559,6 +1622,43 @@ } # ac_fn_c_try_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1586,7 +1686,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1605,6 +1705,48 @@ } # ac_fn_c_try_link +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -1703,85 +1845,6 @@ } # ac_fn_c_check_header_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -1873,7 +1936,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2152,6 +2215,7 @@ >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2221,7 +2285,7 @@ -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2289,7 +2353,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2347,9 +2411,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2360,32 +2421,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2397,6 +2466,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2423,8 +2502,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2436,10 +2515,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2458,7 +2537,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2498,7 +2577,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2549,7 +2628,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2578,12 +2657,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2602,7 +2675,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2687,8 +2760,9 @@ # Define the identity of the package. + PACKAGE=alsa-utils - VERSION=1.0.25 + VERSION=1.0.27.1 cat >>confdefs.h <<_ACEOF @@ -2716,18 +2790,55 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 @@ -2745,6 +2856,9 @@ + GETTEXT_MACRO_VERSION=0.18 + + # Prepare PATH_SEPARATOR. @@ -2834,7 +2948,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3020,6 +3134,9 @@ test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" @@ -3058,7 +3175,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3091,6 +3208,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3123,7 +3241,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3163,7 +3281,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3216,7 +3334,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3257,7 +3375,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3315,7 +3433,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3359,7 +3477,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3805,8 +3923,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3902,8 +4019,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3937,16 +4055,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3955,16 +4073,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4129,7 +4247,7 @@ # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -4163,9 +4281,9 @@ # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -4220,12 +4338,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : @@ -4235,59 +4355,376 @@ - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then : - withval=$with_libiconv_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + + + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + + + + + + + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then : + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" exec_prefix="$acl_save_exec_prefix" @@ -4296,6 +4733,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -4304,6 +4745,8 @@ LIBICONV= LTLIBICONV= INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -4337,22 +4780,52 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBICONV; do @@ -4368,21 +4841,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -4393,7 +4889,9 @@ if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -4406,10 +4904,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" haveit= for x in $rpathdirs; do @@ -4441,7 +4939,7 @@ if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -4460,6 +4958,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -4508,9 +5016,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -4610,21 +5120,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -4654,6 +5164,18 @@ + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : @@ -4736,45 +5258,67 @@ LTLIBINTL= POSUB= + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - - - + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if ${gt_cv_func_gnugettext1_libc+:} false; then : +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; int main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libc=yes + eval "$gt_func_gnugettext_libc=yes" else - gt_cv_func_gnugettext1_libc=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -4862,6 +5406,123 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +else + am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then $as_echo "#define HAVE_ICONV 1" >>confdefs.h @@ -4883,6 +5544,10 @@ + + + + use_additional=yes acl_save_prefix="$prefix" @@ -4919,6 +5584,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -4927,6 +5596,8 @@ LIBINTL= LTLIBINTL= INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -4960,22 +5631,52 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBINTL; do @@ -4991,21 +5692,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -5016,7 +5740,9 @@ if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -5029,10 +5755,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -5064,7 +5790,7 @@ if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -5083,6 +5809,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -5131,9 +5867,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -5233,21 +5971,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -5259,9 +5997,14 @@ done fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if ${gt_cv_func_gnugettext1_libintl+:} false; then : +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -5271,6 +6014,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus @@ -5281,23 +6025,24 @@ main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" else - gt_cv_func_gnugettext1_libintl=no + eval "$gt_func_gnugettext_libintl=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus @@ -5308,7 +6053,7 @@ main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -5316,7 +6061,7 @@ if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -5325,12 +6070,13 @@ CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -5368,7 +6114,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -5383,7 +6129,7 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 $as_echo_n "checking how to link with libintl... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 @@ -5473,7 +6219,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5513,7 +6259,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5566,7 +6312,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5607,7 +6353,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -5665,7 +6411,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5709,7 +6455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5905,8 +6651,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -6002,8 +6747,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -6037,16 +6783,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -6055,16 +6801,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -6153,7 +6899,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6179,27 +6925,146 @@ # 10*(2^10) chars as input seems more than enough test $ac_count -gt 10 && break done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi else - ac_cv_path_SED=$SED + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi alsa_save_CFLAGS="$CFLAGS" alsa_save_LDFLAGS="$LDFLAGS" alsa_save_LIBS="$LIBS" @@ -6252,6 +7117,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 $as_echo "$ALSA_LIBS" >&6; } +if test "x$enable_alsatest" = "xyes"; then min_alsa_version=1.0.24 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libasound headers version >= $min_alsa_version" >&5 $as_echo_n "checking for libasound headers version >= $min_alsa_version... " >&6; } @@ -6332,6 +7198,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +fi if test "x$enable_alsatest" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_ctl_open in -lasound" >&5 @@ -6403,6 +7270,7 @@ +if test "x$enable_alsatest" = "xyes"; then ac_fn_c_check_func "$LINENO" "snd_ctl_elem_add_enumerated" "ac_cv_func_snd_ctl_elem_add_enumerated" if test "x$ac_cv_func_snd_ctl_elem_add_enumerated" = xyes; then : @@ -6410,6 +7278,7 @@ as_fn_error $? "No user enum control support in alsa-lib" "$LINENO" 5 fi +fi for ac_header in alsa/pcm.h do : @@ -6562,436 +7431,168 @@ { return clock_gettime (); ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_rt_clock_gettime=yes -else - ac_cv_lib_rt_clock_gettime=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : - HAVE_LIBRT="yes" -fi - - if test "$HAVE_LIBRT" = "yes" ; then - LIBRT="-lrt" - -$as_echo "#define HAVE_LIBRT 1" >>confdefs.h - - -$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h - - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -CURSESINC="" -CURSESLIB="" -CURSES_CFLAGS="" -alsamixer= -if test "$have_mixer" = "yes"; then -# Check whether --enable-alsamixer was given. -if test "${enable_alsamixer+set}" = set; then : - enableval=$enable_alsamixer; case "${enableval}" in - yes) alsamixer=true ;; - no) alsamixer=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-alsamixer" "$LINENO" 5 ;; - esac -else - alsamixer=true -fi - -fi - if test x$alsamixer = xtrue; then - ALSAMIXER_TRUE= - ALSAMIXER_FALSE='#' -else - ALSAMIXER_TRUE='#' - ALSAMIXER_FALSE= -fi - - -# Check whether --enable-alsaconf was given. -if test "${enable_alsaconf+set}" = set; then : - enableval=$enable_alsaconf; case "${enableval}" in - yes) alsaconf=true ;; - no) alsaconf=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-alsaconf" "$LINENO" 5 ;; - esac -else - alsaconf=true -fi - - if test x$alsaconf = xtrue; then - ALSACONF_TRUE= - ALSACONF_FALSE='#' -else - ALSACONF_TRUE='#' - ALSACONF_FALSE= -fi - - -# Check whether --enable-alsaloop was given. -if test "${enable_alsaloop+set}" = set; then : - enableval=$enable_alsaloop; case "${enableval}" in - yes) alsaloop=true ;; - no) alsaloop=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-alsaloop" "$LINENO" 5 ;; - esac -else - alsaloop=true -fi - - if test x$alsaloop = xtrue; then - ALSALOOP_TRUE= - ALSALOOP_FALSE='#' -else - ALSALOOP_TRUE='#' - ALSALOOP_FALSE= -fi - - -xmlto="" -# Check whether --enable-xmlto was given. -if test "${enable_xmlto+set}" = set; then : - enableval=$enable_xmlto; xmlto="$enableval" -else - xmlto="yes" -fi - -if test "$xmlto" = "yes"; then - # Extract the first word of "xmlto", so it can be a program name with args. -set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_xmlto+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$xmlto"; then - ac_cv_prog_xmlto="$xmlto" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_xmlto="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -xmlto=$ac_cv_prog_xmlto -if test -n "$xmlto"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto" >&5 -$as_echo "$xmlto" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi - if test x"$xmlto" = xyes; then - USE_XMLTO_TRUE= - USE_XMLTO_FALSE='#' -else - USE_XMLTO_TRUE='#' - USE_XMLTO_FALSE= -fi - - - -# Check whether --with-udev-rules-dir was given. -if test "${with_udev_rules_dir+set}" = set; then : - withval=$with_udev_rules_dir; udevrulesdir=$withval -else - udevrulesdir="/lib/udev/rules.d" -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes else - # Broken: fails on valid input. -continue + ac_cv_lib_rt_clock_gettime=no fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + HAVE_LIBRT="yes" fi - done - ac_cv_prog_CPP=$CPP + if test "$HAVE_LIBRT" = "yes" ; then + LIBRT="-lrt" -fi - CPP=$ac_cv_prog_CPP +$as_echo "#define HAVE_LIBRT 1" >>confdefs.h + + +$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + fi else - ac_cv_prog_CPP=$CPP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +CURSESINC="" +CURSESLIB="" +CURSES_CFLAGS="" +alsamixer= +if test "$have_mixer" = "yes"; then +# Check whether --enable-alsamixer was given. +if test "${enable_alsamixer+set}" = set; then : + enableval=$enable_alsamixer; case "${enableval}" in + yes) alsamixer=true ;; + no) alsamixer=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-alsamixer" "$LINENO" 5 ;; + esac else - # Broken: fails on valid input. -continue + alsamixer=true fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +fi + if test x$alsamixer = xtrue; then + ALSAMIXER_TRUE= + ALSAMIXER_FALSE='#' else - # Passes both tests. -ac_preproc_ok=: -break + ALSAMIXER_TRUE='#' + ALSAMIXER_FALSE= fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +# Check whether --enable-alsaconf was given. +if test "${enable_alsaconf+set}" = set; then : + enableval=$enable_alsaconf; case "${enableval}" in + yes) alsaconf=true ;; + no) alsaconf=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-alsaconf" "$LINENO" 5 ;; + esac else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } + alsaconf=true fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 + if test x$alsaconf = xtrue; then + ALSACONF_TRUE= + ALSACONF_FALSE='#' else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac + ALSACONF_TRUE='#' + ALSACONF_FALSE= +fi - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi + +# Check whether --enable-alsaloop was given. +if test "${enable_alsaloop+set}" = set; then : + enableval=$enable_alsaloop; case "${enableval}" in + yes) alsaloop=true ;; + no) alsaloop=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-alsaloop" "$LINENO" 5 ;; + esac else - ac_cv_path_GREP=$GREP + alsaloop=true fi + if test x$alsaloop = xtrue; then + ALSALOOP_TRUE= + ALSALOOP_FALSE='#' +else + ALSALOOP_TRUE='#' + ALSALOOP_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac +xmlto="" +# Check whether --enable-xmlto was given. +if test "${enable_xmlto+set}" = set; then : + enableval=$enable_xmlto; xmlto="$enableval" +else + xmlto="yes" +fi - $ac_path_EGREP_found && break 3 - done - done +if test "$xmlto" = "yes"; then + # Extract the first word of "xmlto", so it can be a program name with args. +set dummy xmlto; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_xmlto+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$xmlto"; then + ac_cv_prog_xmlto="$xmlto" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_xmlto="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi + +fi +fi +xmlto=$ac_cv_prog_xmlto +if test -n "$xmlto"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto" >&5 +$as_echo "$xmlto" >&6; } else - ac_cv_path_EGREP=$EGREP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" + if test x"$xmlto" = xyes; then + USE_XMLTO_TRUE= + USE_XMLTO_FALSE='#' +else + USE_XMLTO_TRUE='#' + USE_XMLTO_FALSE= +fi + + + +# Check whether --with-udev-rules-dir was given. +if test "${with_udev_rules_dir+set}" = set; then : + withval=$with_udev_rules_dir; udevrulesdir=$withval +else + udevrulesdir="/lib/udev/rules.d" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 @@ -7087,47 +7688,358 @@ return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +if test x$alsamixer = xtrue; then + +# Check whether --with-curses was given. +if test "${with_curses+set}" = set; then : + withval=$with_curses; curseslib="$withval" +else + curseslib="auto" +fi + + CURSESLIBDIR="" + NCURSESLIBSUFFIX="" + CURSES_NLS="no" + if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSESW" >&5 +$as_echo_n "checking for NCURSESW... " >&6; } + +if test -n "$NCURSESW_CFLAGS"; then + pkg_cv_NCURSESW_CFLAGS="$NCURSESW_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSESW_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$NCURSESW_LIBS"; then + pkg_cv_NCURSESW_LIBS="$NCURSESW_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSESW_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + NCURSESW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ncursesw" 2>&1` + else + NCURSESW_PKG_ERRORS=`$PKG_CONFIG --print-errors "ncursesw" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NCURSESW_PKG_ERRORS" >&5 + + + # Extract the first word of "ncursesw5-config", so it can be a program name with args. +set dummy ncursesw5-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ncursesw5_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ncursesw5_config"; then + ac_cv_prog_ncursesw5_config="$ncursesw5_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ncursesw5_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ncursesw5_config=$ac_cv_prog_ncursesw5_config +if test -n "$ncursesw5_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ncursesw5_config" >&5 +$as_echo "$ncursesw5_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$ncursesw5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncursesw5-config --libs` + CURSESLIBDIR=`ncursesw5-config --libdir` + CURSES_CFLAGS=`ncursesw5-config --cflags` + curseslib="ncursesw" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5 +$as_echo_n "checking for initscr in -lncursesw... " >&6; } +if ${ac_cv_lib_ncursesw_initscr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncursesw $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncursesw_initscr=yes +else + ac_cv_lib_ncursesw_initscr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5 +$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; } +if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then : + CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw" +fi + + fi + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # Extract the first word of "ncursesw5-config", so it can be a program name with args. +set dummy ncursesw5-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ncursesw5_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ncursesw5_config"; then + ac_cv_prog_ncursesw5_config="$ncursesw5_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ncursesw5_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ncursesw5_config=$ac_cv_prog_ncursesw5_config +if test -n "$ncursesw5_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ncursesw5_config" >&5 +$as_echo "$ncursesw5_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$ncursesw5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncursesw5-config --libs` + CURSESLIBDIR=`ncursesw5-config --libdir` + CURSES_CFLAGS=`ncursesw5-config --cflags` + curseslib="ncursesw" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5 +$as_echo_n "checking for initscr in -lncursesw... " >&6; } +if ${ac_cv_lib_ncursesw_initscr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncursesw $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncursesw_initscr=yes else - ac_cv_header_stdc=no + ac_cv_lib_ncursesw_initscr=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5 +$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; } +if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then : + CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw" +fi + + fi + +else + NCURSESW_CFLAGS=$pkg_cv_NCURSESW_CFLAGS + NCURSESW_LIBS=$pkg_cv_NCURSESW_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CURSESINC="" + CURSESLIB="${NCURSESW_LIBS}" + CURSESLIBDIR= + CURSES_CFLAGS="${NCURSESW_CFLAGS}" + curseslib="ncursesw" + fi + if test -n "$CURSESINC"; then + NCURSESLIBSUFFIX="w" + CURSES_NLS="yes" + fi + fi + if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSES" >&5 +$as_echo_n "checking for NCURSES... " >&6; } + +if test -n "$NCURSES_CFLAGS"; then + pkg_cv_NCURSES_CFLAGS="$NCURSES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSES_CFLAGS=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null` +else + pkg_failed=yes fi + else + pkg_failed=untried +fi +if test -n "$NCURSES_LIBS"; then + pkg_cv_NCURSES_LIBS="$NCURSES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSES_LIBS=`$PKG_CONFIG --libs "ncurses" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi -if test x$alsamixer = xtrue; then +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -# Check whether --with-curses was given. -if test "${with_curses+set}" = set; then : - withval=$with_curses; curseslib="$withval" +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - curseslib="auto" + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + NCURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ncurses" 2>&1` + else + NCURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors "ncurses" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NCURSES_PKG_ERRORS" >&5 - CURSESLIBDIR="" - NCURSESLIBSUFFIX="" - CURSES_NLS="no" - if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then - # Extract the first word of "ncursesw5-config", so it can be a program name with args. -set dummy ncursesw5-config; ac_word=$2 + + # Extract the first word of "ncurses5-config", so it can be a program name with args. +set dummy ncurses5-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ncursesw5_config+:} false; then : +if ${ac_cv_prog_ncurses5_config+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ncursesw5_config"; then - ac_cv_prog_ncursesw5_config="$ncursesw5_config" # Let the user override the test. + if test -n "$ncurses5_config"; then + ac_cv_prog_ncurses5_config="$ncurses5_config" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7135,8 +8047,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ncursesw5_config="yes" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ncurses5_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7146,30 +8058,30 @@ fi fi -ncursesw5_config=$ac_cv_prog_ncursesw5_config -if test -n "$ncursesw5_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ncursesw5_config" >&5 -$as_echo "$ncursesw5_config" >&6; } +ncurses5_config=$ac_cv_prog_ncurses5_config +if test -n "$ncurses5_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ncurses5_config" >&5 +$as_echo "$ncurses5_config" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "$ncursesw5_config" = "yes"; then - CURSESINC="" - CURSESLIB=`ncursesw5-config --libs` - CURSESLIBDIR=`ncursesw5-config --libdir` - CURSES_CFLAGS=`ncursesw5-config --cflags` - curseslib="ncursesw" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5 -$as_echo_n "checking for initscr in -lncursesw... " >&6; } -if ${ac_cv_lib_ncursesw_initscr+:} false; then : + if test "$ncurses5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncurses5-config --libs` + CURSESLIBDIR=`ncurses5-config --libdir` + CURSES_CFLAGS=`ncurses5-config --cflags` + curseslib="ncurses" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 +$as_echo_n "checking for initscr in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lncursesw $LIBS" +LIBS="-lncurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7189,28 +8101,27 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ncursesw_initscr=yes + ac_cv_lib_ncurses_initscr=yes else - ac_cv_lib_ncursesw_initscr=no + ac_cv_lib_ncurses_initscr=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5 -$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; } -if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then : - CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 +$as_echo "$ac_cv_lib_ncurses_initscr" >&6; } +if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : + CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses" fi - fi - if test -n "$CURSESINC"; then - NCURSESLIBSUFFIX="w" - CURSES_NLS="yes" - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then - # Extract the first word of "ncurses5-config", so it can be a program name with args. + fi + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # Extract the first word of "ncurses5-config", so it can be a program name with args. set dummy ncurses5-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -7226,7 +8137,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ncurses5_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7247,14 +8158,14 @@ fi - if test "$ncurses5_config" = "yes"; then - CURSESINC="" - CURSESLIB=`ncurses5-config --libs` - CURSESLIBDIR=`ncurses5-config --libdir` - CURSES_CFLAGS=`ncurses5-config --cflags` - curseslib="ncurses" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 + if test "$ncurses5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncurses5-config --libs` + CURSESLIBDIR=`ncurses5-config --libdir` + CURSES_CFLAGS=`ncurses5-config --cflags` + curseslib="ncurses" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 $as_echo_n "checking for initscr in -lncurses... " >&6; } if ${ac_cv_lib_ncurses_initscr+:} false; then : $as_echo_n "(cached) " >&6 @@ -7294,7 +8205,21 @@ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses" fi - fi + fi + +else + NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS + NCURSES_LIBS=$pkg_cv_NCURSES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CURSESINC="" + CURSESLIB="${NCURSES_LIBS}" + CURSESLIBDIR= + CURSES_CFLAGS="${NCURSES_CFLAGS}" + curseslib="ncurses" + +fi fi if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 @@ -7658,11 +8583,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -7679,8 +8604,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -7696,10 +8622,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -8044,6 +8970,8 @@ esac rm -rf conftest* fi + + fi @@ -8067,122 +8995,6 @@ - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi - # Check whether --with-systemdsystemunitdir was given. if test "${with_systemdsystemunitdir+set}" = set; then : withval=$with_systemdsystemunitdir; @@ -8213,6 +9025,26 @@ + +# Check whether --with-alsactl-pidfile-dir was given. +if test "${with_alsactl_pidfile_dir+set}" = set; then : + withval=$with_alsactl_pidfile_dir; ALSACTL_PIDFILE_DIR="$withval" +else + ALSACTL_PIDFILE_DIR="/var/run" +fi + + + + +# Check whether --with-alsactl-daemonswitch was given. +if test "${with_alsactl_daemonswitch+set}" = set; then : + withval=$with_alsactl_daemonswitch; ALSACTL_DAEMONSWITCH="$withval" +else + ALSACTL_DAEMONSWITCH="/etc/alsa/state-daemon.conf" +fi + + + ac_config_files="$ac_config_files Makefile alsactl/Makefile alsactl/init/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile m4/Makefile po/Makefile.in alsaconf/alsaconf alsaconf/Makefile alsaconf/po/Makefile alsaucm/Makefile aplay/Makefile include/Makefile iecset/Makefile utils/Makefile utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile seq/aplaymidi/Makefile seq/aseqdump/Makefile seq/aseqnet/Makefile speaker-test/Makefile speaker-test/samples/Makefile alsaloop/Makefile" cat >confcache <<\_ACEOF @@ -8324,6 +9156,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -8332,6 +9172,10 @@ am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8682,16 +9526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -8751,28 +9595,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -8794,7 +9626,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8860,10 +9692,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8954,7 +9786,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -9745,7 +10577,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -9779,21 +10611,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru alsa-utils-1.0.25/configure.in alsa-utils-1.0.27.1/configure.in --- alsa-utils-1.0.25/configure.in 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/configure.in 2013-05-21 08:50:34.000000000 +0000 @@ -2,7 +2,9 @@ AC_PREREQ(2.59) AC_INIT(aplay/aplay.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.25) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.27.1) + +AM_MAINTAINER_MODE([enable]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.15]) @@ -29,9 +31,12 @@ AC_PROG_MKDIR_P AC_PROG_LN_S AC_PROG_SED +PKG_PROG_PKG_CONFIG AM_PATH_ALSA(1.0.24) +if test "x$enable_alsatest" = "xyes"; then AC_CHECK_FUNC([snd_ctl_elem_add_enumerated], , [AC_ERROR([No user enum control support in alsa-lib])]) +fi dnl Check components AC_CHECK_HEADERS([alsa/pcm.h], [have_pcm="yes"], [have_pcm="no"], @@ -75,7 +80,7 @@ alsamixer= if test "$have_mixer" = "yes"; then AC_ARG_ENABLE(alsamixer, - [ --disable-alsamixer Disable alsamixer compilation], + AS_HELP_STRING([--disable-alsamixer], [Disable alsamixer compilation]), [case "${enableval}" in yes) alsamixer=true ;; no) alsamixer=false ;; @@ -86,7 +91,7 @@ dnl Disable alsaconf AC_ARG_ENABLE(alsaconf, - [ --disable-alsaconf Disable alsaconf packaging], + AS_HELP_STRING([--disable-alsaconf], [Disable alsaconf packaging]), [case "${enableval}" in yes) alsaconf=true ;; no) alsaconf=false ;; @@ -96,7 +101,7 @@ dnl Disable alsaloop AC_ARG_ENABLE(alsaloop, - [ --disable-alsaloop Disable alsaloop packaging], + AS_HELP_STRING([--disable-alsaloop], [Disable alsaloop packaging]), [case "${enableval}" in yes) alsaloop=true ;; no) alsaloop=false ;; @@ -123,41 +128,59 @@ AC_HEADER_STDC if test x$alsamixer = xtrue; then AC_ARG_WITH(curses, - [ --with-curses libname Specify the curses library to use (default=auto)], + AS_HELP_STRING([--with-curses=libname], [Specify the curses library to use (default=auto)]), curseslib="$withval", curseslib="auto") CURSESLIBDIR="" NCURSESLIBSUFFIX="" CURSES_NLS="no" if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then - AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) - if test "$ncursesw5_config" = "yes"; then - CURSESINC="" - CURSESLIB=`ncursesw5-config --libs` - CURSESLIBDIR=`ncursesw5-config --libdir` - CURSES_CFLAGS=`ncursesw5-config --cflags` - curseslib="ncursesw" - else - AC_CHECK_LIB(ncursesw, initscr, - [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) - fi + dnl First try out pkg-config, then fall back to old config scripts. + PKG_CHECK_MODULES([NCURSESW], [ncursesw], [ + CURSESINC="" + CURSESLIB="${NCURSESW_LIBS}" + CURSESLIBDIR= + CURSES_CFLAGS="${NCURSESW_CFLAGS}" + curseslib="ncursesw" + ], [ + AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) + if test "$ncursesw5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncursesw5-config --libs` + CURSESLIBDIR=`ncursesw5-config --libdir` + CURSES_CFLAGS=`ncursesw5-config --cflags` + curseslib="ncursesw" + else + AC_CHECK_LIB(ncursesw, initscr, + [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) + fi + ]) if test -n "$CURSESINC"; then NCURSESLIBSUFFIX="w" CURSES_NLS="yes" fi fi if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then - AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) - if test "$ncurses5_config" = "yes"; then - CURSESINC="" - CURSESLIB=`ncurses5-config --libs` - CURSESLIBDIR=`ncurses5-config --libdir` - CURSES_CFLAGS=`ncurses5-config --cflags` - curseslib="ncurses" - else - AC_CHECK_LIB(ncurses, initscr, - [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) - fi + dnl First try out pkg-config, then fall back to old config scripts. + PKG_CHECK_MODULES([NCURSES], [ncurses], [ + CURSESINC="" + CURSESLIB="${NCURSES_LIBS}" + CURSESLIBDIR= + CURSES_CFLAGS="${NCURSES_CFLAGS}" + curseslib="ncurses" + ], [ + AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) + if test "$ncurses5_config" = "yes"; then + CURSESINC="" + CURSESLIB=`ncurses5-config --libs` + CURSESLIBDIR=`ncurses5-config --libdir` + CURSES_CFLAGS=`ncurses5-config --cflags` + curseslib="ncurses" + else + AC_CHECK_LIB(ncurses, initscr, + [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) + fi + ]) fi if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then AC_CHECK_LIB(curses, initscr, @@ -264,12 +287,12 @@ AC_DEFINE_UNQUOTED(DATADIR, "$mydatadir", [directory containing alsa configuration]) AC_ARG_WITH(testsound, - [ --with-testsound=file give the path of test sound file for alsaconf], + AS_HELP_STRING([--with-testsound=file], [give the path of test sound file for alsaconf]), TESTSOUND="$withval", TESTSOUND="$dir/test.wav") AC_SUBST(TESTSOUND) -AM_CONFIG_HEADER(include/aconfig.h) +AC_CONFIG_HEADERS(include/aconfig.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -287,7 +310,6 @@ AC_SUBST(LIBRT) dnl Check for systemd -PKG_PROG_PKG_CONFIG AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) @@ -302,6 +324,18 @@ [ASOUND_STATE_DIR="/var/lib/alsa"]) AC_SUBST(ASOUND_STATE_DIR) +AC_ARG_WITH([alsactl-pidfile-dir], + AS_HELP_STRING([--with-alsactl-pidfile-dir=DIR], [Directory to place alsactl.pid file in]), + [ALSACTL_PIDFILE_DIR="$withval"], + [ALSACTL_PIDFILE_DIR="/var/run"]) +AC_SUBST(ALSACTL_PIDFILE_DIR) + +AC_ARG_WITH([alsactl-daemonswitch], + AS_HELP_STRING([--with-alsactl-daemonswitch=FILE], [File to test for the daemon mode]), + [ALSACTL_DAEMONSWITCH="$withval"], + [ALSACTL_DAEMONSWITCH="/etc/alsa/state-daemon.conf"]) +AC_SUBST(ALSACTL_DAEMONSWITCH) + AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \ alsamixer/Makefile amidi/Makefile amixer/Makefile \ m4/Makefile po/Makefile.in \ diff -Nru alsa-utils-1.0.25/debian/NOTES alsa-utils-1.0.27.1/debian/NOTES --- alsa-utils-1.0.25/debian/NOTES 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/NOTES 2013-07-26 00:57:24.000000000 +0000 @@ -4,7 +4,7 @@ TODO when someone has time ~~~~~~~~~~~~~~~~~~~~~~~~~~ -/usr/sbin/alsa-utils should be changed so that instead of doing a +/etc/init.d/alsa-utils should be changed so that instead of doing a mere "alsactl restore" it takes the following steps in the "start" method: Move old asound.state to asound.state_PREV diff -Nru alsa-utils-1.0.25/debian/README.Debian alsa-utils-1.0.27.1/debian/README.Debian --- alsa-utils-1.0.25/debian/README.Debian 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/README.Debian 2013-07-26 00:57:24.000000000 +0000 @@ -30,7 +30,7 @@ To set mixer levels to "reasonable" default values from the command line (i.e., without trying first to restore saved values), run -"/usr/sbin/alsa-utils reset". +"alsactl restore". For modular drivers on a udev system, the /lib/alsa/udev script runs the initscript "start" method after a driver has initialized and its @@ -72,7 +72,7 @@ message can be ignored because the initscript gets run again later in the boot process. - /usr/sbin/alsa-utils: Warning: No alsactl program available. + /etc/init.d/alsa-utils: Warning: No alsactl program available. If you use the snd-cs46xx module then you may see messages like this: diff -Nru alsa-utils-1.0.25/debian/alsa-restore.upstart alsa-utils-1.0.27.1/debian/alsa-restore.upstart --- alsa-utils-1.0.25/debian/alsa-restore.upstart 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/alsa-restore.upstart 2013-07-26 00:57:24.000000000 +0000 @@ -3,10 +3,16 @@ # This task restores the sound card(s') mixer state(s) to # /var/lib/alsa/asound.state on startup -description "restore sound card(s') mixer state(s)" +description "Restore Sound Card State" start on runlevel [2345] task +pre-start script + if test -f /var/lib/alsa/state-daemon.conf ; then + stop; exit 0 + fi +end script + exec /usr/sbin/alsactl restore diff -Nru alsa-utils-1.0.25/debian/alsa-state.upstart alsa-utils-1.0.27.1/debian/alsa-state.upstart --- alsa-utils-1.0.25/debian/alsa-state.upstart 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/alsa-state.upstart 2013-07-26 00:57:24.000000000 +0000 @@ -0,0 +1,22 @@ +# alsa-state - Manage Sound Card State (restore and store) +# +# This task launches the alsactl daemon to manage sound +# card state (restore and store). + +description "Restore Sound Card State" + +start on runlevel [2345] + +expect fork + +pre-start script + if ! test -f /var/lib/alsa/state-daemon.conf ; then + stop; exit 0 + fi +end script + +exec /usr/sbin/alsactl -s -n 19 -b -c rdaemon + +pre-stop script + /usr/sbin/alsactl -s kill save_and_quit +end script diff -Nru alsa-utils-1.0.25/debian/alsa-store.upstart alsa-utils-1.0.27.1/debian/alsa-store.upstart --- alsa-utils-1.0.25/debian/alsa-store.upstart 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/alsa-store.upstart 2013-07-26 00:57:24.000000000 +0000 @@ -1,12 +1,18 @@ -# alsa-store - save sound card(s') mixer state(s) +# alsa-store - Store sound card state # # This task saves the sound card(s') mixer state(s) to # /var/lib/alsa/asound.state on reboot or shutdown -description "save sound card(s') mixer state(s)" - +description "Store Sound Card State" + start on runlevel [!2345] task +pre-start script + if test -f /var/lib/alsa/state-daemon.conf ; then + stop; exit 0 + fi +end script + exec /usr/sbin/alsactl store diff -Nru alsa-utils-1.0.25/debian/changelog alsa-utils-1.0.27.1/debian/changelog --- alsa-utils-1.0.25/debian/changelog 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/changelog 2013-07-26 00:57:24.000000000 +0000 @@ -1,3 +1,91 @@ +alsa-utils (1.0.27.1-1ubuntu1) saucy; urgency=low + + * Merge from debian unstable. Remaining changes: + - Move init script volume settings to new alsactl database: + + Set sane level for 'Speaker' and 'Headphone', needed for Dell Mini 9 + and Dell E series + + ute PC Beep on hda cards that support it during initial volume setup + + Mute *Analog/Digital Control for Creative cards by default + + Default Digital Input Source to be Digital Mic 1 so that users + with digital mic will be able to use it out of the box + + Mute "IEC958 Optical Raw" by default + + Set sane level for headphone 1 for Dell Studio XPS with 2.6.30 + + Prefer built-in digital mics on newer Dells + + Unmute 'Line HP Swap' for Dove boards + + Set reasonable volume levels for VMWare guests using snd.ens1371 + - debian/README.init.cs4236: Include in /usr/share/doc/alsa-utils so that + users of snd-cs4236 (e.g., ThinkPad 600) can have audible sound + - debian/patches/unset_pulse_internal.patch: We don't want alsamixer to + show the pulse mixer by default, since it can be controlled from + pulseaudio itself + - Use upstart jobs for storing/restoring card settings + - Add udev rule to apply UCM profiles for panda and equivalent hardware + - Add Vcs-Bzr field + * Create a new upstart job for the alsa state daemon, and adjust the + other upstart jobs accordingly + * Put the daemon file in /var/lib/alsa + + -- Luke Yelavich Fri, 26 Jul 2013 10:56:44 +1000 + +alsa-utils (1.0.27.1-1) unstable; urgency=low + + * New upstream release. + * Drop all patches: all applied upstream. + * Add fix_hctl_elem_search.patch from git: fix hctl searching in amixer + (closes: #710059) + * Add revert_removal_udev_rules.patch: revert erroneous removal of udev + rules from the tarball. + * Build-Depend on and use dh-autoreconf and autopoint for the above change. + * Mark alsa-utils Multi-Arch: foreign (closes: #710185). + + -- Jordi Mallach Wed, 29 May 2013 12:16:24 +0200 + +alsa-utils (1.0.27-3) unstable; urgency=low + + * alsa-restore_service_improvements.patch: dropped. Our assumption was + wrong and there's nothing to fix. + * Rebuilding against current alsa-lib fixes alsa-utils-udeb dependencies + (closes: #708353). + * Mark all patches as forwarded and applied. + + -- Jordi Mallach Fri, 17 May 2013 14:10:42 +0200 + +alsa-utils (1.0.27-2) unstable; urgency=low + + * Upload to unstable. + * Include all included programs in alsa-utils' description. + + -- Jordi Mallach Thu, 09 May 2013 12:58:00 +0200 + +alsa-utils (1.0.27-1) experimental; urgency=low + + * New upstream release. + * Bump libasound2-dev requirement to 1.0.27, for snd_pcm_abort(). + * Pass --with-systemdsystemunitdir=/lib/systemd/system to configure. + * Drop udev_test_alsactl.patch: obsolete. + * Don't call dh_installinit with static runlevel info. This is all + managed via the LSB headers in the init script. + * Add utils_ftbfs_format-security_fix.patch: fix a format-string FTBFS. + * Add alsa-restore_typo.patch: from Git; fix typo oneshop → oneshot. + * Add alsa-restore_service_improvements.patch: start restore after + sysinit, to ensure it's run after local-fs.target. + * Add alsactl_lock_underflow.patch: from Git; fix underflow in alsactl. + * Add manpage_fixes.patch: formatting and spelling fixes (lintian). + * Use default compression for source package. + * Drop pciutils recommends, it was needed for alsaconf. + + -- Jordi Mallach Sat, 04 May 2013 01:39:32 +0200 + +alsa-utils (1.0.26-1) experimental; urgency=low + + * New upstream release. + - fixes typos in aplay's manpage (closes: #658762). + * Drop aseqnet_manpage_errors.patch, applied upstream. + * Build-Depend on pkg-config, for improved ncurses test (closes: #695316). + * Bump Standards-Version to 3.9.4, with no changes needed. + + -- Jordi Mallach Mon, 01 Apr 2013 23:02:11 -0500 + alsa-utils (1.0.25-4ubuntu2) raring; urgency=low * debian/control: Mark alsa-utils Multi-Arch foreign. diff -Nru alsa-utils-1.0.25/debian/changelog.ALSA alsa-utils-1.0.27.1/debian/changelog.ALSA --- alsa-utils-1.0.25/debian/changelog.ALSA 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/changelog.ALSA 2013-07-26 00:57:24.000000000 +0000 @@ -1,3 +1,141 @@ +Changelog between 1.0.27 and 1.0.27.1 releases +(http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1) +(Reformated as ASCII text) ++++++++++++++++++++++++++++++++++++++++++++ + +* alsa-utils + + Core + Release v1.0.27.1 + Add AM_MAINTAINER_MODE([enable]) to configure.in. + + + ALSA Control (alsactl) + alsactl: remove 90-alsa-restore.rules from the tar ball + Fix a build failure due to a misused format string. + alsactl: sprintf to snprintf prevent buffer overflow + alsactl: Fix the string size for the lock file contents + alsactl: Fix a typo in systemd alsa-restore.service + + + ALSA RawMidi Utility (amidi) + Several formatting fixes for manpages. + + + Speaker Test + Several formatting fixes for manpages. + Fix several typos in manpage and help strings. + + + alsaloop + Several formatting fixes for manpages. + + + amixer + Several formatting fixes for manpages. + + + aplay/arecord + Several formatting fixes for manpages. + Fix several typos in manpage and help strings. + arecord: add a missing break to the capture loop + + + aseqnet + Fix several typos in manpage and help strings. + + + iecset + Fix several typos in manpage and help strings. + +Changelog between 1.0.26 and 1.0.27 releases +(http://www.alsa-project.org/main/index.php/Changes_v1.0.26_v1.0.27) +(Reformated as ASCII text) ++++++++++++++++++++++++++++++++++++++++++++ + +* alsa-utils + + Core + Release v1.0.27 + alsactl: add --with-alsactl-daemonswitch=FILE to the global configure.in + alsactl: move systemd config to the daemon mode + configure: Fix obsolete AM_CONFIG_HEADER macro + + + ALSA Control (alsactl) + alsactl: add --with-alsactl-daemonswitch=FILE to the global configure.in + alsactl: revert back old systemd static units with the /etc/alsa/state-daemon.conf switch + alsactl: add --nice and --sched-idle options + alsactl: daemon mode - remove disconnected cards + alsactl: move systemd config to the daemon mode + alsactl: add event filter and cache for the daemon mode + alsactl: Improved command line argument handling... + alsactl: add the daemon mode + alsactl: small code reorder to avoid memory leaks + alsactl: safe state store and memory allocation cleanups + + + Speaker Test + speaker-test: change the interrupt handling logic to follow aplay/arecord + speaker-test: try to call snd_pcm_close() when a signal is received + speaker-test: increase the maximum supported rate to 384000 + speaker-test: Update man page for chmap option + speaker-test: Add support for channel mapping API + + + alsaloop + alsaloop: Fix missing #endif + alsaloop: Make alsaloop working without libsamplerate + + + alsamixer + alsamixer: Use isatty() to check the terminal (interactive) availability + alsamixer: fix handling of removed controls + + + amixer + amixer: Use the alsa-lib functions for id print and parse and value parse + amixer: Fix dB value outputs in amixer contents + amixer: Fix parsing container TLV entries + amixer: fix rounding of relative changes + + + aplay/arecord + aplay/arecord: change the interrupt handling using snd_pcm_abort() + aplay/arecord: added isatty() check (interactive mode) + aplay: Add the support for big-endian WAV format (RIFX) + aplay: Show usage if no parameter is passed + aplay: fix typo & silence warning.. + aplay: More support for channel map option + aplay: Add support for channel mapping + +Changelog between 1.0.25 and 1.0.26 releases +(http://www.alsa-project.org/main/index.php/Changes_v1.0.25_v1.0.26) +(Reformated as ASCII text) ++++++++++++++++++++++++++++++++++++++++++++ + +* alsa-utils + + Core + Release v1.0.26 + build: Don't call AC_CHECK_FUNC with --disable-alsatest + configure.in: use AS_HELP_STRING everywhere + configure.in: look for ncurses pkg-config first + Trivial fixes in INSTALL file + + + ALSA Control (alsactl) + alsactl: Add reference to alsactl_init(7) in alsactl man page + alsactl: Read only *.conf files when a directory is passed via INCLUDE + alsactl: Do not access other cards than specified for init + + + alsaloop + alsaloop: fix the avail_min setup + alsaloop: Improve xrun_sync - fill missing playback samples + + + alsamixer + amixer, alsamixer: Add description of volume-mapping + + + amixer + amixer, alsamixer: Add description of volume-mapping + amixer: Add the support for mapped volumes like alsamixer + + + aplay/arecord + aplay: Use open() instead of open64() + aplay: Fix signal.h include + aplay: print vu-meter to stderr, not stdout + aplay/arecord: option to treat any xrun as fatal + aplay - option to dump HW parameters + Fix the examples in aplay.1 + + + aseqnet + aseqnet: Remove obsoleted .LO entry from man page + + + cvscompile + Remove the cvscompile file + Changelog between 1.0.24 and 1.0.25 releases (http://www.alsa-project.org/main/index.php/Changes_v1.0.24_v1.0.25) (Reformated as ASCII text) @@ -5,58 +143,58 @@ * alsa-utils + Core - Release v1.0.25 - alsactl: add support for recreating enumerated user controls - fix use of $(SED) - Updated COPYING with the recent FSF address - Release v1.0.24.2 - Release v1.0.24.1 + Release v1.0.25 + alsactl: add support for recreating enumerated user controls + fix use of $(SED) + Updated COPYING with the recent FSF address + Release v1.0.24.2 + Release v1.0.24.1 + ALSA Control (alsactl) - Alsa-utils: Fix typo causing some volumes not to be initialized - alsactl: Initialize Front Speaker, etc - alsactl: add support for recreating enumerated user controls - fix use of $(SED) - Revert "alsactl - Display help for names command" - alsactl init: Mute CD Playback volume by default + Alsa-utils: Fix typo causing some volumes not to be initialized + alsactl: Initialize Front Speaker, etc + alsactl: add support for recreating enumerated user controls + fix use of $(SED) + Revert "alsactl - Display help for names command" + alsactl init: Mute CD Playback volume by default + Speaker Test - speaker-test.1: Clarify man page by giving examples + speaker-test.1: Clarify man page by giving examples + alsaconf - fix use of $(SED) + fix use of $(SED) + alsaloop - alsaloop: Use AM_CFLAGS in Makefile.am - alsaloop: another try to force correct formats for libsamplerate - alsaloop: libsamplerate requires specific formats, force them for slave mode + alsaloop: Use AM_CFLAGS in Makefile.am + alsaloop: another try to force correct formats for libsamplerate + alsaloop: libsamplerate requires specific formats, force them for slave mode + alsamixer - alsamixer: Fix X-win related crash for PulseAudio plugin (bad linking) - alsamixer: Fix 64bit issues - alsamixer: fix build on uClibc - alsamixer: fix display of active/inactive controls + alsamixer: Fix X-win related crash for PulseAudio plugin (bad linking) + alsamixer: Fix 64bit issues + alsamixer: fix build on uClibc + alsamixer: fix display of active/inactive controls + alsaucm - alsaucm: Don't double-free empty lists - alsaucm: Add list1 command for non-tuple lists - alsaucm: do not bail out in the interactive mode upon error - alsaucm: fix interactive mode, add batch mode - alsaucm: fix list command and output + alsaucm: Don't double-free empty lists + alsaucm: Add list1 command for non-tuple lists + alsaucm: do not bail out in the interactive mode upon error + alsaucm: fix interactive mode, add batch mode + alsaucm: fix list command and output + amixer - alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling + alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling + aplay/arecord - aplay: Fix spelling error - aplay: increase channel limit to 256 - aplay: Use standard endian convesions - aplay: Add include files for mkdir() - aplay: Avoid recursive signal handling - aplay: Add -i option for interactive mode + aplay: Fix spelling error + aplay: increase channel limit to 256 + aplay: Use standard endian convesions + aplay: Add include files for mkdir() + aplay: Avoid recursive signal handling + aplay: Add -i option for interactive mode + aplaymidi/arecordmidi - aplaymidi: clarify multi-port documentation + aplaymidi: clarify multi-port documentation Changelog between 1.0.23 and 1.0.24 releases (http://www.alsa-project.org/main/index.php/Changes_v1.0.23_v1.0.24) @@ -564,96 +702,96 @@ * alsa-utils + Core - Add WAV file playback support to speaker-test - + Add WAV file playback support to speaker-test. The support is still limited to S16_LE, and doesn't refer to csv file yet. + ALSA Control (alsactl) - Remove obsolete power command from alsactl - + Remove obsolete power command from alsactl. + Speaker Test - Improve buffer/period set up in speaker-test - + Improve buffer/period set up in speaker-test. - + - Don't ignore -b and -p options but use them if specified - Clean up and improvement of messy buffer/period setup codes - Add -P option for specifying number of periods explicitly - Fix missing commas - + Fixed missing commas in array elements (ALSA bug#1938). - Add --nloops option and fix manpage - + - Added --nloops option to specify the number of loops - Fixed man page of speaker-test - Fix a typo in speaker-test help text - + Fix a typo in speaker-test help text. Updated ja.po, too. - Make speaker-test compatible with dmix by default. - Avoid unnecessary drain/restart in speaker-test - + Avoid unnecessary drain/restart in speaker-test when the buffer is enough small. - speaker-test - Fix missing i18n - + Add the gettext tags to newly added texts. - speaker-test: Fix version reporting. - Tentative fix for speaker-test WAV with 5 or more channels - + Fix the WAV file name for center/lfe. Use the existing "Rear_Center.wav" for LFE as a workaround. - Add missing comma - + Add a missing comma in the last fix... - Fix compile on big-endian arch - + Fix compile on big-endian arch. - Remove loops after errors - + Don't retry after fatal errors. - Add WAV file playback support to speaker-test - + Add WAV file playback support to speaker-test. The support is still limited to S16_LE, and doesn't refer to csv file yet. + alsaconf - Fix a text in alsa-utils - + Fix a text in alsa-utils after proof-reading. - Minor clean up of bashism - + Minor clean up of bashism, replaced with normal test. - Fix PCI class and name extraction in alsaconf - + - Allow all PCI class 04xx, not only 040x - Fix the extraction of device name from lspci output - + ALSA bug#1935 - Use amixer -s option - + Optimize to use amixer with -s option. + amixer - amixer - Add -s option - + - Add -s option to read from stdin the command sequentially. - Suppress unneeded warnings in sset. + aplay/arecord - Fix a typo in manpage - + Fix a typo in manpage of aplay. - Don't show invalid plug example in the error message of aplay - + Don't show invalid examples of usage with plug prefix in the error message of aplay/arecord. - alternative peak meter for aplay From: Dirk Jagdmann - + This patch adds an alternative peak meter for aplay/arecord which is enabled via three "-v" command line arguments. This new mode differs from the old in a larger meter, no linefeeds for every meter update and a static maximum peak (for 1s). - split interleaved files in arecord when reaching 2GB From: Dirk Jagdmann - + This patch will split files in chunks of aprox. 2GB in the interleaved recording mode of arecord. This is meant to overcome the 2GB filesize limit of .wav files, which is easily reached when recording multiple diff -Nru alsa-utils-1.0.25/debian/control alsa-utils-1.0.27.1/debian/control --- alsa-utils-1.0.25/debian/control 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/control 2013-07-26 00:57:24.000000000 +0000 @@ -5,38 +5,44 @@ XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Elimar Riesebieter -Build-Depends: autopoint, - autotools-dev, +Build-Depends: autotools-dev, debhelper (>= 9), dh-autoreconf, - libasound2-dev (>= 1.0.25), + autopoint, + libasound2-dev (>= 1.0.27), libncursesw5-dev, libsamplerate-dev, + pkg-config, xmlto -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.alsa-project.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-utils Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-utils/ -Vcs-Bzr: http://launchpad.net/~ubuntu-audio-dev/alsa-utils/ubuntu.raring +Vcs-Bzr: http://launchpad.net/~ubuntu-audio-dev/alsa-utils/ubuntu Package: alsa-utils Architecture: linux-any -Provides: audio-mixer Multi-Arch: foreign +Provides: audio-mixer Depends: lsb-base (>= 3.0-9), kmod, whiptail | dialog, ${misc:Depends}, ${shlibs:Depends} -Recommends: alsa-base (>= 1.0.15), pciutils +Recommends: alsa-base (>= 1.0.15) Description: Utilities for configuring and using ALSA Included tools: - - amixer: command line mixer + - alsactl: advanced controls for ALSA sound drivers + - alsaloop: create loopbacks between PCM capture and playback devices - alsamixer: curses mixer + - alsaucm: alsa use case manager + - amixer: command line mixer - amidi: read from and write to ALSA RawMIDI ports - aplay, arecord: command line playback and recording - aplaymidi, arecordmidi: command line MIDI playback and recording - aconnect, aseqnet, aseqdump: command line MIDI sequencer control + - iecset: set or dump IEC958 status bits + - speaker-test: speaker test tone generator . ALSA is the Advanced Linux Sound Architecture. diff -Nru alsa-utils-1.0.25/debian/init alsa-utils-1.0.27.1/debian/init --- alsa-utils-1.0.25/debian/init 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/init 2013-07-26 00:57:24.000000000 +0000 @@ -0,0 +1,206 @@ +#!/bin/sh +# +# alsa-utils initscript +# +### BEGIN INIT INFO +# Provides: alsa-utils +# Required-Start: $local_fs $remote_fs +# Required-Stop: $remote_fs +# Default-Start: S +# Default-Stop: 0 1 6 +# Short-Description: Restore and store ALSA driver settings +# Description: This script stores and restores mixer levels on +# shutdown and bootup.On sysv-rc systems: to +# disable storing of mixer levels on shutdown, +# remove /etc/rc[06].d/K50alsa-utils. To disable +# restoring of mixer levels on bootup, rename the +# "S50alsa-utils" symbolic link in /etc/rcS.d/ to +# "K50alsa-utils". +### END INIT INFO + +# Don't use set -e; check exit status instead + +# Exit silently if package is no longer installed +[ -x /usr/sbin/alsactl ] || exit 0 + +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +MYNAME=/etc/init.d/alsa-utils + +. /lib/lsb/init-functions +. /usr/share/alsa/utils.sh + +# $1 EXITSTATUS +# [$2 MESSAGE] +log_action_end_msg_and_exit() +{ + log_action_end_msg "$1" ${2:+"$2"} + exit $1 +} + +# $1 PROGRAM +executable() +{ + # If which is not available then we must be running before + # /usr is mounted on a system that has which in /usr/bin/. + # Conclude that $1 is not executable. + [ -x /bin/which ] || [ -x /usr/bin/which ] || return 1 + which "$1" >/dev/null 2>&1 +} + +executable amixer || { echo "${MYNAME}: Error: No amixer program available." >&2 ; exit 1 ; } + +# $1 | "all" +restore_levels() +{ + [ -f /var/lib/alsa/asound.state ] || return 1 + CARD="$1" + [ "$1" = all ] && CARD="" + # Assume that if alsactl prints a message on stderr + # then it failed somehow. This works around the fact + # that alsactl doesn't return nonzero status when it + # can't restore settings for the card + if MSG="$(alsactl restore $CARD 2>&1 >/dev/null)" && [ ! "$MSG" ] ; then + return 0 + else + # Retry with the "force" option. This restores more levels + # but it results in much longer error messages. + alsactl -F restore $CARD >/dev/null 2>&1 + log_action_cont_msg "warning: 'alsactl restore${CARD:+ $CARD}' failed with error message '$MSG'" + return 1 + fi +} + +# $1 | "all" +store_levels() +{ + CARD="$1" + [ "$1" = all ] && CARD="" + if MSG="$(alsactl store $CARD 2>&1)" ; then + sleep 1 + return 0 + else + log_action_cont_msg "warning: 'alsactl store${CARD:+ $CARD}' failed with error message '$MSG'" + return 1 + fi +} + + +# $1 +mute_and_zero_levels_on_card() +{ + CARDOPT="-c $1" + for CTL in \ + Master \ + PCM \ + Synth \ + CD \ + Line \ + Mic \ + "PCM,1" \ + Wave \ + Music \ + AC97 \ + "Master Digital" \ + DAC \ + "DAC,0" \ + "DAC,1" \ + Headphone \ + Speaker \ + Playback + do + mute_and_zero_level "$CTL" + done +# for CTL in \ +# "Audigy Analog/Digital Output Jack" \ +# "SB Live Analog/Digital Output Jack" +# do +# switch_control "$CTL" off +# done + return 0 +} + +# $1 | "all" +mute_and_zero_levels() +{ + TTZML_RETURNSTATUS=0 + case "$1" in + all) + for CARD in $(echo_card_indices) ; do + mute_and_zero_levels_on_card "$CARD" || TTZML_RETURNSTATUS=1 + done + ;; + *) + mute_and_zero_levels_on_card "$1" || TTZML_RETURNSTATUS=1 + ;; + esac + return $TTZML_RETURNSTATUS +} + + +# $1 | "all" +card_OK() +{ + [ "$1" ] || bugout + if [ "$1" = all ] ; then + [ -d /proc/asound ] + return $? + else + [ -d "/proc/asound/card$1" ] || [ -d "/proc/asound/$1" ] + return $? + fi +} + +# If a card identifier is provided in $2 then regard it as an error +# if that card is not present; otherwise don't regard it as an error. + +case "$1" in + start) + EXITSTATUS=0 + TARGET_CARD="$2" + case "$TARGET_CARD" in + ""|all) TARGET_CARD=all ; log_action_begin_msg "Setting up ALSA" ;; + *) log_action_begin_msg "Setting up ALSA card ${TARGET_CARD}" ;; + esac + card_OK "$TARGET_CARD" || log_action_end_msg_and_exit "$( [ ! "$2" ] ; echo $? ; )" "none loaded" + preinit_levels "$TARGET_CARD" || EXITSTATUS=1 + if ! restore_levels "$TARGET_CARD" ; then + sanify_levels "$TARGET_CARD" || EXITSTATUS=1 + restore_levels "$TARGET_CARD" >/dev/null 2>&1 || : + fi + log_action_end_msg_and_exit "$EXITSTATUS" + ;; + stop) + EXITSTATUS=0 + TARGET_CARD="$2" + case "$TARGET_CARD" in + ""|all) TARGET_CARD=all ; log_action_begin_msg "Shutting down ALSA" ;; + *) log_action_begin_msg "Shutting down ALSA card ${TARGET_CARD}" ;; + esac + card_OK "$TARGET_CARD" || log_action_end_msg_and_exit "$( [ ! "$2" ] ; echo $? ; )" "none loaded" + store_levels "$TARGET_CARD" || EXITSTATUS=1 + #mute_and_zero_levels "$TARGET_CARD" || EXITSTATUS=1 + log_action_end_msg_and_exit "$EXITSTATUS" + ;; + restart|force-reload) + EXITSTATUS=0 + $0 stop || EXITSTATUS=1 + $0 start || EXITSTATUS=1 + exit $EXITSTATUS + ;; + reset) + TARGET_CARD="$2" + case "$TARGET_CARD" in + ""|all) TARGET_CARD=all ; log_action_begin_msg "Resetting ALSA" ;; + *) log_action_begin_msg "Resetting ALSA card ${TARGET_CARD}" ;; + esac + card_OK "$TARGET_CARD" || log_action_end_msg_and_exit "$( [ ! "$2" ] ; echo $? ; )" "none loaded" + preinit_levels "$TARGET_CARD" + sanify_levels "$TARGET_CARD" + log_action_end_msg_and_exit "$?" + ;; + *) + echo "Usage: $MYNAME {start [CARD]|stop [CARD]|restart [CARD]|reset [CARD]}" >&2 + exit 3 + ;; +esac + diff -Nru alsa-utils-1.0.25/debian/install alsa-utils-1.0.27.1/debian/install --- alsa-utils-1.0.25/debian/install 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/install 2013-07-26 00:57:24.000000000 +0000 @@ -1,6 +1,8 @@ +debian/utils.sh /usr/share/alsa usr/bin usr/sbin usr/share +lib/systemd lib/udev debian/90-alsa-ucm.rules lib/udev/rules.d diff -Nru alsa-utils-1.0.25/debian/links alsa-utils-1.0.27.1/debian/links --- alsa-utils-1.0.25/debian/links 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/links 2013-07-26 00:57:24.000000000 +0000 @@ -1,2 +1,3 @@ -/usr/bin/aplay /usr/bin/arecord -/usr/share/man/man1/aplay.1.gz /usr/share/man/man1/arecord.1.gz +dev/null lib/systemd/system/alsa-utils.service +usr/bin/aplay usr/bin/arecord +usr/share/man/man1/aplay.1.gz usr/share/man/man1/arecord.1.gz diff -Nru alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch alsa-utils-1.0.27.1/debian/patches/add_extra_volume_defaults.patch --- alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/add_extra_volume_defaults.patch 2013-07-26 00:57:24.000000000 +0000 @@ -1,8 +1,8 @@ -Index: alsa-utils-1.0.24.2/alsactl/init/default +Index: alsa-utils-1.0.27/alsactl/init/default =================================================================== ---- alsa-utils-1.0.24.2.orig/alsactl/init/default 2011-02-21 12:43:29.374811231 +0100 -+++ alsa-utils-1.0.24.2/alsactl/init/default 2011-02-21 13:26:42.762810505 +0100 -@@ -126,6 +126,12 @@ +--- alsa-utils-1.0.27.orig/alsactl/init/default 2013-04-30 15:45:50.744984923 +1000 ++++ alsa-utils-1.0.27/alsactl/init/default 2013-04-30 15:45:50.740984923 +1000 +@@ -196,6 +196,12 @@ CTL{values}="on" CTL{reset}="mixer" @@ -15,7 +15,7 @@ CTL{name}="Synth Playback Volume",CTL{do_search}=="1", \ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" CTL{name}="Synth Playback Switch",CTL{do_search}=="1", \ -@@ -174,6 +180,81 @@ +@@ -237,6 +243,81 @@ CTL{name}="AC97 Playback Switch",CTL{do_search}=="1", \ CTL{values}="on" @@ -97,7 +97,7 @@ # # Powermacs # -@@ -199,11 +280,13 @@ +@@ -262,11 +343,13 @@ CTL{name}="Input Source",PROGRAM!="__ctl_search", GOTO="" CTL{enums}=="*|Internal Mic|*",CTL{values}="Internal Mic", GOTO="" diff -Nru alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch alsa-utils-1.0.27.1/debian/patches/aseqnet_manpage_errors.patch --- alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/aseqnet_manpage_errors.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -From: Jordi Mallach -Description: Remove an unknown "LO" section from the manpage to avoid - man errors. -Index: alsa-utils-1.0.21/seq/aseqnet/aseqnet.1 -=================================================================== ---- alsa-utils-1.0.21.orig/seq/aseqnet/aseqnet.1 2009-08-31 17:13:36.000000000 +0200 -+++ alsa-utils-1.0.21/seq/aseqnet/aseqnet.1 2009-09-04 22:19:32.000000000 +0200 -@@ -1,5 +1,4 @@ - .TH aseqnet 1 "January 1, 2000" --.LO 1 - .SH NAME - aseqnet \- ALSA sequencer connectors over network - diff -Nru alsa-utils-1.0.25/debian/patches/fix_hctl_elem_search.patch alsa-utils-1.0.27.1/debian/patches/fix_hctl_elem_search.patch --- alsa-utils-1.0.25/debian/patches/fix_hctl_elem_search.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/fix_hctl_elem_search.patch 2013-07-26 00:57:24.000000000 +0000 @@ -0,0 +1,25 @@ +From d61924fd247c2cf0280391e076c439c9427732aa Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 May 2013 16:40:26 +0200 +Subject: [PATCH] amixer: Fix the hctl elem search bug + +Signed-off-by: Jaroslav Kysela +--- + amixer/amixer.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/amixer/amixer.c b/amixer/amixer.c +index 2f1521b..92b0f83 100644 +--- a/amixer/amixer.c ++++ b/amixer/amixer.c +@@ -1105,6 +1105,7 @@ static int cset(int argc, char *argv[], int roflag, int keep_handle) + } + return err; + } ++ snd_ctl_elem_info_get_id(info, id); /* FIXME: Remove it when hctl find works ok !!! */ + if (!roflag) { + snd_ctl_elem_value_set_id(control, id); + if ((err = snd_ctl_elem_read(handle, control)) < 0) { +-- +1.7.11.7 + diff -Nru alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch alsa-utils-1.0.27.1/debian/patches/fix_misspelling_speaker-test_man_page.patch --- alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/fix_misspelling_speaker-test_man_page.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -From: Elimar Riesebieter -Subject: Fix typo in speaker-test manpage - -Index: alsa-utils-1.0.18/speaker-test/speaker-test.1 -=================================================================== ---- alsa-utils-1.0.18.orig/speaker-test/speaker-test.1 2009-02-01 16:56:12.000000000 -0500 -+++ alsa-utils-1.0.18/speaker-test/speaker-test.1 2009-02-01 16:56:46.000000000 -0500 -@@ -51,7 +51,7 @@ - The default value is 0. - - .TP --\fB\-P\fP | \fB\-\-nperiods\fP \fPERIODS\fP -+\fB\-P\fP | \fB\-\-nperiods\fP \fPPERIODS\fP - Use number of periods. The default value is 4. - - .TP diff -Nru alsa-utils-1.0.25/debian/patches/ncurses_pkg-config.patch alsa-utils-1.0.27.1/debian/patches/ncurses_pkg-config.patch --- alsa-utils-1.0.25/debian/patches/ncurses_pkg-config.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/ncurses_pkg-config.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -Description: Look for ncurses pkg-config first - Newer ncurses installs pkg-config files, and these are much easier to - manage when cross-compiling, so default to searching for those. If they - can't be found, we fall back to the existing xxx-config. -Author: Mike Frysinger -Origin: upstream, http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=3a25a31285ffb1dff0151c717b114fefc0b89b70 -Forwarded: not-needed -Last-Update: 2012-12-06 - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -29,6 +29,7 @@ - AC_PROG_MKDIR_P - AC_PROG_LN_S - AC_PROG_SED -+PKG_PROG_PKG_CONFIG - AM_PATH_ALSA(1.0.24) - AC_CHECK_FUNC([snd_ctl_elem_add_enumerated], - , [AC_ERROR([No user enum control support in alsa-lib])]) -@@ -130,34 +131,52 @@ - NCURSESLIBSUFFIX="" - CURSES_NLS="no" - if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then -- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -- if test "$ncursesw5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncursesw5-config --libs` -- CURSESLIBDIR=`ncursesw5-config --libdir` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -- curseslib="ncursesw" -- else -- AC_CHECK_LIB(ncursesw, initscr, -- [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) -- fi -+ dnl First try out pkg-config, then fall back to old config scripts. -+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [ -+ CURSESINC="" -+ CURSESLIB="${NCURSESW_LIBS}" -+ CURSESLIBDIR= -+ CURSES_CFLAGS="${NCURSESW_CFLAGS}" -+ curseslib="ncursesw" -+ ], [ -+ AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -+ if test "$ncursesw5_config" = "yes"; then -+ CURSESINC="" -+ CURSESLIB=`ncursesw5-config --libs` -+ CURSESLIBDIR=`ncursesw5-config --libdir` -+ CURSES_CFLAGS=`ncursesw5-config --cflags` -+ curseslib="ncursesw" -+ else -+ AC_CHECK_LIB(ncursesw, initscr, -+ [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) -+ fi -+ ]) - if test -n "$CURSESINC"; then - NCURSESLIBSUFFIX="w" - CURSES_NLS="yes" - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then -- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) -- if test "$ncurses5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncurses5-config --libs` -- CURSESLIBDIR=`ncurses5-config --libdir` -- CURSES_CFLAGS=`ncurses5-config --cflags` -- curseslib="ncurses" -- else -- AC_CHECK_LIB(ncurses, initscr, -- [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) -- fi -+ dnl First try out pkg-config, then fall back to old config scripts. -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [ -+ CURSESINC="" -+ CURSESLIB="${NCURSES_LIBS}" -+ CURSESLIBDIR= -+ CURSES_CFLAGS="${NCURSES_CFLAGS}" -+ curseslib="ncurses" -+ ], [ -+ AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) -+ if test "$ncurses5_config" = "yes"; then -+ CURSESINC="" -+ CURSESLIB=`ncurses5-config --libs` -+ CURSESLIBDIR=`ncurses5-config --libdir` -+ CURSES_CFLAGS=`ncurses5-config --cflags` -+ curseslib="ncurses" -+ else -+ AC_CHECK_LIB(ncurses, initscr, -+ [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) -+ fi -+ ]) - fi - if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then - AC_CHECK_LIB(curses, initscr, -@@ -287,7 +306,6 @@ - AC_SUBST(LIBRT) - - dnl Check for systemd --PKG_PROG_PKG_CONFIG - AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) diff -Nru alsa-utils-1.0.25/debian/patches/revert_removal_udev_rules.patch alsa-utils-1.0.27.1/debian/patches/revert_removal_udev_rules.patch --- alsa-utils-1.0.25/debian/patches/revert_removal_udev_rules.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/revert_removal_udev_rules.patch 2013-07-26 00:57:24.000000000 +0000 @@ -0,0 +1,28 @@ +From c0f70a0b8e340d6ee903ff226886bb6f969d46a1 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 27 May 2013 09:26:39 +0200 +Subject: [PATCH] alsactl: return back the udevrules_DATA rule for + 90-alsa-restore.rules + +Signed-off-by: Jaroslav Kysela +--- + alsactl/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index c0df981..bac84eb 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -11,6 +11,9 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c + alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" + noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c + ++udevrules_DATA = \ ++ 90-alsa-restore.rules ++ + if HAVE_SYSTEMD + + systemdsystemunit_DATA = \ +-- +1.7.11.7 + diff -Nru alsa-utils-1.0.25/debian/patches/series alsa-utils-1.0.27.1/debian/patches/series --- alsa-utils-1.0.25/debian/patches/series 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/series 2013-07-26 00:57:24.000000000 +0000 @@ -1,8 +1,5 @@ -aseqnet_manpage_errors.patch +fix_hctl_elem_search.patch +revert_removal_udev_rules.patch unset_pulse_internal.patch -spelling_fixes.patch -fix_misspelling_speaker-test_man_page.patch -udev_test_alsactl.patch add_extra_volume_defaults.patch vmware_audio_volume.patch -ncurses_pkg-config.patch diff -Nru alsa-utils-1.0.25/debian/patches/spelling_fixes.patch alsa-utils-1.0.27.1/debian/patches/spelling_fixes.patch --- alsa-utils-1.0.25/debian/patches/spelling_fixes.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/spelling_fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From: Elimar Riesebieter -Subject: Fix typos in aplay.c, aseqnet.c and iecbits.c - ---- a/aplay/aplay.c 2012-01-25 10:43:38.000000000 +0100 -+++ b/aplay/aplay.c 2012-02-11 20:00:10.000000000 +0100 -@@ -232,7 +232,7 @@ - printf(" %s", s); - } - printf(_("\nSome of these may not be available on selected hardware\n")); -- printf(_("The availabled format shortcuts are:\n")); -+ printf(_("The available format shortcuts are:\n")); - printf(_("-f cd (16 bit little endian, 44100, stereo)\n")); - printf(_("-f cdr (16 bit big endian, 44100, stereo)\n")); - printf(_("-f dat (16 bit little endian, 48000, stereo)\n")); ---- a/seq/aseqnet/aseqnet.c 2012-01-25 10:43:38.000000000 +0100 -+++ b/seq/aseqnet/aseqnet.c 2012-02-11 20:00:10.000000000 +0100 -@@ -167,7 +167,7 @@ - printf(_(" server mode: aseqnet [-options]\n")); - printf(_(" client mode: aseqnet [-options] server_host\n")); - printf(_("options:\n")); -- printf(_(" -p,--port # : sepcify TCP port (digit or service name)\n")); -+ printf(_(" -p,--port # : specify TCP port (digit or service name)\n")); - printf(_(" -s,--source addr : read from given addr (client:port)\n")); - printf(_(" -d,--dest addr : write to given addr (client:port)\n")); - printf(_(" -v, --verbose : print verbose messages\n")); ---- a/iecset/iecbits.c 2012-01-25 10:43:38.000000000 +0100 -+++ b/iecset/iecbits.c 2012-02-12 01:07:33.951015893 +0100 -@@ -218,7 +218,7 @@ - printf("user-defined\n"); - break; - default: -- printf("unkown\n"); -+ printf("unknown\n"); - break; - } - printf("Sample Bits: "); diff -Nru alsa-utils-1.0.25/debian/patches/udev_test_alsactl.patch alsa-utils-1.0.27.1/debian/patches/udev_test_alsactl.patch --- alsa-utils-1.0.25/debian/patches/udev_test_alsactl.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/udev_test_alsactl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -From: Jordi Mallach -Description: test for alsactl - Test for @sbindir@/alsactl to fix state restoration for systems with - split /usr. -Forwarded: no - -Index: alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in -=================================================================== ---- alsa-utils-1.0.25.orig/alsactl/90-alsa-restore.rules.in 2012-01-25 10:43:38.000000000 +0100 -+++ alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in 2013-01-10 01:12:15.679998854 +0100 -@@ -1,2 +1,2 @@ - ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ -- RUN+="@sbindir@/alsactl restore $attr{number}" -+ TEST=="@sbindir@/alsactl", RUN+="@sbindir@/alsactl restore $attr{number}" diff -Nru alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch alsa-utils-1.0.27.1/debian/patches/unset_pulse_internal.patch --- alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/unset_pulse_internal.patch 2013-07-26 00:57:24.000000000 +0000 @@ -1,7 +1,8 @@ -diff -urN alsa-utils-1.0.21/alsamixer/cli.c alsa-utils-1.0.21.new/alsamixer/cli.c ---- alsa-utils-1.0.21/alsamixer/cli.c 2009-09-01 01:13:36.000000000 +1000 -+++ alsa-utils-1.0.21.new/alsamixer/cli.c 2009-11-05 15:58:15.000000000 +1100 -@@ -120,6 +120,10 @@ +Index: alsa-utils-1.0.27/alsamixer/cli.c +=================================================================== +--- alsa-utils-1.0.27.orig/alsamixer/cli.c 2013-04-30 15:42:02.652987098 +1000 ++++ alsa-utils-1.0.27/alsamixer/cli.c 2013-04-30 15:42:02.644987098 +1000 +@@ -123,6 +123,10 @@ textdomain(PACKAGE); #endif @@ -12,10 +13,11 @@ parse_options(argc, argv); create_mixer_object(&selem_regopt); -diff -urN alsa-utils-1.0.21/amixer/amixer.c alsa-utils-1.0.21.new/amixer/amixer.c ---- alsa-utils-1.0.21/amixer/amixer.c 2009-09-01 01:13:36.000000000 +1000 -+++ alsa-utils-1.0.21.new/amixer/amixer.c 2009-11-05 15:57:21.000000000 +1100 -@@ -1892,6 +1892,11 @@ +Index: alsa-utils-1.0.27/amixer/amixer.c +=================================================================== +--- alsa-utils-1.0.27.orig/amixer/amixer.c 2013-04-30 15:42:02.652987098 +1000 ++++ alsa-utils-1.0.27/amixer/amixer.c 2013-04-30 15:42:02.644987098 +1000 +@@ -1712,6 +1712,11 @@ { int morehelp, level = 0; int read_stdin = 0; @@ -27,9 +29,10 @@ static const struct option long_option[] = { {"help", 0, NULL, 'h'}, -diff -urN alsa-utils-1.0.21/iecset/iecset.c alsa-utils-1.0.21.new/iecset/iecset.c ---- alsa-utils-1.0.21/iecset/iecset.c 2009-09-01 01:13:36.000000000 +1000 -+++ alsa-utils-1.0.21.new/iecset/iecset.c 2009-11-05 15:57:22.000000000 +1100 +Index: alsa-utils-1.0.27/iecset/iecset.c +=================================================================== +--- alsa-utils-1.0.27.orig/iecset/iecset.c 2013-04-30 15:42:02.652987098 +1000 ++++ alsa-utils-1.0.27/iecset/iecset.c 2013-04-30 15:42:02.648987098 +1000 @@ -324,6 +324,10 @@ char tmpname[32]; int parms[IDX_LAST]; diff -Nru alsa-utils-1.0.25/debian/patches/vmware_audio_volume.patch alsa-utils-1.0.27.1/debian/patches/vmware_audio_volume.patch --- alsa-utils-1.0.25/debian/patches/vmware_audio_volume.patch 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/patches/vmware_audio_volume.patch 2013-07-26 00:57:24.000000000 +0000 @@ -1,7 +1,7 @@ -Index: alsa-utils-1.0.25/alsactl/init/Makefile.am +Index: alsa-utils-1.0.27/alsactl/init/Makefile.am =================================================================== ---- alsa-utils-1.0.25.orig/alsactl/init/Makefile.am 2012-01-25 20:43:38.000000000 +1100 -+++ alsa-utils-1.0.25/alsactl/init/Makefile.am 2012-04-04 13:03:14.730440294 +1000 +--- alsa-utils-1.0.27.orig/alsactl/init/Makefile.am 2013-04-30 15:45:55.548984877 +1000 ++++ alsa-utils-1.0.27/alsactl/init/Makefile.am 2013-04-30 15:45:55.544984877 +1000 @@ -1,7 +1,7 @@ init_files = \ @@ -11,11 +11,11 @@ EXTRA_DIST = $(init_files) alsainitdir = $(datadir)/alsa/init alsainit_DATA = $(init_files) -Index: alsa-utils-1.0.25/alsactl/init/Makefile.in +Index: alsa-utils-1.0.27/alsactl/init/Makefile.in =================================================================== ---- alsa-utils-1.0.25.orig/alsactl/init/Makefile.in 2012-01-25 20:43:50.000000000 +1100 -+++ alsa-utils-1.0.25/alsactl/init/Makefile.in 2012-04-04 13:03:19.874440424 +1000 -@@ -206,7 +206,7 @@ +--- alsa-utils-1.0.27.orig/alsactl/init/Makefile.in 2013-04-30 15:45:55.548984877 +1000 ++++ alsa-utils-1.0.27/alsactl/init/Makefile.in 2013-04-30 15:45:55.544984877 +1000 +@@ -243,7 +243,7 @@ xmlto = @xmlto@ init_files = \ 00main default help info test \ @@ -24,10 +24,10 @@ EXTRA_DIST = $(init_files) alsainitdir = $(datadir)/alsa/init -Index: alsa-utils-1.0.25/alsactl/init/00main +Index: alsa-utils-1.0.27/alsactl/init/00main =================================================================== ---- alsa-utils-1.0.25.orig/alsactl/init/00main 2012-01-25 20:43:38.000000000 +1100 -+++ alsa-utils-1.0.25/alsactl/init/00main 2012-04-04 13:02:14.426438751 +1000 +--- alsa-utils-1.0.27.orig/alsactl/init/00main 2013-04-30 15:45:55.548984877 +1000 ++++ alsa-utils-1.0.27/alsactl/init/00main 2013-04-30 15:45:55.544984877 +1000 @@ -32,6 +32,7 @@ # real ALSA configuration database CARDINFO{driver}=="HDA-Intel", INCLUDE="hda", GOTO="init_end" @@ -36,10 +36,10 @@ CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end" LABEL="init_end" -Index: alsa-utils-1.0.25/alsactl/init/ens1371 +Index: alsa-utils-1.0.27/alsactl/init/ens1371 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ alsa-utils-1.0.25/alsactl/init/ens1371 2012-04-04 13:03:38.562440904 +1000 ++++ alsa-utils-1.0.27/alsactl/init/ens1371 2013-04-30 15:45:55.544984877 +1000 @@ -0,0 +1,15 @@ +# Configuration for ensoniq based cards + diff -Nru alsa-utils-1.0.25/debian/postinst alsa-utils-1.0.27.1/debian/postinst --- alsa-utils-1.0.25/debian/postinst 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - configure) - # Rename /etc/modprobe.d/sound - S="/etc/modprobe.d/sound" - if [ -f "$S" ] - then mv "$S" "$S.conf" - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) - # Nothing to do because we didn't take any action in the prerm - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# diff -Nru alsa-utils-1.0.25/debian/rules alsa-utils-1.0.27.1/debian/rules --- alsa-utils-1.0.25/debian/rules 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/rules 2013-07-26 00:57:24.000000000 +0000 @@ -5,7 +5,9 @@ override_dh_auto_configure: dh_auto_configure -- \ --with-asound-state-dir=/var/lib/alsa \ - --disable-alsaconf + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-alsaconf \ + --with-alsactl-daemonswitch=/var/lib/alsa/state-daemon.conf override_dh_auto_install: dh_auto_install --destdir=debian/tmp @@ -20,3 +22,4 @@ override_dh_installinit: dh_installinit -n --name=alsa-store --upstart-only --no-start dh_installinit -n --name=alsa-restore --upstart-only + dh_installinit -n --name=alsa-state --upstart-only --no-start diff -Nru alsa-utils-1.0.25/debian/source/options alsa-utils-1.0.27.1/debian/source/options --- alsa-utils-1.0.25/debian/source/options 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = "bzip2" -compression-level = 9 diff -Nru alsa-utils-1.0.25/debian/udev.rules alsa-utils-1.0.27.1/debian/udev.rules --- alsa-utils-1.0.25/debian/udev.rules 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/udev.rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -KERNEL=="controlC[0-7]", ACTION=="add", RUN+="/lib/udev/alsa-utils" - -# Handle addition and removal of soundcards. -KERNEL=="controlC*", ACTION=="add", SUBSYSTEM=="sound", \ - RUN+="/usr/sbin/alsactl restore /dev/$name" -KERNEL=="controlC*", ACTION=="remove", SUBSYSTEM=="sound", \ - RUN+="/usr/sbin/alsactl store /dev/$name" diff -Nru alsa-utils-1.0.25/debian/udev.script alsa-utils-1.0.27.1/debian/udev.script --- alsa-utils-1.0.25/debian/udev.script 2013-02-28 02:48:11.000000000 +0000 +++ alsa-utils-1.0.27.1/debian/udev.script 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh -e -# -# udev script for alsa-utils - -( - . /lib/udev/hotplug.functions - wait_for_file /usr/sbin/alsactl - DEV_BASENAME="${DEVNAME##*/}" - N="${DEV_BASENAME#controlC}" - exec /etc/init.d/alsa-utils start $N -) & - diff -Nru alsa-utils-1.0.25/depcomp alsa-utils-1.0.27.1/depcomp --- alsa-utils-1.0.25/depcomp 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/depcomp 2013-05-21 08:50:36.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +27,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +95,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +167,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +213,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +233,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +273,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +288,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +316,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +366,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +381,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +429,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +499,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +519,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +579,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +602,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +671,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru alsa-utils-1.0.25/iecset/Makefile.in alsa-utils-1.0.27.1/iecset/Makefile.in --- alsa-utils-1.0.25/iecset/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/iecset/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = iecset$(EXEEXT) subdir = iecset -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -66,6 +83,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(iecset_SOURCES) DIST_SOURCES = $(iecset_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -87,6 +109,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -94,6 +122,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -118,6 +148,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -138,11 +169,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -153,6 +189,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -167,6 +205,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -231,7 +270,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -256,15 +295,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -298,7 +340,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -iecset$(EXEEXT): $(iecset_OBJECTS) $(iecset_DEPENDENCIES) +iecset$(EXEEXT): $(iecset_OBJECTS) $(iecset_DEPENDENCIES) $(EXTRA_iecset_DEPENDENCIES) @rm -f iecset$(EXEEXT) $(LINK) $(iecset_OBJECTS) $(iecset_LDADD) $(LIBS) @@ -326,11 +368,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -359,9 +408,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -412,6 +459,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -422,10 +483,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -475,10 +536,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -564,7 +630,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/iecset/iecbits.c alsa-utils-1.0.27.1/iecset/iecbits.c --- alsa-utils-1.0.25/iecset/iecbits.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/iecset/iecbits.c 2013-05-21 08:48:28.000000000 +0000 @@ -218,7 +218,7 @@ printf("user-defined\n"); break; default: - printf("unkown\n"); + printf("unknown\n"); break; } printf("Sample Bits: "); diff -Nru alsa-utils-1.0.25/include/Makefile.in alsa-utils-1.0.27.1/include/Makefile.in --- alsa-utils-1.0.25/include/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/include/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,11 +68,18 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -81,6 +104,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -101,11 +125,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -116,6 +145,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -130,6 +161,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -191,7 +223,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -216,22 +248,20 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): aconfig.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/aconfig.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status include/aconfig.h -$(srcdir)/aconfig.h.in: $(am__configure_deps) +$(srcdir)/aconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -288,6 +318,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -335,10 +379,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -419,9 +468,9 @@ .MAKE: all install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - ctags distclean distclean-generic distclean-hdr distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + cscopelist ctags distclean distclean-generic distclean-hdr \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ diff -Nru alsa-utils-1.0.25/include/aconfig.h.in alsa-utils-1.0.27.1/include/aconfig.h.in --- alsa-utils-1.0.25/include/aconfig.h.in 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/include/aconfig.h.in 2013-05-21 08:50:36.000000000 +0000 @@ -46,7 +46,7 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have the iconv() function. */ +/* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV /* Define to 1 if you have the header file. */ @@ -124,6 +124,11 @@ /* ALSA util version */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff -Nru alsa-utils-1.0.25/include/version.h alsa-utils-1.0.27.1/include/version.h --- alsa-utils-1.0.25/include/version.h 2012-01-25 09:43:58.000000000 +0000 +++ alsa-utils-1.0.27.1/include/version.h 2013-05-21 08:50:42.000000000 +0000 @@ -4,9 +4,9 @@ #define SND_UTIL_MAJOR 1 #define SND_UTIL_MINOR 0 -#define SND_UTIL_SUBMINOR 25 +#define SND_UTIL_SUBMINOR 27 #define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\ (SND_UTIL_MINOR<<8)|\ SND_UTIL_SUBMINOR) -#define SND_UTIL_VERSION_STR "1.0.25" +#define SND_UTIL_VERSION_STR "1.0.27.1" diff -Nru alsa-utils-1.0.25/install-sh alsa-utils-1.0.27.1/install-sh --- alsa-utils-1.0.25/install-sh 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/install-sh 2013-05-21 08:50:36.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru alsa-utils-1.0.25/m4/Makefile.am alsa-utils-1.0.27.1/m4/Makefile.am --- alsa-utils-1.0.25/m4/Makefile.am 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/Makefile.am 2013-05-21 08:50:34.000000000 +0000 @@ -1 +1 @@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 gettext.m4 +EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 diff -Nru alsa-utils-1.0.25/m4/Makefile.in alsa-utils-1.0.27.1/m4/Makefile.in --- alsa-utils-1.0.25/m4/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +66,15 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -76,6 +99,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -96,11 +120,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -111,6 +140,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -125,6 +156,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -180,11 +212,11 @@ top_srcdir = @top_srcdir@ udevrulesdir = @udevrulesdir@ xmlto = @xmlto@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 gettext.m4 +EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -209,9 +241,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): tags: TAGS @@ -220,6 +252,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -265,10 +299,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru alsa-utils-1.0.25/m4/codeset.m4 alsa-utils-1.0.27.1/m4/codeset.m4 --- alsa-utils-1.0.25/m4/codeset.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/gettext.m4 alsa-utils-1.0.27.1/m4/gettext.m4 --- alsa-utils-1.0.25/m4/gettext.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/gettext.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# gettext.m4 serial 53 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2005. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,11 +60,18 @@ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_included_intl], + ifelse([$1], [external], + ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), + [yes])) define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ @@ -78,7 +85,7 @@ dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: @@ -104,16 +111,25 @@ LTLIBINTL= POSUB= + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -122,26 +138,35 @@ dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif +changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_TRY_LINK([#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK @@ -152,48 +177,40 @@ dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, + [$gt_func_gnugettext_libintl], [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" ]) fi CPPFLAGS="$gt_save_CPPFLAGS" @@ -204,8 +221,8 @@ dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -252,7 +269,7 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -265,7 +282,7 @@ if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -279,16 +296,16 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -304,9 +321,9 @@ fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -314,316 +331,51 @@ dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], [ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([gl_VISIBILITY])dnl - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_LANGINFO_CODESET - gt_LC_MESSAGES - - dnl Compilation on mingw and Cygwin needs special Makefile rules, because - dnl 1. when we install a shared library, we must arrange to export - dnl auxiliary pointer variables for every exported variable, - dnl 2. when we install a shared library and a static library simultaneously, - dnl the include file specifies __declspec(dllimport) and therefore we - dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in - cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no - fi - WOE32DLL=$is_woe32dll - AC_SUBST([WOE32DLL]) - - dnl Rename some macros and functions used for locking. - AH_BOTTOM([ -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -]) + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) ]) -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], [ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_TRY_LINK( - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], - [], - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, - [Define to 1 if the compiler understands __builtin_expect.])]) - - AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - - AM_ICONV - - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, - dnl and a _NL_LOCALE_NAME macro always. - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, - [AC_TRY_LINK([#include -#include ], - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], - gt_cv_nl_locale_name=yes, - gt_cv_nl_locale_name=no) - ]) - if test $gt_cv_nl_locale_name = yes; then - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, - [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) ]) diff -Nru alsa-utils-1.0.25/m4/glibc2.m4 alsa-utils-1.0.27.1/m4/glibc2.m4 --- alsa-utils-1.0.25/m4/glibc2.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/glibc2.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# glibc2.m4 serial 1 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.0 or newer. -# From Bruno Haible. - -AC_DEFUN([gt_GLIBC2], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, - ac_cv_gnu_library_2, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2=yes, - ac_cv_gnu_library_2=no) - ] - ) - AC_SUBST(GLIBC2) - GLIBC2="$ac_cv_gnu_library_2" - ] -) diff -Nru alsa-utils-1.0.25/m4/glibc21.m4 alsa-utils-1.0.27.1/m4/glibc21.m4 --- alsa-utils-1.0.25/m4/glibc21.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/glibc21.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# glibc21.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([gl_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) diff -Nru alsa-utils-1.0.25/m4/iconv.m4 alsa-utils-1.0.27.1/m4/iconv.m4 --- alsa-utils-1.0.25/m4/iconv.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/iconv.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# iconv.m4 serial 11 (gettext-0.18.1) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,6 +21,7 @@ [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. @@ -33,7 +34,7 @@ am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include @@ -41,7 +42,7 @@ [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -50,13 +51,110 @@ [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) @@ -68,16 +166,31 @@ LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])) +gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include #include @@ -90,12 +203,12 @@ #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff -Nru alsa-utils-1.0.25/m4/intdiv0.m4 alsa-utils-1.0.27.1/m4/intdiv0.m4 --- alsa-utils-1.0.25/m4/intdiv0.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/intdiv0.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -# intdiv0.m4 serial 1 (gettext-0.11.3) -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - AC_TRY_RUN([ -#include -#include - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - ]) - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) diff -Nru alsa-utils-1.0.25/m4/intmax.m4 alsa-utils-1.0.27.1/m4/intmax.m4 --- alsa-utils-1.0.25/m4/intmax.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/intmax.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# intmax.m4 serial 2 (gettext-0.14.2) -dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the system has the 'intmax_t' type, but don't attempt to -dnl find a replacement if it is lacking. - -AC_DEFUN([gt_TYPE_INTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, - [AC_TRY_COMPILE([ -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) - if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, - [Define if you have the 'intmax_t' type in or .]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/inttypes-h.m4 alsa-utils-1.0.27.1/m4/inttypes-h.m4 --- alsa-utils-1.0.25/m4/inttypes-h.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/inttypes-h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# inttypes-h.m4 serial 1 (gettext-0.15) -dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H if exists and doesn't clash with -# . - -AC_DEFUN([gl_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, - [ - AC_TRY_COMPILE( - [#include -#include ], - [], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no) - ]) - if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, - [Define if exists and doesn't clash with .]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/inttypes-pri.m4 alsa-utils-1.0.27.1/m4/inttypes-pri.m4 --- alsa-utils-1.0.25/m4/inttypes-pri.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/inttypes-pri.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# inttypes-pri.m4 serial 2 (gettext-0.15) -dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_REQUIRE([gl_HEADER_INTTYPES_H]) - if test $gl_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, - [ - AC_TRY_COMPILE([#include -#ifdef PRId32 -char *p = PRId32; -#endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, - [Define if exists and defines unusable PRI* macros.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/inttypes_h.m4 alsa-utils-1.0.27.1/m4/inttypes_h.m4 --- alsa-utils-1.0.25/m4/inttypes_h.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/inttypes_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# inttypes_h.m4 serial 6 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - gl_cv_header_inttypes_h=yes, - gl_cv_header_inttypes_h=no)]) - if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/lcmessage.m4 alsa-utils-1.0.27.1/m4/lcmessage.m4 --- alsa-utils-1.0.25/m4/lcmessage.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/lcmessage.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# lcmessage.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([gt_LC_MESSAGES], -[ - AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) - if test $gt_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/lib-ld.m4 alsa-utils-1.0.27.1/m4/lib-ld.m4 --- alsa-utils-1.0.25/m4/lib-ld.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/lib-ld.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,7 +77,7 @@ else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do @@ -89,9 +89,9 @@ # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -101,9 +101,9 @@ fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff -Nru alsa-utils-1.0.25/m4/lib-link.m4 alsa-utils-1.0.27.1/m4/lib-link.m4 --- alsa-utils-1.0.25/m4/lib-link.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/lib-link.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,58 +1,66 @@ -# lib-link.m4 serial 8 (gettext-0.15) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.50) +AC_PREREQ([2.54]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" ]) LIB[]NAME="$ac_cv_lib[]Name[]_libs" LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -66,13 +74,25 @@ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else @@ -82,17 +102,23 @@ CPPFLAGS="$ac_save_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= + LIB[]NAME[]_PREFIX= fi AC_SUBST([HAVE_LIB]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) ]) dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ dnl Tell automake >= 1.10 to complain if config.rpath is missing. @@ -101,7 +127,7 @@ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh @@ -109,35 +135,66 @@ acl_cv_rpath=done ]) wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -150,6 +207,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -158,6 +219,10 @@ LIB[]NAME= LTLIB[]NAME= INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -197,22 +262,55 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIB[]NAME; do @@ -220,21 +318,46 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -249,7 +372,9 @@ dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -268,12 +393,12 @@ ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then dnl Using DIR/libNAME.so during linking hardcodes DIR into the dnl resulting binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode DIR into the resulting dnl binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" @@ -304,13 +429,13 @@ if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH dnl here, because this doesn't fit in flags passed to the dnl compiler. So give up. No hardcoding. This affects only dnl very old systems. @@ -337,6 +462,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -397,9 +532,11 @@ dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -498,18 +635,18 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user must dnl pass all path elements in one option. We can arrange that for a dnl single library, but not when more than one $LIBNAMEs are used. alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else @@ -517,7 +654,7 @@ for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done @@ -530,6 +667,11 @@ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -566,7 +708,7 @@ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) $1= if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode directories into the resulting dnl binary. rpathdirs= @@ -575,7 +717,8 @@ if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -584,7 +727,8 @@ -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; @@ -600,16 +744,16 @@ done else dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user dnl must pass all path elements in one option. alldirs= for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="$flag" else @@ -617,7 +761,7 @@ for dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done diff -Nru alsa-utils-1.0.25/m4/lib-prefix.m4 alsa-utils-1.0.27.1/m4/lib-prefix.m4 --- alsa-utils-1.0.25/m4/lib-prefix.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/lib-prefix.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff -Nru alsa-utils-1.0.25/m4/lock.m4 alsa-utils-1.0.27.1/m4/lock.m4 --- alsa-utils-1.0.25/m4/lock.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/lock.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,289 +0,0 @@ -# lock.m4 serial 2 (gettext-0.15) -dnl Copyright (C) 2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl Tests for a multithreading library to be used. -dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, -dnl USE_PTH_THREADS, USE_WIN32_THREADS -dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use -dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with -dnl libtool). -dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for -dnl programs that really need multithread functionality. The difference -dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak -dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". -dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for -dnl multithread-safe programs. - -AC_DEFUN([gl_LOCK], -[ - AC_REQUIRE([gl_LOCK_BODY]) -]) - -dnl The guts of gl_LOCK. Needs to be expanded only once. - -AC_DEFUN([gl_LOCK_BODY], -[ - dnl Ordering constraints: This macro modifies CPPFLAGS in a way that - dnl influences the result of the autoconf tests that test for *_unlocked - dnl declarations, on AIX 5 at least. Therefore it must come early. - AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl - AC_BEFORE([$0], [gl_ARGP])dnl - - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems - dnl Check for multithreading. - AC_ARG_ENABLE(threads, -AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) -AC_HELP_STRING([--disable-threads], [build without multithread safety]), - gl_use_threads=$enableval, gl_use_threads=yes) - gl_threads_api=none - LIBTHREAD= - LTLIBTHREAD= - LIBMULTITHREAD= - LTLIBMULTITHREAD= - if test "$gl_use_threads" != no; then - dnl Check whether the compiler and linker support weak declarations. - AC_MSG_CHECKING([whether imported symbols can be declared weak]) - gl_have_weak=no - AC_TRY_LINK([extern void xyzzy (); -#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) - AC_MSG_RESULT([$gl_have_weak]) - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that - # it groks . - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) - CPPFLAGS="$gl_save_CPPFLAGS" - if test "$gl_have_pthread_h" = yes; then - # Other possible tests: - # -lpthreads (FSU threads, PCthreads) - # -lgthreads - case "$host_os" in - osf*) - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it - # groks . cc also understands the flag -pthread, but - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, - # 2. putting a flag into CPPFLAGS that has an effect on the linker - # causes the AC_TRY_LINK test below to succeed unexpectedly, - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - ;; - esac - gl_have_pthread= - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. - AC_TRY_LINK([#include ], - [pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0);], - [gl_have_pthread=yes]) - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB(pthread, pthread_kill, - [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread - # On Solaris and HP-UX, most pthread functions exist also in libc. - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. - case "$host_os" in - solaris* | hpux*) - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, - [Define if the pthread_in_use() detection is hard.]) - esac - ]) - else - # Some library is needed. Try libpthread and libc_r. - AC_CHECK_LIB(pthread, pthread_kill, - [gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) - if test -z "$gl_have_pthread"; then - # For FreeBSD 4. - AC_CHECK_LIB(c_r, pthread_kill, - [gl_have_pthread=yes - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) - fi - fi - if test -n "$gl_have_pthread"; then - gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], 1, - [Define if the POSIX multithreading library can be used.]) - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, - [Define if references to the POSIX multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the - # pthread_rwlock_* functions. - AC_CHECK_TYPE([pthread_rwlock_t], - [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, - [Define if the POSIX multithreading library has read/write locks.])], - [], - [#include ]) - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. - AC_TRY_COMPILE([#include ], - [#if __FreeBSD__ == 4 -error "No, in FreeBSD 4.0 recursive mutexes actually don't work." -#else -int x = (int)PTHREAD_MUTEX_RECURSIVE; -#endif], - [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, - [Define if the defines PTHREAD_MUTEX_RECURSIVE.])]) - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case "$host_os" in - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; - esac - fi - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then - gl_have_solaristhread= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lthread" - AC_TRY_LINK([#include -#include ], - [thr_self();], - [gl_have_solaristhread=yes]) - LIBS="$gl_save_LIBS" - if test -n "$gl_have_solaristhread"; then - gl_threads_api=solaris - LIBTHREAD=-lthread - LTLIBTHREAD=-lthread - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_SOLARIS_THREADS], 1, - [Define if the old Solaris multithreading library can be used.]) - if test $gl_have_weak = yes; then - AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, - [Define if references to the old Solaris multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - fi - fi - if test "$gl_use_threads" = pth; then - gl_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_LINKFLAGS(pth) - gl_have_pth= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lpth" - AC_TRY_LINK([#include ], [pth_self();], gl_have_pth=yes) - LIBS="$gl_save_LIBS" - if test -n "$gl_have_pth"; then - gl_threads_api=pth - LIBTHREAD="$LIBPTH" - LTLIBTHREAD="$LTLIBPTH" - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_PTH_THREADS], 1, - [Define if the GNU Pth multithreading library can be used.]) - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then - AC_DEFINE([USE_PTH_THREADS_WEAK], 1, - [Define if references to the GNU Pth multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - else - CPPFLAGS="$gl_save_CPPFLAGS" - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then - if { case "$host_os" in - mingw*) true;; - *) false;; - esac - }; then - gl_threads_api=win32 - AC_DEFINE([USE_WIN32_THREADS], 1, - [Define if the Win32 multithreading API can be used.]) - fi - fi - fi - fi - AC_MSG_CHECKING([for multithread API to use]) - AC_MSG_RESULT([$gl_threads_api]) - AC_SUBST(LIBTHREAD) - AC_SUBST(LTLIBTHREAD) - AC_SUBST(LIBMULTITHREAD) - AC_SUBST(LTLIBMULTITHREAD) - gl_PREREQ_LOCK -]) - -# Prerequisites of lib/lock.c. -AC_DEFUN([gl_PREREQ_LOCK], [ - AC_REQUIRE([AC_C_INLINE]) -]) - -dnl Survey of platforms: -dnl -dnl Platform Available Compiler Supports test-lock -dnl flavours option weak result -dnl --------------- --------- --------- -------- --------- -dnl Linux 2.4/glibc posix -lpthread Y OK -dnl -dnl GNU Hurd/glibc posix -dnl -dnl FreeBSD 5.3 posix -lc_r Y -dnl posix -lkse ? Y -dnl posix -lpthread ? Y -dnl posix -lthr Y -dnl -dnl FreeBSD 5.2 posix -lc_r Y -dnl posix -lkse Y -dnl posix -lthr Y -dnl -dnl FreeBSD 4.0,4.10 posix -lc_r Y OK -dnl -dnl NetBSD 1.6 -- -dnl -dnl OpenBSD 3.4 posix -lpthread Y OK -dnl -dnl MacOS X 10.[123] posix -lpthread Y OK -dnl -dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK -dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK -dnl -dnl HP-UX 11 posix -lpthread N (cc) OK -dnl Y (gcc) -dnl -dnl IRIX 6.5 posix -lpthread Y 0.5 -dnl -dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK -dnl -dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK -dnl -lpthread (gcc) Y -dnl -dnl Cygwin posix -lpthread Y OK -dnl -dnl Any of the above pth -lpth 0.0 -dnl -dnl Mingw win32 N OK -dnl -dnl BeOS 5 -- -dnl -dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is -dnl turned off: -dnl OK if all three tests terminate OK, -dnl 0.5 if the first test terminates OK but the second one loops endlessly, -dnl 0.0 if the first test already loops endlessly. diff -Nru alsa-utils-1.0.25/m4/longdouble.m4 alsa-utils-1.0.27.1/m4/longdouble.m4 --- alsa-utils-1.0.25/m4/longdouble.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/longdouble.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# longdouble.m4 serial 2 (gettext-0.15) -dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the compiler supports the 'long double' type. -dnl Prerequisite: AC_PROG_CC - -dnl This file is only needed in autoconf <= 2.59. Newer versions of autoconf -dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics. - -AC_DEFUN([gt_TYPE_LONGDOUBLE], -[ - AC_CACHE_CHECK([for long double], gt_cv_c_long_double, - [if test "$GCC" = yes; then - gt_cv_c_long_double=yes - else - AC_TRY_COMPILE([ - /* The Stardent Vistra knows sizeof(long double), but does not support it. */ - long double foo = 0.0; - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ - int array [2*(sizeof(long double) >= sizeof(double)) - 1]; - ], , - gt_cv_c_long_double=yes, gt_cv_c_long_double=no) - fi]) - if test $gt_cv_c_long_double = yes; then - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/longlong.m4 alsa-utils-1.0.27.1/m4/longlong.m4 --- alsa-utils-1.0.25/m4/longlong.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/longlong.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# longlong.m4 serial 5 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_LONG_LONG if 'long long' works. - -AC_DEFUN([gl_AC_TYPE_LONG_LONG], -[ - AC_CACHE_CHECK([for long long], ac_cv_type_long_long, - [AC_TRY_LINK([long long ll = 1LL; int i = 63;], - [long long llmax = (long long) -1; - return ll << i | ll >> i | llmax / ll | llmax % ll;], - ac_cv_type_long_long=yes, - ac_cv_type_long_long=no)]) - if test $ac_cv_type_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, - [Define if you have the 'long long' type.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/nls.m4 alsa-utils-1.0.27.1/m4/nls.m4 --- alsa-utils-1.0.25/m4/nls.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/nls.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff -Nru alsa-utils-1.0.25/m4/po.m4 alsa-utils-1.0.27.1/m4/po.m4 --- alsa-utils-1.0.25/m4/po.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/po.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# po.m4 serial 13 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -27,6 +27,10 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake AC_REQUIRE([AM_NLS])dnl + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -37,7 +41,7 @@ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl @@ -84,6 +88,10 @@ test -n "$localedir" || localedir='${datadir}/locale' AC_SUBST([localedir]) + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + AC_CONFIG_COMMANDS([po-directories], [[ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" @@ -426,3 +434,16 @@ fi mv "$ac_file.tmp" "$ac_file" ]) + +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. +AC_DEFUN([AM_XGETTEXT_OPTION_INIT], +[ + XGETTEXT_EXTRA_OPTIONS= +]) + +dnl Registers an option to be passed to xgettext in the po subdirectory. +AC_DEFUN([AM_XGETTEXT_OPTION], +[ + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" +]) diff -Nru alsa-utils-1.0.25/m4/printf-posix.m4 alsa-utils-1.0.27.1/m4/printf-posix.m4 --- alsa-utils-1.0.25/m4/printf-posix.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/printf-posix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -# printf-posix.m4 serial 2 (gettext-0.13.1) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether the printf() function supports POSIX/XSI format strings with -dnl positions. - -AC_DEFUN([gt_PRINTF_POSIX], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], - gt_cv_func_printf_posix, - [ - AC_TRY_RUN([ -#include -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) diff -Nru alsa-utils-1.0.25/m4/progtest.m4 alsa-utils-1.0.27.1/m4/progtest.m4 --- alsa-utils-1.0.25/m4/progtest.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/progtest.m4 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl Authors: dnl Ulrich Drepper , 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff -Nru alsa-utils-1.0.25/m4/signed.m4 alsa-utils-1.0.27.1/m4/signed.m4 --- alsa-utils-1.0.25/m4/signed.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/signed.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# signed.m4 serial 1 (gettext-0.10.40) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([bh_C_SIGNED], -[ - AC_CACHE_CHECK([for signed], bh_cv_c_signed, - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) - if test $bh_cv_c_signed = no; then - AC_DEFINE(signed, , - [Define to empty if the C compiler doesn't support this keyword.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/size_max.m4 alsa-utils-1.0.27.1/m4/size_max.m4 --- alsa-utils-1.0.25/m4/size_max.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/size_max.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -# size_max.m4 serial 4 -dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - result= - AC_EGREP_CPP([Found it], [ -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif -], result=yes) - if test -z "$result"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. Try hard to find a definition that can - dnl be used in a preprocessor #if, i.e. doesn't contain a cast. - _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, - [#include -#include ], size_t_bits_minus_1=) - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, - [#include ], fits_in_uint=) - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then - if test $fits_in_uint = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - dnl We cannot use 'expr' to simplify this expression, because 'expr' - dnl works only with 'long' integers in the host environment, while we - dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. - if test $fits_in_uint = 1; then - result="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" - else - result="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" - fi - else - dnl Shouldn't happen, but who knows... - result='((size_t)~(size_t)0)' - fi - fi - AC_MSG_RESULT([$result]) - if test "$result" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/stdint_h.m4 alsa-utils-1.0.27.1/m4/stdint_h.m4 --- alsa-utils-1.0.25/m4/stdint_h.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/stdint_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# stdint_h.m4 serial 5 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_STDINT_H], -[ - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - gl_cv_header_stdint_h=yes, - gl_cv_header_stdint_h=no)]) - if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/uintmax_t.m4 alsa-utils-1.0.27.1/m4/uintmax_t.m4 --- alsa-utils-1.0.25/m4/uintmax_t.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/uintmax_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# uintmax_t.m4 serial 9 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -AC_PREREQ(2.13) - -# Define uintmax_t to 'unsigned long' or 'unsigned long long' -# if it is not already defined in or . - -AC_DEFUN([gl_AC_TYPE_UINTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then - AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if and don't define.]) - else - AC_DEFINE(HAVE_UINTMAX_T, 1, - [Define if you have the 'uintmax_t' type in or .]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/ulonglong.m4 alsa-utils-1.0.27.1/m4/ulonglong.m4 --- alsa-utils-1.0.25/m4/ulonglong.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/ulonglong.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# ulonglong.m4 serial 4 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. - -AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], -[ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) - if test $ac_cv_type_unsigned_long_long = yes; then - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the 'unsigned long long' type.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/visibility.m4 alsa-utils-1.0.27.1/m4/visibility.m4 --- alsa-utils-1.0.25/m4/visibility.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/visibility.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# visibility.m4 serial 1 (gettext-0.15) -dnl Copyright (C) 2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl Tests whether the compiler supports the command-line option -dnl -fvisibility=hidden and the function and variable attributes -dnl __attribute__((__visibility__("hidden"))) and -dnl __attribute__((__visibility__("default"))). -dnl Does *not* test for __visibility__("protected") - which has tricky -dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -dnl MacOS X. -dnl Does *not* test for __visibility__("internal") - which has processor -dnl dependent semantics. -dnl Does *not* test for #pragma GCC visibility push(hidden) - which is -dnl "really only recommended for legacy code". -dnl Set the variable CFLAG_VISIBILITY. -dnl Defines and sets the variable HAVE_VISIBILITY. - -AC_DEFUN([gl_VISIBILITY], -[ - AC_REQUIRE([AC_PROG_CC]) - CFLAG_VISIBILITY= - HAVE_VISIBILITY=0 - if test -n "$GCC"; then - AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL(gl_cv_cc_visibility, [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - AC_TRY_COMPILE( - [extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void);], - [], - gl_cv_cc_visibility=yes, - gl_cv_cc_visibility=no) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_visibility]) - if test $gl_cv_cc_visibility = yes; then - CFLAG_VISIBILITY="-fvisibility=hidden" - HAVE_VISIBILITY=1 - fi - fi - AC_SUBST([CFLAG_VISIBILITY]) - AC_SUBST([HAVE_VISIBILITY]) - AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], - [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) -]) diff -Nru alsa-utils-1.0.25/m4/wchar_t.m4 alsa-utils-1.0.27.1/m4/wchar_t.m4 --- alsa-utils-1.0.25/m4/wchar_t.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/wchar_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether has the 'wchar_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WCHAR_T], -[ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, - [AC_TRY_COMPILE([#include - wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) - if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/wint_t.m4 alsa-utils-1.0.27.1/m4/wint_t.m4 --- alsa-utils-1.0.25/m4/wint_t.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/wint_t.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# wint_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether has the 'wint_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, - [AC_TRY_COMPILE([#include - wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) - fi -]) diff -Nru alsa-utils-1.0.25/m4/xsize.m4 alsa-utils-1.0.27.1/m4/xsize.m4 --- alsa-utils-1.0.25/m4/xsize.m4 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/m4/xsize.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# xsize.m4 serial 3 -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_XSIZE], -[ - dnl Prerequisites of lib/xsize.h. - AC_REQUIRE([gl_SIZE_MAX]) - AC_REQUIRE([AC_C_INLINE]) - AC_CHECK_HEADERS(stdint.h) -]) diff -Nru alsa-utils-1.0.25/missing alsa-utils-1.0.27.1/missing --- alsa-utils-1.0.25/missing 2012-01-25 09:43:50.000000000 +0000 +++ alsa-utils-1.0.27.1/missing 2013-05-21 08:50:36.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -Nru alsa-utils-1.0.25/po/Makefile.in.in alsa-utils-1.0.27.1/po/Makefile.in.in --- alsa-utils-1.0.25/po/Makefile.in.in 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/po/Makefile.in.in 2013-05-21 08:50:34.000000000 +0000 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,7 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.15 +# Origin: gettext-0.18 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -30,7 +31,17 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ + +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ GMSGFMT_ = @GMSGFMT@ @@ -77,19 +88,26 @@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: all-@USE_NLS@ +all: check-macro-version all-@USE_NLS@ all-yes: stamp-po all-no: +# Ensure that the gettext macros and this Makefile.in.in are in sync. +check-macro-version: + @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } + # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that @@ -120,16 +138,34 @@ # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ + fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ else \ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address="$$msgid_bugs_address" + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -157,8 +193,15 @@ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -181,7 +224,6 @@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -233,7 +275,6 @@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -359,9 +400,15 @@ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -382,9 +429,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff -Nru alsa-utils-1.0.25/po/Rules-quot alsa-utils-1.0.27.1/po/Rules-quot --- alsa-utils-1.0.25/po/Rules-quot 2012-01-25 09:43:48.000000000 +0000 +++ alsa-utils-1.0.27.1/po/Rules-quot 2013-05-21 08:50:34.000000000 +0000 @@ -20,7 +20,7 @@ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff -Nru alsa-utils-1.0.25/po/alsa-utils.pot alsa-utils-1.0.27.1/po/alsa-utils.pot --- alsa-utils-1.0.25/po/alsa-utils.pot 2012-01-25 09:44:00.000000000 +0000 +++ alsa-utils-1.0.27.1/po/alsa-utils.pot 2013-05-21 08:50:47.000000000 +0000 @@ -6,12 +6,13 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: alsa-utils 1.0.27.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-25 10:44+0100\n" +"POT-Creation-Date: 2013-05-21 10:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -203,7 +204,7 @@ msgid "Rear" msgstr "" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:108 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 msgid "Center" msgstr "" @@ -215,131 +216,131 @@ msgid "Side" msgstr "" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 +#: alsamixer/mixer_widget.c:91 alsamixer/mixer_widget.c:96 msgid "cannot open mixer" msgstr "" -#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:102 alsamixer/mixer_widget.c:179 msgid "cannot load mixer controls" msgstr "" -#: alsamixer/mixer_widget.c:173 +#: alsamixer/mixer_widget.c:169 #, c-format msgid "Cannot open mixer device '%s'." msgstr "" -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:190 msgid "Esc Exit" msgstr "" -#: alsamixer/mixer_widget.c:195 +#: alsamixer/mixer_widget.c:191 msgid "F1 ? H Help" msgstr "" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:192 msgid "F2 / System information" msgstr "" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:193 msgid "F3 Show playback controls" msgstr "" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:194 msgid "F4 Show capture controls" msgstr "" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:195 msgid "F5 Show all controls" msgstr "" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:196 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:197 msgid "F6 S Select sound card" msgstr "" -#: alsamixer/mixer_widget.c:202 +#: alsamixer/mixer_widget.c:198 msgid "L Redraw screen" msgstr "" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:200 msgid "Left Move to the previous control" msgstr "" -#: alsamixer/mixer_widget.c:205 +#: alsamixer/mixer_widget.c:201 msgid "Right Move to the next control" msgstr "" -#: alsamixer/mixer_widget.c:207 +#: alsamixer/mixer_widget.c:203 msgid "Up/Down Change volume" msgstr "" -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:204 msgid "+ - Change volume" msgstr "" -#: alsamixer/mixer_widget.c:209 +#: alsamixer/mixer_widget.c:205 msgid "Page Up/Dn Change volume in big steps" msgstr "" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:206 msgid "End Set volume to 0%" msgstr "" -#: alsamixer/mixer_widget.c:211 +#: alsamixer/mixer_widget.c:207 msgid "0-9 Set volume to 0%-90%" msgstr "" -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:208 msgid "Q W E Increase left/both/right volumes" msgstr "" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:210 msgid "Z X C Decrease left/both/right volumes" msgstr "" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:211 msgid "B Balance left and right volumes" msgstr "" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:213 msgid "M Toggle mute" msgstr "" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:215 msgid "< > Toggle left/right mute" msgstr "" -#: alsamixer/mixer_widget.c:221 +#: alsamixer/mixer_widget.c:217 msgid "Space Toggle capture" msgstr "" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:223 +#: alsamixer/mixer_widget.c:219 msgid "; ' Toggle left/right capture" msgstr "" -#: alsamixer/mixer_widget.c:225 +#: alsamixer/mixer_widget.c:221 msgid "Authors:" msgstr "" -#: alsamixer/mixer_widget.c:226 +#: alsamixer/mixer_widget.c:222 msgid " Tim Janik" msgstr "" -#: alsamixer/mixer_widget.c:227 +#: alsamixer/mixer_widget.c:223 msgid " Jaroslav Kysela " msgstr "" -#: alsamixer/mixer_widget.c:228 +#: alsamixer/mixer_widget.c:224 msgid " Clemens Ladisch " msgstr "" -#: alsamixer/mixer_widget.c:230 +#: alsamixer/mixer_widget.c:226 msgid "Help" msgstr "" @@ -356,23 +357,23 @@ msgid "Cannot open file \"%s\"." msgstr "" -#: aplay/aplay.c:163 +#: aplay/aplay.c:175 msgid "raw data" msgstr "" -#: aplay/aplay.c:164 +#: aplay/aplay.c:176 msgid "VOC" msgstr "" -#: aplay/aplay.c:166 +#: aplay/aplay.c:178 msgid "WAVE" msgstr "" -#: aplay/aplay.c:167 +#: aplay/aplay.c:179 msgid "Sparc Audio" msgstr "" -#: aplay/aplay.c:188 +#: aplay/aplay.c:200 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -403,6 +404,7 @@ "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" +"-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -418,464 +420,486 @@ " for this many seconds\n" " --process-id-file write the process ID here\n" " --use-strftime apply the strftime facility to the output file name\n" +" --dump-hw-params dump hw_params of the device\n" +" --fatal-errors treat all errors as fatal\n" msgstr "" -#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 #, c-format msgid "Recognized sample formats are:" msgstr "" -#: aplay/aplay.c:234 +#: aplay/aplay.c:250 #, c-format msgid "" "\n" "Some of these may not be available on selected hardware\n" msgstr "" -#: aplay/aplay.c:235 +#: aplay/aplay.c:251 #, c-format -msgid "The availabled format shortcuts are:\n" +msgid "The available format shortcuts are:\n" msgstr "" -#: aplay/aplay.c:236 +#: aplay/aplay.c:252 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "" -#: aplay/aplay.c:237 +#: aplay/aplay.c:253 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "" -#: aplay/aplay.c:238 +#: aplay/aplay.c:254 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "" -#: aplay/aplay.c:252 +#: aplay/aplay.c:268 msgid "no soundcards found..." msgstr "" -#: aplay/aplay.c:255 +#: aplay/aplay.c:271 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "" -#: aplay/aplay.c:284 +#: aplay/aplay.c:300 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "" -#: aplay/aplay.c:290 +#: aplay/aplay.c:306 #, c-format msgid " Subdevices: %i/%i\n" msgstr "" -#: aplay/aplay.c:297 +#: aplay/aplay.c:313 #, c-format msgid " Subdevice #%i: %s\n" msgstr "" -#: aplay/aplay.c:380 +#: aplay/aplay.c:394 #, c-format msgid "Aborted by signal %s...\n" msgstr "" -#: aplay/aplay.c:492 +#: aplay/aplay.c:512 msgid "command should be named either arecord or aplay" msgstr "" -#: aplay/aplay.c:531 +#: aplay/aplay.c:556 #, c-format msgid "unrecognized file format %s" msgstr "" -#: aplay/aplay.c:538 +#: aplay/aplay.c:563 #, c-format msgid "value %i for channels is invalid" msgstr "" -#: aplay/aplay.c:557 +#: aplay/aplay.c:582 #, c-format msgid "wrong extended format '%s'" msgstr "" -#: aplay/aplay.c:568 +#: aplay/aplay.c:593 #, c-format msgid "bad speed value %i" msgstr "" -#: aplay/aplay.c:666 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:601 +#, c-format +msgid "Unable to parse channel map string: %s\n" +msgstr "" + +#: aplay/aplay.c:706 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: aplay/aplay.c:682 +#: aplay/aplay.c:722 #, c-format msgid "audio open error: %s" msgstr "" -#: aplay/aplay.c:687 +#: aplay/aplay.c:727 #, c-format msgid "info error: %s" msgstr "" -#: aplay/aplay.c:694 +#: aplay/aplay.c:734 #, c-format msgid "nonblock setting error: %s" msgstr "" -#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 +#: aplay/aplay.c:1867 aplay/aplay.c:1897 msgid "not enough memory" msgstr "" -#: aplay/aplay.c:728 +#: aplay/aplay.c:768 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "" -#: aplay/aplay.c:818 +#: aplay/aplay.c:858 #, c-format msgid "read error (called from line %i)" msgstr "" -#: aplay/aplay.c:876 +#: aplay/aplay.c:925 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "" -#: aplay/aplay.c:886 +#: aplay/aplay.c:936 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" msgstr "" -#: aplay/aplay.c:891 +#: aplay/aplay.c:941 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "" -#: aplay/aplay.c:898 +#: aplay/aplay.c:948 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "" -#: aplay/aplay.c:902 +#: aplay/aplay.c:953 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "" -#: aplay/aplay.c:910 aplay/aplay.c:1010 +#: aplay/aplay.c:961 aplay/aplay.c:1087 #, c-format msgid "Warning: format is changed to U8\n" msgstr "" -#: aplay/aplay.c:916 -#, c-format -msgid "Warning: format is changed to S16_LE\n" -msgstr "" - -#: aplay/aplay.c:924 -#, c-format -msgid "Warning: format is changed to S24_3LE\n" -msgstr "" - -#: aplay/aplay.c:930 +#: aplay/aplay.c:971 aplay/aplay.c:984 aplay/aplay.c:995 #, c-format -msgid "Warning: format is changed to S24_LE\n" +msgid "Warning: format is changed to %s\n" msgstr "" -#: aplay/aplay.c:934 +#: aplay/aplay.c:1000 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" msgstr "" -#: aplay/aplay.c:946 +#: aplay/aplay.c:1023 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr "" -#: aplay/aplay.c:1004 +#: aplay/aplay.c:1081 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "" -#: aplay/aplay.c:1016 +#: aplay/aplay.c:1093 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "" -#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 -#: aplay/aplay.c:2495 +#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 +#: aplay/aplay.c:2727 msgid "read error" msgstr "" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1136 +msgid "Channel numbers don't match between hw_params and channel map" +msgstr "" + +#: aplay/aplay.c:1145 +#, c-format +msgid "Warning: unable to get channel map\n" +msgstr "" + +#: aplay/aplay.c:1178 +#, c-format +msgid "Channel %d doesn't match with hw_parmas" +msgstr "" + +#: aplay/aplay.c:1204 msgid "Broken configuration for this PCM: no configurations available" msgstr "" -#: aplay/aplay.c:1076 +#: aplay/aplay.c:1208 +#, c-format +msgid "HW Params of device \"%s\":\n" +msgstr "" + +#: aplay/aplay.c:1228 msgid "Access type not available" msgstr "" -#: aplay/aplay.c:1081 +#: aplay/aplay.c:1233 msgid "Sample format non available" msgstr "" -#: aplay/aplay.c:1087 +#: aplay/aplay.c:1239 msgid "Channels count non available" msgstr "" -#: aplay/aplay.c:1102 +#: aplay/aplay.c:1254 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1260 #, c-format msgid " please, try the plug plugin %s\n" msgstr "" -#: aplay/aplay.c:1145 +#: aplay/aplay.c:1297 msgid "Unable to install hw params:" msgstr "" -#: aplay/aplay.c:1152 +#: aplay/aplay.c:1304 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "" -#: aplay/aplay.c:1183 +#: aplay/aplay.c:1335 msgid "unable to install sw params:" msgstr "" -#: aplay/aplay.c:1214 +#: aplay/aplay.c:1369 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1239 +#: aplay/aplay.c:1398 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1263 +#: aplay/aplay.c:1422 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1268 +#: aplay/aplay.c:1427 #, c-format msgid "pause push error: %s" msgstr "" -#: aplay/aplay.c:1277 +#: aplay/aplay.c:1436 #, c-format msgid "pause release error: %s" msgstr "" -#: aplay/aplay.c:1293 +#: aplay/aplay.c:1452 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1335 +#: aplay/aplay.c:1494 #, c-format msgid "status error: %s" msgstr "" -#: aplay/aplay.c:1345 aplay/aplay.c:1356 +#: aplay/aplay.c:1499 #, c-format -msgid "%s!!! (at least %.3f ms long)\n" +msgid "fatal %s: %s" msgstr "" -#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 msgid "underrun" msgstr "" -#: aplay/aplay.c:1346 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 msgid "overrun" msgstr "" -#: aplay/aplay.c:1361 +#: aplay/aplay.c:1510 aplay/aplay.c:1521 +#, c-format +msgid "%s!!! (at least %.3f ms long)\n" +msgstr "" + +#: aplay/aplay.c:1526 #, c-format msgid "Status:\n" msgstr "" -#: aplay/aplay.c:1365 +#: aplay/aplay.c:1530 #, c-format msgid "xrun: prepare error: %s" msgstr "" -#: aplay/aplay.c:1371 +#: aplay/aplay.c:1536 #, c-format msgid "Status(DRAINING):\n" msgstr "" -#: aplay/aplay.c:1375 +#: aplay/aplay.c:1540 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "" -#: aplay/aplay.c:1377 +#: aplay/aplay.c:1542 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "" -#: aplay/aplay.c:1384 +#: aplay/aplay.c:1549 #, c-format msgid "Status(R/W):\n" msgstr "" -#: aplay/aplay.c:1387 +#: aplay/aplay.c:1552 #, c-format msgid "read/write error, state = %s" msgstr "" -#: aplay/aplay.c:1397 +#: aplay/aplay.c:1562 #, c-format msgid "Suspended. Trying resume. " msgstr "" -#: aplay/aplay.c:1402 +#: aplay/aplay.c:1567 #, c-format msgid "Failed. Restarting stream. " msgstr "" -#: aplay/aplay.c:1404 +#: aplay/aplay.c:1569 #, c-format msgid "suspend: prepare error: %s" msgstr "" -#: aplay/aplay.c:1409 +#: aplay/aplay.c:1574 #, c-format msgid "Done.\n" msgstr "" -#: aplay/aplay.c:1431 +#: aplay/aplay.c:1596 #, c-format msgid " !clip " msgstr "" -#: aplay/aplay.c:1578 +#: aplay/aplay.c:1743 #, c-format msgid "Unsupported bit size %d.\n" msgstr "" -#: aplay/aplay.c:1612 +#: aplay/aplay.c:1777 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "" -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1811 #, c-format msgid "" -"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %" -"li\n" +"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " +"%li\n" msgstr "" -#: aplay/aplay.c:1710 +#: aplay/aplay.c:1939 #, c-format msgid "write error: %s" msgstr "" -#: aplay/aplay.c:1757 +#: aplay/aplay.c:1987 #, c-format msgid "writev error: %s" msgstr "" -#: aplay/aplay.c:1801 +#: aplay/aplay.c:2031 #, c-format msgid "read error: %s" msgstr "" -#: aplay/aplay.c:1845 +#: aplay/aplay.c:2075 #, c-format msgid "readv error: %s" msgstr "" -#: aplay/aplay.c:1893 +#: aplay/aplay.c:2123 msgid "can't allocate buffer for silence" msgstr "" -#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 -#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 -#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 +#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 +#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 +#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 msgid "write error" msgstr "" -#: aplay/aplay.c:1915 +#: aplay/aplay.c:2145 #, c-format msgid "voc_pcm_flush - silence error" msgstr "" -#: aplay/aplay.c:1918 +#: aplay/aplay.c:2148 msgid "voc_pcm_flush error" msgstr "" -#: aplay/aplay.c:1944 +#: aplay/aplay.c:2173 msgid "malloc error" msgstr "" -#: aplay/aplay.c:1948 +#: aplay/aplay.c:2177 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "" -#: aplay/aplay.c:2016 aplay/aplay.c:2108 +#: aplay/aplay.c:2245 aplay/aplay.c:2340 msgid "can't play packed .voc files" msgstr "" -#: aplay/aplay.c:2068 +#: aplay/aplay.c:2300 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "" -#: aplay/aplay.c:2117 +#: aplay/aplay.c:2349 #, c-format msgid "unknown blocktype %d. terminate." msgstr "" -#: aplay/aplay.c:2248 +#: aplay/aplay.c:2480 #, c-format msgid "Wave doesn't support %s format..." msgstr "" -#: aplay/aplay.c:2308 +#: aplay/aplay.c:2540 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Playing" msgstr "" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Recording" msgstr "" -#: aplay/aplay.c:2393 +#: aplay/aplay.c:2625 #, c-format msgid "Rate %d Hz, " msgstr "" -#: aplay/aplay.c:2395 +#: aplay/aplay.c:2627 #, c-format msgid "Mono" msgstr "" -#: aplay/aplay.c:2397 +#: aplay/aplay.c:2629 #, c-format msgid "Stereo" msgstr "" -#: aplay/aplay.c:2399 +#: aplay/aplay.c:2631 #, c-format msgid "Channels %i" msgstr "" -#: aplay/aplay.c:2910 aplay/aplay.c:2963 +#: aplay/aplay.c:3145 aplay/aplay.c:3198 #, c-format msgid "You need to specify %d files" msgstr "" @@ -1063,7 +1087,7 @@ #: seq/aseqnet/aseqnet.c:170 #, c-format -msgid " -p,--port # : sepcify TCP port (digit or service name)\n" +msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr "" #: seq/aseqnet/aseqnet.c:171 @@ -1156,257 +1180,262 @@ msgid "disconnected\n" msgstr "" -#: speaker-test/speaker-test.c:104 +#: speaker-test/speaker-test.c:116 msgid "Front Left" msgstr "" -#: speaker-test/speaker-test.c:105 +#: speaker-test/speaker-test.c:117 msgid "Front Right" msgstr "" -#: speaker-test/speaker-test.c:106 +#: speaker-test/speaker-test.c:118 msgid "Rear Left" msgstr "" -#: speaker-test/speaker-test.c:107 +#: speaker-test/speaker-test.c:119 msgid "Rear Right" msgstr "" -#: speaker-test/speaker-test.c:109 +#: speaker-test/speaker-test.c:121 msgid "LFE" msgstr "" -#: speaker-test/speaker-test.c:110 +#: speaker-test/speaker-test.c:122 msgid "Side Left" msgstr "" -#: speaker-test/speaker-test.c:111 +#: speaker-test/speaker-test.c:123 msgid "Side Right" msgstr "" -#: speaker-test/speaker-test.c:112 +#: speaker-test/speaker-test.c:124 msgid "Channel 9" msgstr "" -#: speaker-test/speaker-test.c:113 +#: speaker-test/speaker-test.c:125 msgid "Channel 10" msgstr "" -#: speaker-test/speaker-test.c:114 +#: speaker-test/speaker-test.c:126 msgid "Channel 11" msgstr "" -#: speaker-test/speaker-test.c:115 +#: speaker-test/speaker-test.c:127 msgid "Channel 12" msgstr "" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:128 msgid "Channel 13" msgstr "" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:129 msgid "Channel 14" msgstr "" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:130 msgid "Channel 15" msgstr "" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:131 msgid "Channel 16" msgstr "" -#: speaker-test/speaker-test.c:383 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "" -#: speaker-test/speaker-test.c:390 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Access type not available for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:397 +#: speaker-test/speaker-test.c:468 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:404 +#: speaker-test/speaker-test.c:475 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "" -#: speaker-test/speaker-test.c:412 +#: speaker-test/speaker-test.c:483 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:417 +#: speaker-test/speaker-test.c:488 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "" -#: speaker-test/speaker-test.c:421 +#: speaker-test/speaker-test.c:492 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "" -#: speaker-test/speaker-test.c:427 +#: speaker-test/speaker-test.c:498 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "" -#: speaker-test/speaker-test.c:428 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "" -#: speaker-test/speaker-test.c:430 +#: speaker-test/speaker-test.c:501 #, c-format msgid "Requested period time %u us\n" msgstr "" -#: speaker-test/speaker-test.c:433 +#: speaker-test/speaker-test.c:504 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:439 +#: speaker-test/speaker-test.c:510 #, c-format msgid "Requested buffer time %u us\n" msgstr "" -#: speaker-test/speaker-test.c:442 +#: speaker-test/speaker-test.c:513 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:451 +#: speaker-test/speaker-test.c:522 #, c-format msgid "Using max buffer size %lu\n" msgstr "" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:460 +#: speaker-test/speaker-test.c:531 #, c-format msgid "Periods = %u\n" msgstr "" -#: speaker-test/speaker-test.c:463 +#: speaker-test/speaker-test.c:534 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:472 +#: speaker-test/speaker-test.c:543 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:478 +#: speaker-test/speaker-test.c:549 #, c-format msgid "was set period_size = %lu\n" msgstr "" -#: speaker-test/speaker-test.c:479 +#: speaker-test/speaker-test.c:550 #, c-format msgid "was set buffer_size = %lu\n" msgstr "" -#: speaker-test/speaker-test.c:481 +#: speaker-test/speaker-test.c:552 #, c-format msgid "buffer to small, could not use\n" msgstr "" -#: speaker-test/speaker-test.c:494 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:508 +#: speaker-test/speaker-test.c:579 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:515 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:530 +#: speaker-test/speaker-test.c:606 +#, c-format +msgid "Unable to set channel map: %s\n" +msgstr "" + +#: speaker-test/speaker-test.c:626 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:541 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:605 speaker-test/speaker-test.c:1025 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 #, c-format msgid "No enough memory\n" msgstr "" -#: speaker-test/speaker-test.c:610 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Cannot open WAV file %s\n" msgstr "" -#: speaker-test/speaker-test.c:614 speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 #, c-format msgid "Invalid WAV file %s\n" msgstr "" -#: speaker-test/speaker-test.c:619 +#: speaker-test/speaker-test.c:715 #, c-format msgid "Not a WAV file: %s\n" msgstr "" -#: speaker-test/speaker-test.c:623 +#: speaker-test/speaker-test.c:719 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "" -#: speaker-test/speaker-test.c:628 +#: speaker-test/speaker-test.c:724 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "" -#: speaker-test/speaker-test.c:633 +#: speaker-test/speaker-test.c:729 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "" -#: speaker-test/speaker-test.c:638 +#: speaker-test/speaker-test.c:734 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "" -#: speaker-test/speaker-test.c:688 +#: speaker-test/speaker-test.c:787 #, c-format msgid "Undefined channel %d\n" msgstr "" -#: speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:838 #, c-format msgid "Write error: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:741 +#: speaker-test/speaker-test.c:840 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:803 +#: speaker-test/speaker-test.c:926 #, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1424,75 +1453,76 @@ "-s,--speaker\tsingle speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile\tUse the given WAV file as a test sound\n" "-W,--wavdir\tSpecify the directory containing WAV files\n" +"-m,--chmap\tSpecify the channel map to override\n" "\n" msgstr "" -#: speaker-test/speaker-test.c:921 +#: speaker-test/speaker-test.c:1055 #, c-format msgid "Invalid number of periods %d\n" msgstr "" -#: speaker-test/speaker-test.c:937 speaker-test/speaker-test.c:941 +#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 #, c-format msgid "Invalid test type %s\n" msgstr "" -#: speaker-test/speaker-test.c:953 +#: speaker-test/speaker-test.c:1087 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "" -#: speaker-test/speaker-test.c:967 +#: speaker-test/speaker-test.c:1106 #, c-format msgid "Unknown option '%c'\n" msgstr "" -#: speaker-test/speaker-test.c:981 +#: speaker-test/speaker-test.c:1120 #, c-format msgid "Playback device is %s\n" msgstr "" -#: speaker-test/speaker-test.c:982 +#: speaker-test/speaker-test.c:1121 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "" -#: speaker-test/speaker-test.c:985 +#: speaker-test/speaker-test.c:1124 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "" -#: speaker-test/speaker-test.c:988 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "" -#: speaker-test/speaker-test.c:991 +#: speaker-test/speaker-test.c:1130 #, c-format msgid "WAV file(s)\n" msgstr "" -#: speaker-test/speaker-test.c:997 +#: speaker-test/speaker-test.c:1140 #, c-format msgid "Playback open error: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:1002 +#: speaker-test/speaker-test.c:1146 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1007 +#: speaker-test/speaker-test.c:1150 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1056 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 #, c-format msgid "Transfer failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:1066 +#: speaker-test/speaker-test.c:1205 #, c-format msgid "Time per period = %lf\n" msgstr "" Binary files /tmp/oRSekIPKbX/alsa-utils-1.0.25/po/de.gmo and /tmp/BVig9mejsQ/alsa-utils-1.0.27.1/po/de.gmo differ diff -Nru alsa-utils-1.0.25/po/de.po alsa-utils-1.0.27.1/po/de.po --- alsa-utils-1.0.25/po/de.po 2012-01-25 09:44:01.000000000 +0000 +++ alsa-utils-1.0.27.1/po/de.po 2013-05-21 08:50:47.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-25 10:44+0100\n" +"POT-Creation-Date: 2013-05-21 10:50+0200\n" "PO-Revision-Date: 2010-11-09 21:12+0100\n" "Last-Translator: Clemens Ladisch \n" "Language-Team: German\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -211,7 +212,7 @@ msgid "Rear" msgstr "Hinten" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:108 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 msgid "Center" msgstr "Mitte" @@ -223,131 +224,131 @@ msgid "Side" msgstr "Seiten" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 +#: alsamixer/mixer_widget.c:91 alsamixer/mixer_widget.c:96 msgid "cannot open mixer" msgstr "Fehler beim Öffen des Mixer-Gerätes" -#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:102 alsamixer/mixer_widget.c:179 msgid "cannot load mixer controls" msgstr "Fehler beim Laden der Mixer-Regler" -#: alsamixer/mixer_widget.c:173 +#: alsamixer/mixer_widget.c:169 #, c-format msgid "Cannot open mixer device '%s'." msgstr "Fehler beim Öffnen des Mixer-Gerätes '%s'." -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:190 msgid "Esc Exit" msgstr "Esc Beenden" -#: alsamixer/mixer_widget.c:195 +#: alsamixer/mixer_widget.c:191 msgid "F1 ? H Help" msgstr "F1 ? H Hilfe" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:192 msgid "F2 / System information" msgstr "F2 / System-Informationen" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:193 msgid "F3 Show playback controls" msgstr "F3 Ansicht Wiedergabe-Regler" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:194 msgid "F4 Show capture controls" msgstr "F4 Ansicht Aufnahme-Regler" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:195 msgid "F5 Show all controls" msgstr "F5 Ansicht alle Regler" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:196 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "Tab Ansichts-Modus umschalten (F3/F4/F5)" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:197 msgid "F6 S Select sound card" msgstr "F6 S Soundkarte auswählen" -#: alsamixer/mixer_widget.c:202 +#: alsamixer/mixer_widget.c:198 msgid "L Redraw screen" msgstr "L Bildschirm neu darstellen" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:200 msgid "Left Move to the previous control" msgstr "Links gehe zum vorherigen Regler" -#: alsamixer/mixer_widget.c:205 +#: alsamixer/mixer_widget.c:201 msgid "Right Move to the next control" msgstr "Rechts gehe zum nächsten Regler" -#: alsamixer/mixer_widget.c:207 +#: alsamixer/mixer_widget.c:203 msgid "Up/Down Change volume" msgstr "Oben/Unten Lautstärke ändern" -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:204 msgid "+ - Change volume" msgstr "+ - Lautstärke ändern" -#: alsamixer/mixer_widget.c:209 +#: alsamixer/mixer_widget.c:205 msgid "Page Up/Dn Change volume in big steps" msgstr "Bild ^/v Lautstärke in großen Schritten ändern" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:206 msgid "End Set volume to 0%" msgstr "Ende Lautstärke auf 0% setzen" -#: alsamixer/mixer_widget.c:211 +#: alsamixer/mixer_widget.c:207 msgid "0-9 Set volume to 0%-90%" msgstr "0-9 Lautstärke auf 0%-90% setzen" -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:208 msgid "Q W E Increase left/both/right volumes" msgstr "Q W E linke/beide/rechte Lautstärke erhöhen" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:210 msgid "Z X C Decrease left/both/right volumes" msgstr "Y X C linke/beide/rechte Lautstärke verringern" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:211 msgid "B Balance left and right volumes" msgstr "B linke und rechte Lautstärke angleichen" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:213 msgid "M Toggle mute" msgstr "M stumm umschalten" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:215 msgid "< > Toggle left/right mute" msgstr ", . stumm links/rechts umschalten" -#: alsamixer/mixer_widget.c:221 +#: alsamixer/mixer_widget.c:217 msgid "Space Toggle capture" msgstr "Leertaste Aufnahme umschalten" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:223 +#: alsamixer/mixer_widget.c:219 msgid "; ' Toggle left/right capture" msgstr "Einfg Entf Aufnahme links/rechts umschalten" -#: alsamixer/mixer_widget.c:225 +#: alsamixer/mixer_widget.c:221 msgid "Authors:" msgstr "Autoren:" -#: alsamixer/mixer_widget.c:226 +#: alsamixer/mixer_widget.c:222 msgid " Tim Janik" msgstr " Tim Janik" -#: alsamixer/mixer_widget.c:227 +#: alsamixer/mixer_widget.c:223 msgid " Jaroslav Kysela " msgstr " Jaroslav Kysela " -#: alsamixer/mixer_widget.c:228 +#: alsamixer/mixer_widget.c:224 msgid " Clemens Ladisch " msgstr " Clemens Ladisch " -#: alsamixer/mixer_widget.c:230 +#: alsamixer/mixer_widget.c:226 msgid "Help" msgstr "Hilfe" @@ -364,23 +365,23 @@ msgid "Cannot open file \"%s\"." msgstr "Fehler beim Öffnen der Datei \"%s\"." -#: aplay/aplay.c:163 +#: aplay/aplay.c:175 msgid "raw data" msgstr "Rohdaten" -#: aplay/aplay.c:164 +#: aplay/aplay.c:176 msgid "VOC" msgstr "VOC" -#: aplay/aplay.c:166 +#: aplay/aplay.c:178 msgid "WAVE" msgstr "WAVE" -#: aplay/aplay.c:167 +#: aplay/aplay.c:179 msgid "Sparc Audio" msgstr "Sparc-Audio" -#: aplay/aplay.c:188 +#: aplay/aplay.c:200 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -411,6 +412,7 @@ "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" +"-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -426,6 +428,8 @@ " for this many seconds\n" " --process-id-file write the process ID here\n" " --use-strftime apply the strftime facility to the output file name\n" +" --dump-hw-params dump hw_params of the device\n" +" --fatal-errors treat all errors as fatal\n" msgstr "" "Verwendung: %s [Option]... [Datei]...\n" "\n" @@ -467,12 +471,12 @@ " --process-id-file=# schreibe Prozess-ID in diese Datei\n" " --use-strftime formatiere Dateiname mit strftime; %%v=Dateinummer\n" -#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 #, c-format msgid "Recognized sample formats are:" msgstr "Unterstützte Sample-Formate:" -#: aplay/aplay.c:234 +#: aplay/aplay.c:250 #, c-format msgid "" "\n" @@ -481,120 +485,126 @@ "\n" "Nicht alle davon sind auf jeder Hardware verfügbar.\n" -#: aplay/aplay.c:235 -#, c-format -msgid "The availabled format shortcuts are:\n" +#: aplay/aplay.c:251 +#, fuzzy, c-format +msgid "The available format shortcuts are:\n" msgstr "Unterstütze Format-Abkürzungen:\n" -#: aplay/aplay.c:236 +#: aplay/aplay.c:252 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "-f cd (16 Bits, Little Endian, 44100 Hz, stereo)\n" -#: aplay/aplay.c:237 +#: aplay/aplay.c:253 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "-f cdr (16 Bits, Big Endian, 44100 Hz, stereo)\n" -#: aplay/aplay.c:238 +#: aplay/aplay.c:254 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "-f dat (16 Bits, Little Endian, 48000 Hz, stereo)\n" -#: aplay/aplay.c:252 +#: aplay/aplay.c:268 msgid "no soundcards found..." msgstr "keine Soundkarten gefunden ..." -#: aplay/aplay.c:255 +#: aplay/aplay.c:271 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "**** Liste der Hardware-Geräte (%s) ****\n" -#: aplay/aplay.c:284 +#: aplay/aplay.c:300 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "Karte %i: %s [%s], Gerät %i: %s [%s]\n" -#: aplay/aplay.c:290 +#: aplay/aplay.c:306 #, c-format msgid " Subdevices: %i/%i\n" msgstr " Sub-Geräte: %i/%i\n" -#: aplay/aplay.c:297 +#: aplay/aplay.c:313 #, c-format msgid " Subdevice #%i: %s\n" msgstr " Sub-Gerät #%i: %s\n" -#: aplay/aplay.c:380 +#: aplay/aplay.c:394 #, c-format msgid "Aborted by signal %s...\n" msgstr "Abbruch durch Signal %s ...\n" -#: aplay/aplay.c:492 +#: aplay/aplay.c:512 msgid "command should be named either arecord or aplay" msgstr "Befehl sollte arecord oder aplay sein" -#: aplay/aplay.c:531 +#: aplay/aplay.c:556 #, c-format msgid "unrecognized file format %s" msgstr "unbekanntes Dateiformat %s" -#: aplay/aplay.c:538 +#: aplay/aplay.c:563 #, c-format msgid "value %i for channels is invalid" msgstr "Kanalanzahl %i ist ungültig" -#: aplay/aplay.c:557 +#: aplay/aplay.c:582 #, c-format msgid "wrong extended format '%s'" msgstr "erweitertes Format '%s' ist ungültig" -#: aplay/aplay.c:568 +#: aplay/aplay.c:593 #, c-format msgid "bad speed value %i" msgstr "ungültige Rate %i" -#: aplay/aplay.c:666 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:601 +#, fuzzy, c-format +msgid "Unable to parse channel map string: %s\n" +msgstr "Fehler beim Setzen des Mindest-verfügbar-Wertes: %s\n" + +#: aplay/aplay.c:706 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Siehe `%s --help' für mehr Informationen.\n" -#: aplay/aplay.c:682 +#: aplay/aplay.c:722 #, c-format msgid "audio open error: %s" msgstr "Fehler beim Öffnen des Gerätes: %s" -#: aplay/aplay.c:687 +#: aplay/aplay.c:727 #, c-format msgid "info error: %s" msgstr "Fehler beim Lesen der Geräteinformationen: %s" -#: aplay/aplay.c:694 +#: aplay/aplay.c:734 #, c-format msgid "nonblock setting error: %s" msgstr "Fehler beim Setzen des nonblock-Modus: %s" -#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 +#: aplay/aplay.c:1867 aplay/aplay.c:1897 msgid "not enough memory" msgstr "nicht genug Speicher" -#: aplay/aplay.c:728 +#: aplay/aplay.c:768 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "Fehler beim Schreiben der Prozess-ID-Datei %s: %s" -#: aplay/aplay.c:818 +#: aplay/aplay.c:858 #, c-format msgid "read error (called from line %i)" msgstr "Lesefehler (aufgerufen von Zeile %i)" -#: aplay/aplay.c:876 +#: aplay/aplay.c:925 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "" "unbekannte Länge des 'fmt '-Blocks (gelesen: %u, sollte mindestens %u sein)" -#: aplay/aplay.c:886 +#: aplay/aplay.c:936 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" @@ -602,340 +612,354 @@ "unbekannte Länge des erweiterten 'fmt '-Blocks (gelesen: %u, sollte " "mindestens %u sein)" -#: aplay/aplay.c:891 +#: aplay/aplay.c:941 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "ungültiger Format-Wert im erweiterten 'fmt '-Block" -#: aplay/aplay.c:898 +#: aplay/aplay.c:948 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "" "kann WAVE-Datei-Format 0x%04x nicht abspielen; ist weder PCM noch FLOAT" -#: aplay/aplay.c:902 +#: aplay/aplay.c:953 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "kann WAVE-Datei mit %d Kanälen nicht abspielen" -#: aplay/aplay.c:910 aplay/aplay.c:1010 +#: aplay/aplay.c:961 aplay/aplay.c:1087 #, c-format msgid "Warning: format is changed to U8\n" msgstr "Warnung: benutztes Format ist U8\n" -#: aplay/aplay.c:916 -#, c-format -msgid "Warning: format is changed to S16_LE\n" -msgstr "Warnung: benutztes Format ist S16_LE\n" - -#: aplay/aplay.c:924 -#, c-format -msgid "Warning: format is changed to S24_3LE\n" -msgstr "Warnung: benutztes Format ist S24_3LE\n" - -#: aplay/aplay.c:930 -#, c-format -msgid "Warning: format is changed to S24_LE\n" -msgstr "Warnung: benutztes Format ist S24_LE\n" +#: aplay/aplay.c:971 aplay/aplay.c:984 aplay/aplay.c:995 +#, fuzzy, c-format +msgid "Warning: format is changed to %s\n" +msgstr "Warnung: benutztes Format ist U8\n" -#: aplay/aplay.c:934 +#: aplay/aplay.c:1000 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" msgstr "" "kann WAVE-Datei mit %d-Bit-Samples in %d Bytes (%d Kanäle) nicht abspielen" -#: aplay/aplay.c:946 +#: aplay/aplay.c:1023 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr "kann WAVE-Datei mit %d-Bit-Samples nicht abspielen" -#: aplay/aplay.c:1004 +#: aplay/aplay.c:1081 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "Warnung: benutztes Format ist MU_LAW\n" -#: aplay/aplay.c:1016 +#: aplay/aplay.c:1093 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "Warnung: benutztes Format ist S16_BE\n" -#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 -#: aplay/aplay.c:2495 +#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 +#: aplay/aplay.c:2727 msgid "read error" msgstr "Lesefehler" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1136 +msgid "Channel numbers don't match between hw_params and channel map" +msgstr "" + +#: aplay/aplay.c:1145 +#, c-format +msgid "Warning: unable to get channel map\n" +msgstr "" + +#: aplay/aplay.c:1178 +#, c-format +msgid "Channel %d doesn't match with hw_parmas" +msgstr "" + +#: aplay/aplay.c:1204 msgid "Broken configuration for this PCM: no configurations available" msgstr "" "ungültige Konfiguration für dieses Gerät: keine unterstützte Konfiguration" -#: aplay/aplay.c:1076 +#: aplay/aplay.c:1208 +#, c-format +msgid "HW Params of device \"%s\":\n" +msgstr "" + +#: aplay/aplay.c:1228 msgid "Access type not available" msgstr "Zugriffs-Modus nicht unterstützt" -#: aplay/aplay.c:1081 +#: aplay/aplay.c:1233 msgid "Sample format non available" msgstr "Sample-Format nicht unterstützt" -#: aplay/aplay.c:1087 +#: aplay/aplay.c:1239 msgid "Channels count non available" msgstr "Kanalanzahl nicht unterstützt" -#: aplay/aplay.c:1102 +#: aplay/aplay.c:1254 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "" "Warnung: Rate ist nicht exakt (angefordert: %i Hz, unterstützt: %i Hz)\n" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1260 #, c-format msgid " please, try the plug plugin %s\n" msgstr " probieren Sie bitte das plug-Plugin: %s\n" -#: aplay/aplay.c:1145 +#: aplay/aplay.c:1297 msgid "Unable to install hw params:" msgstr "Fehler beim Setzen der Hardware-Parameter:" -#: aplay/aplay.c:1152 +#: aplay/aplay.c:1304 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "Periode gleich der Puffer-Größe wird nicht unterstützt (%lu == %lu)" -#: aplay/aplay.c:1183 +#: aplay/aplay.c:1335 msgid "unable to install sw params:" msgstr "Fehler beim Setzen der Software-Parameter:" -#: aplay/aplay.c:1214 +#: aplay/aplay.c:1369 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "Fehler bei snd_pcm_mmap_begin: %s" -#: aplay/aplay.c:1239 +#: aplay/aplay.c:1398 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "Fehler beim Setzen von O_NONBLOCK in stdin\n" -#: aplay/aplay.c:1263 +#: aplay/aplay.c:1422 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "\rPause-Kommando ignoriert (keine HW-Unterstützung)\n" -#: aplay/aplay.c:1268 +#: aplay/aplay.c:1427 #, c-format msgid "pause push error: %s" msgstr "Fehler beim Pausieren: %s" -#: aplay/aplay.c:1277 +#: aplay/aplay.c:1436 #, c-format msgid "pause release error: %s" msgstr "Fehler beim Beenden der Pause: %s" -#: aplay/aplay.c:1293 +#: aplay/aplay.c:1452 #, c-format msgid "" "\r=== PAUSE === " msgstr "" "\r=== PAUSE === " -#: aplay/aplay.c:1335 +#: aplay/aplay.c:1494 #, c-format msgid "status error: %s" msgstr "Status-Fehler: %s" -#: aplay/aplay.c:1345 aplay/aplay.c:1356 -#, c-format -msgid "%s!!! (at least %.3f ms long)\n" -msgstr "%s!!! (mindestens %.3f ms)\n" +#: aplay/aplay.c:1499 +#, fuzzy, c-format +msgid "fatal %s: %s" +msgstr "%s: %s\n" -#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 msgid "underrun" msgstr "Unterlauf" -#: aplay/aplay.c:1346 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 msgid "overrun" msgstr "Überlauf" -#: aplay/aplay.c:1361 +#: aplay/aplay.c:1510 aplay/aplay.c:1521 +#, c-format +msgid "%s!!! (at least %.3f ms long)\n" +msgstr "%s!!! (mindestens %.3f ms)\n" + +#: aplay/aplay.c:1526 #, c-format msgid "Status:\n" msgstr "Status:\n" -#: aplay/aplay.c:1365 +#: aplay/aplay.c:1530 #, c-format msgid "xrun: prepare error: %s" msgstr "Unter-/Überlauf: Fehler beim Re-Initialisieren des Gerätes: %s" -#: aplay/aplay.c:1371 +#: aplay/aplay.c:1536 #, c-format msgid "Status(DRAINING):\n" msgstr "Status (DRAINING):\n" -#: aplay/aplay.c:1375 +#: aplay/aplay.c:1540 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "Format-Wechsel der Aufnahme-Daten? Versuche Wiederherstellung ...\n" -#: aplay/aplay.c:1377 +#: aplay/aplay.c:1542 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "XRUN (DRAINING): Fehler beim Re-Initialisieren des Gerätes: %s" -#: aplay/aplay.c:1384 +#: aplay/aplay.c:1549 #, c-format msgid "Status(R/W):\n" msgstr "Status (R/W):\n" -#: aplay/aplay.c:1387 +#: aplay/aplay.c:1552 #, c-format msgid "read/write error, state = %s" msgstr "Lese-/Schreibfehler, Status = %s" -#: aplay/aplay.c:1397 +#: aplay/aplay.c:1562 #, c-format msgid "Suspended. Trying resume. " msgstr "Ruhezustand. Versuche, aufzuwecken. " -#: aplay/aplay.c:1402 +#: aplay/aplay.c:1567 #, c-format msgid "Failed. Restarting stream. " msgstr "Fehlgeschlagen. Re-Initialisierung. " -#: aplay/aplay.c:1404 +#: aplay/aplay.c:1569 #, c-format msgid "suspend: prepare error: %s" msgstr "Ruhezustand: Fehler beim Re-Initialisieren: %s" -#: aplay/aplay.c:1409 +#: aplay/aplay.c:1574 #, c-format msgid "Done.\n" msgstr "Fertig.\n" -#: aplay/aplay.c:1431 +#: aplay/aplay.c:1596 #, c-format msgid " !clip " msgstr " !clip " -#: aplay/aplay.c:1578 +#: aplay/aplay.c:1743 #, c-format msgid "Unsupported bit size %d.\n" msgstr "%d-Bit-Samples werden nicht unterstützt.\n" -#: aplay/aplay.c:1612 +#: aplay/aplay.c:1777 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "Höchstwert (%li Samples): 0x%08x " -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1811 #, c-format msgid "" -"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %" -"li\n" +"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " +"%li\n" msgstr "" -"verdächtige Puffer-Position (total %li): avail = %li, delay = %li, buffer = %" -"li\n" +"verdächtige Puffer-Position (total %li): avail = %li, delay = %li, buffer = " +"%li\n" -#: aplay/aplay.c:1710 +#: aplay/aplay.c:1939 #, c-format msgid "write error: %s" msgstr "Schreibfehler: %s" -#: aplay/aplay.c:1757 +#: aplay/aplay.c:1987 #, c-format msgid "writev error: %s" msgstr "Vektor-Schreib-Fehler: %s" -#: aplay/aplay.c:1801 +#: aplay/aplay.c:2031 #, c-format msgid "read error: %s" msgstr "Lesefehler: %s" -#: aplay/aplay.c:1845 +#: aplay/aplay.c:2075 #, c-format msgid "readv error: %s" msgstr "Vektor-Lese-Fehler: %s" -#: aplay/aplay.c:1893 +#: aplay/aplay.c:2123 msgid "can't allocate buffer for silence" msgstr "nicht genug Speicher für Stille-Block" -#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 -#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 -#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 +#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 +#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 +#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 msgid "write error" msgstr "Schreibfehler" -#: aplay/aplay.c:1915 +#: aplay/aplay.c:2145 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - Fehler in set_silence" -#: aplay/aplay.c:1918 +#: aplay/aplay.c:2148 msgid "voc_pcm_flush error" msgstr "Schreibfehler" -#: aplay/aplay.c:1944 +#: aplay/aplay.c:2173 msgid "malloc error" msgstr "nicht genug Speicher" -#: aplay/aplay.c:1948 +#: aplay/aplay.c:2177 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "Spiele Creative Labs Channel-Datei '%s'...\n" -#: aplay/aplay.c:2016 aplay/aplay.c:2108 +#: aplay/aplay.c:2245 aplay/aplay.c:2340 msgid "can't play packed .voc files" msgstr "kann komprimierte .voc-Dateien nicht abspielen" -#: aplay/aplay.c:2068 +#: aplay/aplay.c:2300 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "" "kann Schleife nicht abspielen; Dateiposition in %s ist nicht änderbar\n" -#: aplay/aplay.c:2117 +#: aplay/aplay.c:2349 #, c-format msgid "unknown blocktype %d. terminate." msgstr "Unbekannter Block-Typ %d. Abbruch." -#: aplay/aplay.c:2248 +#: aplay/aplay.c:2480 #, c-format msgid "Wave doesn't support %s format..." msgstr "Format %s wird in WAVE nicht unterstützt ..." -#: aplay/aplay.c:2308 +#: aplay/aplay.c:2540 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Format %s wird in Sparc-Audio nicht unterstützt ..." -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Playing" msgstr "Wiedergabe:" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Recording" msgstr "Aufnahme:" -#: aplay/aplay.c:2393 +#: aplay/aplay.c:2625 #, c-format msgid "Rate %d Hz, " msgstr "Rate: %d Hz, " -#: aplay/aplay.c:2395 +#: aplay/aplay.c:2627 #, c-format msgid "Mono" msgstr "mono" -#: aplay/aplay.c:2397 +#: aplay/aplay.c:2629 #, c-format msgid "Stereo" msgstr "stereo" -#: aplay/aplay.c:2399 +#: aplay/aplay.c:2631 #, c-format msgid "Channels %i" msgstr "%i Kanäle" -#: aplay/aplay.c:2910 aplay/aplay.c:2963 +#: aplay/aplay.c:3145 aplay/aplay.c:3198 #, c-format msgid "You need to specify %d files" msgstr "Es werden %d Dateien benötigt." @@ -1122,8 +1146,8 @@ msgstr "Optionen:\n" #: seq/aseqnet/aseqnet.c:170 -#, c-format -msgid " -p,--port # : sepcify TCP port (digit or service name)\n" +#, fuzzy, c-format +msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr " -p,--port # : TCP-Port (Zahl oder Service-Name)\n" #: seq/aseqnet/aseqnet.c:171 @@ -1216,263 +1240,268 @@ msgid "disconnected\n" msgstr "Verbindung getrennt\n" -#: speaker-test/speaker-test.c:104 +#: speaker-test/speaker-test.c:116 msgid "Front Left" msgstr "Vorne links" -#: speaker-test/speaker-test.c:105 +#: speaker-test/speaker-test.c:117 msgid "Front Right" msgstr "Vorne rechts" -#: speaker-test/speaker-test.c:106 +#: speaker-test/speaker-test.c:118 msgid "Rear Left" msgstr "Hinten links" -#: speaker-test/speaker-test.c:107 +#: speaker-test/speaker-test.c:119 msgid "Rear Right" msgstr "Hinten rechts" -#: speaker-test/speaker-test.c:109 +#: speaker-test/speaker-test.c:121 msgid "LFE" msgstr "Bass" -#: speaker-test/speaker-test.c:110 +#: speaker-test/speaker-test.c:122 msgid "Side Left" msgstr "Seitlich links" -#: speaker-test/speaker-test.c:111 +#: speaker-test/speaker-test.c:123 msgid "Side Right" msgstr "Seitlich rechts" -#: speaker-test/speaker-test.c:112 +#: speaker-test/speaker-test.c:124 msgid "Channel 9" msgstr "Kanal 9" -#: speaker-test/speaker-test.c:113 +#: speaker-test/speaker-test.c:125 msgid "Channel 10" msgstr "Kanal 10" -#: speaker-test/speaker-test.c:114 +#: speaker-test/speaker-test.c:126 msgid "Channel 11" msgstr "Kanal 11" -#: speaker-test/speaker-test.c:115 +#: speaker-test/speaker-test.c:127 msgid "Channel 12" msgstr "Kanal 12" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:128 msgid "Channel 13" msgstr "Kanal 13" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:129 msgid "Channel 14" msgstr "Kanal 14" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:130 msgid "Channel 15" msgstr "Kanal 15" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:131 msgid "Channel 16" msgstr "Kanal 16" -#: speaker-test/speaker-test.c:383 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "Ungültige Konfiguration: keine unterstützte Konfiguration: %s\n" -#: speaker-test/speaker-test.c:390 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Access type not available for playback: %s\n" msgstr "Zugriffsmodus nicht unterstützt: %s\n" -#: speaker-test/speaker-test.c:397 +#: speaker-test/speaker-test.c:468 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "Sample-Format nicht unterstützt: %s\n" -#: speaker-test/speaker-test.c:404 +#: speaker-test/speaker-test.c:475 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "Kanal-Anzahl %i nicht unterstützt: %s\n" -#: speaker-test/speaker-test.c:412 +#: speaker-test/speaker-test.c:483 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "Rate %i Hz nicht unterstützt: %s\n" -#: speaker-test/speaker-test.c:417 +#: speaker-test/speaker-test.c:488 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "" -"Rate ist nicht exakt (angefordert: %i Hz, unterstützt: %i Hz, Fehlercode %" -"d)\n" +"Rate ist nicht exakt (angefordert: %i Hz, unterstützt: %i Hz, Fehlercode " +"%d)\n" -#: speaker-test/speaker-test.c:421 +#: speaker-test/speaker-test.c:492 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "Rate ist %i Hz (angefordert: %i Hz)\n" -#: speaker-test/speaker-test.c:427 +#: speaker-test/speaker-test.c:498 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "Puffergröße von %lu bis %lu\n" -#: speaker-test/speaker-test.c:428 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "Periodengröße von %lu bis %lu\n" -#: speaker-test/speaker-test.c:430 +#: speaker-test/speaker-test.c:501 #, c-format msgid "Requested period time %u us\n" msgstr "Angeforderte Periodenzeit %u µs\n" -#: speaker-test/speaker-test.c:433 +#: speaker-test/speaker-test.c:504 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "Fehler beim Setzen der Periodenzeit %u µs: %s\n" -#: speaker-test/speaker-test.c:439 +#: speaker-test/speaker-test.c:510 #, c-format msgid "Requested buffer time %u us\n" msgstr "Angeforderte Pufferlänge %u µs\n" -#: speaker-test/speaker-test.c:442 +#: speaker-test/speaker-test.c:513 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "Fehler beim Setzen der Pufferlänge %u µs: %s\n" -#: speaker-test/speaker-test.c:451 +#: speaker-test/speaker-test.c:522 #, c-format msgid "Using max buffer size %lu\n" msgstr "Verwende maximale Puffergröße %lu\n" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "Fehler beim Setzen der Puffergröße %lu: %s\n" -#: speaker-test/speaker-test.c:460 +#: speaker-test/speaker-test.c:531 #, c-format msgid "Periods = %u\n" msgstr "Perioden = %u\n" -#: speaker-test/speaker-test.c:463 +#: speaker-test/speaker-test.c:534 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "Fehler beim Setzen der Periodenanzahl %u: %s\n" -#: speaker-test/speaker-test.c:472 +#: speaker-test/speaker-test.c:543 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "Fehler beim Setzen der Hardware-Parameter: %s\n" -#: speaker-test/speaker-test.c:478 +#: speaker-test/speaker-test.c:549 #, c-format msgid "was set period_size = %lu\n" msgstr "gesetzt: period_size = %lu\n" -#: speaker-test/speaker-test.c:479 +#: speaker-test/speaker-test.c:550 #, c-format msgid "was set buffer_size = %lu\n" msgstr "gesetzt: buffer_size = %lu\n" -#: speaker-test/speaker-test.c:481 +#: speaker-test/speaker-test.c:552 #, c-format msgid "buffer to small, could not use\n" msgstr "Puffer zu klein, kann nicht benutzt werden\n" -#: speaker-test/speaker-test.c:494 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "Fehler beim Lesen der Software-Parameter: %s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "Fehler beim Setzen des Start-Schwellenwertes: %s\n" -#: speaker-test/speaker-test.c:508 +#: speaker-test/speaker-test.c:579 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "Fehler beim Setzen des Mindest-verfügbar-Wertes: %s\n" -#: speaker-test/speaker-test.c:515 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "Fehler beim Setzen der Software-Parameter: %s\n" -#: speaker-test/speaker-test.c:530 +#: speaker-test/speaker-test.c:606 +#, fuzzy, c-format +msgid "Unable to set channel map: %s\n" +msgstr "Fehler beim Setzen des Mindest-verfügbar-Wertes: %s\n" + +#: speaker-test/speaker-test.c:626 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "" "Fehler bei Unterlauf-Behandlung, Re-Initialisierung fehlgeschlagen: %s\n" -#: speaker-test/speaker-test.c:541 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "" "Fehler beim Aufwachen aus dem Ruhezustand, Re-Initialisierung " "fehlgeschlagen: %s\n" -#: speaker-test/speaker-test.c:605 speaker-test/speaker-test.c:1025 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 #, c-format msgid "No enough memory\n" msgstr "Nicht genug Speicher\n" -#: speaker-test/speaker-test.c:610 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Cannot open WAV file %s\n" msgstr "Kann WAV-Datei %s nicht öffnen\n" -#: speaker-test/speaker-test.c:614 speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 #, c-format msgid "Invalid WAV file %s\n" msgstr "Ungültige WAV-Datei %s\n" -#: speaker-test/speaker-test.c:619 +#: speaker-test/speaker-test.c:715 #, c-format msgid "Not a WAV file: %s\n" msgstr "Keine WAV-Datei: %s\n" -#: speaker-test/speaker-test.c:623 +#: speaker-test/speaker-test.c:719 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "Nicht unterstütztes WAV-Format %d in %s\n" -#: speaker-test/speaker-test.c:628 +#: speaker-test/speaker-test.c:724 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s ist keine Mono-Datei (%d Kanäle)\n" -#: speaker-test/speaker-test.c:633 +#: speaker-test/speaker-test.c:729 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "Sample-Rate (%d) stimmt nicht überein in %s\n" -#: speaker-test/speaker-test.c:638 +#: speaker-test/speaker-test.c:734 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "Nicht unterstütztes Sample-Format mit %d Bits in %s\n" -#: speaker-test/speaker-test.c:688 +#: speaker-test/speaker-test.c:787 #, c-format msgid "Undefined channel %d\n" msgstr "Kanal %d nicht definiert\n" -#: speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:838 #, c-format msgid "Write error: %d,%s\n" msgstr "Schreibfehler: %d, %s\n" -#: speaker-test/speaker-test.c:741 +#: speaker-test/speaker-test.c:840 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery fehlgeschlagen: %d, %s\n" -#: speaker-test/speaker-test.c:803 -#, c-format +#: speaker-test/speaker-test.c:926 +#, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" "-h,--help\thelp\n" @@ -1489,6 +1518,7 @@ "-s,--speaker\tsingle speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile\tUse the given WAV file as a test sound\n" "-W,--wavdir\tSpecify the directory containing WAV files\n" +"-m,--chmap\tSpecify the channel map to override\n" "\n" msgstr "" "Verwendung: speaker-test [Option]...\n" @@ -1508,72 +1538,81 @@ "-W,--wavdir benutze Verzeichnis mit darin enthaltenen WAV-Dateien\n" "\n" -#: speaker-test/speaker-test.c:921 +#: speaker-test/speaker-test.c:1055 #, c-format msgid "Invalid number of periods %d\n" msgstr "Ungültige Periodenanzahl %d\n" -#: speaker-test/speaker-test.c:937 speaker-test/speaker-test.c:941 +#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 #, c-format msgid "Invalid test type %s\n" msgstr "Ungültiger Test-Typ %s\n" -#: speaker-test/speaker-test.c:953 +#: speaker-test/speaker-test.c:1087 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "Ungültiger Wert für Option -s\n" -#: speaker-test/speaker-test.c:967 +#: speaker-test/speaker-test.c:1106 #, c-format msgid "Unknown option '%c'\n" msgstr "Unbekannte Options '%c'\n" -#: speaker-test/speaker-test.c:981 +#: speaker-test/speaker-test.c:1120 #, c-format msgid "Playback device is %s\n" msgstr "Wiedergabe-Gerät ist %s\n" -#: speaker-test/speaker-test.c:982 +#: speaker-test/speaker-test.c:1121 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "Stream-Parameter sind %i Hz, %s, %i Kanäle\n" -#: speaker-test/speaker-test.c:985 +#: speaker-test/speaker-test.c:1124 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "Verwende 16 Oktaven rosa Rauschen\n" -#: speaker-test/speaker-test.c:988 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "Sinuswelle mit Frequenz %.4f Hz\n" -#: speaker-test/speaker-test.c:991 +#: speaker-test/speaker-test.c:1130 #, c-format msgid "WAV file(s)\n" msgstr "WAV-Datei(en)\n" -#: speaker-test/speaker-test.c:997 +#: speaker-test/speaker-test.c:1140 #, c-format msgid "Playback open error: %d,%s\n" msgstr "Fehler beim Öffnen des Gerätes: %d, %s\n" -#: speaker-test/speaker-test.c:1002 +#: speaker-test/speaker-test.c:1146 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "Fehler beim Setzen der Hardware-Parameter: %s\n" -#: speaker-test/speaker-test.c:1007 +#: speaker-test/speaker-test.c:1150 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "Fehler beim Setzen der Software-Parameter: %s\n" -#: speaker-test/speaker-test.c:1056 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 #, c-format msgid "Transfer failed: %s\n" msgstr "Schreibfehler: %s\n" -#: speaker-test/speaker-test.c:1066 +#: speaker-test/speaker-test.c:1205 #, c-format msgid "Time per period = %lf\n" msgstr "Zeit pro Periode = %lf\n" + +#~ msgid "Warning: format is changed to S16_LE\n" +#~ msgstr "Warnung: benutztes Format ist S16_LE\n" + +#~ msgid "Warning: format is changed to S24_3LE\n" +#~ msgstr "Warnung: benutztes Format ist S24_3LE\n" + +#~ msgid "Warning: format is changed to S24_LE\n" +#~ msgstr "Warnung: benutztes Format ist S24_LE\n" Binary files /tmp/oRSekIPKbX/alsa-utils-1.0.25/po/fr.gmo and /tmp/BVig9mejsQ/alsa-utils-1.0.27.1/po/fr.gmo differ diff -Nru alsa-utils-1.0.25/po/fr.po alsa-utils-1.0.27.1/po/fr.po --- alsa-utils-1.0.25/po/fr.po 2012-01-25 09:44:01.000000000 +0000 +++ alsa-utils-1.0.27.1/po/fr.po 2013-05-21 08:50:47.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-25 10:44+0100\n" +"POT-Creation-Date: 2013-05-21 10:50+0200\n" "PO-Revision-Date: 2011-01-07 06:23+0100\n" "Last-Translator: Christoph J. Thompson \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -210,7 +211,7 @@ msgid "Rear" msgstr "Arrière" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:108 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 msgid "Center" msgstr "Centre" @@ -222,131 +223,131 @@ msgid "Side" msgstr "Côté" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 +#: alsamixer/mixer_widget.c:91 alsamixer/mixer_widget.c:96 msgid "cannot open mixer" msgstr "le mixeur ne peut pas être ouvert" -#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:102 alsamixer/mixer_widget.c:179 msgid "cannot load mixer controls" msgstr "les commandes de mixage ne peuvent pas être chargés" -#: alsamixer/mixer_widget.c:173 +#: alsamixer/mixer_widget.c:169 #, c-format msgid "Cannot open mixer device '%s'." msgstr "Le périphérique de mixage '%s' ne peut pas être ouvert." -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:190 msgid "Esc Exit" msgstr "Esc Quitter" -#: alsamixer/mixer_widget.c:195 +#: alsamixer/mixer_widget.c:191 msgid "F1 ? H Help" msgstr "F1 ? H Aide" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:192 msgid "F2 / System information" msgstr "F2 / Informations système" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:193 msgid "F3 Show playback controls" msgstr "F3 Afficher les commandes de lecture" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:194 msgid "F4 Show capture controls" msgstr "F4 Afficher les commandes de capture" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:195 msgid "F5 Show all controls" msgstr "F5 Afficher toutes les commandes" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:196 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "Tab Choisir le mode de visualisation (F3/F4/F5)" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:197 msgid "F6 S Select sound card" msgstr "F6 S Choisir la carte son" -#: alsamixer/mixer_widget.c:202 +#: alsamixer/mixer_widget.c:198 msgid "L Redraw screen" msgstr "L Actualiser l'écran" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:200 msgid "Left Move to the previous control" msgstr "Gauche Aller à la commande précédente" -#: alsamixer/mixer_widget.c:205 +#: alsamixer/mixer_widget.c:201 msgid "Right Move to the next control" msgstr "Droite Aller à la commande suivante" -#: alsamixer/mixer_widget.c:207 +#: alsamixer/mixer_widget.c:203 msgid "Up/Down Change volume" msgstr "Haut/Bas Ajuster le volume" -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:204 msgid "+ - Change volume" msgstr "+ - Ajuster le volume" -#: alsamixer/mixer_widget.c:209 +#: alsamixer/mixer_widget.c:205 msgid "Page Up/Dn Change volume in big steps" msgstr "Page Préc./Suiv. Ajuster le volume en grandes intervalles" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:206 msgid "End Set volume to 0%" msgstr "Fin Couper le volume" -#: alsamixer/mixer_widget.c:211 +#: alsamixer/mixer_widget.c:207 msgid "0-9 Set volume to 0%-90%" msgstr "0-9 Ajuster le volume entre 0 et 90%" -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:208 msgid "Q W E Increase left/both/right volumes" msgstr "Q W E Augmenter les volumes de gauche/centre/droite" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:210 msgid "Z X C Decrease left/both/right volumes" msgstr "Z X C Baisser les volumes de gauche/centre/droite" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:211 msgid "B Balance left and right volumes" msgstr "B Égaliser les volumes de gauche et droite" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:213 msgid "M Toggle mute" msgstr "M (Dés)activer le mode muet" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:215 msgid "< > Toggle left/right mute" msgstr "< > (Dés)activer le mode muet à gauche et à droite" -#: alsamixer/mixer_widget.c:221 +#: alsamixer/mixer_widget.c:217 msgid "Space Toggle capture" msgstr "Espace (Dés)activer la capture" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:223 +#: alsamixer/mixer_widget.c:219 msgid "; ' Toggle left/right capture" msgstr "; (Dés)activer la capture à gauche et à droite" -#: alsamixer/mixer_widget.c:225 +#: alsamixer/mixer_widget.c:221 msgid "Authors:" msgstr "Auteurs:" -#: alsamixer/mixer_widget.c:226 +#: alsamixer/mixer_widget.c:222 msgid " Tim Janik" msgstr "" -#: alsamixer/mixer_widget.c:227 +#: alsamixer/mixer_widget.c:223 msgid " Jaroslav Kysela " msgstr "" -#: alsamixer/mixer_widget.c:228 +#: alsamixer/mixer_widget.c:224 msgid " Clemens Ladisch " msgstr "" -#: alsamixer/mixer_widget.c:230 +#: alsamixer/mixer_widget.c:226 msgid "Help" msgstr "Aide" @@ -363,23 +364,23 @@ msgid "Cannot open file \"%s\"." msgstr "Le fichier \"%s\" n'a pas pu être ouvert." -#: aplay/aplay.c:163 +#: aplay/aplay.c:175 msgid "raw data" msgstr "données brutes" -#: aplay/aplay.c:164 +#: aplay/aplay.c:176 msgid "VOC" msgstr "" -#: aplay/aplay.c:166 +#: aplay/aplay.c:178 msgid "WAVE" msgstr "" -#: aplay/aplay.c:167 +#: aplay/aplay.c:179 msgid "Sparc Audio" msgstr "" -#: aplay/aplay.c:188 +#: aplay/aplay.c:200 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -410,6 +411,7 @@ "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" +"-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -425,6 +427,8 @@ " for this many seconds\n" " --process-id-file write the process ID here\n" " --use-strftime apply the strftime facility to the output file name\n" +" --dump-hw-params dump hw_params of the device\n" +" --fatal-errors treat all errors as fatal\n" msgstr "" "Utilisation: %s [OPTION]... [FICHIER]...\n" "\n" @@ -474,12 +478,12 @@ " --process-id-file écrire l'identifiant du processus ici\n" " --use-strftime utiliser strftime pour le nom du fichier de capture\n" -#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 #, c-format msgid "Recognized sample formats are:" msgstr "Les formats d'échantillonage connus sont:" -#: aplay/aplay.c:234 +#: aplay/aplay.c:250 #, c-format msgid "" "\n" @@ -488,119 +492,125 @@ "\n" "Certains de ceux-ci ne sont peut être pas disponibles avec ce matériel\n" -#: aplay/aplay.c:235 -#, c-format -msgid "The availabled format shortcuts are:\n" +#: aplay/aplay.c:251 +#, fuzzy, c-format +msgid "The available format shortcuts are:\n" msgstr "Les raccourcis format disponibles sont:\n" -#: aplay/aplay.c:236 +#: aplay/aplay.c:252 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "-f cd (16 bit petit boutiste, 44100, stéréo)\n" -#: aplay/aplay.c:237 +#: aplay/aplay.c:253 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "-f cdr (16 bit gros boutiste, 44100, stéréo)\n" -#: aplay/aplay.c:238 +#: aplay/aplay.c:254 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "-f dat (16 bit petit boutiste, 48000, stéréo)\n" -#: aplay/aplay.c:252 +#: aplay/aplay.c:268 msgid "no soundcards found..." msgstr "aucune carte son n'a été trouvée..." -#: aplay/aplay.c:255 +#: aplay/aplay.c:271 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "**** Liste des Périphériques Matériels %s ****\n" -#: aplay/aplay.c:284 +#: aplay/aplay.c:300 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "carte %i: %s [%s], périphérique %i: %s [%s]\n" -#: aplay/aplay.c:290 +#: aplay/aplay.c:306 #, c-format msgid " Subdevices: %i/%i\n" msgstr " Sous-périphériques: %i/%i\n" -#: aplay/aplay.c:297 +#: aplay/aplay.c:313 #, c-format msgid " Subdevice #%i: %s\n" msgstr " Sous-périphérique #%i: %s\n" -#: aplay/aplay.c:380 +#: aplay/aplay.c:394 #, c-format msgid "Aborted by signal %s...\n" msgstr "Interrompu par le signal %s...\n" -#: aplay/aplay.c:492 +#: aplay/aplay.c:512 msgid "command should be named either arecord or aplay" msgstr "la commande doit être nommée arecord ou aplay" -#: aplay/aplay.c:531 +#: aplay/aplay.c:556 #, c-format msgid "unrecognized file format %s" msgstr "format de fichier inconnu %s" -#: aplay/aplay.c:538 +#: aplay/aplay.c:563 #, c-format msgid "value %i for channels is invalid" msgstr "la valeur %i pour les canaux est incorrecte" -#: aplay/aplay.c:557 +#: aplay/aplay.c:582 #, c-format msgid "wrong extended format '%s'" msgstr "format étendu '%s' erronné" -#: aplay/aplay.c:568 +#: aplay/aplay.c:593 #, c-format msgid "bad speed value %i" msgstr "mauvaise valeur de vitesse %i" -#: aplay/aplay.c:666 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:601 +#, c-format +msgid "Unable to parse channel map string: %s\n" +msgstr "" + +#: aplay/aplay.c:706 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" -#: aplay/aplay.c:682 +#: aplay/aplay.c:722 #, c-format msgid "audio open error: %s" msgstr "erreur à l'ouverture audio: %s" -#: aplay/aplay.c:687 +#: aplay/aplay.c:727 #, c-format msgid "info error: %s" msgstr "erreur info: %s" -#: aplay/aplay.c:694 +#: aplay/aplay.c:734 #, c-format msgid "nonblock setting error: %s" msgstr "paramètre de non-blocage erronné: %s" -#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 +#: aplay/aplay.c:1867 aplay/aplay.c:1897 msgid "not enough memory" msgstr "pas assez de mémoire" -#: aplay/aplay.c:728 +#: aplay/aplay.c:768 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "Le fichier de numéro de processus %s n'a pas pu être créé: %s" -#: aplay/aplay.c:818 +#: aplay/aplay.c:858 #, c-format msgid "read error (called from line %i)" msgstr "erreur de lecture (appelé à la ligne %i)" -#: aplay/aplay.c:876 +#: aplay/aplay.c:925 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "longueur du morceau 'fmt ' inconnue (lu %u, devrait être au moins %u)" -#: aplay/aplay.c:886 +#: aplay/aplay.c:936 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" @@ -608,43 +618,33 @@ "longueur du morceau 'fmt ' extensible inconnue (lu %u, devrait être au moins " "%u)" -#: aplay/aplay.c:891 +#: aplay/aplay.c:941 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "libellé de format erronné dans le morceau extensible 'fmt '" -#: aplay/aplay.c:898 +#: aplay/aplay.c:948 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "" "Les formats de ficher WAVE 0x%04x qui ne sont pas encodés en PCM ouFLOAT ne " "sont pas supportés" -#: aplay/aplay.c:902 +#: aplay/aplay.c:953 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "Les fichiers WAVE avec %d pistes ne sont pas supportés" -#: aplay/aplay.c:910 aplay/aplay.c:1010 +#: aplay/aplay.c:961 aplay/aplay.c:1087 #, c-format msgid "Warning: format is changed to U8\n" msgstr "Avertissement: le format est changé en U8\n" -#: aplay/aplay.c:916 -#, c-format -msgid "Warning: format is changed to S16_LE\n" -msgstr "Avertissement: le format est changé en S16_LE\n" - -#: aplay/aplay.c:924 -#, c-format -msgid "Warning: format is changed to S24_3LE\n" -msgstr "Avertissement: le format est changé en S24_3LE\n" - -#: aplay/aplay.c:930 -#, c-format -msgid "Warning: format is changed to S24_LE\n" -msgstr "Avertissement: le format est changé en S24_LE\n" +#: aplay/aplay.c:971 aplay/aplay.c:984 aplay/aplay.c:995 +#, fuzzy, c-format +msgid "Warning: format is changed to %s\n" +msgstr "Avertissement: le format est changé en U8\n" -#: aplay/aplay.c:934 +#: aplay/aplay.c:1000 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" @@ -652,299 +652,323 @@ " les fichiers WAVE échantillonés %d bits par %d octets en largeur (%d canaux)" "ne sont pas supportés" -#: aplay/aplay.c:946 +#: aplay/aplay.c:1023 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr "" " les fichiers WAVES échantillonés %d bits en largeur ne sont passupportés" -#: aplay/aplay.c:1004 +#: aplay/aplay.c:1081 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "Avertissement: le format est changé en MU_LAW\n" -#: aplay/aplay.c:1016 +#: aplay/aplay.c:1093 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "Avertissement: le format est changé en S16_BE\n" -#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 -#: aplay/aplay.c:2495 +#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 +#: aplay/aplay.c:2727 msgid "read error" msgstr "erreur de lecture" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1136 +msgid "Channel numbers don't match between hw_params and channel map" +msgstr "" + +#: aplay/aplay.c:1145 +#, c-format +msgid "Warning: unable to get channel map\n" +msgstr "" + +#: aplay/aplay.c:1178 +#, c-format +msgid "Channel %d doesn't match with hw_parmas" +msgstr "" + +#: aplay/aplay.c:1204 msgid "Broken configuration for this PCM: no configurations available" msgstr "Configuration erronée pour ce périphérique PCM: pas de configuration" -#: aplay/aplay.c:1076 +#: aplay/aplay.c:1208 +#, c-format +msgid "HW Params of device \"%s\":\n" +msgstr "" + +#: aplay/aplay.c:1228 msgid "Access type not available" msgstr "Ce type d'accès n'est pas disponible" -#: aplay/aplay.c:1081 +#: aplay/aplay.c:1233 msgid "Sample format non available" msgstr "Ce format d'échantillonage n'est pas disponible" -#: aplay/aplay.c:1087 +#: aplay/aplay.c:1239 msgid "Channels count non available" msgstr "Nombre de canaux non disponible" -#: aplay/aplay.c:1102 +#: aplay/aplay.c:1254 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "" "Avertissement: la fréquence n'est pas précise (demandé = %iHz,\n" "obtenu = %iHz)\n" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1260 #, c-format msgid " please, try the plug plugin %s\n" msgstr " veuillez essayez le greffon de branchement %s\n" -#: aplay/aplay.c:1145 +#: aplay/aplay.c:1297 msgid "Unable to install hw params:" msgstr "Les paramètres matériel n'ont pas pu être installés:" -#: aplay/aplay.c:1152 +#: aplay/aplay.c:1304 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "" "Une période égale à la taille du tampon (%lu == %lu) ne peut êtreutilisée" -#: aplay/aplay.c:1183 +#: aplay/aplay.c:1335 msgid "unable to install sw params:" msgstr "Les paramètres logiciel n'ont pas pu être installés:" -#: aplay/aplay.c:1214 +#: aplay/aplay.c:1369 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1239 +#: aplay/aplay.c:1398 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1263 +#: aplay/aplay.c:1422 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1268 +#: aplay/aplay.c:1427 #, fuzzy, c-format msgid "pause push error: %s" msgstr "erreur d'état: %s" -#: aplay/aplay.c:1277 +#: aplay/aplay.c:1436 #, fuzzy, c-format msgid "pause release error: %s" msgstr "suspension: prepare error: %s" -#: aplay/aplay.c:1293 +#: aplay/aplay.c:1452 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1335 +#: aplay/aplay.c:1494 #, c-format msgid "status error: %s" msgstr "erreur d'état: %s" -#: aplay/aplay.c:1345 aplay/aplay.c:1356 -#, c-format -msgid "%s!!! (at least %.3f ms long)\n" -msgstr "%s!!! (au moins longue de %.3f ms)\n" +#: aplay/aplay.c:1499 +#, fuzzy, c-format +msgid "fatal %s: %s" +msgstr "%s: %s\n" -#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 msgid "underrun" msgstr "perte" -#: aplay/aplay.c:1346 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 msgid "overrun" msgstr "dépassement" -#: aplay/aplay.c:1361 +#: aplay/aplay.c:1510 aplay/aplay.c:1521 +#, c-format +msgid "%s!!! (at least %.3f ms long)\n" +msgstr "%s!!! (au moins longue de %.3f ms)\n" + +#: aplay/aplay.c:1526 #, c-format msgid "Status:\n" msgstr "État:\n" -#: aplay/aplay.c:1365 +#: aplay/aplay.c:1530 #, c-format msgid "xrun: prepare error: %s" msgstr "" -#: aplay/aplay.c:1371 +#: aplay/aplay.c:1536 #, c-format msgid "Status(DRAINING):\n" msgstr "" -#: aplay/aplay.c:1375 +#: aplay/aplay.c:1540 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "" "changement de format de flux de capture? tentative de récupération...\n" -#: aplay/aplay.c:1377 +#: aplay/aplay.c:1542 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "" -#: aplay/aplay.c:1384 +#: aplay/aplay.c:1549 #, c-format msgid "Status(R/W):\n" msgstr "" -#: aplay/aplay.c:1387 +#: aplay/aplay.c:1552 #, c-format msgid "read/write error, state = %s" msgstr "erreur de lecture/écriture, état = %s" -#: aplay/aplay.c:1397 +#: aplay/aplay.c:1562 #, c-format msgid "Suspended. Trying resume. " msgstr "Suspendu. Tentative de reprise. " -#: aplay/aplay.c:1402 +#: aplay/aplay.c:1567 #, c-format msgid "Failed. Restarting stream. " msgstr "Échec. Redémarrage du flux." -#: aplay/aplay.c:1404 +#: aplay/aplay.c:1569 #, c-format msgid "suspend: prepare error: %s" msgstr "suspension: prepare error: %s" -#: aplay/aplay.c:1409 +#: aplay/aplay.c:1574 #, c-format msgid "Done.\n" msgstr "Terminé.\n" -#: aplay/aplay.c:1431 +#: aplay/aplay.c:1596 #, c-format msgid " !clip " msgstr "" -#: aplay/aplay.c:1578 +#: aplay/aplay.c:1743 #, c-format msgid "Unsupported bit size %d.\n" msgstr "%d bit(s) non supporté(s).\n" -#: aplay/aplay.c:1612 +#: aplay/aplay.c:1777 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "Pic max. (%li échantillons): 0x%08x " -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1811 #, c-format msgid "" -"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %" -"li\n" +"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " +"%li\n" msgstr "" "Position de tampon suspicieuse (total %li): dispo = %li, délai = %li, tampon " "= %li\n" -#: aplay/aplay.c:1710 +#: aplay/aplay.c:1939 #, c-format msgid "write error: %s" msgstr "erreur en écriture: %s" -#: aplay/aplay.c:1757 +#: aplay/aplay.c:1987 #, c-format msgid "writev error: %s" msgstr "erreur de writev: %s" -#: aplay/aplay.c:1801 +#: aplay/aplay.c:2031 #, c-format msgid "read error: %s" msgstr "erreur en lecture: %s" -#: aplay/aplay.c:1845 +#: aplay/aplay.c:2075 #, c-format msgid "readv error: %s" msgstr "erreur de readv: %s" -#: aplay/aplay.c:1893 +#: aplay/aplay.c:2123 msgid "can't allocate buffer for silence" msgstr "Un tampon pour silence n'a pas pu être alloué" -#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 -#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 -#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 +#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 +#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 +#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 msgid "write error" msgstr "erreur en écriture" -#: aplay/aplay.c:1915 +#: aplay/aplay.c:2145 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - erreur de silence" -#: aplay/aplay.c:1918 +#: aplay/aplay.c:2148 msgid "voc_pcm_flush error" msgstr "erreur voc_pcm_flush" -#: aplay/aplay.c:1944 +#: aplay/aplay.c:2173 msgid "malloc error" msgstr "erreur malloc" -#: aplay/aplay.c:1948 +#: aplay/aplay.c:2177 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "Lecture du ficher de canaux Creative Labs '%s'...\n" -#: aplay/aplay.c:2016 aplay/aplay.c:2108 +#: aplay/aplay.c:2245 aplay/aplay.c:2340 msgid "can't play packed .voc files" msgstr "les fichiers .voc de type 'packed' ne sont pas supportés" -#: aplay/aplay.c:2068 +#: aplay/aplay.c:2300 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "%s n'est pas navigable; les motifs n'ont pas pu être lus\n" -#: aplay/aplay.c:2117 +#: aplay/aplay.c:2349 #, c-format msgid "unknown blocktype %d. terminate." msgstr "type de bloc %d inconnu. fin." -#: aplay/aplay.c:2248 +#: aplay/aplay.c:2480 #, c-format msgid "Wave doesn't support %s format..." msgstr "Le format wave %s n'est pas supporté..." -#: aplay/aplay.c:2308 +#: aplay/aplay.c:2540 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Le format %s Sparc Audio n'est pas supporté..." -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Playing" msgstr "Lecture" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Recording" msgstr "Capture" -#: aplay/aplay.c:2393 +#: aplay/aplay.c:2625 #, c-format msgid "Rate %d Hz, " msgstr "Fréquence %d Hz, " -#: aplay/aplay.c:2395 +#: aplay/aplay.c:2627 #, c-format msgid "Mono" msgstr "" -#: aplay/aplay.c:2397 +#: aplay/aplay.c:2629 #, c-format msgid "Stereo" msgstr "Stéréo" -#: aplay/aplay.c:2399 +#: aplay/aplay.c:2631 #, c-format msgid "Channels %i" msgstr "%i Canaux" -#: aplay/aplay.c:2910 aplay/aplay.c:2963 +#: aplay/aplay.c:3145 aplay/aplay.c:3198 #, c-format msgid "You need to specify %d files" msgstr "Vous devez spécifier %d fichiers" @@ -1133,8 +1157,8 @@ msgstr "options:\n" #: seq/aseqnet/aseqnet.c:170 -#, c-format -msgid " -p,--port # : sepcify TCP port (digit or service name)\n" +#, fuzzy, c-format +msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr " -p,--port # : spécifier le port TCP (numéro ou nom de service)\n" #: seq/aseqnet/aseqnet.c:171 @@ -1227,263 +1251,269 @@ msgid "disconnected\n" msgstr "déconnecté\n" -#: speaker-test/speaker-test.c:104 +#: speaker-test/speaker-test.c:116 msgid "Front Left" msgstr "Avant Gauche" -#: speaker-test/speaker-test.c:105 +#: speaker-test/speaker-test.c:117 msgid "Front Right" msgstr "Avant Droit" -#: speaker-test/speaker-test.c:106 +#: speaker-test/speaker-test.c:118 msgid "Rear Left" msgstr "Arrière Gauche" -#: speaker-test/speaker-test.c:107 +#: speaker-test/speaker-test.c:119 msgid "Rear Right" msgstr "Arrière Droit" -#: speaker-test/speaker-test.c:109 +#: speaker-test/speaker-test.c:121 msgid "LFE" msgstr "" -#: speaker-test/speaker-test.c:110 +#: speaker-test/speaker-test.c:122 msgid "Side Left" msgstr "Côté Gauche" -#: speaker-test/speaker-test.c:111 +#: speaker-test/speaker-test.c:123 msgid "Side Right" msgstr "Côté Droit" -#: speaker-test/speaker-test.c:112 +#: speaker-test/speaker-test.c:124 msgid "Channel 9" msgstr "Canal 9" -#: speaker-test/speaker-test.c:113 +#: speaker-test/speaker-test.c:125 msgid "Channel 10" msgstr "Canal 10" -#: speaker-test/speaker-test.c:114 +#: speaker-test/speaker-test.c:126 msgid "Channel 11" msgstr "Canal 11" -#: speaker-test/speaker-test.c:115 +#: speaker-test/speaker-test.c:127 msgid "Channel 12" msgstr "Canal 12" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:128 msgid "Channel 13" msgstr "Canal 13" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:129 msgid "Channel 14" msgstr "Canal 14" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:130 msgid "Channel 15" msgstr "Canal 15" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:131 msgid "Channel 16" msgstr "Canal 16" -#: speaker-test/speaker-test.c:383 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "Configuration erronée pour la lecture: pas de configuration: %s\n" -#: speaker-test/speaker-test.c:390 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Access type not available for playback: %s\n" msgstr "Le type d'accès est indisponible à la lecture: %s\n" -#: speaker-test/speaker-test.c:397 +#: speaker-test/speaker-test.c:468 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "Le format d'échantillonage est indisponible à la lecture: %s\n" -#: speaker-test/speaker-test.c:404 +#: speaker-test/speaker-test.c:475 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "Le nombre (%i) de canaux est indisponible à la lecture: %s\n" -#: speaker-test/speaker-test.c:412 +#: speaker-test/speaker-test.c:483 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "La fréquence %iHz est indisponible à la lecture: %s\n" -#: speaker-test/speaker-test.c:417 +#: speaker-test/speaker-test.c:488 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "" "La fréquence ne correspond pas (demandée: %iHz, obtenue %iHz, err %d)\n" -#: speaker-test/speaker-test.c:421 +#: speaker-test/speaker-test.c:492 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "La fréquence est %iHz (demandée %iHz)\n" -#: speaker-test/speaker-test.c:427 +#: speaker-test/speaker-test.c:498 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "L'intervalle de la taille du tampon est de %lu à %lu\n" -#: speaker-test/speaker-test.c:428 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "L'intervalle de la taille de la période est de %lu à %lu\n" -#: speaker-test/speaker-test.c:430 +#: speaker-test/speaker-test.c:501 #, c-format msgid "Requested period time %u us\n" msgstr "Temps de période demandé %u µs\n" -#: speaker-test/speaker-test.c:433 +#: speaker-test/speaker-test.c:504 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "Le temps de période %u µs n'a pas pu être défini pour la lecture: %s\n" -#: speaker-test/speaker-test.c:439 +#: speaker-test/speaker-test.c:510 #, c-format msgid "Requested buffer time %u us\n" msgstr "Temps tampon demandé %u µs\n" -#: speaker-test/speaker-test.c:442 +#: speaker-test/speaker-test.c:513 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "Le temps tampon de %u µs n'a pas pu être définie pour la lecture: %s\n" -#: speaker-test/speaker-test.c:451 +#: speaker-test/speaker-test.c:522 #, c-format msgid "Using max buffer size %lu\n" msgstr "Taille max. de tampon %lu utilisée\n" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "La taile de tampon %lu n'a pas pu être définie pour la lecture: %s\n" -#: speaker-test/speaker-test.c:460 +#: speaker-test/speaker-test.c:531 #, c-format msgid "Periods = %u\n" msgstr "Périodes = %u\n" -#: speaker-test/speaker-test.c:463 +#: speaker-test/speaker-test.c:534 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "nperiods %u n'a pas pu être défini pour la lecture: %s\n" -#: speaker-test/speaker-test.c:472 +#: speaker-test/speaker-test.c:543 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "" "Les paramètres matériel n'ont pas pu être définis pour la lecture: %s\n" -#: speaker-test/speaker-test.c:478 +#: speaker-test/speaker-test.c:549 #, c-format msgid "was set period_size = %lu\n" msgstr "" -#: speaker-test/speaker-test.c:479 +#: speaker-test/speaker-test.c:550 #, c-format msgid "was set buffer_size = %lu\n" msgstr "" -#: speaker-test/speaker-test.c:481 +#: speaker-test/speaker-test.c:552 #, c-format msgid "buffer to small, could not use\n" msgstr "tampon trop petit, il n'a pas pu être utilisé\n" -#: speaker-test/speaker-test.c:494 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "" "Les paramètres logiciels actuels n'ont pas pu être déterminés pour la " "lecture: %s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:508 +#: speaker-test/speaker-test.c:579 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "" -#: speaker-test/speaker-test.c:515 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "" "Les paramètres logiciel n'ont pas pu être définis pour la lecture: %s\n" -#: speaker-test/speaker-test.c:530 +#: speaker-test/speaker-test.c:606 +#, fuzzy, c-format +msgid "Unable to set channel map: %s\n" +msgstr "" +"Les paramètres matériel n'ont pas pu être définis pour la lecture: %s\n" + +#: speaker-test/speaker-test.c:626 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:541 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "" -#: speaker-test/speaker-test.c:605 speaker-test/speaker-test.c:1025 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 #, c-format msgid "No enough memory\n" msgstr "Pas assez de mémoire\n" -#: speaker-test/speaker-test.c:610 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Cannot open WAV file %s\n" msgstr "Le fichier WAV %s n'a pas pu être ouvert\n" -#: speaker-test/speaker-test.c:614 speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 #, c-format msgid "Invalid WAV file %s\n" msgstr "Fichier WAV incorrect %s\n" -#: speaker-test/speaker-test.c:619 +#: speaker-test/speaker-test.c:715 #, c-format msgid "Not a WAV file: %s\n" msgstr "Le fichier %s n'est pas au format WAV\n" -#: speaker-test/speaker-test.c:623 +#: speaker-test/speaker-test.c:719 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "Format WAV %d non supporté pour %s\n" -#: speaker-test/speaker-test.c:628 +#: speaker-test/speaker-test.c:724 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s n'est pas un flux en mono (%d canaux)\n" -#: speaker-test/speaker-test.c:633 +#: speaker-test/speaker-test.c:729 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "La fréquence d'échantillonage (%d) ne correspond pas à %s\n" -#: speaker-test/speaker-test.c:638 +#: speaker-test/speaker-test.c:734 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "Le format d'échantillonage %d bits n'est pas supporté pour %s\n" -#: speaker-test/speaker-test.c:688 +#: speaker-test/speaker-test.c:787 #, c-format msgid "Undefined channel %d\n" msgstr "Canal non-défini %d\n" -#: speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:838 #, c-format msgid "Write error: %d,%s\n" msgstr "Erreur en écriture: %d,%s\n" -#: speaker-test/speaker-test.c:741 +#: speaker-test/speaker-test.c:840 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "" -#: speaker-test/speaker-test.c:803 -#, c-format +#: speaker-test/speaker-test.c:926 +#, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" "-h,--help\thelp\n" @@ -1500,6 +1530,7 @@ "-s,--speaker\tsingle speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile\tUse the given WAV file as a test sound\n" "-W,--wavdir\tSpecify the directory containing WAV files\n" +"-m,--chmap\tSpecify the channel map to override\n" "\n" msgstr "" "Utilisation: speaker-test [OPTION]...\n" @@ -1520,72 +1551,81 @@ "-w,--wavdir\tSpécifier le répertoire contenant les fichiers WAV\n" "\n" -#: speaker-test/speaker-test.c:921 +#: speaker-test/speaker-test.c:1055 #, c-format msgid "Invalid number of periods %d\n" msgstr "Nombre de périodes %d incorrect\n" -#: speaker-test/speaker-test.c:937 speaker-test/speaker-test.c:941 +#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 #, c-format msgid "Invalid test type %s\n" msgstr "Type de test %s incorrect\n" -#: speaker-test/speaker-test.c:953 +#: speaker-test/speaker-test.c:1087 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "Paramètre incorrect pour l'option -s.\n" -#: speaker-test/speaker-test.c:967 +#: speaker-test/speaker-test.c:1106 #, c-format msgid "Unknown option '%c'\n" msgstr "Option '%c' inconnue\n" -#: speaker-test/speaker-test.c:981 +#: speaker-test/speaker-test.c:1120 #, c-format msgid "Playback device is %s\n" msgstr "Le périphérique de lecture est %s\n" -#: speaker-test/speaker-test.c:982 +#: speaker-test/speaker-test.c:1121 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "Les paramètres du flux sont %iHz, %s, %i canaux\n" -#: speaker-test/speaker-test.c:985 +#: speaker-test/speaker-test.c:1124 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "Utilisation de 16 octaves de 'pink noise'\n" -#: speaker-test/speaker-test.c:988 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "La fréquence de la courbe sinus est %.4fHz\n" -#: speaker-test/speaker-test.c:991 +#: speaker-test/speaker-test.c:1130 #, c-format msgid "WAV file(s)\n" msgstr "fichier(s) WAV\n" -#: speaker-test/speaker-test.c:997 +#: speaker-test/speaker-test.c:1140 #, c-format msgid "Playback open error: %d,%s\n" msgstr "Erreur d'ouverture à la lecture: %d,%s\n" -#: speaker-test/speaker-test.c:1002 +#: speaker-test/speaker-test.c:1146 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "Échec de la configuration des paramètres matériel: %s\n" -#: speaker-test/speaker-test.c:1007 +#: speaker-test/speaker-test.c:1150 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "Échec de la configuration des paramètres logiciel: %s\n" -#: speaker-test/speaker-test.c:1056 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 #, c-format msgid "Transfer failed: %s\n" msgstr "Échec du transfer: %s\n" -#: speaker-test/speaker-test.c:1066 +#: speaker-test/speaker-test.c:1205 #, c-format msgid "Time per period = %lf\n" msgstr "Temps par période = %lf\n" + +#~ msgid "Warning: format is changed to S16_LE\n" +#~ msgstr "Avertissement: le format est changé en S16_LE\n" + +#~ msgid "Warning: format is changed to S24_3LE\n" +#~ msgstr "Avertissement: le format est changé en S24_3LE\n" + +#~ msgid "Warning: format is changed to S24_LE\n" +#~ msgstr "Avertissement: le format est changé en S24_LE\n" Binary files /tmp/oRSekIPKbX/alsa-utils-1.0.25/po/ja.gmo and /tmp/BVig9mejsQ/alsa-utils-1.0.27.1/po/ja.gmo differ diff -Nru alsa-utils-1.0.25/po/ja.po alsa-utils-1.0.27.1/po/ja.po --- alsa-utils-1.0.25/po/ja.po 2012-01-25 09:44:01.000000000 +0000 +++ alsa-utils-1.0.27.1/po/ja.po 2013-05-21 08:50:47.000000000 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.9a\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-25 10:44+0100\n" +"POT-Creation-Date: 2013-05-21 10:50+0200\n" "PO-Revision-Date: 2009-05-27 15:08+0200\n" "Last-Translator: Takashi Iwai \n" "Language-Team: Japanese\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -212,7 +213,7 @@ msgid "Rear" msgstr "リア" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:108 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 msgid "Center" msgstr "センター" @@ -224,132 +225,132 @@ msgid "Side" msgstr "サイド" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 +#: alsamixer/mixer_widget.c:91 alsamixer/mixer_widget.c:96 msgid "cannot open mixer" msgstr "ミキサーを開けません" -#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:102 alsamixer/mixer_widget.c:179 msgid "cannot load mixer controls" msgstr "ミキサーをロードできません" -#: alsamixer/mixer_widget.c:173 +#: alsamixer/mixer_widget.c:169 #, c-format msgid "Cannot open mixer device '%s'." msgstr "ミキサーデバイス'%s'を開けません" -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:190 msgid "Esc Exit" msgstr "Esc 終了" -#: alsamixer/mixer_widget.c:195 +#: alsamixer/mixer_widget.c:191 msgid "F1 ? H Help" msgstr "F1 ? H ヘルプ" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:192 msgid "F2 / System information" msgstr "F2 / システム情報" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:193 msgid "F3 Show playback controls" msgstr "F3 再生ミキサー表示" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:194 msgid "F4 Show capture controls" msgstr "F4 録音ミキサー表示" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:195 msgid "F5 Show all controls" msgstr "F5 全て表示" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:196 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "Tab 表示モード変更 (F3/F4/F5)" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:197 msgid "F6 S Select sound card" msgstr "F5 S サウンドカード選択" -#: alsamixer/mixer_widget.c:202 +#: alsamixer/mixer_widget.c:198 msgid "L Redraw screen" msgstr "L 画面再描画" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:200 msgid "Left Move to the previous control" msgstr "← 前の項目に移る" -#: alsamixer/mixer_widget.c:205 +#: alsamixer/mixer_widget.c:201 msgid "Right Move to the next control" msgstr "→ 次の項目に移る" # ↑ -#: alsamixer/mixer_widget.c:207 +#: alsamixer/mixer_widget.c:203 msgid "Up/Down Change volume" msgstr "↑/↓ 音量変更" -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:204 msgid "+ - Change volume" msgstr "+ - 音量変更" -#: alsamixer/mixer_widget.c:209 +#: alsamixer/mixer_widget.c:205 msgid "Page Up/Dn Change volume in big steps" msgstr "Page Up/dn 音量変更" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:206 msgid "End Set volume to 0%" msgstr "End 音量 0%" -#: alsamixer/mixer_widget.c:211 +#: alsamixer/mixer_widget.c:207 msgid "0-9 Set volume to 0%-90%" msgstr "0-9 音量 0%-90%" -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:208 msgid "Q W E Increase left/both/right volumes" msgstr "Q W E 左/両/右音量アップ" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:210 msgid "Z X C Decrease left/both/right volumes" msgstr "Z X C 左/両/右音量ダウン" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:211 msgid "B Balance left and right volumes" msgstr "B 左右音量を平均化する" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:213 msgid "M Toggle mute" msgstr "M ミュートをトグル" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:215 msgid "< > Toggle left/right mute" msgstr "< > 左/右ミュートをトグル" -#: alsamixer/mixer_widget.c:221 +#: alsamixer/mixer_widget.c:217 msgid "Space Toggle capture" msgstr "スペース 録音をトグル" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:223 +#: alsamixer/mixer_widget.c:219 msgid "; ' Toggle left/right capture" msgstr "; ' 左/右録音をトグル" -#: alsamixer/mixer_widget.c:225 +#: alsamixer/mixer_widget.c:221 msgid "Authors:" msgstr "作者:" -#: alsamixer/mixer_widget.c:226 +#: alsamixer/mixer_widget.c:222 msgid " Tim Janik" msgstr "" -#: alsamixer/mixer_widget.c:227 +#: alsamixer/mixer_widget.c:223 msgid " Jaroslav Kysela " msgstr "" -#: alsamixer/mixer_widget.c:228 +#: alsamixer/mixer_widget.c:224 msgid " Clemens Ladisch " msgstr "" -#: alsamixer/mixer_widget.c:230 +#: alsamixer/mixer_widget.c:226 msgid "Help" msgstr "ヘルプ" @@ -366,23 +367,23 @@ msgid "Cannot open file \"%s\"." msgstr "\"%s\"をオープンできません" -#: aplay/aplay.c:163 +#: aplay/aplay.c:175 msgid "raw data" msgstr "raw データ" -#: aplay/aplay.c:164 +#: aplay/aplay.c:176 msgid "VOC" msgstr "VOC" -#: aplay/aplay.c:166 +#: aplay/aplay.c:178 msgid "WAVE" msgstr "WAVE" -#: aplay/aplay.c:167 +#: aplay/aplay.c:179 msgid "Sparc Audio" msgstr "Sparc オーディオ" -#: aplay/aplay.c:188 +#: aplay/aplay.c:200 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -413,6 +414,7 @@ "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" +"-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -428,6 +430,8 @@ " for this many seconds\n" " --process-id-file write the process ID here\n" " --use-strftime apply the strftime facility to the output file name\n" +" --dump-hw-params dump hw_params of the device\n" +" --fatal-errors treat all errors as fatal\n" msgstr "" "使用法: %s [オプション]... [ファイル]...\n" "\n" @@ -464,12 +468,12 @@ " テスト範囲: coef * (buffer_size / 2)\n" " --test-nowait リングバッファのウエイトを禁止 - 注意:高CPU負荷\n" -#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 #, c-format msgid "Recognized sample formats are:" msgstr "認識されるサンプルフォーマット:" -#: aplay/aplay.c:234 +#: aplay/aplay.c:250 #, c-format msgid "" "\n" @@ -478,159 +482,155 @@ "\n" "これらのいくつかは指定のハードウェアで使用不可能な場合があります\n" -#: aplay/aplay.c:235 -#, c-format -msgid "The availabled format shortcuts are:\n" +#: aplay/aplay.c:251 +#, fuzzy, c-format +msgid "The available format shortcuts are:\n" msgstr "可能なフォーマットの省略形:\n" -#: aplay/aplay.c:236 +#: aplay/aplay.c:252 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "-f cd (16 ビット、リトルエンディアン、44100、ステレオ)\n" -#: aplay/aplay.c:237 +#: aplay/aplay.c:253 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "-f cdr (16 ビット、ビッグエンディアン、44100、ステレオ)\n" -#: aplay/aplay.c:238 +#: aplay/aplay.c:254 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "-f dat (16 ビット、リトルエンディアン、48000、ステレオ)\n" -#: aplay/aplay.c:252 +#: aplay/aplay.c:268 msgid "no soundcards found..." msgstr "サウンドカードが見つかりません..." -#: aplay/aplay.c:255 +#: aplay/aplay.c:271 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "**** ハードウェアデバイス %s のリスト ****\n" -#: aplay/aplay.c:284 +#: aplay/aplay.c:300 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "カード %i: %s [%s], デバイス %i: %s [%s]\n" -#: aplay/aplay.c:290 +#: aplay/aplay.c:306 #, c-format msgid " Subdevices: %i/%i\n" msgstr " サブデバイス: %i/%i\n" -#: aplay/aplay.c:297 +#: aplay/aplay.c:313 #, c-format msgid " Subdevice #%i: %s\n" msgstr " サブデバイス #%i: %s\n" -#: aplay/aplay.c:380 +#: aplay/aplay.c:394 #, c-format msgid "Aborted by signal %s...\n" msgstr "シグナル %s で中断...\n" -#: aplay/aplay.c:492 +#: aplay/aplay.c:512 msgid "command should be named either arecord or aplay" msgstr "arecord または aplay コマンドのみ可能" -#: aplay/aplay.c:531 +#: aplay/aplay.c:556 #, c-format msgid "unrecognized file format %s" msgstr "不正なファイルフォーマット %s" -#: aplay/aplay.c:538 +#: aplay/aplay.c:563 #, c-format msgid "value %i for channels is invalid" msgstr "不正なチャネル数 %i" -#: aplay/aplay.c:557 +#: aplay/aplay.c:582 #, c-format msgid "wrong extended format '%s'" msgstr "不正な拡張フォーマット '%s'" -#: aplay/aplay.c:568 +#: aplay/aplay.c:593 #, c-format msgid "bad speed value %i" msgstr "不正なレート値 %i" -#: aplay/aplay.c:666 +#: aplay/aplay.c:700 speaker-test/speaker-test.c:601 +#, fuzzy, c-format +msgid "Unable to parse channel map string: %s\n" +msgstr "avail_min を設定できません: %s\n" + +#: aplay/aplay.c:706 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "より詳しい情報は「%s --help」を実行してください\n" -#: aplay/aplay.c:682 +#: aplay/aplay.c:722 #, c-format msgid "audio open error: %s" msgstr "" -#: aplay/aplay.c:687 +#: aplay/aplay.c:727 #, c-format msgid "info error: %s" msgstr "" -#: aplay/aplay.c:694 +#: aplay/aplay.c:734 #, c-format msgid "nonblock setting error: %s" msgstr "" -#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 +#: aplay/aplay.c:1867 aplay/aplay.c:1897 msgid "not enough memory" msgstr "メモリが足りません" -#: aplay/aplay.c:728 +#: aplay/aplay.c:768 #, fuzzy, c-format msgid "Cannot create process ID file %s: %s" msgstr "WAVファイルがオープンできません: %s\n" -#: aplay/aplay.c:818 +#: aplay/aplay.c:858 #, c-format msgid "read error (called from line %i)" msgstr "リードエラー (%i 行)" -#: aplay/aplay.c:876 +#: aplay/aplay.c:925 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "" -#: aplay/aplay.c:886 +#: aplay/aplay.c:936 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" msgstr "" -#: aplay/aplay.c:891 +#: aplay/aplay.c:941 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "" -#: aplay/aplay.c:898 +#: aplay/aplay.c:948 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "" -#: aplay/aplay.c:902 +#: aplay/aplay.c:953 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "%d トラックを含む WAVE ファイルは再生できません" -#: aplay/aplay.c:910 aplay/aplay.c:1010 +#: aplay/aplay.c:961 aplay/aplay.c:1087 #, c-format msgid "Warning: format is changed to U8\n" msgstr "警告: フォーマットは U8 に変更されます\n" -#: aplay/aplay.c:916 -#, c-format -msgid "Warning: format is changed to S16_LE\n" -msgstr "警告: フォーマットは S16_LE に変更されます\n" - -#: aplay/aplay.c:924 -#, c-format -msgid "Warning: format is changed to S24_3LE\n" -msgstr "警告: フォーマットは S24_3LE に変更されます\n" - -#: aplay/aplay.c:930 -#, c-format -msgid "Warning: format is changed to S24_LE\n" -msgstr "警告: フォーマットは S24_LE に変更されます\n" +#: aplay/aplay.c:971 aplay/aplay.c:984 aplay/aplay.c:995 +#, fuzzy, c-format +msgid "Warning: format is changed to %s\n" +msgstr "警告: フォーマットは U8 に変更されます\n" -#: aplay/aplay.c:934 +#: aplay/aplay.c:1000 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" @@ -638,292 +638,316 @@ "%2$d バイト長 %1$d サンプルビット (%3$d チャネル) の WAVE ファイルは再生でき" "ません" -#: aplay/aplay.c:946 +#: aplay/aplay.c:1023 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr "%d ビット長のサンプルの WAVE ファイルは再生できません" -#: aplay/aplay.c:1004 +#: aplay/aplay.c:1081 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "警告: フォーマットは MU_LAW に変更されます\n" -#: aplay/aplay.c:1016 +#: aplay/aplay.c:1093 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "警告: フォーマットは S16_BE に変更されます\n" -#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 -#: aplay/aplay.c:2495 +#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 +#: aplay/aplay.c:2727 msgid "read error" msgstr "リードエラー" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1136 +msgid "Channel numbers don't match between hw_params and channel map" +msgstr "" + +#: aplay/aplay.c:1145 +#, c-format +msgid "Warning: unable to get channel map\n" +msgstr "" + +#: aplay/aplay.c:1178 +#, c-format +msgid "Channel %d doesn't match with hw_parmas" +msgstr "" + +#: aplay/aplay.c:1204 msgid "Broken configuration for this PCM: no configurations available" msgstr "指定の PCM を使用できません: 設定がありません" -#: aplay/aplay.c:1076 +#: aplay/aplay.c:1208 +#, c-format +msgid "HW Params of device \"%s\":\n" +msgstr "" + +#: aplay/aplay.c:1228 msgid "Access type not available" msgstr "アクセスタイプが使用不可能" -#: aplay/aplay.c:1081 +#: aplay/aplay.c:1233 msgid "Sample format non available" msgstr "サンプルフォーマットが使用不可能" -#: aplay/aplay.c:1087 +#: aplay/aplay.c:1239 msgid "Channels count non available" msgstr "チャネル数が使用不可能" -#: aplay/aplay.c:1102 +#: aplay/aplay.c:1254 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "警告: レートが不正確です (要求値 = %iHz, 使用値 = %iHz)\n" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1260 #, c-format msgid " please, try the plug plugin %s\n" msgstr " plug プラグイン%s を使用してください\n" -#: aplay/aplay.c:1145 +#: aplay/aplay.c:1297 msgid "Unable to install hw params:" msgstr "hw params のインストールに失敗しました:" -#: aplay/aplay.c:1152 +#: aplay/aplay.c:1304 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "period と buffer サイズには同じ値を使用できません (%lu == %lu)" -#: aplay/aplay.c:1183 +#: aplay/aplay.c:1335 msgid "unable to install sw params:" msgstr "sw params のインストールに失敗しました:" -#: aplay/aplay.c:1214 +#: aplay/aplay.c:1369 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1239 +#: aplay/aplay.c:1398 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1263 +#: aplay/aplay.c:1422 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1268 +#: aplay/aplay.c:1427 #, fuzzy, c-format msgid "pause push error: %s" msgstr "ステータスエラー: %s" -#: aplay/aplay.c:1277 +#: aplay/aplay.c:1436 #, fuzzy, c-format msgid "pause release error: %s" msgstr "サスペンド: prepare エラー: %s" -#: aplay/aplay.c:1293 +#: aplay/aplay.c:1452 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1335 +#: aplay/aplay.c:1494 #, c-format msgid "status error: %s" msgstr "ステータスエラー: %s" -#: aplay/aplay.c:1345 aplay/aplay.c:1356 +#: aplay/aplay.c:1499 #, c-format -msgid "%s!!! (at least %.3f ms long)\n" -msgstr "%s!!! (少なくとも %.3f ms)\n" +msgid "fatal %s: %s" +msgstr "" -#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 msgid "underrun" msgstr "アンダーラン" -#: aplay/aplay.c:1346 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 msgid "overrun" msgstr "オーバーラン" -#: aplay/aplay.c:1361 +#: aplay/aplay.c:1510 aplay/aplay.c:1521 +#, c-format +msgid "%s!!! (at least %.3f ms long)\n" +msgstr "%s!!! (少なくとも %.3f ms)\n" + +#: aplay/aplay.c:1526 #, c-format msgid "Status:\n" msgstr "ステータス:\n" -#: aplay/aplay.c:1365 +#: aplay/aplay.c:1530 #, c-format msgid "xrun: prepare error: %s" msgstr "" -#: aplay/aplay.c:1371 +#: aplay/aplay.c:1536 #, c-format msgid "Status(DRAINING):\n" msgstr "ステータス(DRAINING):\n" -#: aplay/aplay.c:1375 +#: aplay/aplay.c:1540 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "録音ストリームのフォーマットが変更？ 修復を試みます...\n" -#: aplay/aplay.c:1377 +#: aplay/aplay.c:1542 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "" -#: aplay/aplay.c:1384 +#: aplay/aplay.c:1549 #, c-format msgid "Status(R/W):\n" msgstr "ステータス(R/W):\n" -#: aplay/aplay.c:1387 +#: aplay/aplay.c:1552 #, c-format msgid "read/write error, state = %s" msgstr "読み書きエラー, ステータス = %s" -#: aplay/aplay.c:1397 +#: aplay/aplay.c:1562 #, c-format msgid "Suspended. Trying resume. " msgstr "サスペンド中です。レジュームします。" -#: aplay/aplay.c:1402 +#: aplay/aplay.c:1567 #, c-format msgid "Failed. Restarting stream. " msgstr "失敗しました。ストリームを再スタートします。" -#: aplay/aplay.c:1404 +#: aplay/aplay.c:1569 #, c-format msgid "suspend: prepare error: %s" msgstr "サスペンド: prepare エラー: %s" -#: aplay/aplay.c:1409 +#: aplay/aplay.c:1574 #, c-format msgid "Done.\n" msgstr "終了\n" -#: aplay/aplay.c:1431 +#: aplay/aplay.c:1596 #, c-format msgid " !clip " msgstr "" -#: aplay/aplay.c:1578 +#: aplay/aplay.c:1743 #, c-format msgid "Unsupported bit size %d.\n" msgstr "" -#: aplay/aplay.c:1612 +#: aplay/aplay.c:1777 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大ピーク (%li サンプル): 0x%08x " -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1811 #, c-format msgid "" -"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = %" -"li\n" +"Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " +"%li\n" msgstr "" -#: aplay/aplay.c:1710 +#: aplay/aplay.c:1939 #, c-format msgid "write error: %s" msgstr "書込エラー: %s" -#: aplay/aplay.c:1757 +#: aplay/aplay.c:1987 #, c-format msgid "writev error: %s" msgstr "書込(writev)エラー: %s" -#: aplay/aplay.c:1801 +#: aplay/aplay.c:2031 #, c-format msgid "read error: %s" msgstr "読込エラー: %s" -#: aplay/aplay.c:1845 +#: aplay/aplay.c:2075 #, c-format msgid "readv error: %s" msgstr "読込(readv)エラー: %s" -#: aplay/aplay.c:1893 +#: aplay/aplay.c:2123 msgid "can't allocate buffer for silence" msgstr "サイレンス用のバッファの取得に失敗しました" -#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 -#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 -#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 +#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 +#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 +#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 msgid "write error" msgstr "書込エラー" -#: aplay/aplay.c:1915 +#: aplay/aplay.c:2145 #, c-format msgid "voc_pcm_flush - silence error" msgstr "" -#: aplay/aplay.c:1918 +#: aplay/aplay.c:2148 msgid "voc_pcm_flush error" msgstr "" -#: aplay/aplay.c:1944 +#: aplay/aplay.c:2173 msgid "malloc error" msgstr "malloc エラー" -#: aplay/aplay.c:1948 +#: aplay/aplay.c:2177 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "Creative Labs Channel ファイル '%s' を演奏中...\n" -#: aplay/aplay.c:2016 aplay/aplay.c:2108 +#: aplay/aplay.c:2245 aplay/aplay.c:2340 msgid "can't play packed .voc files" msgstr "packed .voc ファイルは演奏できません" -#: aplay/aplay.c:2068 +#: aplay/aplay.c:2300 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "ループ演奏できません。%s はシーク不可能です\n" -#: aplay/aplay.c:2117 +#: aplay/aplay.c:2349 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知のブロックタイプ %d: 終了します。" -#: aplay/aplay.c:2248 +#: aplay/aplay.c:2480 #, c-format msgid "Wave doesn't support %s format..." msgstr "WAVE は %s フォーマットをサポートしません..." -#: aplay/aplay.c:2308 +#: aplay/aplay.c:2540 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc オーディオは %s フォーマットをサポートしません..." -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Playing" msgstr "再生中" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Recording" msgstr "録音中" -#: aplay/aplay.c:2393 +#: aplay/aplay.c:2625 #, c-format msgid "Rate %d Hz, " msgstr "レート %d Hz, " -#: aplay/aplay.c:2395 +#: aplay/aplay.c:2627 #, c-format msgid "Mono" msgstr "モノラル" -#: aplay/aplay.c:2397 +#: aplay/aplay.c:2629 #, c-format msgid "Stereo" msgstr "ステレオ" -#: aplay/aplay.c:2399 +#: aplay/aplay.c:2631 #, c-format msgid "Channels %i" msgstr "チャネル数 %i" -#: aplay/aplay.c:2910 aplay/aplay.c:2963 +#: aplay/aplay.c:3145 aplay/aplay.c:3198 #, c-format msgid "You need to specify %d files" msgstr "%d 個のファイルを指定してください" @@ -1110,8 +1134,8 @@ msgstr "オプション:\n" #: seq/aseqnet/aseqnet.c:170 -#, c-format -msgid " -p,--port # : sepcify TCP port (digit or service name)\n" +#, fuzzy, c-format +msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr " -p,--port # : TCP ポートの指定 (数字またはサービス名)\n" #: seq/aseqnet/aseqnet.c:171 @@ -1204,258 +1228,263 @@ msgid "disconnected\n" msgstr "切り離し\n" -#: speaker-test/speaker-test.c:104 +#: speaker-test/speaker-test.c:116 msgid "Front Left" msgstr "" -#: speaker-test/speaker-test.c:105 +#: speaker-test/speaker-test.c:117 msgid "Front Right" msgstr "" -#: speaker-test/speaker-test.c:106 +#: speaker-test/speaker-test.c:118 msgid "Rear Left" msgstr "" -#: speaker-test/speaker-test.c:107 +#: speaker-test/speaker-test.c:119 msgid "Rear Right" msgstr "" -#: speaker-test/speaker-test.c:109 +#: speaker-test/speaker-test.c:121 msgid "LFE" msgstr "" -#: speaker-test/speaker-test.c:110 +#: speaker-test/speaker-test.c:122 msgid "Side Left" msgstr "" -#: speaker-test/speaker-test.c:111 +#: speaker-test/speaker-test.c:123 msgid "Side Right" msgstr "" -#: speaker-test/speaker-test.c:112 +#: speaker-test/speaker-test.c:124 msgid "Channel 9" msgstr "" -#: speaker-test/speaker-test.c:113 +#: speaker-test/speaker-test.c:125 msgid "Channel 10" msgstr "" -#: speaker-test/speaker-test.c:114 +#: speaker-test/speaker-test.c:126 msgid "Channel 11" msgstr "" -#: speaker-test/speaker-test.c:115 +#: speaker-test/speaker-test.c:127 msgid "Channel 12" msgstr "" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:128 msgid "Channel 13" msgstr "" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:129 msgid "Channel 14" msgstr "" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:130 msgid "Channel 15" msgstr "" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:131 msgid "Channel 16" msgstr "" -#: speaker-test/speaker-test.c:383 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "再生用に設定できません: 設定がみつかりません: %s\n" -#: speaker-test/speaker-test.c:390 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Access type not available for playback: %s\n" msgstr "アクセスタイプが不正です: %s\n" -#: speaker-test/speaker-test.c:397 +#: speaker-test/speaker-test.c:468 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "指定のサンプルフォーマットを使用できません: %s\n" -#: speaker-test/speaker-test.c:404 +#: speaker-test/speaker-test.c:475 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "チャネル数 (%i) を使用できません: %s\n" -#: speaker-test/speaker-test.c:412 +#: speaker-test/speaker-test.c:483 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "レート %iHz を使用できません: %s\n" -#: speaker-test/speaker-test.c:417 +#: speaker-test/speaker-test.c:488 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "設定レートが一致しません< (要求値 %iHz, 取得値 %iHz, エラー %d)\n" -#: speaker-test/speaker-test.c:421 +#: speaker-test/speaker-test.c:492 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "レート %iHz (要求値 %iHz)\n" -#: speaker-test/speaker-test.c:427 +#: speaker-test/speaker-test.c:498 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "バッファサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:428 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "ピリオドサイズ範囲 %lu 〜 %lu\n" -#: speaker-test/speaker-test.c:430 +#: speaker-test/speaker-test.c:501 #, c-format msgid "Requested period time %u us\n" msgstr "要求されたピリオド長 %u us\n" -#: speaker-test/speaker-test.c:433 +#: speaker-test/speaker-test.c:504 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "ピリオド長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:439 +#: speaker-test/speaker-test.c:510 #, c-format msgid "Requested buffer time %u us\n" msgstr "要求されたバッファ長 %u us\n" -#: speaker-test/speaker-test.c:442 +#: speaker-test/speaker-test.c:513 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "バッファ長 %u us を設定できません: %s\n" -#: speaker-test/speaker-test.c:451 +#: speaker-test/speaker-test.c:522 #, c-format msgid "Using max buffer size %lu\n" msgstr "最大バッファサイズ %lu を使用\n" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "バッファサイズ %lu を設定できません: %s\n" -#: speaker-test/speaker-test.c:460 +#: speaker-test/speaker-test.c:531 #, c-format msgid "Periods = %u\n" msgstr "ピリオド数 = %u\n" -#: speaker-test/speaker-test.c:463 +#: speaker-test/speaker-test.c:534 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "ピリオド数 %u を設定できません: %s\n" -#: speaker-test/speaker-test.c:472 +#: speaker-test/speaker-test.c:543 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "hw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:478 +#: speaker-test/speaker-test.c:549 #, c-format msgid "was set period_size = %lu\n" msgstr "period_size = %lu で設定\n" -#: speaker-test/speaker-test.c:479 +#: speaker-test/speaker-test.c:550 #, c-format msgid "was set buffer_size = %lu\n" msgstr "buffer_size = %lu で設定\n" -#: speaker-test/speaker-test.c:481 +#: speaker-test/speaker-test.c:552 #, c-format msgid "buffer to small, could not use\n" msgstr "バッファが小さすぎます\n" -#: speaker-test/speaker-test.c:494 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "現在の swparams を取得できません: %s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "start_threshold モードを設定できません: %s\n" -#: speaker-test/speaker-test.c:508 +#: speaker-test/speaker-test.c:579 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "avail_min を設定できません: %s\n" -#: speaker-test/speaker-test.c:515 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "再生用の sw params を設定できません: %s\n" -#: speaker-test/speaker-test.c:530 +#: speaker-test/speaker-test.c:606 +#, fuzzy, c-format +msgid "Unable to set channel map: %s\n" +msgstr "avail_min を設定できません: %s\n" + +#: speaker-test/speaker-test.c:626 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "アンダーランから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:541 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "サスペンドから復帰失敗: %s\n" -#: speaker-test/speaker-test.c:605 speaker-test/speaker-test.c:1025 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 #, c-format msgid "No enough memory\n" msgstr "メモリが足りません\n" -#: speaker-test/speaker-test.c:610 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Cannot open WAV file %s\n" msgstr "WAVファイルがオープンできません: %s\n" -#: speaker-test/speaker-test.c:614 speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 #, c-format msgid "Invalid WAV file %s\n" msgstr "不正なWAVファイルです: %s\n" -#: speaker-test/speaker-test.c:619 +#: speaker-test/speaker-test.c:715 #, c-format msgid "Not a WAV file: %s\n" msgstr "WAVファイルではありません: %s\n" -#: speaker-test/speaker-test.c:623 +#: speaker-test/speaker-test.c:719 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "未サポートのWAVフォーマット %d: %s\n" -#: speaker-test/speaker-test.c:628 +#: speaker-test/speaker-test.c:724 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s はモノストリームではありません (%d チャネル)\n" -#: speaker-test/speaker-test.c:633 +#: speaker-test/speaker-test.c:729 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "サンプルレートが不一致です(%d): %s\n" -#: speaker-test/speaker-test.c:638 +#: speaker-test/speaker-test.c:734 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "未サポートのサンプルフォーマットビット %d: %s\n" -#: speaker-test/speaker-test.c:688 +#: speaker-test/speaker-test.c:787 #, c-format msgid "Undefined channel %d\n" msgstr "未定義のチャネル %d\n" -#: speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:838 #, c-format msgid "Write error: %d,%s\n" msgstr "書込エラー: %d,%s\n" -#: speaker-test/speaker-test.c:741 +#: speaker-test/speaker-test.c:840 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery 失敗: %d,%s\n" -#: speaker-test/speaker-test.c:803 -#, c-format +#: speaker-test/speaker-test.c:926 +#, fuzzy, c-format msgid "" "Usage: speaker-test [OPTION]... \n" "-h,--help\thelp\n" @@ -1472,6 +1501,7 @@ "-s,--speaker\tsingle speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile\tUse the given WAV file as a test sound\n" "-W,--wavdir\tSpecify the directory containing WAV files\n" +"-m,--chmap\tSpecify the channel map to override\n" "\n" msgstr "" "使用法: speaker-test [オプション]...\n" @@ -1492,72 +1522,81 @@ "-W,--wavdir WAVファイルのあるディレクトリを指定\n" "\n" -#: speaker-test/speaker-test.c:921 +#: speaker-test/speaker-test.c:1055 #, c-format msgid "Invalid number of periods %d\n" msgstr "不正なピリオド数 %d\n" -#: speaker-test/speaker-test.c:937 speaker-test/speaker-test.c:941 +#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 #, c-format msgid "Invalid test type %s\n" msgstr "不正なテストタイプ %s\n" -#: speaker-test/speaker-test.c:953 +#: speaker-test/speaker-test.c:1087 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s オプションの値が不正です\n" -#: speaker-test/speaker-test.c:967 +#: speaker-test/speaker-test.c:1106 #, c-format msgid "Unknown option '%c'\n" msgstr "未知のオプション '%c'\n" -#: speaker-test/speaker-test.c:981 +#: speaker-test/speaker-test.c:1120 #, c-format msgid "Playback device is %s\n" msgstr "再生デバイス: %s\n" -#: speaker-test/speaker-test.c:982 +#: speaker-test/speaker-test.c:1121 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "ストリームパラメータ: %iHz, %s, %i チャネル\n" -#: speaker-test/speaker-test.c:985 +#: speaker-test/speaker-test.c:1124 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "16 オクターブのピンクノイズを使用\n" -#: speaker-test/speaker-test.c:988 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "正弦波レート: %.4fHz\n" -#: speaker-test/speaker-test.c:991 +#: speaker-test/speaker-test.c:1130 #, c-format msgid "WAV file(s)\n" msgstr "WAV ファイル\n" -#: speaker-test/speaker-test.c:997 +#: speaker-test/speaker-test.c:1140 #, c-format msgid "Playback open error: %d,%s\n" msgstr "再生オープンエラー: %d,%s\n" -#: speaker-test/speaker-test.c:1002 +#: speaker-test/speaker-test.c:1146 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "hwparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1007 +#: speaker-test/speaker-test.c:1150 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "swparams の設定に失敗: %s\n" -#: speaker-test/speaker-test.c:1056 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 #, c-format msgid "Transfer failed: %s\n" msgstr "転送に失敗しました: %s\n" -#: speaker-test/speaker-test.c:1066 +#: speaker-test/speaker-test.c:1205 #, c-format msgid "Time per period = %lf\n" msgstr "ピリオド時間 = %lf\n" + +#~ msgid "Warning: format is changed to S16_LE\n" +#~ msgstr "警告: フォーマットは S16_LE に変更されます\n" + +#~ msgid "Warning: format is changed to S24_3LE\n" +#~ msgstr "警告: フォーマットは S24_3LE に変更されます\n" + +#~ msgid "Warning: format is changed to S24_LE\n" +#~ msgstr "警告: フォーマットは S24_LE に変更されます\n" diff -Nru alsa-utils-1.0.25/seq/Makefile.in alsa-utils-1.0.27.1/seq/Makefile.in --- alsa-utils-1.0.25/seq/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,6 +73,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -92,6 +113,8 @@ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -116,6 +139,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -136,11 +160,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -151,6 +180,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -165,6 +196,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -224,7 +256,7 @@ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -249,19 +281,19 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -271,7 +303,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -285,37 +321,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -324,6 +329,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -387,6 +396,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -422,13 +445,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -463,10 +483,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -544,21 +569,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru alsa-utils-1.0.25/seq/aconnect/Makefile.in alsa-utils-1.0.27.1/seq/aconnect/Makefile.in --- alsa-utils-1.0.25/seq/aconnect/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aconnect/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = aconnect$(EXEEXT) subdir = seq/aconnect -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -67,6 +84,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(aconnect_SOURCES) DIST_SOURCES = $(aconnect_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -88,6 +110,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -95,6 +123,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -119,6 +149,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -139,11 +170,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -154,6 +190,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -168,6 +206,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -232,7 +271,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -257,15 +296,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -299,7 +341,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -aconnect$(EXEEXT): $(aconnect_OBJECTS) $(aconnect_DEPENDENCIES) +aconnect$(EXEEXT): $(aconnect_OBJECTS) $(aconnect_DEPENDENCIES) $(EXTRA_aconnect_DEPENDENCIES) @rm -f aconnect$(EXEEXT) $(LINK) $(aconnect_OBJECTS) $(aconnect_LDADD) $(LIBS) @@ -326,11 +368,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -359,9 +408,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -412,6 +459,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -422,10 +483,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -475,10 +536,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -564,7 +630,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/seq/aplaymidi/Makefile.in alsa-utils-1.0.27.1/seq/aplaymidi/Makefile.in --- alsa-utils-1.0.25/seq/aplaymidi/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aplaymidi/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = aplaymidi$(EXEEXT) arecordmidi$(EXEEXT) subdir = seq/aplaymidi -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -68,6 +85,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = aplaymidi.c arecordmidi.c DIST_SOURCES = aplaymidi.c arecordmidi.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -89,6 +111,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -96,6 +124,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -120,6 +150,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -140,11 +171,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -155,6 +191,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -169,6 +207,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -231,7 +270,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -256,15 +295,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -298,10 +340,10 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -aplaymidi$(EXEEXT): $(aplaymidi_OBJECTS) $(aplaymidi_DEPENDENCIES) +aplaymidi$(EXEEXT): $(aplaymidi_OBJECTS) $(aplaymidi_DEPENDENCIES) $(EXTRA_aplaymidi_DEPENDENCIES) @rm -f aplaymidi$(EXEEXT) $(LINK) $(aplaymidi_OBJECTS) $(aplaymidi_LDADD) $(LIBS) -arecordmidi$(EXEEXT): $(arecordmidi_OBJECTS) $(arecordmidi_DEPENDENCIES) +arecordmidi$(EXEEXT): $(arecordmidi_OBJECTS) $(arecordmidi_DEPENDENCIES) $(EXTRA_arecordmidi_DEPENDENCIES) @rm -f arecordmidi$(EXEEXT) $(LINK) $(arecordmidi_OBJECTS) $(arecordmidi_LDADD) $(LIBS) @@ -329,11 +371,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -362,9 +411,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -415,6 +462,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -425,10 +486,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -478,10 +539,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -567,7 +633,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/seq/aseqdump/Makefile.in alsa-utils-1.0.27.1/seq/aseqdump/Makefile.in --- alsa-utils-1.0.25/seq/aseqdump/Makefile.in 2012-01-25 09:43:51.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aseqdump/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = aseqdump$(EXEEXT) subdir = seq/aseqdump -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -65,6 +82,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = aseqdump.c DIST_SOURCES = aseqdump.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -86,6 +108,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -93,6 +121,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -117,6 +147,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -137,11 +168,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -152,6 +188,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -166,6 +204,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -228,7 +267,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -253,15 +292,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -295,7 +337,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -aseqdump$(EXEEXT): $(aseqdump_OBJECTS) $(aseqdump_DEPENDENCIES) +aseqdump$(EXEEXT): $(aseqdump_OBJECTS) $(aseqdump_DEPENDENCIES) $(EXTRA_aseqdump_DEPENDENCIES) @rm -f aseqdump$(EXEEXT) $(LINK) $(aseqdump_OBJECTS) $(aseqdump_LDADD) $(LIBS) @@ -322,11 +364,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -355,9 +404,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -408,6 +455,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -418,10 +479,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -471,10 +532,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -560,7 +626,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/seq/aseqnet/Makefile.in alsa-utils-1.0.27.1/seq/aseqnet/Makefile.in --- alsa-utils-1.0.25/seq/aseqnet/Makefile.in 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aseqnet/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = aseqnet$(EXEEXT) subdir = seq/aseqnet -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -66,6 +83,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(aseqnet_SOURCES) DIST_SOURCES = $(aseqnet_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -87,6 +109,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -94,6 +122,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -118,6 +148,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -138,11 +169,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -153,6 +189,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -167,6 +205,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -231,7 +270,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -256,15 +295,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -298,7 +340,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -aseqnet$(EXEEXT): $(aseqnet_OBJECTS) $(aseqnet_DEPENDENCIES) +aseqnet$(EXEEXT): $(aseqnet_OBJECTS) $(aseqnet_DEPENDENCIES) $(EXTRA_aseqnet_DEPENDENCIES) @rm -f aseqnet$(EXEEXT) $(LINK) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS) @@ -325,11 +367,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -358,9 +407,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -411,6 +458,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -421,10 +482,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -474,10 +535,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -563,7 +629,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru alsa-utils-1.0.25/seq/aseqnet/aseqnet.1 alsa-utils-1.0.27.1/seq/aseqnet/aseqnet.1 --- alsa-utils-1.0.25/seq/aseqnet/aseqnet.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aseqnet/aseqnet.1 2013-05-21 08:48:28.000000000 +0000 @@ -1,5 +1,4 @@ .TH aseqnet 1 "January 1, 2000" -.LO 1 .SH NAME aseqnet \- ALSA sequencer connectors over network diff -Nru alsa-utils-1.0.25/seq/aseqnet/aseqnet.c alsa-utils-1.0.27.1/seq/aseqnet/aseqnet.c --- alsa-utils-1.0.25/seq/aseqnet/aseqnet.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/seq/aseqnet/aseqnet.c 2013-05-21 08:48:28.000000000 +0000 @@ -167,7 +167,7 @@ printf(_(" server mode: aseqnet [-options]\n")); printf(_(" client mode: aseqnet [-options] server_host\n")); printf(_("options:\n")); - printf(_(" -p,--port # : sepcify TCP port (digit or service name)\n")); + printf(_(" -p,--port # : specify TCP port (digit or service name)\n")); printf(_(" -s,--source addr : read from given addr (client:port)\n")); printf(_(" -d,--dest addr : write to given addr (client:port)\n")); printf(_(" -v, --verbose : print verbose messages\n")); diff -Nru alsa-utils-1.0.25/speaker-test/Makefile.in alsa-utils-1.0.27.1/speaker-test/Makefile.in --- alsa-utils-1.0.25/speaker-test/Makefile.in 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/speaker-test/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ bin_PROGRAMS = speaker-test$(EXEEXT) subdir = speaker-test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -74,6 +91,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -95,6 +117,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -133,6 +161,8 @@ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -157,6 +187,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -177,11 +208,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -192,6 +228,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -206,6 +244,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -271,7 +310,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -296,15 +335,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -338,7 +380,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -speaker-test$(EXEEXT): $(speaker_test_OBJECTS) $(speaker_test_DEPENDENCIES) +speaker-test$(EXEEXT): $(speaker_test_OBJECTS) $(speaker_test_DEPENDENCIES) $(EXTRA_speaker_test_DEPENDENCIES) @rm -f speaker-test$(EXEEXT) $(LINK) $(speaker_test_OBJECTS) $(speaker_test_LDADD) $(LIBS) @@ -366,11 +408,18 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -399,17 +448,15 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -419,7 +466,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -433,37 +484,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -472,6 +492,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -535,6 +559,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -545,10 +583,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -583,13 +621,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -627,10 +662,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -713,24 +753,25 @@ uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 + clean-generic cscopelist cscopelist-recursive ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-man uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru alsa-utils-1.0.25/speaker-test/samples/Makefile.in alsa-utils-1.0.27.1/speaker-test/samples/Makefile.in --- alsa-utils-1.0.25/speaker-test/samples/Makefile.in 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/speaker-test/samples/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,6 +67,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -72,10 +93,18 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(alsadir)" "$(DESTDIR)$(sounddir)" DATA = $(alsa_DATA) $(sound_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -100,6 +129,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -120,11 +150,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -135,6 +170,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -149,6 +186,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -226,7 +264,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -251,15 +289,18 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-alsaDATA: $(alsa_DATA) @$(NORMAL_INSTALL) - test -z "$(alsadir)" || $(MKDIR_P) "$(DESTDIR)$(alsadir)" @list='$(alsa_DATA)'; test -n "$(alsadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(alsadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(alsadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -273,13 +314,14 @@ @$(NORMAL_UNINSTALL) @list='$(alsa_DATA)'; test -n "$(alsadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(alsadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(alsadir)" && rm -f $$files + dir='$(DESTDIR)$(alsadir)'; $(am__uninstall_files_from_dir) install-soundDATA: $(sound_DATA) @$(NORMAL_INSTALL) - test -z "$(sounddir)" || $(MKDIR_P) "$(DESTDIR)$(sounddir)" @list='$(sound_DATA)'; test -n "$(sounddir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sounddir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sounddir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -293,15 +335,15 @@ @$(NORMAL_UNINSTALL) @list='$(sound_DATA)'; test -n "$(sounddir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sounddir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sounddir)" && rm -f $$files + dir='$(DESTDIR)$(sounddir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -350,10 +392,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru alsa-utils-1.0.25/speaker-test/speaker-test.1 alsa-utils-1.0.27.1/speaker-test/speaker-test.1 --- alsa-utils-1.0.25/speaker-test/speaker-test.1 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/speaker-test/speaker-test.1 2013-05-21 08:48:28.000000000 +0000 @@ -11,26 +11,26 @@ . fi . PP .. -.TH SPEAKER\-TEST 1 "April 2nd, 2011" speaker-test +.TH SPEAKER\-TEST 1 "April 2nd, 2011" speaker\-test .SH NAME -speaker\-test \- command-line speaker test tone generator for ALSA +speaker\-test \- command\-line speaker test tone generator for ALSA .SH SYNOPSIS .B speaker\-test [\-options] .SH DESCRIPTION \fBspeaker\-test\fP generates a tone that can be used to test the speakers of a computer. -\fBspeaker-test\fP by default will test the \fIdefault\fP device. If you +\fBspeaker\-test\fP by default will test the \fIdefault\fP device. If you want to test another sound device you will have first to get a list of all of the sound cards in your system and the devices associated with those cards. Notice that there might be for example, one device for analog sound, one for digital sound and one for HDMI sound. -To get the list of available cards and devices you can run \fBaplay -L\fR. +To get the list of available cards and devices you can run \fBaplay \-L\fR. .P \fBaplay\fR's output will be similar to this one: .nf -$ aplay -L +$ aplay \-L null Discard all samples (playback) or generate zero samples (capture) default:CARD=ICH5 @@ -48,7 +48,7 @@ .P Each of the devices is listed in the beginning of the definition so, in the above example, there are four devices listed: null, default, front and surround40. So, if you want to test the last device you can -run \fBspeaker-test -Dsurround40:ICH5 -c 6\fR. The \fB-c\fR option will +run \fBspeaker\-test \-Dsurround40:ICH5 \-c 6\fR. The \fB\-c\fR option will indicate that the six audio channels in the device have to be tested. @@ -86,7 +86,7 @@ The default value is 0. .TP -\fB\-P\fP | \fB\-\-nperiods\fP \fPERIODS\fP +\fB\-P\fP | \fB\-\-nperiods\fP \fPPERIODS\fP Use number of periods. The default value is 4. .TP @@ -131,39 +131,48 @@ Specify the directory containing WAV files for playback. The default path is \fI/usr/share/sounds/alsa\fP. +.TP +\fB\-m\fP | \fB\-\-chmap\fP +Pass the channel map to override. +If the playback in a specific channel order or channel positions is +required, pass the channel position strings to this option. .SH USAGE EXAMPLES Produce stereo sound from one stereo jack: .EX - speaker-test -Dplug:front -c2 + speaker\-test \-Dplug:front \-c2 .EE Produce 4 speaker sound from two stereo jacks: .EX - speaker-test -Dplug:surround40 -c4 + speaker\-test \-Dplug:surround40 \-c4 .EE Produce 5.1 speaker sound from three stereo jacks: .EX - speaker-test -Dplug:surround51 -c6 + speaker\-test \-Dplug:surround51 \-c6 .EE To send a nice low 75Hz tone to the Woofer and then exit without touching any other speakers: .EX - speaker-test -Dplug:surround51 -c6 -s1 -f75 + speaker\-test \-Dplug:surround51 \-c6 \-s1 \-f75 .EE -To do a 2-speaker test using the spdif (coax or optical) output: +To do a 2\-speaker test using the spdif (coax or optical) output: .EX - speaker-test -Dplug:spdif -c2 + speaker\-test \-Dplug:spdif \-c2 .EE +Play in the order of front\-right and front-left from the front PCM +.EX + speaker\-test \-Dplug:front \-c2 \-mFR,FL +.EE .SH SEE ALSO .BR aplay(1) .SH AUTHOR -The speaker-test program was written by James Courtier-Dutton. +The speaker\-test program was written by James Courtier-Dutton. Pink noise support was added by Nathan Hurst. Further extensions by Takashi Iwai. diff -Nru alsa-utils-1.0.25/speaker-test/speaker-test.c alsa-utils-1.0.27.1/speaker-test/speaker-test.c --- alsa-utils-1.0.25/speaker-test/speaker-test.c 2012-01-25 09:43:38.000000000 +0000 +++ alsa-utils-1.0.27.1/speaker-test/speaker-test.c 2013-05-21 08:48:28.000000000 +0000 @@ -45,6 +45,7 @@ #include #include #include +#include #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API @@ -60,6 +61,10 @@ #include #endif +#ifdef SND_CHMAP_API_VERSION +#define CONFIG_SUPPORT_CHMAP 1 +#endif + enum { TEST_PINK_NOISE = 1, TEST_SINE, @@ -99,6 +104,13 @@ static const char *given_test_wav_file = NULL; static char *wav_file_dir = SOUNDSDIR; static int debug = 0; +static int in_aborting = 0; +static snd_pcm_t *pcm_handle = NULL; + +#ifdef CONFIG_SUPPORT_CHMAP +static snd_pcm_chmap_t *channel_map; +static int channel_map_set; +#endif static const char *const channel_name[MAX_CHANNELS] = { /* 0 */ N_("Front Left"), @@ -143,6 +155,65 @@ 6, /* Side Left */ 5, /* LFE */ }; + +static int get_mapped_channel(int chn) +{ +#ifdef CONFIG_SUPPORT_CHMAP + static const int maps[MAX_CHANNELS] = { + SND_CHMAP_FL, + SND_CHMAP_FR, + SND_CHMAP_RL, + SND_CHMAP_RR, + SND_CHMAP_FC, + SND_CHMAP_LFE, + SND_CHMAP_SL, + SND_CHMAP_SR, + }; + + if (channel_map && maps[chn]) { + int i; + for (i = 0; i < channel_map->channels; i++) { + if (channel_map->pos[i] == maps[chn]) + return i; + } + } +#endif + return chn; +} + +static int get_speaker_channel(int chn) +{ +#ifdef CONFIG_SUPPORT_CHMAP + if (channel_map_set) + return chn; +#endif + + switch (channels) { + case 4: + chn = channels4[chn]; + break; + case 6: + chn = channels6[chn]; + break; + case 8: + chn = channels8[chn]; + break; + } + + return get_mapped_channel(chn); +} + +static const char *get_channel_name(int chn) +{ +#ifdef CONFIG_SUPPORT_CHMAP + if (channel_map_set && chn < channel_map->channels) { + const char *name = snd_pcm_chmap_long_name(channel_map->pos[chn]); + return name ? name : "Unknown"; + } +#endif + return gettext(channel_name[chn]); +} + static const int supported_formats[] = { SND_PCM_FORMAT_S8, SND_PCM_FORMAT_S16_LE, @@ -519,6 +590,31 @@ return 0; } +#ifdef CONFIG_SUPPORT_CHMAP +static int config_chmap(snd_pcm_t *handle, const char *mapstr) +{ + int err; + + if (mapstr) { + channel_map = snd_pcm_chmap_parse_string(mapstr); + if (!channel_map) { + fprintf(stderr, _("Unable to parse channel map string: %s\n"), mapstr); + return -EINVAL; + } + err = snd_pcm_set_chmap(handle, channel_map); + if (err < 0) { + fprintf(stderr, _("Unable to set channel map: %s\n"), mapstr); + return err; + } + channel_map_set = 1; + return 0; + } + + channel_map = snd_pcm_get_chmap(handle); + return 0; +} +#endif + /* * Underrun and suspend recovery */ @@ -684,6 +780,9 @@ static FILE *wavfp = NULL; int size; + if (in_aborting) + return -EFAULT; + if (! wav_file[channel]) { fprintf(stderr, _("Undefined channel %d\n"), channel); return -EINVAL; @@ -728,7 +827,7 @@ { int err; - while (cptr > 0) { + while (cptr > 0 && !in_aborting) { err = snd_pcm_writei(handle, ptr, cptr); @@ -737,9 +836,9 @@ if (err < 0) { fprintf(stderr, _("Write error: %d,%s\n"), err, snd_strerror(err)); - if (xrun_recovery(handle, err) < 0) { + if ((err = xrun_recovery(handle, err)) < 0) { fprintf(stderr, _("xrun_recovery failed: %d,%s\n"), err, snd_strerror(err)); - return -1; + return err; } break; /* skip one period */ } @@ -760,13 +859,13 @@ if (test_type == TEST_WAV) { int bufsize = snd_pcm_frames_to_bytes(handle, period_size); n = 0; - while ((err = read_wav((uint16_t *)frames, channel, n, bufsize)) > 0) { + while ((err = read_wav((uint16_t *)frames, channel, n, bufsize)) > 0 && !in_aborting) { n += err; if ((err = write_buffer(handle, frames, snd_pcm_bytes_to_frames(handle, err * channels))) < 0) break; } - if (buffer_size > n) { + if (buffer_size > n && !in_aborting) { snd_pcm_drain(handle); snd_pcm_prepare(handle); } @@ -777,7 +876,7 @@ if (periods <= 0) periods = 1; - for(n = 0; n < periods; n++) { + for(n = 0; n < periods && !in_aborting; n++) { if (test_type == TEST_PINK_NOISE) generate_pink_noise(frames, channel, period_size); else if (test_type == TEST_PATTERN) @@ -788,13 +887,37 @@ if ((err = write_buffer(handle, frames, period_size)) < 0) return err; } - if (buffer_size > n * period_size) { + if (buffer_size > n * period_size && !in_aborting) { snd_pcm_drain(handle); snd_pcm_prepare(handle); } return 0; } +static int prg_exit(int code) +{ + if (pcm_handle) + snd_pcm_close(pcm_handle); + exit(code); + return code; +} + +static void signal_handler(int sig) +{ + if (in_aborting) + return; + + in_aborting = 1; + + if (pcm_handle) + snd_pcm_abort(pcm_handle); + if (sig == SIGABRT) { + pcm_handle = NULL; + prg_exit(EXIT_FAILURE); + } + signal(sig, signal_handler); +} + static void help(void) { const int *fmt; @@ -815,6 +938,7 @@ "-s,--speaker single speaker test. Values 1=Left, 2=right, etc\n" "-w,--wavfile Use the given WAV file as a test sound\n" "-W,--wavdir Specify the directory containing WAV files\n" + "-m,--chmap Specify the channel map to override\n" "\n")); printf(_("Recognized sample formats are:")); for (fmt = supported_formats; *fmt >= 0; fmt++) { @@ -837,6 +961,9 @@ double time1,time2,time3; unsigned int n, nloops; struct timeval tv1,tv2; +#ifdef CONFIG_SUPPORT_CHMAP + const char *chmap = NULL; +#endif static const struct option long_option[] = { {"help", 0, NULL, 'h'}, @@ -854,6 +981,9 @@ {"wavfile", 1, NULL, 'w'}, {"wavdir", 1, NULL, 'W'}, {"debug", 0, NULL, 'd'}, +#ifdef CONFIG_SUPPORT_CHMAP + {"chmap", 1, NULL, 'm'}, +#endif {NULL, 0, NULL, 0 }, }; @@ -872,7 +1002,11 @@ while (1) { int c; - if ((c = getopt_long(argc, argv, "hD:r:c:f:F:b:p:P:t:l:s:w:W:d", long_option, NULL)) < 0) + if ((c = getopt_long(argc, argv, "hD:r:c:f:F:b:p:P:t:l:s:w:W:d" +#ifdef CONFIG_SUPPORT_CHMAP + "m:" +#endif + , long_option, NULL)) < 0) break; switch (c) { @@ -895,7 +1029,7 @@ case 'r': rate = atoi(optarg); rate = rate < 4000 ? 4000 : rate; - rate = rate > 196000 ? 196000 : rate; + rate = rate > 384000 ? 384000 : rate; break; case 'c': channels = atoi(optarg); @@ -963,6 +1097,11 @@ case 'd': debug = 1; break; +#ifdef CONFIG_SUPPORT_CHMAP + case 'm': + chmap = optarg; + break; +#endif default: fprintf(stderr, _("Unknown option '%c'\n"), c); exit(EXIT_FAILURE); @@ -993,21 +1132,31 @@ } + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); + signal(SIGABRT, signal_handler); + if ((err = snd_pcm_open(&handle, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) { printf(_("Playback open error: %d,%s\n"), err,snd_strerror(err)); - exit(EXIT_FAILURE); + prg_exit(EXIT_FAILURE); } + pcm_handle = handle; if ((err = set_hwparams(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { printf(_("Setting of hwparams failed: %s\n"), snd_strerror(err)); - snd_pcm_close(handle); - exit(EXIT_FAILURE); + prg_exit(EXIT_FAILURE); } if ((err = set_swparams(handle, swparams)) < 0) { printf(_("Setting of swparams failed: %s\n"), snd_strerror(err)); - snd_pcm_close(handle); - exit(EXIT_FAILURE); + prg_exit(EXIT_FAILURE); } + +#ifdef CONFIG_SUPPORT_CHMAP + err = config_chmap(handle, chmap); + if (err < 0) + prg_exit(EXIT_FAILURE); +#endif + if (debug) { snd_output_t *log; err = snd_output_stdio_attach(&log, stderr, 0); @@ -1023,40 +1172,30 @@ if (frames == NULL) { fprintf(stderr, _("No enough memory\n")); - exit(EXIT_FAILURE); + prg_exit(EXIT_FAILURE); } + if (speaker==0) { if (test_type == TEST_WAV) { for (chn = 0; chn < channels; chn++) { if (setup_wav_file(chn) < 0) - exit(EXIT_FAILURE); + prg_exit(EXIT_FAILURE); } } - for (n = 0; ! nloops || n < nloops; n++) { + for (n = 0; (! nloops || n < nloops) && !in_aborting; n++) { gettimeofday(&tv1, NULL); for(chn = 0; chn < channels; chn++) { - int channel=chn; - if (channels == 4) { - channel=channels4[chn]; - } - if (channels == 6) { - channel=channels6[chn]; - } - if (channels == 8) { - channel=channels8[chn]; - } - printf(" %d - %s\n", channel, gettext(channel_name[channel])); + int channel = get_speaker_channel(chn); + printf(" %d - %s\n", channel, get_channel_name(channel)); err = write_loop(handle, channel, ((rate*3)/period_size), frames); if (err < 0) { fprintf(stderr, _("Transfer failed: %s\n"), snd_strerror(err)); - free(frames); - snd_pcm_close(handle); - exit(EXIT_SUCCESS); + prg_exit(EXIT_SUCCESS); } } gettimeofday(&tv2, NULL); @@ -1066,13 +1205,15 @@ printf(_("Time per period = %lf\n"), time3 ); } } else { + chn = get_speaker_channel(speaker - 1); + if (test_type == TEST_WAV) { - if (setup_wav_file(speaker - 1) < 0) - exit(EXIT_FAILURE); + if (setup_wav_file(chn) < 0) + prg_exit(EXIT_FAILURE); } - printf(" - %s\n", gettext(channel_name[speaker-1])); - err = write_loop(handle, speaker-1, ((rate*5)/period_size), frames); + printf(" - %s\n", get_channel_name(chn)); + err = write_loop(handle, chn, ((rate*5)/period_size), frames); if (err < 0) { fprintf(stderr, _("Transfer failed: %s\n"), snd_strerror(err)); @@ -1081,7 +1222,6 @@ free(frames); - snd_pcm_close(handle); - exit(EXIT_SUCCESS); + return prg_exit(EXIT_SUCCESS); } diff -Nru alsa-utils-1.0.25/utils/Makefile.in alsa-utils-1.0.27.1/utils/Makefile.in --- alsa-utils-1.0.25/utils/Makefile.in 2012-01-25 09:43:52.000000000 +0000 +++ alsa-utils-1.0.27.1/utils/Makefile.in 2013-05-21 08:50:37.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +67,15 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ALSACTL_DAEMONSWITCH = @ALSACTL_DAEMONSWITCH@ +ALSACTL_PIDFILE_DIR = @ALSACTL_PIDFILE_DIR@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ @@ -77,6 +100,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -97,11 +121,16 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -112,6 +141,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -126,6 +157,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -185,7 +217,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -210,9 +242,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): alsa-utils.spec: $(top_builddir)/config.status $(srcdir)/alsa-utils.spec.in @@ -223,6 +255,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -268,10 +302,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: