diff -Nru mp3splt-2.4.1/AUTHORS mp3splt-2.6.0/AUTHORS --- mp3splt-2.4.1/AUTHORS 2011-02-27 22:46:06.000000000 +0000 +++ mp3splt-2.6.0/AUTHORS 2012-10-07 14:33:00.000000000 +0000 @@ -1,5 +1,5 @@ * Matteo Trotta : Author and main maintainer of Mp3Splt Project -* Alexandru Ionut Munteanu : Maintainer of Mp3Splt Project +* Alexandru Ionut Munteanu : Maintainer of Mp3Splt Project People who contributed to mp3splt-project development : diff -Nru mp3splt-2.4.1/COPYING mp3splt-2.6.0/COPYING --- mp3splt-2.4.1/COPYING 2009-08-02 00:27:56.000000000 +0000 +++ mp3splt-2.6.0/COPYING 2012-12-30 22:04:55.000000000 +0000 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) 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 @@ -303,16 +303,16 @@ 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, USA. + 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. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -335,5 +335,6 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + diff -Nru mp3splt-2.4.1/ChangeLog mp3splt-2.6.0/ChangeLog --- mp3splt-2.4.1/ChangeLog 2011-11-13 22:14:29.000000000 +0000 +++ mp3splt-2.6.0/ChangeLog 2013-07-20 06:07:43.000000000 +0000 @@ -7,6 +7,63 @@ - translated 'mp3splt -h' doesn't show complete message on utf8 on windows: won't fix ? +#mp3splt version 2.6 + +- experimental FLAC support added - stdin and stdout are not yet implemented +- new --enable-flacsplt_symlink configure option to mp3splt +- fixed progress bar of ogg vorbis when using the auto adjust option (libmp3splt) + +#mp3splt version 2.5.2 + +- added option -I to specify the input tags encoding for when writing ID3v2 tags (ISO-8859-1, UTF-8 +or UTF-16) +- added option -K to keep the original tags and just replace them when importing a CUE or CDDB file +(feature request #95) +- fixed bug #149 - use of getline() on mac +- libmp3splt check is now more correct and checks for the exact version of libmp3splt with = instead +of >=; will be changed to >= when final version of libmp3splt will be released +- now using pkg-config instead of mp3splt.m4 (bug #145) +- corrected build files (configure.ac, Makefile.am, ...) and check using 'make distcheck' (bug #147) + +#mp3splt version 2.5.1 + +- fixed a bug when removing the tags from skippoints (libmp3splt) +- added option to set output ID3v2 tags encoded in latin1, UTF-8 or UTF16 + +#mp3splt version 2.5 + +- done issues #40 and #85 - added minimum silence length parameter for auto adjust (mainly libmp3splt) +- added minimum silence length for trim silence mode (minimum silence to trigger a trimming) +(mainly libmp3splt) +- done issue #12 - added option to output the full silence log useful to plot a graph +(mainly libmp3splt) +- implemented back the proxy feature with basic authentification - feature #50 (mainly libmp3splt) +- added option to generate exactly the same input tags bytes using @O (mainly libmp3splt) +- enhanced the CUE export to export the tags as REM comments and also the splitpoint names (libmp3splt) +- fixed bug when detecting the input tags version - output had no tags when the input only had ID3v1 +(libmp3splt) +- fixed bug: output tags versions was not equal to the input file tags versions when the user was +setting custom tags without any @o to get the original tags (libmp3splt) +- done issue #79 - added 0 to the number of digits to output in order to be able to support +the old mp3splt output format (libmp3splt) +- fixed bug #141 - when input file is a symlink and output directory is the one of the input file +(libmp3splt) +- fixed bug on mp3 trim silence scan: last frame was skipped (libmp3splt) +- fixed bug #133 - updated GPLv2 COPYING file +- fixed bug #142 - skipped splitpoints were handled wrong by '-c' + +#mp3splt version 2.4.3 + +- added the trackjoin parameter for silence detection split: tracks shorter than trackjoin will be joined with others +- fixed bug: removing TLEN id3v2 tag from the split files (libmp3splt) +- fixed bug #3530488 - regression introduced with ogg multiple logical streams (libmp3splt) + +#mp3splt version 2.4.2 + +- fixed error when ID3v2 was containing what appears a valid frame; make sure we skip the ID3v2 after looking for the first frames (libmp3splt) +- added the shots parameter to silence detection +(-p shots=INTEGER - minimum number of shots to be found as non silence after the silence) + #mp3splt version 2.4.1 - added minimum track length option for silence scan: 'trackmin' parameter to '-p' - closes #2393766 diff -Nru mp3splt-2.4.1/INSTALL mp3splt-2.6.0/INSTALL --- mp3splt-2.4.1/INSTALL 2010-10-10 16:21:45.000000000 +0000 +++ mp3splt-2.6.0/INSTALL 2013-04-08 21:06:20.000000000 +0000 @@ -50,6 +50,7 @@ Main configure options : --enable-oggsplt_symlink + --enable-flacsplt_symlink Other configure options : --with-mp3splt=PFX @@ -78,7 +79,7 @@ for any suggestion, bugs, etc... contact us. Matteo Trotta - -Alexandru Munteanu - +Alexandru Munteanu - /////////////////////////////////////////// diff -Nru mp3splt-2.4.1/Makefile.am mp3splt-2.6.0/Makefile.am --- mp3splt-2.4.1/Makefile.am 2010-12-11 18:10:23.000000000 +0000 +++ mp3splt-2.6.0/Makefile.am 2013-01-29 22:30:03.000000000 +0000 @@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = foreign no-dependencies ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src doc m4 po +SUBDIRS = src doc po EXTRA_DIST = autogen.sh debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/rules diff -Nru mp3splt-2.4.1/Makefile.in mp3splt-2.6.0/Makefile.in --- mp3splt-2.4.1/Makefile.in 2011-11-13 23:12:36.000000000 +0000 +++ mp3splt-2.6.0/Makefile.in 2013-07-20 07:11:00.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.3 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,18 +78,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ - INSTALL NEWS TODO config.guess config.rpath config.sub depcomp \ - install-sh missing mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in mkinstalldirs ABOUT-NLS AUTHORS COPYING \ + ChangeLog INSTALL NEWS README TODO config.guess config.rpath \ + config.sub depcomp 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 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -54,32 +97,75 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = depcomp = am__depfiles_maybe = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-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 +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) 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,'; \ @@ -107,10 +193,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@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -139,6 +229,8 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@ +LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ @@ -149,8 +241,6 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@ -MP3SPLT_LIBS = @MP3SPLT_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ @@ -162,6 +252,9 @@ PACKAGE_URL = @PACKAGE_URL@ 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@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -223,13 +316,13 @@ # General automake options. AUTOMAKE_OPTIONS = foreign no-dependencies ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src doc m4 po +SUBDIRS = src doc po EXTRA_DIST = autogen.sh debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/rules all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -265,10 +358,8 @@ $(am__aclocal_m4_deps): config.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)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -282,22 +373,25 @@ -rm -f config.h stamp-h1 # 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): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# 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. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ 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; \ @@ -312,57 +406,12 @@ $(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); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -378,12 +427,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -395,15 +439,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -412,9 +452,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(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 +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + 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) @@ -450,13 +512,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; \ @@ -485,36 +544,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 @@ -525,8 +584,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*) \ @@ -536,9 +595,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -546,6 +605,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 \ @@ -569,13 +629,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)"; \ @@ -606,10 +674,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: @@ -690,23 +763,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.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-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck 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 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck 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-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mp3splt-2.4.1/NEWS mp3splt-2.6.0/NEWS --- mp3splt-2.4.1/NEWS 2011-11-13 22:06:28.000000000 +0000 +++ mp3splt-2.6.0/NEWS 2013-07-20 06:04:53.000000000 +0000 @@ -1,6 +1,24 @@ See the ChangeLog file for details. See also the ChangeLog of libmp3splt. +* 21.07.2013 * + -version 2.6 released + +* 31.03.2013 * + -version 2.5.2 released + +* 27.01.2013 * + -version 2.5.1 released + +* 20.01.2013 * + -version 2.5 released + +* 27.08.2012 * + -version 2.4.3 released + +* 12.05.2012 * + -version 2.4.2 released + * 14.11.2011 * -version 2.4.1 released diff -Nru mp3splt-2.4.1/README mp3splt-2.6.0/README --- mp3splt-2.4.1/README 2011-11-13 23:11:41.000000000 +0000 +++ mp3splt-2.6.0/README 2013-07-20 07:09:10.000000000 +0000 @@ -1,7 +1,7 @@ - mp3splt version 2.4.1 + mp3splt version 2.6 Copyright (C) 2002-2005 Matteo Trotta - Copyright (C) 2005-2011 Alexandru Ionut Munteanu + Copyright (C) 2005-2013 Alexandru Ionut Munteanu Visit http://mp3splt.sourceforge.net for latest realease! @@ -26,7 +26,7 @@ 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, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYING for more details. @@ -42,4 +42,4 @@ Enjoy! Matteo Trotta - -Alexandru Ionut Munteanu - +Alexandru Ionut Munteanu - diff -Nru mp3splt-2.4.1/TODO mp3splt-2.6.0/TODO --- mp3splt-2.4.1/TODO 2010-10-10 16:21:45.000000000 +0000 +++ mp3splt-2.6.0/TODO 2013-03-17 19:02:01.000000000 +0000 @@ -1 +0,0 @@ -A_option incompatibility diff -Nru mp3splt-2.4.1/aclocal.m4 mp3splt-2.6.0/aclocal.m4 --- mp3splt-2.4.1/aclocal.m4 2011-11-13 23:12:35.000000000 +0000 +++ mp3splt-2.6.0/aclocal.m4 2013-07-20 07:10:58.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.13.3 -*- Autoconf -*- + +# Copyright (C) 1996-2013 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. @@ -11,15 +11,176 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) 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'.])]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +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 +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# 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_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[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` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +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 --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + 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 .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +192,10 @@ # 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.13' 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.13.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +211,22 @@ # 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.13.3])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-2013 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. # 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 @@ -84,7 +245,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, @@ -110,22 +271,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 - # 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 @@ -144,16 +302,14 @@ 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-2013 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 -# 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 @@ -163,7 +319,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 @@ -176,12 +332,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], @@ -189,8 +346,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. @@ -229,16 +387,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 @@ -247,16 +405,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} @@ -304,7 +462,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 @@ -314,34 +472,39 @@ # 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-2013 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 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +517,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. @@ -366,21 +529,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 + 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"])` @@ -398,7 +559,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], @@ -406,29 +567,14 @@ [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-2013 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 - # 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. @@ -444,7 +590,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -473,31 +619,40 @@ # 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.]) +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 @@ -508,28 +663,32 @@ [_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_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 is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro 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], @@ -557,7 +716,7 @@ 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-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -576,16 +735,14 @@ 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-2013 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 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,20 +759,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 - # 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 +# 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]), @@ -623,13 +777,14 @@ [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 am_maintainer_other maintainer-specific portions of Makefiles]) +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], -[ --][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])) + [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 @@ -637,18 +792,14 @@ ] ) -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-2013 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 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -666,7 +817,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 @@ -693,15 +844,12 @@ # 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-2013 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 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -709,11 +857,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -726,63 +873,64 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " 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. +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-2013 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. -# AM_PROG_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 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. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_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)])]) @@ -795,22 +943,16 @@ # 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-2013 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 - # 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=' @@ -821,32 +963,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 @@ -856,9 +1006,85 @@ 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) 2009-2013 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. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -866,34 +1092,32 @@ # 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-2013 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_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -901,24 +1125,22 @@ 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-2013 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_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 @@ -928,75 +1150,114 @@ # Substitute a variable $(am__untar) that extract such # 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]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# 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}']) + +# We'll loop over all known methods to create a tar archive until one works. _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 `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR @@ -1006,7 +1267,6 @@ m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) -m4_include([m4/mp3splt.m4]) m4_include([m4/nls.m4]) m4_include([m4/po.m4]) m4_include([m4/progtest.m4]) diff -Nru mp3splt-2.4.1/autogen.sh mp3splt-2.6.0/autogen.sh --- mp3splt-2.4.1/autogen.sh 2011-01-08 21:38:29.000000000 +0000 +++ mp3splt-2.6.0/autogen.sh 2013-04-07 21:00:47.000000000 +0000 @@ -1,4 +1,5 @@ #!/bin/sh +win=$1 #autopoint check (autopoint --version) > /dev/null 2>&1 || @@ -34,11 +35,15 @@ HAS_MSGFMT=no } +if ! test -z $win ;then + WIN_ACLOCAL_FLAGS="-I /usr/share/aclocal" +fi + #we run aclocal, autoconf and automake echo -n "1/5 Running autopoint... " \ && autopoint -f && echo "done" \ && echo -n "2/5 Running aclocal... " \ -&& aclocal -I m4 $ACLOCAL_FLAGS && echo "done" \ +&& aclocal -I m4 $WIN_ACLOCAL_FLAGS $ACLOCAL_FLAGS && echo "done" \ && echo -n "3/5 Running autoheader... " \ && autoheader && echo "done" \ && echo -n "4/5 Running autoconf... " \ diff -Nru mp3splt-2.4.1/config.guess mp3splt-2.6.0/config.guess --- mp3splt-2.4.1/config.guess 2010-11-26 23:54:37.000000000 +0000 +++ mp3splt-2.6.0/config.guess 2012-09-12 20:42:02.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, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-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 @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +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." @@ -145,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 @@ -181,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,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 @@ -270,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 @@ -296,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} @@ -395,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 ;; @@ -481,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 ] || \ @@ -495,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,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 @@ -595,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 @@ -731,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 ;; @@ -770,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} @@ -789,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*:*) @@ -804,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 ;; @@ -858,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 ;; @@ -867,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} @@ -879,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 @@ -934,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 @@ -960,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 @@ -968,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. @@ -984,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:*:*) @@ -1020,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 ;; @@ -1048,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 ;; @@ -1089,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 \ @@ -1133,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 @@ -1162,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 ;; @@ -1231,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,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 ;; @@ -1300,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 @@ -1322,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru mp3splt-2.4.1/config.h.in mp3splt-2.6.0/config.h.in --- mp3splt-2.4.1/config.h.in 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/config.h.in 2013-07-20 07:11:03.000000000 +0000 @@ -8,6 +8,9 @@ */ #undef HAVE_DCGETTEXT +/* Define to 1 if you have the `getline' function. */ +#undef HAVE_GETLINE + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -41,6 +44,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* libmp3splt library with soname */ +#undef LIBMP3SPLT_WITH_SONAME + /* Name of package */ #undef PACKAGE diff -Nru mp3splt-2.4.1/config.sub mp3splt-2.6.0/config.sub --- mp3splt-2.4.1/config.sub 2010-11-26 23:54:37.000000000 +0000 +++ mp3splt-2.6.0/config.sub 2012-09-12 20:42:02.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # 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., 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 @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +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." @@ -124,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 ] @@ -157,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,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 ;; @@ -246,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 \ @@ -282,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 ;; @@ -314,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. @@ -328,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-* \ @@ -368,26 +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-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | 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-*) @@ -412,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,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 ;; @@ -518,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,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 @@ -734,7 +788,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,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 @@ -841,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 ;; @@ -923,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 @@ -1019,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +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 - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,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 @@ -1260,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|'` @@ -1300,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* \ @@ -1348,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1501,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,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) @@ -1481,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-*) @@ -1502,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) @@ -1536,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru mp3splt-2.4.1/configure mp3splt-2.6.0/configure --- mp3splt-2.4.1/configure 2011-11-13 23:12:36.000000000 +0000 +++ mp3splt-2.6.0/configure 2013-07-20 07:10:59.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for mp3splt 2.4.1. +# Generated by GNU Autoconf 2.69 for mp3splt 2.6. # # Report bugs to . # # -# 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 @@ -136,6 +134,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 @@ -169,7 +192,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'\" && @@ -214,21 +238,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 : @@ -331,6 +359,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 @@ -452,6 +488,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). @@ -486,16 +526,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 @@ -507,28 +547,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'" @@ -560,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='mp3splt' PACKAGE_TARNAME='mp3splt' -PACKAGE_VERSION='2.4.1' -PACKAGE_STRING='mp3splt 2.4.1' +PACKAGE_VERSION='2.6' +PACKAGE_STRING='mp3splt 2.6' PACKAGE_BUGREPORT='mtrotta@users.sourceforge.net' PACKAGE_URL='' @@ -606,10 +626,15 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -DO_SYMLINK_FALSE -DO_SYMLINK_TRUE -MP3SPLT_LIBS -MP3SPLT_CFLAGS +DO_FLAC_SYMLINK_FALSE +DO_FLAC_SYMLINK_TRUE +DO_OGG_SYMLINK_FALSE +DO_OGG_SYMLINK_TRUE +LIBMP3SPLT_LIBS +LIBMP3SPLT_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG WIN32_FALSE WIN32_TRUE POSUB @@ -639,6 +664,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -655,6 +681,10 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -719,6 +749,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_nls @@ -726,11 +757,8 @@ enable_rpath with_libiconv_prefix with_libintl_prefix -with_mp3splt -with_mp3splt_libraries -with_mp3splt_includes -enable_mp3splttest enable_oggsplt_symlink +enable_flacsplt_symlink enable_c_debug enable_optimise enable_extra_warnings @@ -743,7 +771,12 @@ LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +LIBMP3SPLT_CFLAGS +LIBMP3SPLT_LIBS' # Initialize some variables set by options. @@ -1199,8 +1232,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 @@ -1286,7 +1317,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mp3splt 2.4.1 to adapt to many kinds of systems. +\`configure' configures mp3splt 2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1356,7 +1387,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mp3splt 2.4.1:";; + short | recursive ) echo "Configuration of mp3splt 2.6:";; esac cat <<\_ACEOF @@ -1364,18 +1395,23 @@ --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-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths - --disable-mp3splttest Do not try to compile and run a test mp3splt - program. --enable-oggsplt_symlink Enable symlink of oggsplt to mp3splt. + --enable-flacsplt_symlink + Enable symlink of flacsplt to mp3splt. --enable-c-debug Enable debugging symbols. - --enable-optimise Enable O2 optimise. + --enable-optimise Enable O3 optimise. --enable-extra-warnings Enable extra warnings. Optional Packages: @@ -1386,13 +1422,6 @@ --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-mp3splt=PFX Prefix where libmp3splt is installed (optional). - --with-mp3splt-libraries=DIR - Directory where libmp3splt library is installed - (optional). - --with-mp3splt-includes=DIR - Directory where libmp3splt header files are - installed (optional). Some influential environment variables: CC C compiler command @@ -1403,6 +1432,15 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if 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 + LIBMP3SPLT_CFLAGS + C compiler flags for LIBMP3SPLT, overriding pkg-config + LIBMP3SPLT_LIBS + linker flags for LIBMP3SPLT, 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. @@ -1470,10 +1508,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mp3splt configure 2.4.1 -generated by GNU Autoconf 2.68 +mp3splt configure 2.6 +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 @@ -1750,7 +1788,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 @@ -1768,12 +1806,79 @@ as_fn_set_status $ac_retval } # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* 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 $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mp3splt $as_me 2.4.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by mp3splt $as_me 2.6, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2122,7 +2227,7 @@ -am__api_version='1.11' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2190,7 +2295,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. @@ -2248,9 +2353,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=' @@ -2261,32 +2363,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 @@ -2298,6 +2408,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. @@ -2320,12 +2440,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " 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 @@ -2337,10 +2457,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. @@ -2359,7 +2479,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 @@ -2399,7 +2519,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 @@ -2450,7 +2570,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) '* | \ @@ -2479,12 +2599,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. @@ -2503,7 +2617,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 @@ -2567,6 +2681,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2588,8 +2741,8 @@ # Define the identity of the package. - PACKAGE=mp3splt - VERSION=2.4.1 + PACKAGE='mp3splt' + VERSION='2.6' cat >>confdefs.h <<_ACEOF @@ -2617,13 +2770,24 @@ 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}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' -AMTAR=${AMTAR-"${am_missing_run}tar"} +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' @@ -2632,8 +2796,8 @@ ac_config_headers="$ac_config_headers config.h" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } +{ $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 @@ -2681,7 +2845,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 @@ -2721,7 +2885,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 @@ -2774,7 +2938,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 @@ -2815,7 +2979,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 @@ -2873,7 +3037,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 @@ -2917,7 +3081,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 @@ -3363,8 +3527,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); @@ -3467,7 +3630,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 @@ -3500,6 +3663,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= @@ -3522,8 +3686,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. @@ -3557,16 +3722,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 @@ -3575,16 +3740,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} @@ -3806,7 +3971,7 @@ 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 + 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 @@ -3872,7 +4037,7 @@ 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 + 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 @@ -4178,7 +4343,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 @@ -5708,6 +5873,28 @@ + +cat >>confdefs.h <<_ACEOF +#define LIBMP3SPLT_WITH_SONAME "libmp3splt0" +_ACEOF + + +################################################################# +# Check for functions +################################################################# + +for ac_func in getline +do : + ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" +if test "x$ac_cv_func_getline" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETLINE 1 +_ACEOF + +fi +done + + ################################################################# # Check for the type of the host ################################################################# @@ -5764,164 +5951,203 @@ -# Check whether --with-mp3splt was given. -if test "${with_mp3splt+set}" = set; then : - withval=$with_mp3splt; mp3splt_prefix="$withval" -else - mp3splt_prefix="" -fi -# Check whether --with-mp3splt-libraries was given. -if test "${with_mp3splt_libraries+set}" = set; then : - withval=$with_mp3splt_libraries; mp3splt_libraries="$withval" -else - mp3splt_libraries="" -fi -# Check whether --with-mp3splt-includes was given. -if test "${with_mp3splt_includes+set}" = set; then : - withval=$with_mp3splt_includes; mp3splt_includes="$withval" +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 - mp3splt_includes="" -fi + 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 -# Check whether --enable-mp3splttest was given. -if test "${enable_mp3splttest+set}" = set; then : - enableval=$enable_mp3splttest; + ;; +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 - enable_mp3splttest=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x$mp3splt_libraries" != "x"; then - MP3SPLT_LIBS="-L$mp3splt_libraries" -elif test "x$mp3splt_prefix" != "x"; then - MP3SPLT_LIBS="-L$mp3splt_prefix/lib" -elif test "x$prefix" != "xNONE"; then - MP3SPLT_LIBS="-L$prefix/lib" 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 -MP3SPLT_LIBS="$MP3SPLT_LIBS -lmp3splt" - -if test "x$mp3splt_includes" != "x"; then - MP3SPLT_CFLAGS="-I$mp3splt_includes" -elif test "x$mp3splt_prefix" != "x"; then - MP3SPLT_CFLAGS="-I$mp3splt_prefix/include" -elif test "x$prefix" != "xNONE"; then - mp3splt_CFLAGS="-I$prefix/include" + ;; +esac fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmp3splt" >&5 -$as_echo_n "checking for libmp3splt... " >&6; } -no_mp3splt="" - -if test "x$enable_mp3splttest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MP3SPLT_CFLAGS" - LIBS="$LIBS $MP3SPLT_LIBS" - - rm -f conf.mp3splttest - - if test "$cross_compiling" = yes; then : - echo $ac_n "cross compiling; assumed OK... $ac_c" +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 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -#include - -int main () -{ - system("touch conf.mp3splttest"); - return 0; -} + { $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 -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +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 +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMP3SPLT" >&5 +$as_echo_n "checking for LIBMP3SPLT... " >&6; } + +if test -n "$LIBMP3SPLT_CFLAGS"; then + pkg_cv_LIBMP3SPLT_CFLAGS="$LIBMP3SPLT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmp3splt = 0.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmp3splt = 0.9.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBMP3SPLT_CFLAGS=`$PKG_CONFIG --cflags "libmp3splt = 0.9.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBMP3SPLT_LIBS"; then + pkg_cv_LIBMP3SPLT_LIBS="$LIBMP3SPLT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmp3splt = 0.9.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmp3splt = 0.9.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBMP3SPLT_LIBS=`$PKG_CONFIG --libs "libmp3splt = 0.9.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - no_mp3splt=yes + pkg_failed=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + else + pkg_failed=untried fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -fi - -if test "x$no_mp3splt" = "x" ; 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 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test -f conf.mp3splttest ; then - : - else - echo "*** Could not run libmp3splt test program, checking why..." - CFLAGS="$CFLAGS $MP3SPLT_CFLAGS" - LIBS="$LIBS $MP3SPLT_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libmp3splt or finding the wrong" - echo "*** version of libmp3splt. If it is not finding libmp3splt, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libmp3splt was incorrectly installed" - echo "*** or that you have moved libmp3splt since it was installed." +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - MP3SPLT_CFLAGS="" - MP3SPLT_LIBS="" - as_fn_error $? "libmp3splt version 0.7.1 needed : + if test $_pkg_short_errors_supported = yes; then + LIBMP3SPLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmp3splt = 0.9.0" 2>&1` + else + LIBMP3SPLT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmp3splt = 0.9.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBMP3SPLT_PKG_ERRORS" >&5 + + as_fn_error $? "libmp3splt version 0.9.0 needed : Download the latest version of libmp3splt at http://mp3splt.sourceforge.net/ " "$LINENO" 5 -fi - - +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "libmp3splt version 0.9.0 needed : -rm -f conf.mp3splttest +Download the latest version of libmp3splt at http://mp3splt.sourceforge.net/ +" "$LINENO" 5 +else + LIBMP3SPLT_CFLAGS=$pkg_cv_LIBMP3SPLT_CFLAGS + LIBMP3SPLT_LIBS=$pkg_cv_LIBMP3SPLT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi ################################################# -#Check for --enable-oggsplt +#Check for --enable-oggsplt_symlink # Check whether --enable-oggsplt_symlink was given. if test "${enable_oggsplt_symlink+set}" = set; then : @@ -5933,24 +6159,56 @@ if test "x$enable_ogg_symlink" = xyes;then if true; then - DO_SYMLINK_TRUE= - DO_SYMLINK_FALSE='#' + DO_OGG_SYMLINK_TRUE= + DO_OGG_SYMLINK_FALSE='#' else - DO_SYMLINK_TRUE='#' - DO_SYMLINK_FALSE= + DO_OGG_SYMLINK_TRUE='#' + DO_OGG_SYMLINK_FALSE= fi else if false; then - DO_SYMLINK_TRUE= - DO_SYMLINK_FALSE='#' + DO_OGG_SYMLINK_TRUE= + DO_OGG_SYMLINK_FALSE='#' else - DO_SYMLINK_TRUE='#' - DO_SYMLINK_FALSE= + DO_OGG_SYMLINK_TRUE='#' + DO_OGG_SYMLINK_FALSE= fi fi +################################################# +#Check for --enable-flacsplt_symlink + +# Check whether --enable-flacsplt_symlink was given. +if test "${enable_flacsplt_symlink+set}" = set; then : + enableval=$enable_flacsplt_symlink; enable_flac_symlink=$enableval +else + enable_flac_symlink="no" +fi + + +if test "x$enable_flac_symlink" = xyes;then + if true; then + DO_FLAC_SYMLINK_TRUE= + DO_FLAC_SYMLINK_FALSE='#' +else + DO_FLAC_SYMLINK_TRUE='#' + DO_FLAC_SYMLINK_FALSE= +fi + +else + if false; then + DO_FLAC_SYMLINK_TRUE= + DO_FLAC_SYMLINK_FALSE='#' +else + DO_FLAC_SYMLINK_TRUE='#' + DO_FLAC_SYMLINK_FALSE= +fi + +fi + + ################################################################# # Check for some debugging, warnings and optimise options ################################################################# @@ -5963,7 +6221,7 @@ fi if test "x$enable_c_debug" = xyes;then - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS -g -Wall" fi # Check whether --enable-optimise was given. @@ -5974,7 +6232,7 @@ fi if test "x$enable_optimise" = xyes;then - CFLAGS="$CFLAGS -O2" + CFLAGS="$CFLAGS -O3" fi # Check whether --enable-extra-warnings was given. @@ -5992,7 +6250,7 @@ # Generate Makefiles ################################################# -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in doc/Makefile m4/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6088,7 +6346,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -6103,6 +6360,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='#' @@ -6131,12 +6396,20 @@ as_fn_error $? "conditional \"WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DO_SYMLINK_TRUE}" && test -z "${DO_SYMLINK_FALSE}"; then - as_fn_error $? "conditional \"DO_SYMLINK\" was never defined. +if test -z "${DO_OGG_SYMLINK_TRUE}" && test -z "${DO_OGG_SYMLINK_FALSE}"; then + as_fn_error $? "conditional \"DO_OGG_SYMLINK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DO_OGG_SYMLINK_TRUE}" && test -z "${DO_OGG_SYMLINK_FALSE}"; then + as_fn_error $? "conditional \"DO_OGG_SYMLINK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DO_FLAC_SYMLINK_TRUE}" && test -z "${DO_FLAC_SYMLINK_FALSE}"; then + as_fn_error $? "conditional \"DO_FLAC_SYMLINK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DO_SYMLINK_TRUE}" && test -z "${DO_SYMLINK_FALSE}"; then - as_fn_error $? "conditional \"DO_SYMLINK\" was never defined. +if test -z "${DO_FLAC_SYMLINK_TRUE}" && test -z "${DO_FLAC_SYMLINK_FALSE}"; then + as_fn_error $? "conditional \"DO_FLAC_SYMLINK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -6437,16 +6710,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 @@ -6506,28 +6779,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'" @@ -6548,8 +6809,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mp3splt $as_me 2.4.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by mp3splt $as_me 2.6, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6614,11 +6875,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mp3splt config.status 2.4.1 -configured by $0, generated by GNU Autoconf 2.68, +mp3splt config.status 2.6 +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." @@ -6709,7 +6970,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' @@ -6757,7 +7018,6 @@ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -7354,7 +7614,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -7367,7 +7627,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. @@ -7401,21 +7661,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 + 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" || @@ -7606,6 +7864,7 @@ echo echo " install path: ${prefix}" echo " oggsplt symlink: ${enable_ogg_symlink}" +echo " flacsplt symlink: ${enable_flac_symlink}" echo echo "---------------------------------------------------------" echo diff -Nru mp3splt-2.4.1/configure.ac mp3splt-2.6.0/configure.ac --- mp3splt-2.4.1/configure.ac 2011-11-13 23:11:41.000000000 +0000 +++ mp3splt-2.6.0/configure.ac 2013-07-20 07:09:10.000000000 +0000 @@ -4,7 +4,7 @@ # * for mp3/ogg splitting without decoding # * # * Copyright (c) 2002-2005 M. Trotta - -# * Copyright (c) 2005-2011 Munteanu Alexandru - io_fx@yahoo.fr +# * Copyright (c) 2005-2013 Munteanu Alexandru - m@ioalex.net # * # * http://mp3splt.sourceforge.net # * @@ -24,7 +24,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # *********************************************************/ @@ -32,11 +32,13 @@ # Basic initialisations ################################################# +m4_define([minimum_libmp3splt_version],[0.9.0]) + AC_PREREQ(2.56) -AC_INIT(mp3splt, 2.4.1, mtrotta@users.sourceforge.net) +AC_INIT(mp3splt, 2.6, mtrotta@users.sourceforge.net) AC_CONFIG_SRCDIR([src/mp3splt.c]) -AM_INIT_AUTOMAKE(mp3splt, 2.4.1) +AM_INIT_AUTOMAKE AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE([enable]) @@ -52,6 +54,14 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.13.1]) +AC_DEFINE_UNQUOTED([LIBMP3SPLT_WITH_SONAME], "libmp3splt0", [libmp3splt library with soname]) + +################################################################# +# Check for functions +################################################################# + +AC_CHECK_FUNCS([getline]) + ################################################################# # Check for the type of the host ################################################################# @@ -89,24 +99,40 @@ ################################################# #Check for libmp3splt -MP3SPLT_CHECK(,[ AC_MSG_ERROR(libmp3splt version 0.7.1 needed : +PKG_CHECK_MODULES([LIBMP3SPLT], [libmp3splt = minimum_libmp3splt_version], +[], +[ AC_MSG_ERROR(libmp3splt version minimum_libmp3splt_version needed : Download the latest version of libmp3splt at http://mp3splt.sourceforge.net/ ) ]) ################################################# -#Check for --enable-oggsplt +#Check for --enable-oggsplt_symlink AC_ARG_ENABLE(oggsplt_symlink, AC_HELP_STRING([--enable-oggsplt_symlink], [Enable symlink of oggsplt to mp3splt. ]), [enable_ogg_symlink=$enableval],[enable_ogg_symlink="no"]) if test "x$enable_ogg_symlink" = xyes;then - AM_CONDITIONAL(DO_SYMLINK, true) + AM_CONDITIONAL(DO_OGG_SYMLINK, true) else - AM_CONDITIONAL(DO_SYMLINK, false) + AM_CONDITIONAL(DO_OGG_SYMLINK, false) fi +################################################# +#Check for --enable-flacsplt_symlink + +AC_ARG_ENABLE(flacsplt_symlink, +AC_HELP_STRING([--enable-flacsplt_symlink], [Enable symlink of flacsplt to mp3splt. ]), +[enable_flac_symlink=$enableval],[enable_flac_symlink="no"]) + +if test "x$enable_flac_symlink" = xyes;then + AM_CONDITIONAL(DO_FLAC_SYMLINK, true) +else + AM_CONDITIONAL(DO_FLAC_SYMLINK, false) +fi + + ################################################################# # Check for some debugging, warnings and optimise options ################################################################# @@ -114,13 +140,13 @@ AC_ARG_ENABLE(c-debug, [AC_HELP_STRING([--enable-c-debug],[ Enable debugging symbols. ]) ], [enable_c_debug=$enableval],[enable_c_debug="no"]) if test "x$enable_c_debug" = xyes;then - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS -g -Wall" fi -AC_ARG_ENABLE(optimise, [AC_HELP_STRING([--enable-optimise],[ Enable O2 optimise. ]) ], +AC_ARG_ENABLE(optimise, [AC_HELP_STRING([--enable-optimise],[ Enable O3 optimise. ]) ], [enable_optimise=$enableval],[enable_optimise="no"]) if test "x$enable_optimise" = xyes;then - CFLAGS="$CFLAGS -O2" + CFLAGS="$CFLAGS -O3" fi AC_ARG_ENABLE(extra-warnings, [AC_HELP_STRING([--enable-extra-warnings],[ Enable extra warnings. ]) ], @@ -133,7 +159,7 @@ # Generate Makefiles ################################################# -AC_OUTPUT(Makefile src/Makefile po/Makefile.in doc/Makefile m4/Makefile) +AC_OUTPUT(Makefile src/Makefile po/Makefile.in doc/Makefile) ################################################# # Output configuration @@ -145,6 +171,7 @@ echo echo " install path: ${prefix}" echo " oggsplt symlink: ${enable_ogg_symlink}" +echo " flacsplt symlink: ${enable_flac_symlink}" echo echo "---------------------------------------------------------" echo diff -Nru mp3splt-2.4.1/debian/changelog mp3splt-2.6.0/debian/changelog --- mp3splt-2.4.1/debian/changelog 2012-01-08 11:45:03.000000000 +0000 +++ mp3splt-2.6.0/debian/changelog 2013-09-13 20:38:46.000000000 +0000 @@ -1,8 +1,48 @@ -mp3splt (2.4.1-0ubuntu1) precise; urgency=low +mp3splt (2.6.0-0ubuntu0~ppa1) precise; urgency=low - * New Upstream version (LP: #913308) + * New upstream release. - -- Andreas Moog Sun, 08 Jan 2012 12:44:32 +0100 + -- Dominik Stadler (Ubuntu key) Fri, 13 Sep 2013 22:38:23 +0200 + +mp3splt (2.6.0) raring; urgency=low + + * Non-maintainer upload. + * New Upstream Version + * Updated the debian control file + + -- Gunter Königsmann Sat, 3 Mar 2011 23:04:40 +0100 + +mp3splt (2.4.2-2) unstable; urgency=low + + * Include dependencies on libmp3splt-* plugin packages + + -- Ryan Niebur Fri, 08 Jun 2012 18:24:54 -0700 + +mp3splt (2.4.2-1) unstable; urgency=low + + * move debian/rules to the libmp3splt-dev package + * regenerate debian/control against libmp3splt 0.7.2-1, to get the + bumped build dep + * change build dependency on debhelper to 7.0.50 instead of 7.2 + * standards version 3.9.3 + * remove dep on libmp3splt-plugin, moved to libmp3splt0 + * suggest mp3splt-gtk + * New Upstream Version (Closes: #622876) + - fixes -o option fails without any '@' variable (Closes: #536027) + - fixes regression in padded filename support (Closes: #592613) + - fixes ID3v1 tags (Closes: #624577) + * Update maintainer address, standards version, and vcs-* fields to + collab-maint + * Remove DMUA field + * Use quilt 3.0 source format + * add TODO and README to docs + * update debian/copyright file + * add patch to fix spelling of information + - use DEP3 patch headers + * convert to copyright format 1.0 + * Fix long lines in the man page + + -- Ryan Niebur Mon, 04 Jun 2012 00:23:15 -0700 mp3splt (2.2.5-1) unstable; urgency=low diff -Nru mp3splt-2.4.1/debian/control mp3splt-2.6.0/debian/control --- mp3splt-2.4.1/debian/control 2012-01-08 11:45:29.000000000 +0000 +++ mp3splt-2.6.0/debian/control 2013-09-15 13:47:12.000000000 +0000 @@ -1,30 +1,29 @@ Source: mp3splt Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ryan Niebur -DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.2), libmp3splt-dev (>= 0.7.1), libmp3splt-dev (<< 0.7.2~) -Standards-Version: 3.8.1 +Maintainer: Ryan Niebur +Build-Depends: debhelper (>= 7.0.50), libmp3splt-dev (>= 0.9.0~), libmp3splt-dev (<< 0.9.1~) +Standards-Version: 3.9.3 Homepage: http://mp3splt.sourceforge.net/ -Vcs-Git: git://git.ryan52.info/git/mp3splt -Vcs-Browser: http://git.ryan52.info/?p=mp3splt;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/mp3splt.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mp3splt.git;a=summary Package: mp3splt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmp3splt-mp3 | libmp3splt-plugin -Description: command line interface to split MP3 and Ogg Vorbis files without reencoding - Mp3Splt-project is a utility to split mp3 and ogg files selecting a +Depends: ${shlibs:Depends}, ${misc:Depends}, libmp3splt0-mp3 | libmp3splt0-plugin +Recommends: libmp3splt0-mp3, libmp3splt0-ogg, libmp3splt0-flac, +Suggests: mp3splt-gtk, +Description: interface to split MP3, Ogg Vorbis and FLAC files without reencoding + Mp3Splt-project is a utility to split mp3, ogg and flac files selecting a begin and an end time position, without decoding. It's very useful to - split large mp3/ogg to make smaller files or to split entire albums to + split large mp3/ogg/flac to make smaller files or to split entire albums to obtain original tracks. If you want to split an album, you can select split points and filenames manually or you can get them automatically from CDDB (internet or a local file) or from .cue files. Supports also automatic silence split, that can be used also to adjust cddb/cue splitpoints. You can extract tracks from Mp3Wrap or AlbumWrap files in few seconds. For mp3 files, both ID3v1 & ID3v2 tags are - supported. Mp3splt-project is split in 3 parts : libmp3splt, mp3splt + supported. Mp3splt-project is split in 3 parts: libmp3splt, mp3splt and mp3splt-gtk. . - This package provides mp3splt, the command line interface. - + This package provides mp3splt, the interface. diff -Nru mp3splt-2.4.1/debian/copyright mp3splt-2.6.0/debian/copyright --- mp3splt-2.4.1/debian/copyright 2012-01-08 11:37:22.000000000 +0000 +++ mp3splt-2.6.0/debian/copyright 2013-09-13 20:35:27.000000000 +0000 @@ -1,28 +1,18 @@ -This package was debianized by Ryan Niebur on -Sun, 15 Mar 2009 10:26:56 -0700. - -It was downloaded from - -Upstream Author: - - Matteo Trotta - Alexandru Munteanu - -Copyright: - - Copyright (C) 2002-2005 Matteo Trotta - Copyright (C) 2005-2009 Alexandru Ionut Munteanu - -License: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: http://mp3splt.sourceforge.net/ +Files: * +Copyright: Copyright (C) 2002-2005 Matteo Trotta + Copyright (C) 2005-2012 Alexandru Ionut Munteanu +License: GPL-2+ + +Files: debian/* +Copyright: copyright 2009-2012, Ryan Niebur +License: GPL-2+ You can redistribute this software 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. - + . On Debian systems you can find the full text of the GNU General Public License version 2 in '/usr/share/common-licenses/GPL-2'. - -The Debian packaging is copyright 2009, Ryan Niebur and -is licensed under the same license as mp3splt itself. - diff -Nru mp3splt-2.4.1/debian/dirs mp3splt-2.6.0/debian/dirs --- mp3splt-2.4.1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/dirs 2013-09-13 20:34:30.000000000 +0000 @@ -0,0 +1 @@ +usr/bin diff -Nru mp3splt-2.4.1/debian/docs mp3splt-2.6.0/debian/docs --- mp3splt-2.4.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/docs 2013-09-13 20:34:31.000000000 +0000 @@ -0,0 +1,2 @@ +TODO +README diff -Nru mp3splt-2.4.1/debian/links mp3splt-2.6.0/debian/links --- mp3splt-2.4.1/debian/links 2012-01-08 11:37:22.000000000 +0000 +++ mp3splt-2.6.0/debian/links 2013-09-15 13:45:34.000000000 +0000 @@ -1 +1,2 @@ usr/share/man/man1/mp3splt.1 usr/share/man/man1/oggsplt.1 +usr/share/man/man1/mp3splt.1 usr/share/man/man1/flacsplt.1 diff -Nru mp3splt-2.4.1/debian/patches/fix-informations-spelling mp3splt-2.6.0/debian/patches/fix-informations-spelling --- mp3splt-2.4.1/debian/patches/fix-informations-spelling 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/patches/fix-informations-spelling 2013-09-13 20:39:52.000000000 +0000 @@ -0,0 +1,131 @@ +Description: fix spelling of informations to be information +Author: Ryan Niebur +Forwarded: no + +Index: mp3splt/doc/mp3splt.1 +=================================================================== +--- mp3splt.orig/doc/mp3splt.1 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/doc/mp3splt.1 2013-09-13 22:39:33.000000000 +0200 +@@ -243,7 +243,7 @@ + of a ".CUE" file (note that it must end with ".cue", otherwise it will be wrongly + interpreted as a cddb file) or a local .XMCD (.CDDB) file on your hard disk. + +-If you want to get informations from Internet, SOURCE must have one of the ++If you want to get information from Internet, SOURCE must have one of the + following formats: + + \fBquery\fP +@@ -277,7 +277,7 @@ + query[get=cddb_cgi://freedb.org/~cddb/cddb.cgi:80] + + Mp3splt will connect to the server and start to find the requested +-informations. If the right album is found, then mp3splt will query the ++information. If the right album is found, then mp3splt will query the + server to get the selected album and (if no problem occurs) will + write a file named "query.cddb" from which will get splitpoints and + filenames. +@@ -663,7 +663,7 @@ + to STDOUT. This option cannot be used with STDOUT output. + + .IP "\fB\-D\fP " 10 +-\fBDebug mode\fP. Experimental debug support. Print extra informations ++\fBDebug mode\fP. Experimental debug support. Print extra information + about what is being done. Current print doesn't have a nice format. + + .IP "\fB\-v\fP " 10 +@@ -691,7 +691,7 @@ + \fBmp3splt \-nf album.mp3 0.12 21.34.7 25.3 30.40 38.58\fP + + This is the use of \-n option and multiple splitpoints. Four files will be created +-and will not contain ID3 informations. ++and will not contain ID3 information. + .PP + \fBmp3splt \-w album_MP3WRAP.mp3\fP + +Index: mp3splt/src/freedb.c +=================================================================== +--- mp3splt.orig/src/freedb.c 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/src/freedb.c 2013-09-13 22:39:44.000000000 +0200 +@@ -127,7 +127,7 @@ + //if we haven't chosen to search from the arguments, interactive search + if (opt->freedb_arg_search_string[0] == '\0') + { +- print_message(_("CDDB QUERY. Insert album and artist informations to find cd.")); ++ print_message(_("CDDB QUERY. Insert album and artist information to find cd.")); + + short first_time = SPLT_TRUE; + do { +@@ -178,7 +178,7 @@ + int selected_cd = 0; + if (opt->freedb_arg_result_option < 0) + { +- //print the searched informations ++ //print the searched information + print_message(_("List of found cd:")); + + int cd_number = 0; +Index: mp3splt/po/cs.po +=================================================================== +--- mp3splt.orig/po/cs.po 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/po/cs.po 2013-09-13 22:39:44.000000000 +0200 +@@ -404,7 +404,7 @@ + msgstr "" + + #: src/freedb.c:130 +-msgid "CDDB QUERY. Insert album and artist informations to find cd." ++msgid "CDDB QUERY. Insert album and artist information to find cd." + msgstr "" + + #: src/freedb.c:136 +Index: mp3splt/po/de_DE.po +=================================================================== +--- mp3splt.orig/po/de_DE.po 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/po/de_DE.po 2013-09-13 22:39:44.000000000 +0200 +@@ -531,7 +531,7 @@ + msgstr " Freedb-Ermittlungstyp: %s , Seite: %s , Port: %d\n" + + #: src/freedb.c:130 +-msgid "CDDB QUERY. Insert album and artist informations to find cd." ++msgid "CDDB QUERY. Insert album and artist information to find cd." + msgstr "" + "CDDB-Abfrage. Geben Sie Informationen über Album und Künstler an, um eine CD " + "zu finden." +Index: mp3splt/po/es.po +=================================================================== +--- mp3splt.orig/po/es.po 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/po/es.po 2013-09-13 22:39:44.000000000 +0200 +@@ -434,7 +434,7 @@ + msgstr "" + + #: src/freedb.c:130 +-msgid "CDDB QUERY. Insert album and artist informations to find cd." ++msgid "CDDB QUERY. Insert album and artist information to find cd." + msgstr "" + "PREGUNTA CDDB. Introduzca la información de álbum y artista para encontrar " + "cd." +Index: mp3splt/po/fr_FR.po +=================================================================== +--- mp3splt.orig/po/fr_FR.po 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/po/fr_FR.po 2013-09-13 22:39:44.000000000 +0200 +@@ -544,7 +544,7 @@ + msgstr " Type de récupération freedb : %s , Site : %s , Port : %d\n" + + #: src/freedb.c:130 +-msgid "CDDB QUERY. Insert album and artist informations to find cd." ++msgid "CDDB QUERY. Insert album and artist information to find cd." + msgstr "" + "RECHERCHE CDDB. Entrez des informations sur l'album et l'artiste pour " + "trouver un CD." +Index: mp3splt/po/mp3splt.pot +=================================================================== +--- mp3splt.orig/po/mp3splt.pot 2013-09-13 22:34:39.000000000 +0200 ++++ mp3splt/po/mp3splt.pot 2013-09-13 22:39:44.000000000 +0200 +@@ -403,7 +403,7 @@ + msgstr "" + + #: src/freedb.c:130 +-msgid "CDDB QUERY. Insert album and artist informations to find cd." ++msgid "CDDB QUERY. Insert album and artist information to find cd." + msgstr "" + + #: src/freedb.c:136 diff -Nru mp3splt-2.4.1/debian/patches/fix-long-lines-in-manpage mp3splt-2.6.0/debian/patches/fix-long-lines-in-manpage --- mp3splt-2.4.1/debian/patches/fix-long-lines-in-manpage 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/patches/fix-long-lines-in-manpage 2013-09-13 20:40:39.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Fix long lines in the man page +Author: Ryan Niebur +Forwarded: no + +Index: mp3splt/doc/mp3splt.1 +=================================================================== +--- mp3splt.orig/doc/mp3splt.1 2013-09-13 22:40:32.000000000 +0200 ++++ mp3splt/doc/mp3splt.1 2013-09-13 22:40:33.000000000 +0200 +@@ -270,7 +270,8 @@ + + Examples: + +- query[search=cddb_cgi://tracktype.org/~cddb/cddb.cgi:80,get=cddb_cgi://tracktype.org/~cddb/cddb.cgi:80] ++ query[search=cddb_cgi://tracktype.org/~cddb/cddb.cgi:80, ++ get=cddb_cgi://tracktype.org/~cddb/cddb.cgi:80] + .br + query[get=cddb_protocol://freedb.org:8880] + .br +@@ -603,7 +604,8 @@ + Example: if the input filename is \fBartist1__album2__title3__comment4__2__2004__Samba.ogg\fP, + .br + the following regular expression +-\fB(?.*?)__(?.*?)__(?.*?)__(?<comment>.*?)__(?<tracknum>.*?)__(?<year>.*?)__(?<genre>.*)\fP extracts the tags: ++\fB(?<artist>.*?)__(?<album>.*?)__(?<title>.*?)__(?<comment>.*?)\fP ++ \fB__(?<tracknum>.*?)__(?<year>.*?)__(?<genre>.*)\fP extracts the tags: + (?<artist>): artist1 + (?<album>): album2 + (?<title>): title3 diff -Nru mp3splt-2.4.1/debian/patches/series mp3splt-2.6.0/debian/patches/series --- mp3splt-2.4.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/patches/series 2013-09-13 20:34:31.000000000 +0000 @@ -0,0 +1,2 @@ +fix-informations-spelling +fix-long-lines-in-manpage diff -Nru mp3splt-2.4.1/debian/regenerate.sh mp3splt-2.6.0/debian/regenerate.sh --- mp3splt-2.4.1/debian/regenerate.sh 1970-01-01 00:00:00.000000000 +0000 +++ mp3splt-2.6.0/debian/regenerate.sh 2013-09-13 20:34:31.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/sh + +set -e +make -f debian/rules regenerate diff -Nru mp3splt-2.4.1/debian/rules mp3splt-2.6.0/debian/rules --- mp3splt-2.4.1/debian/rules 2012-01-08 11:45:20.000000000 +0000 +++ mp3splt-2.6.0/debian/rules 2013-09-13 20:35:04.000000000 +0000 @@ -1,9 +1,14 @@ #!/usr/bin/make -f # -*- makefile -*- +include /usr/share/libmp3splt-dev/mp3splt.rules + + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-oggsplt_symlink --enable-flacsplt_symlink + %: - dh $@ + dh $@ override_dh_auto_configure: - dh_auto_configure -- --disable-mp3splttest --enable-oggsplt_symlink + dh_auto_configure -- ${DEB_CONFIGURE_EXTRA_FLAGS} PKG_CONFIG_PATH=/tmp/temp/usr/lib/pkgconfig diff -Nru mp3splt-2.4.1/debian/watch mp3splt-2.6.0/debian/watch --- mp3splt-2.4.1/debian/watch 2012-01-08 11:37:22.000000000 +0000 +++ mp3splt-2.6.0/debian/watch 2013-09-15 13:47:12.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://sf.net/mp3splt/mp3splt-([0-9.]+)\.tar\.gz +http://sf.net/mp3splt/mp3splt-([0-9.a-z]+)\.tar\.gz diff -Nru mp3splt-2.4.1/depcomp mp3splt-2.6.0/depcomp --- mp3splt-2.4.1/depcomp 2009-08-06 19:22:43.000000000 +0000 +++ mp3splt-2.6.0/depcomp 2012-09-12 20:42:02.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 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 @@ -17,9 +17,7 @@ # 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -30,7 +28,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*) @@ -42,11 +40,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 <bug-automake@gnu.org>. @@ -59,6 +57,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 @@ -87,6 +91,29 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # 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' + 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 @@ -141,20 +168,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" ;; @@ -186,20 +214,17 @@ # 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 - echo >> $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 + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -209,10 +234,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|/[^/]*$|/|'` @@ -242,12 +274,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 @@ -258,23 +289,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 : @@ -283,15 +317,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" ;; @@ -327,8 +367,13 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + # Add 'dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -337,9 +382,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= @@ -385,14 +430,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. @@ -404,13 +494,13 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -430,15 +520,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" @@ -455,38 +544,46 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` 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" @@ -500,13 +597,13 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -538,13 +635,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +668,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$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" ;; +msvcmsys) + # 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 + ;; + none) exec "$@" ;; @@ -585,5 +703,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru mp3splt-2.4.1/doc/Makefile.am mp3splt-2.6.0/doc/Makefile.am --- mp3splt-2.4.1/doc/Makefile.am 2010-10-10 16:21:45.000000000 +0000 +++ mp3splt-2.6.0/doc/Makefile.am 2013-04-10 21:39:16.000000000 +0000 @@ -2,15 +2,22 @@ man_MANS = mp3splt.1 install-exec-hook: -if DO_SYMLINK - -$(mkdir_p) $(DESTDIR)/$(man1dir) - -cd $(DESTDIR)/$(man1dir) && $(LN_S) mp3splt.1 oggsplt.1 +if DO_OGG_SYMLINK + -cd $(DESTDIR)/$(mandir)/man1 && $(LN_S) mp3splt.1 oggsplt.1 +endif +if DO_FLAC_SYMLINK + -cd $(DESTDIR)/$(mandir)/man1 && $(LN_S) mp3splt.1 flacsplt.1 endif uninstall-hook: -if DO_SYMLINK - if [ -L $(DESTDIR)/$(man1dir)/oggsplt.1 ];then \ - echo "The $(DESTDIR)/$(man1dir)/oggsplt.1 symlink still exists. You may want to remove it."; \ +if DO_OGG_SYMLINK + if [ -L $(DESTDIR)/$(mandir)/man1/oggsplt.1 ];then \ + echo "The $(DESTDIR)/$(mandir)/man1/oggsplt.1 symlink still exists. You may want to remove it."; \ + fi +endif +if DO_FLAC_SYMLINK + if [ -L $(DESTDIR)/$(mandir)/man1/flacsplt.1 ];then \ + echo "The $(DESTDIR)/$(mandir)/man1/flacsplt.1 symlink still exists. You may want to remove it."; \ fi endif diff -Nru mp3splt-2.4.1/doc/Makefile.in mp3splt-2.6.0/doc/Makefile.in --- mp3splt-2.4.1/doc/Makefile.in 2011-11-13 23:12:36.000000000 +0000 +++ mp3splt-2.6.0/doc/Makefile.in 2013-07-20 07:11:00.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.3 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,22 +78,39 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs 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 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = 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/||"`;; \ @@ -71,13 +132,21 @@ 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 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -106,6 +175,8 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@ +LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ @@ -116,8 +187,6 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@ -MP3SPLT_LIBS = @MP3SPLT_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ @@ -129,6 +198,9 @@ PACKAGE_URL = @PACKAGE_URL@ 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@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -223,11 +295,18 @@ $(am__aclocal_m4_deps): 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"; \ @@ -256,30 +335,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; } -tags: TAGS -TAGS: + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - 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; \ - 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; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -326,10 +390,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: @@ -413,26 +482,30 @@ .MAKE: install-am install-exec-am install-strip uninstall-am -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic 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-exec-hook \ - 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 maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic 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-exec-hook 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-hook uninstall-man uninstall-man1 install-exec-hook: -@DO_SYMLINK_TRUE@ -$(mkdir_p) $(DESTDIR)/$(man1dir) -@DO_SYMLINK_TRUE@ -cd $(DESTDIR)/$(man1dir) && $(LN_S) mp3splt.1 oggsplt.1 +@DO_OGG_SYMLINK_TRUE@ -cd $(DESTDIR)/$(mandir)/man1 && $(LN_S) mp3splt.1 oggsplt.1 +@DO_FLAC_SYMLINK_TRUE@ -cd $(DESTDIR)/$(mandir)/man1 && $(LN_S) mp3splt.1 flacsplt.1 uninstall-hook: -@DO_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(man1dir)/oggsplt.1 ];then \ -@DO_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(man1dir)/oggsplt.1 symlink still exists. You may want to remove it."; \ -@DO_SYMLINK_TRUE@ fi +@DO_OGG_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(mandir)/man1/oggsplt.1 ];then \ +@DO_OGG_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(mandir)/man1/oggsplt.1 symlink still exists. You may want to remove it."; \ +@DO_OGG_SYMLINK_TRUE@ fi +@DO_FLAC_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(mandir)/man1/flacsplt.1 ];then \ +@DO_FLAC_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(mandir)/man1/flacsplt.1 symlink still exists. You may want to remove it."; \ +@DO_FLAC_SYMLINK_TRUE@ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru mp3splt-2.4.1/doc/manual.html mp3splt-2.6.0/doc/manual.html --- mp3splt-2.4.1/doc/manual.html 2011-11-13 21:17:34.000000000 +0000 +++ mp3splt-2.6.0/doc/manual.html 2013-07-20 06:53:27.000000000 +0000 @@ -11,7 +11,7 @@ <H2>NAME</H2> <P> -mp3splt, oggsplt - utility for mp3/ogg vorbis splitting without decoding +mp3splt, oggsplt, flacsplt - utility for mp3, ogg vorbis and native flac splitting without decoding <A NAME="lbAC"> </A> <H2>SYNOPSIS</H2> @@ -20,7 +20,7 @@ <B>mp3splt [OPTIONS] FILE_OR_DIR1 [FILE_OR_DIR2] ... [BEGIN_TIME] [TIME2] ... [END_TIME]</B> <P> -<B>FILE_OR_DIR</B>: mp3/ogg file to be split or a directory. +<B>FILE_OR_DIR</B>: mp3, ogg vorbis, native flac file to be split or a directory. If you want to specify STDIN as input, you can use "m-" (or "-") when input is mp3, and "o-" when ogg. Multiple files can be specified, all files will be split with the same criterion. If a directory is specified, a recursive scan is performed in that @@ -53,9 +53,9 @@ <P> <B>mp3splt</B> is a free command-line utility that allows you to -split mp3 and ogg files from several splitpoints, +split mp3, ogg vorbis and native flac files from several splitpoints, without need of decoding and reencoding. -It is useful to split large mp3/ogg to make smaller files or to split +It is useful to split large mp3, ogg vorbis and native flac to make smaller files or to split entire albums to obtain original tracks. <P> If you are splitting an album you can get splitpoints and filenames @@ -70,6 +70,10 @@ just with one command (see -w option). <P> +<P> +<B>IMPORTANT NOTE for FLAC:</B> FLAC support is still experimental. Please use with caution. Missing +FLAC features are stdin (input not seekable) and stdout. +<P> <B>NOTE for MP3:</B> usually mp3splt understands if mp3 is VBR by checking the presence of a Xing or Info header and will consequently start in framemode, but if this is not present, mp3splt will start in standard mode. @@ -81,15 +85,19 @@ might fix the issues. <P> <B>NOTES about TAGS:</B> by default, mp3splt will put the original tags in -the split files. Custom tags for the split files can be set with the -g option. -When copying the original file tags, only one artist, album, title are -supported. +the split files with one exception: the track number starts at 1 and is incremented along +split files. When copying the original file tags, only one artist, album, title are supported. +Custom tags for the split files can be set with the -g option. +Setting exactly the same tags as the original file is possible with -g %[@O] (mp3 only) or -g %[@o]. <P> <B>NOTE about MP3 TAGS:</B> in order to extract the original tags from mp3 files, libmp3splt must be compiled with 'id3tag' support. By default, the output files will have the same ID3 tag version as the input file; this behaviour can be changed with the -T option. If the input file has no tags and the -g option is used, then both ID3v1 and ID3v2 are written. Total tracknumber is not yet supported. +Only writing ID3v2.4 is supported for custom tags; note that some software only support ID3v2.3 +and will not be able to read them. However, it is possible to write the exact original tags using +%[@O], keeping the same tags version as in the original file. <P> <B>NOTE about the OUTPUT DIRECTORY:</B> by default, mp3splt will put the split files in the directory of the input file. In order to change the @@ -135,11 +143,13 @@ <BR>   67.000000 127.000000 second_file <BR>   149.000000  206.000000 third_file <P> -<DT><B>-t TIME</B> <DD> +<DT><B>-t TIME[>MIN_TIME]</B> <DD> <B>Time mode</B>. This option will create an indefinite number of smaller files with a fixed time length specified by TIME (which has the same format described above). It is useful to split long files into smaller (for example with the time length of a CD). Adjust option (-a) -can be used to adjust splitpoints with silence detection. +can be used to adjust splitpoints with silence detection. >MIN_TIME can be used to specify the +theoretical minimum track length of the last segment; it allows avoiding to create very small files +as the last segment. Make sure to quote the argument when using MIN_TIME - "TIME>MIN_TIME". <P> <DT><B>-S SPLIT_NUMBER</B> <DD> <B>Equal time tracks mode</B>. @@ -152,8 +162,11 @@ It accepts some parameters with -p option (see below for a detailed description): <I>threshold</I> -level (th) which is the sound level to be considered silence. This feature is new and -probably still needs tweaking; please report any bugs, suggestions, ... +level (th) which is the sound level to be considered silence, +<I>min</I> + +(min) which is the minimum silence length to trigger a trimming; this amount of silence will be kept +in the split file at the beginning and at the end. <P> <DT><B>-s</B> <DD> <B>Silence mode</B>, @@ -179,7 +192,9 @@ mp3splt will use the default values. Of course if you specify the number of tracks to split, you will help mp3splt to understand what are the most probable split points, anyway once you scan a file with -s option, mp3splt will write a file named "mp3splt.log" in which -it saves all silence points found. This allows you to run mp3splt with different parameters (except th and min) +it saves all silence points found. If this file exists in the current working directory, mp3splt +will read the splitpoints from this file and will not recompute the silence splitpoints. +This allows you to run mp3splt with different parameters (except th and min) without decoding the file again. Finally, if the number of silence points is not correct, you have many chances to achieve right result. For example if a silence point was not detected because too short, you can manually split the long track in the two smaller ones. @@ -198,8 +213,7 @@ <BR>  The next lines contain each one three columns: <BR>      -the first column is the start position of the found silence (in seconds.fractions) <BR>      -the second column is the end position of the found silence (in seconds.fractions) -<BR>      -the third column is the length of the silence in hundreths of seconds -<BR>          (second_column * 100 - first_column * 100) +<BR>      -the third column is the order of magnitude of the silence length; it is useful to find out most probable silence points <P> <DT><B>-c SOURCE</B> <DD> <B>CDDB mode</B>. To get splitpoints and filenames automatically from SOURCE, that is the name @@ -247,6 +261,14 @@ write a file named "query.cddb" from which will get splitpoints and filenames. <P> +<B>Proxy support:</B> +The first time that the user queries the internet (and if the quiet mode is not enabled), mp3splt asks +for some information about proxy usage. Mp3splt has basic authentification support using base64 for HTTP +proxies. A file named '.mp3splt' is created in the user home directory containing the informations +provided by the user. Deleting this file will make mp3splt to query the user again. Please note that +the authentification storage is not secure. The 'username:password' is stored as base64 and can be +easily decoded. +<P> <B>IMPORTANT NOTE FOR CDDB</B>: File split with this option can be not very precise due to: <P> 1) Who extracts CD tracks may use "Remove silence" option. This means @@ -262,7 +284,7 @@ 4) There are several entries of the same cd on CDDB. In mp3splt they appears with "\=>" symbol. Try some of them and find the best for yours; usually you can find the correct splitpoints, so good luck! <P> -<B>YOU CAN USE -a OPTION TO ADJUST SPLITPOINTS!</B> +<B>YOU CAN USE THE -a OPTION TO ADJUST SPLITPOINTS!</B> <P> <DT><B>-a</B> <DD> <B>Auto-adjust mode</B>. @@ -275,6 +297,9 @@ <I>offset</I> (off) which is the offset of cutpoint in silence, +<I>min</I> + +(min) which is the minimum silence length in seconds, <I>gap</I> (gap) which is the gap value around splitpoint to search for silence. @@ -297,6 +322,16 @@ between -96 and 0. Default is -48 dB, which is a value found by tests and should be good in most cases. <P> +<DT><B>shots=INTEGER</B><DD> +Positive integer of the minimum number of shots to be found as non silence +after the silence. Default is 25. Decrease this value if you need to split files having +closer silence points. +<P> +<DT><B>min=FLOAT</B><DD> +Positive float of the minimum number of seconds to be considered as valid silence. All silences shorter than min are discarded. Default is 0. +For the trim silence split, it is the minimum silence length to trigger a trimming; this amount of +silence will be kept in the split file at the beginning and at the end. +<P> <DT><B>Both -s and -a</B><DD> <P> <DT><B>off=FLOAT</B><DD> @@ -309,14 +344,27 @@ <P> <DT><B>nt=INTEGER</B><DD> Positive integer number of tracks to be split when using -s option. By default all tracks are split. -<DT><B>min=FLOAT</B><DD> -Positive float of the minimum number of seconds to be considered a valid splitpoint. All silences shorter than min are discarded. Default is 0. -<DT><B>rm</B><DD> -Does not require an additional number and it used to remove silence when using -s option. +<DT><B>rm[=FLOAT_FLOAT]</B><DD> +It is used to remove silence when using the -s option. +Can be used without additional numbers - by default it will cut all the silence found. +Users can keep some of the silence found by passing the number of seconds to be kept at the +beginning of the output files and at the end of the output files. For example, 'rm=2_6' will keep 2 +seconds of silence at the beginning of the split files and 6 seconds at the end. +If the silence length is less than the sum of the number of seconds passed to the rm parameter, +the split will convert the values to a percentage of the silence length. Taking the previous example, if +the silence length is less than 8 seconds, the split will be done at 75% of the silence segment starting from +the beginning of the silence ( 75% = 6/(2+6) ). <DT><B>trackmin=FLOAT</B><DD> Positive float of the minimum number of seconds for a track to be written out. Tracks shorter than trackmin will be skipped during the output phase. The default value 0.0 means to not skip any tracks. +<DT><B>trackjoin=FLOAT</B><DD> +Positive float of the minimum number of seconds for a track to be written out. +Tracks shorter than trackjoin will be joined with others. The main difference between this parameter +and trackmin is that using this one, no part of the original file will be lost. +The default value of 0.0 means to not join any tracks. +If using both trackmin and trackjoin, tracks shorter than trackmin will be discarded, but after the +join. <P> <DT><B>Only -a</B><DD> <P> @@ -337,11 +385,11 @@ <P> <DT><B>-k</B> <DD> <B>Input not seekable</B>. Consider input not seekable (default when using STDIN as input). -This allows you to split mp3 and ogg streams which can be read only one time and can't be +This allows you to split mp3 streams which can be read only one time and can't be seeked. Both framemode and standard mode are available, but framemode can be really slow if used with big files, because to seek splitpoints we need to process all bytes and all frames. -k option (so STDIN as input too) can't be used together with -s -a -w -e, because input must be seekable for -those options. +those options. Copying original tags is not yet supported for the non seekable option. <P> <DT><B>-O TIME</B> <DD> <B>Overlap split files</B>. TIME will be added to each end splitpoint. @@ -405,7 +453,23 @@ @M, @S or @H: the number of minutes, seconds or hundreths of seconds of the end splitpoint** <P> -(**) a digit may follow for the number of digits to output +(**) One digit may follow defining the number of digits to output. +<BR> + +If the digit is 0, then a special rule is applied when the pattern value is equal to 0: +<BR> + +- the pattern is discarded +<BR> + +- all characters like : _ . and -. preceding it are discarded +<BR> + +- all characters following it are discarded up to the next @ or a separator like : _ . and - +<BR> + +This rule is useful for discarding the last part of the time when equal to 0. +For example @m_@<A HREF="mailto:s_@h0hundreths__">s_@h0hundreths__</A>@M_@S will only output @m_@s__@M_@S if the hundreths of seconds are 0. <P> When split files are more than one, at least one of @t, @n, @N, @l, @L, @u or @U (*) must be present to avoid ambiguous names. You can put any prefix, @@ -445,12 +509,27 @@ ID3v1, ID3v2 or ID3v1 and ID3v2. TAGS_VERSION can be 1, 2 or 12. Default is to set the output tags version as the tags version of the input file. <P> +<DT><B>-C ID3V2_TEXT_ENCODING</B> <DD> +<B>Set encoding of the ID3V2 tags</B>. For mp3 files, set the encoding of ID3V2 tags. +ID3V2_TEXT_ENCODING can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16. +Default is UTF-16. +<P> +<DT><B>-I INPUT_TAGS_ENCODING_FOR_ID3V2</B> <DD> +<B>Set encoding of the input tags for mp3 files</B>. +INPUT_TAGS_ENCODING_FOR_ID3V2 can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16. +Default is UTF-8. +<P> <DT><B>-N</B> <DD> <B>No silence log file</B>. Don't create the 'mp3splt.log' log file when using silence detection. This option cannot be used without the '-s' option. <P> +<DT><B>-K</B> <DD> +<B>Keep original tags for CDDB or CUE</B>. When importing a CDDB or CUE file, set the original +input file tags and then replace them with those read from the imported file. +<P> <DT><B>-g TAGS</B> <DD> <B>Custom tags</B>. Set custom tags to the split files. +If you want to set spaces in tags, you might need to double quote the whole TAGS. TAGS should contain a list of square brackets pairs <B>[]</B>. The tags defined in the first pair of square brackets will be set on the first split file, those defined in the second pair of square brackets will be set on the second split file, ... Inside @@ -479,12 +558,15 @@ @g: genre <BR> -@n: track number +@n: track number (set to -2 for none) <BR> @o: set original tags <BR> +@O: set exactly the same original tag bytes and discard other variables (mp3 only) +<BR> + @N: auto increment track number: this variable has to be placed inside the %[] field in order to have the track number auto incremented for all the split files following it @@ -549,6 +631,32 @@ <DT><B>-E CUE_FILE</B> <DD> <B>Export to .cue file</B>. Creates a .cue file containing the splitpoints. Use -P to export the splitpoints without actually splitting. +The cue file contains the tags of the splitpoints as comments (for example REM ALBUM, REM GENRE, REM +DATE). There is however one limitation: REM TRACK is not written if the track was auto incremented +without user defined tags. +<P> +<DT><B>-F FULL_SILENCE_LOG_FILE</B> <DD> +<B>Export the full log of silence detection</B>. The full log filename is useful to draw the +amplitude wave of the input file (in dB) in order to choose a threshold. +<P> +<B>Note about the file structure:</B> +<BR>     -the first column is a dummy column which is always zero, for plotting on zero axis purposes +<BR>     -the second column is the time in seconds as double +<BR>     -the third column is the dB level +<BR>     -the fourth column is the silences shots counter +<BR>     -the five column is the number of splitpoints found +<BR>     -the sixth column is the start time of the silence spot found +<BR>     -the seventh column is the end time of the silence spot found +<P> +Example of plotting the full log file with gnuplot: +<P> +gnuplot -e "file='silence_logs.txt'; set decimalsign locale; set xlabel 'Time in seconds'; +plot file using 2:3 title 'Threshold', +file using 2:4 title 'Silence shots' with linespoints, +file using 2:5 title 'Number of silence points found' with fsteps, +file using 6:1 title 'Begin of silence', +file using 7:1 title 'End of silence' with points; +pause -1" <P> <DT><B>-P</B> <DD> <B>Pretend to split</B>. Simulation of the process without creating any @@ -567,9 +675,6 @@ <B>Debug mode</B>. Experimental debug support. Print extra informations about what is being done. Current print doesn't have a nice format. <P> -<DT><B>-i</B> <DD> -<B>Count silence mode.</B> Print the number of silence splitpoints found with silence detection. Use -p for arguments. -<P> <DT><B>-v</B> <DD> <B>Print version.</B> Print the version of mp3splt and libmp3splt and exit. <P> @@ -684,7 +789,7 @@ Matteo Trotta <<A HREF="mailto:mtrotta@users.sourceforge.net">mtrotta@users.sourceforge.net</A>> <BR> -Alexandru Ionut Munteanu <<A HREF="mailto:io_fx@yahoo.fr">io_fx@yahoo.fr</A>> +Alexandru Ionut Munteanu <m@ioalex.net> <A NAME="lbAJ"> </A> <H2>DISTRIBUTION</H2> @@ -703,7 +808,7 @@ (C) 2002-2005 by Matteo Trotta <BR> -(C) 2005-2011 by Alexandru Ionut Munteanu +(C) 2005-2013 by Alexandru Ionut Munteanu <P> Permission is granted to copy, distribute and/or modify @@ -731,6 +836,6 @@ This document was created by man2html using the manual pages.<BR> -Time: 21:17:34 GMT, November 13, 2011 +Time: 06:53:27 GMT, July 20, 2013 </BODY> </HTML> diff -Nru mp3splt-2.4.1/doc/mp3splt.1 mp3splt-2.6.0/doc/mp3splt.1 --- mp3splt-2.4.1/doc/mp3splt.1 2011-09-19 21:02:41.000000000 +0000 +++ mp3splt-2.6.0/doc/mp3splt.1 2013-07-20 06:53:02.000000000 +0000 @@ -57,12 +57,12 @@ .TH "MP3SPLT" "1" .SH "NAME" -mp3splt, oggsplt - utility for mp3/ogg vorbis splitting without decoding +mp3splt, oggsplt, flacsplt - utility for mp3, ogg vorbis and native flac splitting without decoding .SH "SYNOPSIS" .PP \fBmp3splt [OPTIONS] FILE_OR_DIR1 [FILE_OR_DIR2] ... [BEGIN_TIME] [TIME2] ... [END_TIME]\fP .PP -\fBFILE_OR_DIR\fP: mp3/ogg file to be split or a directory. +\fBFILE_OR_DIR\fP: mp3, ogg vorbis, native flac file to be split or a directory. If you want to specify STDIN as input, you can use "m-" (or "-") when input is mp3, and "o-" when ogg. Multiple files can be specified, all files will be split with the same criterion. If a directory is specified, a recursive scan is performed in that @@ -87,9 +87,9 @@ .SH "DESCRIPTION" .PP \fBmp3splt\fP is a free command-line utility that allows you to -split mp3 and ogg files from several splitpoints, +split mp3, ogg vorbis and native flac files from several splitpoints, without need of decoding and reencoding. -It is useful to split large mp3/ogg to make smaller files or to split +It is useful to split large mp3, ogg vorbis and native flac to make smaller files or to split entire albums to obtain original tracks. If you are splitting an album you can get splitpoints and filenames @@ -103,6 +103,10 @@ Or if you have a file created either with Mp3Wrap or AlbumWrap, you can easily split it just with one command (see \-w option). .PP + +\fBIMPORTANT NOTE for FLAC:\fP FLAC support is still experimental. Please use with caution. Missing +FLAC features are stdin (input not seekable) and stdout. + \fBNOTE for MP3:\fP usually mp3splt understands if mp3 is VBR by checking the presence of a Xing or Info header and will consequently start in framemode, but if this is not present, mp3splt will start in standard mode. @@ -114,15 +118,19 @@ might fix the issues. \fBNOTES about TAGS:\fP by default, mp3splt will put the original tags in -the split files. Custom tags for the split files can be set with the \-g option. -When copying the original file tags, only one artist, album, title are -supported. +the split files with one exception: the track number starts at 1 and is incremented along +split files. When copying the original file tags, only one artist, album, title are supported. +Custom tags for the split files can be set with the \-g option. +Setting exactly the same tags as the original file is possible with \-g %[@O] (mp3 only) or \-g %[@o]. \fBNOTE about MP3 TAGS:\fP in order to extract the original tags from mp3 files, libmp3splt must be compiled with 'id3tag' support. By default, the output files will have the same ID3 tag version as the input file; this behaviour can be changed with the \-T option. If the input file has no tags and the \-g option is used, then both ID3v1 and ID3v2 are written. Total tracknumber is not yet supported. +Only writing ID3v2.4 is supported for custom tags; note that some software only support ID3v2.3 +and will not be able to read them. However, it is possible to write the exact original tags using +%[@O], keeping the same tags version as in the original file. \fBNOTE about the OUTPUT DIRECTORY:\fP by default, mp3splt will put the split files in the directory of the input file. In order to change the @@ -165,11 +173,13 @@ 67.000000 127.000000 second_file 149.000000 206.000000 third_file -.IP "\fB-t TIME\fP " 10 +.IP "\fB-t TIME[>MIN_TIME]\fP " 10 \fBTime mode\fP. This option will create an indefinite number of smaller files with a fixed time length specified by TIME (which has the same format described above). It is useful to split long files into smaller (for example with the time length of a CD). Adjust option (\-a) -can be used to adjust splitpoints with silence detection. +can be used to adjust splitpoints with silence detection. >MIN_TIME can be used to specify the +theoretical minimum track length of the last segment; it allows avoiding to create very small files +as the last segment. Make sure to quote the argument when using MIN_TIME - "TIME>MIN_TIME". .IP "\fB-S SPLIT_NUMBER\fP " 10 \fBEqual time tracks mode\fP. @@ -181,8 +191,10 @@ files, so this option can be really slow if used with big files. It accepts some parameters with \-p option (see below for a detailed description): .I threshold -level (th) which is the sound level to be considered silence. This feature is new and -probably still needs tweaking; please report any bugs, suggestions, ... +level (th) which is the sound level to be considered silence, +.I min +(min) which is the minimum silence length to trigger a trimming; this amount of silence will be kept +in the split file at the beginning and at the end. .IP "\fB-s\fP " 10 \fBSilence mode\fP, @@ -203,7 +215,9 @@ mp3splt will use the default values. Of course if you specify the number of tracks to split, you will help mp3splt to understand what are the most probable split points, anyway once you scan a file with \-s option, mp3splt will write a file named "mp3splt.log" in which -it saves all silence points found. This allows you to run mp3splt with different parameters (except th and min) +it saves all silence points found. If this file exists in the current working directory, mp3splt +will read the splitpoints from this file and will not recompute the silence splitpoints. +This allows you to run mp3splt with different parameters (except th and min) without decoding the file again. Finally, if the number of silence points is not correct, you have many chances to achieve right result. For example if a silence point was not detected because too short, you can manually split the long track in the two smaller ones. @@ -222,8 +236,7 @@ The next lines contain each one three columns: \(hythe first column is the start position of the found silence (in seconds.fractions) \(hythe second column is the end position of the found silence (in seconds.fractions) - \(hythe third column is the length of the silence in hundreths of seconds - (second_column * 100 - first_column * 100) + \(hythe third column is the order of magnitude of the silence length; it is useful to find out most probable silence points .IP "\fB-c SOURCE\fP " 10 \fBCDDB mode\fP. To get splitpoints and filenames automatically from SOURCE, that is the name @@ -269,6 +282,14 @@ write a file named "query.cddb" from which will get splitpoints and filenames. +\fBProxy support:\fP +The first time that the user queries the internet (and if the quiet mode is not enabled), mp3splt asks +for some information about proxy usage. Mp3splt has basic authentification support using base64 for HTTP +proxies. A file named \'.mp3splt\' is created in the user home directory containing the informations +provided by the user. Deleting this file will make mp3splt to query the user again. Please note that +the authentification storage is not secure. The 'username:password' is stored as base64 and can be +easily decoded. + \fBIMPORTANT NOTE FOR CDDB\fP: File split with this option can be not very precise due to: 1) Who extracts CD tracks may use "Remove silence" option. This means @@ -281,7 +302,7 @@ 4) There are several entries of the same cd on CDDB. In mp3splt they appears with "\\=>" symbol. Try some of them and find the best for yours; usually you can find the correct splitpoints, so good luck! -\fBYOU CAN USE \-a OPTION TO ADJUST SPLITPOINTS!\fP +\fBYOU CAN USE THE \-a OPTION TO ADJUST SPLITPOINTS!\fP .IP "\fB-a\fP " 10 \fBAuto-adjust mode\fP. @@ -292,6 +313,8 @@ level (th) which is the sound level to be considered silence, cutpoint .I offset (off) which is the offset of cutpoint in silence, +.I min +(min) which is the minimum silence length in seconds, .I gap (gap) which is the gap value around splitpoint to search for silence. If you don't specify any parameter, mp3splt will use the default values. @@ -313,6 +336,16 @@ between \-96 and 0. Default is \-48 dB, which is a value found by tests and should be good in most cases. +.IP \fBshots=INTEGER\fP +Positive integer of the minimum number of shots to be found as non silence +after the silence. Default is 25. Decrease this value if you need to split files having +closer silence points. + +.IP \fBmin=FLOAT\fP +Positive float of the minimum number of seconds to be considered as valid silence. All silences shorter than min are discarded. Default is 0. +For the trim silence split, it is the minimum silence length to trigger a trimming; this amount of +silence will be kept in the split file at the beginning and at the end. + .IP "\fBBoth -s and -a\fP" .IP \fBoff=FLOAT\fP @@ -336,14 +369,27 @@ .IP \fBnt=INTEGER\fP Positive integer number of tracks to be split when using \-s option. By default all tracks are split. -.IP \fBmin=FLOAT\fP -Positive float of the minimum number of seconds to be considered a valid splitpoint. All silences shorter than min are discarded. Default is 0. -.IP \fBrm\fP -Does not require an additional number and it used to remove silence when using \-s option. +.IP \fBrm[=FLOAT_FLOAT]\fP +It is used to remove silence when using the \-s option. +Can be used without additional numbers - by default it will cut all the silence found. +Users can keep some of the silence found by passing the number of seconds to be kept at the +beginning of the output files and at the end of the output files. For example, 'rm=2_6' will keep 2 +seconds of silence at the beginning of the split files and 6 seconds at the end. +If the silence length is less than the sum of the number of seconds passed to the rm parameter, +the split will convert the values to a percentage of the silence length. Taking the previous example, if +the silence length is less than 8 seconds, the split will be done at 75% of the silence segment starting from +the beginning of the silence ( 75% = 6/(2+6) ). .IP \fBtrackmin=FLOAT\fP Positive float of the minimum number of seconds for a track to be written out. Tracks shorter than trackmin will be skipped during the output phase. The default value 0.0 means to not skip any tracks. +.IP \fBtrackjoin=FLOAT\fP +Positive float of the minimum number of seconds for a track to be written out. +Tracks shorter than trackjoin will be joined with others. The main difference between this parameter +and trackmin is that using this one, no part of the original file will be lost. +The default value of 0.0 means to not join any tracks. +If using both trackmin and trackjoin, tracks shorter than trackmin will be discarded, but after the +join. .IP "\fBOnly \-a\fP" @@ -364,11 +410,11 @@ .IP "\fB\-k\fP " 10 \fBInput not seekable\fP. Consider input not seekable (default when using STDIN as input). -This allows you to split mp3 and ogg streams which can be read only one time and can't be +This allows you to split mp3 streams which can be read only one time and can't be seeked. Both framemode and standard mode are available, but framemode can be really slow if used with big files, because to seek splitpoints we need to process all bytes and all frames. \-k option (so STDIN as input too) can't be used together with \-s \-a \-w \-e, because input must be seekable for -those options. +those options. Copying original tags is not yet supported for the non seekable option. .IP "\fB\-O TIME\fP " 10 \fBOverlap split files\fP. TIME will be added to each end splitpoint. @@ -418,7 +464,18 @@ .br @M, @S or @H: the number of minutes, seconds or hundreths of seconds of the end splitpoint** -(**) a digit may follow for the number of digits to output +(**) One digit may follow defining the number of digits to output. +.br +If the digit is 0, then a special rule is applied when the pattern value is equal to 0: +.br +- the pattern is discarded +.br +- all characters like : _ . and -. preceding it are discarded +.br +- all characters following it are discarded up to the next @ or a separator like : _ . and - +.br +This rule is useful for discarding the last part of the time when equal to 0. +For example @m_@s_@h0hundreths__@M_@S will only output @m_@s__@M_@S if the hundreths of seconds are 0. When split files are more than one, at least one of @t, @n, @N, @l, @L, @u or @U (*) must be present to avoid ambiguous names. You can put any prefix, @@ -455,12 +512,27 @@ ID3v1, ID3v2 or ID3v1 and ID3v2. TAGS_VERSION can be 1, 2 or 12. Default is to set the output tags version as the tags version of the input file. +.IP "\fB\-C ID3V2_TEXT_ENCODING\fP " 10 +\fBSet encoding of the ID3V2 tags\fP. For mp3 files, set the encoding of ID3V2 tags. +ID3V2_TEXT_ENCODING can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16. +Default is UTF-16. + +.IP "\fB\-I INPUT_TAGS_ENCODING_FOR_ID3V2\fP " 10 +\fBSet encoding of the input tags for mp3 files\fP. +INPUT_TAGS_ENCODING_FOR_ID3V2 can be 1 for latin1 (iso-8859-1), 8 for UTF-8 or 16 for UTF-16. +Default is UTF-8. + .IP "\fB\-N\fP " 10 \fBNo silence log file\fP. Don't create the 'mp3splt.log' log file when using silence detection. This option cannot be used without the '\-s' option. +.IP "\fB\-K\fP " 10 +\fBKeep original tags for CDDB or CUE\fP. When importing a CDDB or CUE file, set the original +input file tags and then replace them with those read from the imported file. + .IP "\fB\-g TAGS\fP " 10 \fBCustom tags\fP. Set custom tags to the split files. +If you want to set spaces in tags, you might need to double quote the whole TAGS. TAGS should contain a list of square brackets pairs \fB[]\fP. The tags defined in the first pair of square brackets will be set on the first split file, those defined in the second pair of square brackets will be set on the second split file, ... Inside @@ -483,10 +555,12 @@ .br @g: genre .br -@n: track number +@n: track number (set to -2 for none) .br @o: set original tags .br +@O: set exactly the same original tag bytes and discard other variables (mp3 only) +.br @N: auto increment track number: this variable has to be placed inside the %[] field in order to have the track number auto incremented for all the split files following it @@ -548,6 +622,32 @@ .IP "\fB\-E CUE_FILE\fP " 10 \fBExport to .cue file\fP. Creates a .cue file containing the splitpoints. Use \-P to export the splitpoints without actually splitting. +The cue file contains the tags of the splitpoints as comments (for example REM ALBUM, REM GENRE, REM +DATE). There is however one limitation: REM TRACK is not written if the track was auto incremented +without user defined tags. + +.IP "\fB\-F FULL_SILENCE_LOG_FILE\fP " 10 +\fBExport the full log of silence detection\fP. The full log filename is useful to draw the +amplitude wave of the input file (in dB) in order to choose a threshold. + +\fBNote about the file structure:\fP + \(hythe first column is a dummy column which is always zero, for plotting on zero axis purposes + \(hythe second column is the time in seconds as double + \(hythe third column is the dB level + \(hythe fourth column is the silences shots counter + \(hythe five column is the number of splitpoints found + \(hythe sixth column is the start time of the silence spot found + \(hythe seventh column is the end time of the silence spot found + +Example of plotting the full log file with gnuplot: + +gnuplot -e "file='silence_logs.txt'; set decimalsign locale; set xlabel 'Time in seconds'; +plot file using 2:3 title 'Threshold', +file using 2:4 title 'Silence shots' with linespoints, +file using 2:5 title 'Number of silence points found' with fsteps, +file using 6:1 title 'Begin of silence', +file using 7:1 title 'End of silence' with points; +pause -1" .IP "\fB\-P\fP " 10 \fBPretend to split\fP. Simulation of the process without creating any @@ -566,9 +666,6 @@ \fBDebug mode\fP. Experimental debug support. Print extra informations about what is being done. Current print doesn't have a nice format. -.IP "\fB\-i\fP " 10 -\fBCount silence mode.\fP Print the number of silence splitpoints found with silence detection. Use \-p for arguments. - .IP "\fB\-v\fP " 10 \fBPrint version.\fP Print the version of mp3splt and libmp3splt and exit. @@ -657,7 +754,7 @@ .PP Matteo Trotta <mtrotta@users.sourceforge.net> .br -Alexandru Ionut Munteanu <io_fx@yahoo.fr> +Alexandru Ionut Munteanu <m@ioalex.net> .SH "DISTRIBUTION" .PP Visit @@ -668,7 +765,7 @@ .PP (C) 2002-2005 by Matteo Trotta .br -(C) 2005-2011 by Alexandru Ionut Munteanu +(C) 2005-2013 by Alexandru Ionut Munteanu .PP Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License. diff -Nru mp3splt-2.4.1/install-sh mp3splt-2.6.0/install-sh --- mp3splt-2.4.1/install-sh 2009-08-06 19:22:42.000000000 +0000 +++ mp3splt-2.6.0/install-sh 2012-09-12 20:42:02.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -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 @@ -200,7 +208,11 @@ 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. @@ -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 @@ -515,5 +522,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru mp3splt-2.4.1/m4/Makefile.am mp3splt-2.6.0/m4/Makefile.am --- mp3splt-2.4.1/m4/Makefile.am 2010-10-10 16:21:34.000000000 +0000 +++ mp3splt-2.6.0/m4/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -EXTRA_DIST = mp3splt.m4 diff -Nru mp3splt-2.4.1/m4/Makefile.in mp3splt-2.6.0/m4/Makefile.in --- mp3splt-2.4.1/m4/Makefile.in 2011-11-13 23:12:36.000000000 +0000 +++ mp3splt-2.6.0/m4/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,345 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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. -# 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -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 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@ -MP3SPLT_LIBS = @MP3SPLT_LIBS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = mp3splt.m4 -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu m4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -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 -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru mp3splt-2.4.1/m4/mp3splt.m4 mp3splt-2.6.0/m4/mp3splt.m4 --- mp3splt-2.4.1/m4/mp3splt.m4 2010-10-10 16:21:34.000000000 +0000 +++ mp3splt-2.6.0/m4/mp3splt.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -# Alexandru Munteanu <io_fx@yahoo.fr> -# Slightly modified 'ogg.m4' - -AC_DEFUN([MP3SPLT_CHECK], -[ - -AC_ARG_WITH(mp3splt, [AC_HELP_STRING([--with-mp3splt=PFX], - [ Prefix where libmp3splt is installed (optional). ]) ], - mp3splt_prefix="$withval", mp3splt_prefix="") -AC_ARG_WITH(mp3splt-libraries, [AC_HELP_STRING([--with-mp3splt-libraries=DIR], - [ Directory where libmp3splt library is installed (optional). ]) ], - mp3splt_libraries="$withval", mp3splt_libraries="") -AC_ARG_WITH(mp3splt-includes, [AC_HELP_STRING([--with-mp3splt-includes=DIR], - [ Directory where libmp3splt header files are installed (optional). ]) ], - mp3splt_includes="$withval", mp3splt_includes="") -AC_ARG_ENABLE(mp3splttest, [AC_HELP_STRING([--disable-mp3splttest], - [ Do not try to compile and run a test mp3splt program. ]) ], - , enable_mp3splttest=yes) - -if test "x$mp3splt_libraries" != "x"; then - MP3SPLT_LIBS="-L$mp3splt_libraries" -elif test "x$mp3splt_prefix" != "x"; then - MP3SPLT_LIBS="-L$mp3splt_prefix/lib" -elif test "x$prefix" != "xNONE"; then - MP3SPLT_LIBS="-L$prefix/lib" -fi - -MP3SPLT_LIBS="$MP3SPLT_LIBS -lmp3splt" - -if test "x$mp3splt_includes" != "x"; then - MP3SPLT_CFLAGS="-I$mp3splt_includes" -elif test "x$mp3splt_prefix" != "x"; then - MP3SPLT_CFLAGS="-I$mp3splt_prefix/include" -elif test "x$prefix" != "xNONE"; then - mp3splt_CFLAGS="-I$prefix/include" -fi - - -AC_MSG_CHECKING(for libmp3splt) -no_mp3splt="" - -if test "x$enable_mp3splttest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $MP3SPLT_CFLAGS" - LIBS="$LIBS $MP3SPLT_LIBS" - - rm -f conf.mp3splttest - - AC_TRY_RUN([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <libmp3splt/mp3splt.h> - -int main () -{ - system("touch conf.mp3splttest"); - return 0; -} - -],, no_mp3splt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -fi - - -if test "x$no_mp3splt" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) -else - AC_MSG_RESULT(no) - if test -f conf.mp3splttest ; then - : - else - echo "*** Could not run libmp3splt test program, checking why..." - CFLAGS="$CFLAGS $MP3SPLT_CFLAGS" - LIBS="$LIBS $MP3SPLT_LIBS" - AC_TRY_LINK([ -#include <stdio.h> -#include <libmp3splt/mp3splt.h> -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libmp3splt or finding the wrong" - echo "*** version of libmp3splt. If it is not finding libmp3splt, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libmp3splt was incorrectly installed" - echo "*** or that you have moved libmp3splt since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - MP3SPLT_CFLAGS="" - MP3SPLT_LIBS="" - ifelse([$2], , :, [$2]) -fi - -AC_SUBST(MP3SPLT_CFLAGS) -AC_SUBST(MP3SPLT_LIBS) -rm -f conf.mp3splttest -]) - diff -Nru mp3splt-2.4.1/missing mp3splt-2.6.0/missing --- mp3splt-2.4.1/missing 2009-08-06 19:22:42.000000000 +0000 +++ mp3splt-2.6.0/missing 2012-09-12 20:42:02.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -86,9 +84,11 @@ help2man touch the output file 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] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,23 +106,21 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # 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. @@ -138,7 +136,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +146,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +155,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +185,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +208,7 @@ fi ;; - bison|yacc) + 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 @@ -218,7 +216,7 @@ \`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/'` @@ -240,7 +238,7 @@ fi ;; - lex|flex) + 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 @@ -248,7 +246,7 @@ \`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/'` @@ -263,7 +261,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +275,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + 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 @@ -310,41 +308,6 @@ 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. @@ -363,5 +326,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru mp3splt-2.4.1/po/Makevars mp3splt-2.6.0/po/Makevars --- mp3splt-2.4.1/po/Makevars 2010-10-10 16:30:34.000000000 +0000 +++ mp3splt-2.6.0/po/Makevars 2013-02-07 22:27:04.000000000 +0000 @@ -1,6 +1,5 @@ # Makefile variables for PO directory in any package using GNU gettext. -VERSION = 0.5.6 PACKAGE = mp3splt # Usually the message domain is the same as the package name. @@ -39,7 +38,7 @@ # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. -MSGID_BUGS_ADDRESS = io_fx@yahoo.fr +MSGID_BUGS_ADDRESS = m@ioalex.net # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. diff -Nru mp3splt-2.4.1/po/POTFILES.in mp3splt-2.6.0/po/POTFILES.in --- mp3splt-2.4.1/po/POTFILES.in 2011-01-02 02:53:24.000000000 +0000 +++ mp3splt-2.6.0/po/POTFILES.in 2012-12-30 22:04:55.000000000 +0000 @@ -1,9 +1,10 @@ # List of files which contain translatable strings. src/mp3splt.c -src/freedb.c -src/options_checker.c -src/options_parsers.c src/print_utils.c +src/options_manager.c +src/options_checker.c +src/freedb.c src/utils.c +src/options_parsers.c src/windows_utils.c - +src/data_manager.c Binary files /tmp/JzeX6fzWNb/mp3splt-2.4.1/po/cs.gmo and /tmp/Tv_0YIe6LM/mp3splt-2.6.0/po/cs.gmo differ diff -Nru mp3splt-2.4.1/po/cs.po mp3splt-2.6.0/po/cs.po --- mp3splt-2.4.1/po/cs.po 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/po/cs.po 2013-07-20 07:11:03.000000000 +0000 @@ -3,87 +3,94 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <pavelfric@seznam.cz>, 2011. +# fri <pavelfric@seznam.cz>, 2011 msgid "" msgstr "" "Project-Id-Version: mp3splt-gtk\n" -"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n" -"POT-Creation-Date: 2011-11-14 00:12+0100\n" -"PO-Revision-Date: 2011-09-11 11:11+0000\n" -"Last-Translator: fri <pavelfric@seznam.cz>\n" +"Report-Msgid-Bugs-To: m@ioalex.net\n" +"POT-Creation-Date: 2013-07-20 09:11+0200\n" +"PO-Revision-Date: 2013-04-29 08:36+0000\n" +"Last-Translator: Peter Pall <gunter@peterpall.de>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52 +#: src/mp3splt.c:310 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36 +#: src/utils.c:52 msgid "cannot allocate memory !" msgstr "Nelze přidělit paměť!" -#: src/mp3splt.c:278 +#: src/mp3splt.c:331 msgid "" "bad overlap time expression.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -#: src/mp3splt.c:296 +#: src/mp3splt.c:352 msgid "" "bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -#: src/mp3splt.c:359 +#: src/mp3splt.c:361 +msgid "" +"bad minimum time expression.\n" +"\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." +msgstr "" + +#: src/mp3splt.c:429 msgid "read man page for documentation or type 'mp3splt -h'." msgstr "" -#: src/mp3splt.c:423 +#: src/mp3splt.c:495 msgid "bad argument for -p option. No valid value was recognized !" msgstr "" -#: src/mp3splt.c:554 +#: src/mp3splt.c:642 msgid "no input filename(s)." msgstr "" -#: src/mp3splt.c:567 +#: src/mp3splt.c:655 msgid "multiple splitpoints with stdout !" msgstr "" -#: src/mp3splt.c:571 +#: src/mp3splt.c:659 msgid "using time mode with stdout !" msgstr "" -#: src/mp3splt.c:612 +#: src/mp3splt.c:700 #, c-format msgid " Pretending to split file '%s' ...\n" msgstr "" -#: src/mp3splt.c:616 +#: src/mp3splt.c:704 #, c-format msgid " Processing file '%s' ...\n" msgstr "" -#: src/mp3splt.c:623 src/options_checker.c:49 +#: src/mp3splt.c:710 msgid "" "cannot use -k option (or STDIN) with one of the following options: -S -s -r -" -"w -l -e -i -a -p" +"w -l -e -i -a -p -K" msgstr "" -#: src/mp3splt.c:679 +#: src/mp3splt.c:786 msgid "freedb query format ambigous !" msgstr "" -#: src/mp3splt.c:723 +#: src/mp3splt.c:832 msgid "tags format ambiguous !" msgstr "" -#: src/mp3splt.c:755 +#: src/mp3splt.c:864 #, c-format msgid " Average silence level: %.2f dB" msgstr "" -#: src/mp3splt.c:772 +#: src/mp3splt.c:880 msgid "" "\n" " +-----------------------------------------------------------------------------" @@ -109,414 +116,482 @@ "+\n" msgstr "" -#: src/freedb.c:58 +#: src/print_utils.c:39 #, c-format -msgid " Freedb search type: %s , Site: %s , Port: %d\n" +msgid " Warning: %s\n" +msgstr " Varování: %s\n" + +#: src/print_utils.c:45 +#, c-format +msgid " Error: %s\n" +msgstr " Chyba: %s\n" + +#: src/print_utils.c:127 +#, c-format +msgid " File \"%s\" created%s\n" msgstr "" -#: src/freedb.c:61 +#: src/print_utils.c:142 #, c-format -msgid " Freedb get type: %s , Site: %s , Port: %d\n" +msgid " preparing \"%s\" (%d of %d)" msgstr "" -#: src/freedb.c:71 -msgid "CDDB QUERY. Insert album and artist informations to find cd." +#: src/print_utils.c:149 +#, c-format +msgid " creating \"%s\" (%d of %d)" msgstr "" -#: src/freedb.c:79 -msgid "" -"\n" -"Please search something ..." +#: src/print_utils.c:156 +#, c-format +msgid " searching for sync errors..." msgstr "" -#: src/freedb.c:85 +#: src/print_utils.c:165 #, c-format -msgid "\r Search: [" +msgid "S: %02d, Level: %.2f dB; scanning for silence..." +msgstr "" + +#: src/print_utils.c:170 +#, c-format +msgid "Level: %.2f dB; scanning for silence..." +msgstr "" + +#: src/print_utils.c:202 +msgid "using" msgstr "" -#: src/freedb.c:102 +#: src/print_utils.c:215 #, c-format msgid "" +"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" +msgstr "" + +#: src/print_utils.c:264 +msgid "" "\n" -" Search string: %s\n" +"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" msgstr "" -#: src/freedb.c:103 -#, c-format +#: src/print_utils.c:273 msgid "" "\n" -"Searching from %s on port %d using %s ...\n" +"USAGE:\n" +" mp3splt [OPTIONS] FILE1 [FILE2] ... [BEGIN_TIME] [TIME] ... " +"[END_TIME]\n" +" TIME FORMAT: min.sec[.0-99], even if minutes are over 59\n" +" or EOF-min.sec[.0-99] (or EOF for End Of File). " msgstr "" -#: src/freedb.c:116 -msgid "No results found" +#: src/print_utils.c:278 +msgid "" +"\n" +"OPTIONS (split mode options)\n" +" -t + TIME: to split files every fixed time len. (TIME format same as " +"above). \n" +" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints " +"and\n" +" filenames from a .cddb or .cue file or from Internet (\"query\").\n" +" Use -a to auto-adjust splitpoints." msgstr "" -#: src/freedb.c:126 -msgid "List of found cd:" +#: src/print_utils.c:283 +msgid "" +" -s Silence detection: automatically find splitpoint. (Use -p for " +"arguments)\n" +" -w Splits wrapped files created with Mp3Wrap or AlbumWrap.\n" +" -l Lists the tracks from file without extraction. (Only for wrapped mp3)\n" +" -e Error mode: split mp3 with sync error detection. (For concatenated mp3)" msgstr "" -#: src/freedb.c:140 -#, c-format -msgid "Revision: %d\n" +#: src/print_utils.c:287 +msgid " -r Trim using silence detection (Use -p for arguments)" msgstr "" -#: src/freedb.c:147 -#, c-format -msgid "-- 'q' to select cd, Enter for more:" +#: src/print_utils.c:289 +msgid "" +" -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" msgstr "" -#: src/freedb.c:165 -#, c-format -msgid "-- 'q' to select cd, Enter for more: " +#: src/print_utils.c:290 +msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" msgstr "" -#: src/freedb.c:192 -#, c-format -msgid "Select cd #: " +#: src/print_utils.c:295 +msgid "" +"\n" +"(other options)\n" +" -T + TAGS_VERSION: for mp3 files, force output tags as version 1, 2 or 1 & " +"2.\n" +" TAGS_VERSION can be 1, 2 or 12\n" +" (default is to set the same version as the file to split)" msgstr "" -#: src/freedb.c:207 -#, c-format -msgid "Please " +#: src/print_utils.c:299 +msgid "" +" -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" +" -f Frame mode (mp3 only): process all frames. For higher precision and " +"VBR.\n" +" -a Auto-Adjust splitpoints with silence detection. (Use -p for arguments)" msgstr "" -#: src/freedb.c:232 -#, c-format +#: src/print_utils.c:302 +msgid "" +" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " +"user arguments for -s, -a, -t.\n" +" -o + FORMAT: output filename pattern. Can contain those variables:\n" +" @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" +" @t: title tag, @n: track number identifier, @N: track tag number\n" +" (a digit may follow the 'n' or 'N' for the number of digits to " +"output),\n" +" @f: original filename, @g: genre" +msgstr "" + +#: src/print_utils.c:309 +msgid "" +" -g + TAGS: custom tags for the split files.\n" +" TAGS can contain those variables: \n" +" @a, @b, @t, @y, @c, @n, @g, @o (set original tags),\n" +" @N (auto increment track number).\n" +" TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" +" (% means that we set the tags for all remaining files)" +msgstr "" + +#: src/print_utils.c:315 +msgid "" +" -G + regex=REGEX: set tags from input filename. REGEX defines how to " +"extract\n" +" the tags from the filename. It can contain those variables:\n" +" (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" +"<comment>), (?<genre>)" +msgstr "" + +#: src/print_utils.c:319 +msgid "" +" -d + DIRNAME: to put all output files in the directory DIRNAME.\n" +" -k Consider input not seekable (slower). Default when input is STDIN " +"(-).\n" +" -O + TIME: Overlap split files with TIME (slower)." +msgstr "" + +#: src/print_utils.c:322 +msgid "" +" -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " +"files.\n" +" -x No Xing header: does not write the Xing header. Use with -n if you " +"wish\n" +" to concatenate the split files\n" +" -N Don't create the 'mp3splt.log' log file when using '-s'." +msgstr "" + +#: src/print_utils.c:326 msgid "" +" -P Pretend to split: simulation of the process, without creating any\n" +" files or directories" +msgstr "" + +#: src/print_utils.c:328 +msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" +msgstr "" + +#: src/print_utils.c:329 +msgid "" +" -q Quiet mode: try not to prompt (if possible) and print less messages.\n" +" -Q Very quiet mode: don't print anything to stdout and no progress bar\n" +" (also enables -q).\n" +" -D Debug mode: used to debug the program.\n" "\n" -"Getting file from %s on port %d using %s ...\n" +" Please read man page for complete documentation.\n" msgstr "" -#: src/options_checker.c:66 +#: src/options_checker.c:49 +msgid "" +"cannot use -k option (or STDIN) with one of the following options: -S -s -r -" +"w -l -e -i -a -p -F" +msgstr "" + +#: src/options_checker.c:67 msgid "the -w option can only be used with -m, -d, -q and -Q" msgstr "" -#: src/options_checker.c:82 +#: src/options_checker.c:84 msgid "the -l option can only be used with -q" msgstr "" -#: src/options_checker.c:96 +#: src/options_checker.c:98 msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" msgstr "" -#: src/options_checker.c:111 -msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S" +#: src/options_checker.c:114 +msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F" msgstr "" -#: src/options_checker.c:119 -msgid "the -A option cannot be used with -t, -s, -r, -i or -S" +#: src/options_checker.c:124 +msgid "the -A option cannot be used with -t, -s, -r, -i, -S or -F" msgstr "" -#: src/options_checker.c:127 -msgid "the -t option cannot be used with -s, -r, -i or -S" +#: src/options_checker.c:134 +msgid "the -t option cannot be used with -s, -r, -i, -S or -F" msgstr "" -#: src/options_checker.c:135 +#: src/options_checker.c:143 msgid "-s option cannot be used with -a, -r, -i or -S" msgstr "" -#: src/options_checker.c:143 +#: src/options_checker.c:151 msgid "-a option cannot be used with -i" msgstr "" -#: src/options_checker.c:155 +#: src/options_checker.c:163 msgid "the -p option cannot be used without -a, -s, -r or -i" msgstr "" -#: src/options_checker.c:163 +#: src/options_checker.c:171 msgid "the -o option cannot be used with -i" msgstr "" -#: src/options_checker.c:169 +#: src/options_checker.c:177 msgid "cannot use '-o -' (STDOUT) with -m or -d" msgstr "" -#: src/options_checker.c:178 +#: src/options_checker.c:186 msgid "the -g option cannot be used with -n, -i or -G" msgstr "" -#: src/options_checker.c:186 +#: src/options_checker.c:194 msgid "the -d option cannot be used with -i" msgstr "" -#: src/options_checker.c:194 +#: src/options_checker.c:202 msgid "the -n option cannot be used with -i or -T" msgstr "" -#: src/options_checker.c:202 +#: src/options_checker.c:210 msgid "the -m option cannot be used with -i" msgstr "" -#: src/options_checker.c:220 +#: src/options_checker.c:228 msgid "the -Q option cannot be used with STDOUT output ('-o -')" msgstr "" -#: src/options_checker.c:228 +#: src/options_checker.c:236 msgid "the -Q option cannot be used with interactive freedb query ('-c query')" msgstr "" -#: src/options_checker.c:238 +#: src/options_checker.c:246 msgid "the -N option must be used with silence detection (-s option)" msgstr "" -#: src/options_checker.c:248 +#: src/options_checker.c:255 msgid "the -O option cannot be used with -w, -e, -l or -i" msgstr "" -#: src/options_parsers.c:45 -msgid "bad gap argument. It will be ignored !" +#: src/options_checker.c:281 +msgid "the -F option cannot be used without -s" msgstr "" -#: src/options_parsers.c:60 -msgid "bad threshold argument. It will be ignored !" +#: src/options_checker.c:289 +msgid "the -K option cannot be used without -c" msgstr "" -#: src/options_parsers.c:75 -msgid "bad tracknumber argument. It will be ignored !" +#: src/freedb.c:118 +#, c-format +msgid " Freedb search type: %s , Site: %s , Port: %d\n" msgstr "" -#: src/options_parsers.c:99 -msgid "bad offset argument. It will be ignored!" +#: src/freedb.c:121 +#, c-format +msgid " Freedb get type: %s , Site: %s , Port: %d\n" msgstr "" -#: src/options_parsers.c:114 -msgid "bad minimum track length argument. It will be ignored !" +#: src/freedb.c:130 +msgid "CDDB QUERY. Insert album and artist informations to find cd." msgstr "" -#: src/options_parsers.c:133 -msgid "bad minimum silence length argument. It will be ignored !" +#: src/freedb.c:136 +msgid "" +"\n" +"Please search something ..." msgstr "" -#: src/options_parsers.c:156 -msgid "no regular expression found as argument." +#: src/freedb.c:142 +#, c-format +msgid "\r Search: [" msgstr "" -#: src/options_parsers.c:332 -msgid "found non digits characters in port ! (switched to default)" +#: src/freedb.c:158 +#, c-format +msgid "" +"\n" +" Search string: %s\n" msgstr "" -#: src/options_parsers.c:357 -msgid "unknown search type ! (switched to default)" +#: src/freedb.c:159 +#, c-format +msgid "" +"\n" +"Searching from %s on port %d using %s ...\n" msgstr "" -#: src/options_parsers.c:373 -msgid "freedb web search not implemented yet ! (switched to default)" +#: src/freedb.c:172 +msgid "No results found" msgstr "" -#: src/options_parsers.c:379 -msgid "unknown get type ! (switched to default)" +#: src/freedb.c:182 +msgid "List of found cd:" msgstr "" -#: src/print_utils.c:39 +#: src/freedb.c:201 #, c-format -msgid " Warning: %s\n" -msgstr " Varování: %s\n" +msgid "Revision: %d\n" +msgstr "" -#: src/print_utils.c:45 +#: src/freedb.c:208 #, c-format -msgid " Error: %s\n" -msgstr " Chyba: %s\n" +msgid "-- 'q' to select cd, Enter for more:" +msgstr "" -#: src/print_utils.c:75 +#: src/freedb.c:226 #, c-format -msgid " File \"%s\" created%s\n" +msgid "-- 'q' to select cd, Enter for more: " msgstr "" -#: src/print_utils.c:87 +#: src/freedb.c:253 #, c-format -msgid " preparing \"%s\" (%d of %d)" +msgid "Select cd #: " msgstr "" -#: src/print_utils.c:94 +#: src/freedb.c:268 #, c-format -msgid " creating \"%s\" (%d of %d)" +msgid "Please " msgstr "" -#: src/print_utils.c:101 +#: src/freedb.c:288 #, c-format -msgid " searching for sync errors..." +msgid "" +"\n" +"Getting file from %s on port %d using %s ...\n" msgstr "" -#: src/print_utils.c:107 -#, c-format -msgid "S: %02d, Level: %.2f dB; scanning for silence..." +#: src/freedb.c:426 +msgid "the configuration file is malformed !" msgstr "" -#: src/print_utils.c:112 +#: src/freedb.c:462 +msgid "can't open the configuration file !" +msgstr "" + +#: src/freedb.c:470 #, c-format -msgid "Level: %.2f dB; scanning for silence..." +msgid "Will you use a proxy ? (y/n): " msgstr "" -#: src/print_utils.c:155 -msgid "using" +#: src/freedb.c:477 +#, c-format +msgid "Proxy Address: " msgstr "" -#: src/print_utils.c:167 +#: src/freedb.c:481 #, c-format -msgid "" -"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" +msgid "Proxy Port: " msgstr "" -#: src/print_utils.c:216 -msgid "" -"\n" -"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" +#: src/freedb.c:485 +#, c-format +msgid "Need authentication ? (y/n): " msgstr "" -#: src/print_utils.c:225 -msgid "" -"\n" -"USAGE:\n" -" mp3splt [OPTIONS] FILE1 [FILE2] ... [BEGIN_TIME] [TIME] ... " -"[END_TIME]\n" -" TIME FORMAT: min.sec[.0-99], even if minutes are over 59\n" -" or EOF-min.sec[.0-99] (or EOF for End Of File). " +#: src/freedb.c:493 +#, c-format +msgid "Would you like to save the password (insecure) ? (y/n): " msgstr "" -#: src/print_utils.c:230 -msgid "" -"\n" -"OPTIONS (split mode options)\n" -" -t + TIME: to split files every fixed time len. (TIME format same as " -"above). \n" -" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints " -"and\n" -" filenames from a .cddb or .cue file or from Internet (\"query\").\n" -" Use -a to auto-adjust splitpoints." +#: src/freedb.c:522 +#, c-format +msgid "Username: " msgstr "" -#: src/print_utils.c:235 -msgid "" -" -s Silence detection: automatically find splitpoint. (Use -p for " -"arguments)\n" -" -w Splits wrapped files created with Mp3Wrap or AlbumWrap.\n" -" -l Lists the tracks from file without extraction. (Only for wrapped mp3)\n" -" -e Error mode: split mp3 with sync error detection. (For concatenated mp3)" +#: src/freedb.c:526 +msgid "Password: " msgstr "" -#: src/print_utils.c:239 -msgid " -r Trim using silence detection (Use -p for arguments)" +#: src/utils.c:127 +msgid "List of found files:\n" msgstr "" -#: src/print_utils.c:241 +#: src/utils.c:135 +#, c-format msgid "" -" -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" +"\n" +"-- 'Enter' for more, 's' to split, 'c' to cancel:" msgstr "" -#: src/print_utils.c:242 -msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" +#: src/utils.c:144 src/utils.c:167 +msgid "" +"\n" +" split aborted." msgstr "" -#: src/print_utils.c:247 +#: src/utils.c:158 +#, c-format msgid "" "\n" -"(other options)\n" -" -T + TAGS_VERSION: for mp3 files, force output tags as version 1, 2 or 1 & " -"2.\n" -" TAGS_VERSION can be 1, 2 or 12\n" -" (default is to set the same version as the file to split)" +"-- 's' to split, 'c' to cancel:" msgstr "" -#: src/print_utils.c:251 -msgid "" -" -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" -" -f Frame mode (mp3 only): process all frames. For higher precision and " -"VBR.\n" -" -a Auto-Adjust splitpoints with silence detection. (Use -p for arguments)" +#: src/options_parsers.c:46 +msgid "bad gap argument. It will be ignored !" msgstr "" -#: src/print_utils.c:254 -msgid "" -" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -" -"s and -a.\n" -" -o + FORMAT: output filename pattern. Can contain those variables:\n" -" @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" -" @t: title tag, @n: track number identifier, @N: track tag number\n" -" (a digit may follow the 'n' or 'N' for the number of digits to " -"output),\n" -" @f: original filename, @g: genre" +#: src/options_parsers.c:61 +msgid "bad shots argument. It will be ignored !" msgstr "" -#: src/print_utils.c:260 -msgid "" -" -g + TAGS: custom tags for the split files.\n" -" TAGS can contain those variables: \n" -" @a, @b, @t, @y, @c, @n, @g, @o (set original tags),\n" -" @N (auto increment track number).\n" -" TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" -" (% means that we set the tags for all remaining files)" +#: src/options_parsers.c:76 +msgid "bad trackjoin argument. It will be ignored !" msgstr "" -#: src/print_utils.c:266 -msgid "" -" -G + regex=REGEX: set tags from input filename. REGEX defines how to " -"extract\n" -" the tags from the filename. It can contain those variables:\n" -" (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" -"<comment>), (?<genre>)" +#: src/options_parsers.c:91 +msgid "bad threshold argument. It will be ignored !" msgstr "" -#: src/print_utils.c:270 -msgid "" -" -d + DIRNAME: to put all output files in the directory DIRNAME.\n" -" -k Consider input not seekable (slower). Default when input is STDIN " -"(-).\n" -" -O + TIME: Overlap split files with TIME (slower)." +#: src/options_parsers.c:106 +msgid "bad tracknumber argument. It will be ignored !" msgstr "" -#: src/print_utils.c:273 -msgid "" -" -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " -"files.\n" -" -x No Xing header: does not write the Xing header. Use with -n if you " -"wish\n" -" to concatenate the split files\n" -" -N Don't create the 'mp3splt.log' log file when using '-s'." +#: src/options_parsers.c:119 +msgid "Bad values for the rm argument. rm parameter will be ignored!" msgstr "" -#: src/print_utils.c:277 -msgid "" -" -P Pretend to split: simulation of the process, without creating any\n" -" files or directories" +#: src/options_parsers.c:141 +msgid "bad offset argument. It will be ignored!" msgstr "" -#: src/print_utils.c:279 -msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" +#: src/options_parsers.c:156 +msgid "bad minimum track length argument. It will be ignored !" msgstr "" -#: src/print_utils.c:280 -msgid "" -" -q Quiet mode: try not to prompt (if possible) and print less messages.\n" -" -Q Very quiet mode: don't print anything to stdout and no progress bar\n" -" (also enables -q).\n" -" -D Debug mode: used to debug the program.\n" -"\n" -" Please read man page for complete documentation.\n" +#: src/options_parsers.c:175 +msgid "bad minimum silence length argument. It will be ignored !" msgstr "" -#: src/utils.c:127 -msgid "List of found files:\n" +#: src/options_parsers.c:198 +msgid "no regular expression found as argument." msgstr "" -#: src/utils.c:135 -#, c-format -msgid "" -"\n" -"-- 'Enter' for more, 's' to split, 'c' to cancel:" +#: src/options_parsers.c:374 +msgid "found non digits characters in port ! (switched to default)" msgstr "" -#: src/utils.c:144 src/utils.c:167 -msgid "" -"\n" -" split aborted." +#: src/options_parsers.c:399 +msgid "unknown search type ! (switched to default)" msgstr "" -#: src/utils.c:158 -#, c-format -msgid "" -"\n" -"-- 's' to split, 'c' to cancel:" +#: src/options_parsers.c:415 +msgid "freedb web search not implemented yet ! (switched to default)" +msgstr "" + +#: src/options_parsers.c:421 +msgid "unknown get type ! (switched to default)" msgstr "" #: src/windows_utils.c:49 Binary files /tmp/JzeX6fzWNb/mp3splt-2.4.1/po/de_DE.gmo and /tmp/Tv_0YIe6LM/mp3splt-2.6.0/po/de_DE.gmo differ diff -Nru mp3splt-2.4.1/po/de_DE.po mp3splt-2.6.0/po/de_DE.po --- mp3splt-2.4.1/po/de_DE.po 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/po/de_DE.po 2013-07-20 07:11:03.000000000 +0000 @@ -1,97 +1,107 @@ -# German translation of newmp3splt. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Alexandru Munteanu -# This file is distributed under the same license as the newmp3splt package. -# Mario Blättermann <mariobl@freenet.de>, 2010, 2011. +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Peter Pall <gunter@peterpall.de>, 2011 +# Wasilis <m.wasilis@yahoo.de>, 2013 msgid "" msgstr "" -"Project-Id-Version: newmp3splt\n" -"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n" -"POT-Creation-Date: 2011-11-14 00:12+0100\n" -"PO-Revision-Date: 2011-09-15 23:27+0100\n" -"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n" -"Language-Team: German <gnome-de@gnome.org>\n" +"Project-Id-Version: mp3splt-gtk\n" +"Report-Msgid-Bugs-To: m@ioalex.net\n" +"POT-Creation-Date: 2013-07-20 09:11+0200\n" +"PO-Revision-Date: 2013-04-29 08:36+0000\n" +"Last-Translator: Peter Pall <gunter@peterpall.de>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52 +#: src/mp3splt.c:310 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36 +#: src/utils.c:52 msgid "cannot allocate memory !" msgstr "Speicher kann nicht zugewiesen werden!" -#: src/mp3splt.c:278 -#, fuzzy +#: src/mp3splt.c:331 msgid "" "bad overlap time expression.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"Falscher Zeit-Ausdruck für Teilung nach Zeit.\n" -"\tMuss in min.sec[.0-99] oder EOF-min.sec[.0-99] angegeben werden, bitte die " -"Handbuchseite lesen." +"bad overlap time expression.⏎ »Must be min.sec[.0-99] or EOF-min.sec[.0-99], " +"read man page for details." -#: src/mp3splt.c:296 +#: src/mp3splt.c:352 msgid "" "bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"Falscher Zeit-Ausdruck für Teilung nach Zeit.\n" -"\tMuss in min.sec[.0-99] oder EOF-min.sec[.0-99] angegeben werden, bitte die " -"Handbuchseite lesen." +"bad time expression for the time split.⏎ »Must be min.sec[.0-99] or EOF-min." +"sec[.0-99], read man page for details." -#: src/mp3splt.c:359 +#: src/mp3splt.c:361 +#, fuzzy +msgid "" +"bad minimum time expression.\n" +"\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." +msgstr "" +"bad overlap time expression.⏎ »Must be min.sec[.0-99] or EOF-min.sec[.0-99], " +"read man page for details." + +#: src/mp3splt.c:429 msgid "read man page for documentation or type 'mp3splt -h'." msgstr "Lesen Sie die Handbuchseite oder geben Sie »mp3splt -h« ein." -#: src/mp3splt.c:423 +#: src/mp3splt.c:495 msgid "bad argument for -p option. No valid value was recognized !" msgstr "Falsches Argument für Option -p. Kein gültiger Wert erkannt!" -#: src/mp3splt.c:554 +#: src/mp3splt.c:642 msgid "no input filename(s)." msgstr "Kein(e) Name(n) für Eingabedateien." -#: src/mp3splt.c:567 +#: src/mp3splt.c:655 msgid "multiple splitpoints with stdout !" msgstr "Mehrere Teilungspunkte mit Standardausgabe!" -#: src/mp3splt.c:571 +#: src/mp3splt.c:659 msgid "using time mode with stdout !" msgstr "Zeitmodus mit Standardausgabe wird verwendet!" -#: src/mp3splt.c:612 +#: src/mp3splt.c:700 #, c-format msgid " Pretending to split file '%s' ...\n" msgstr " Teilung der Datei »%s« wird simuliert …\n" -#: src/mp3splt.c:616 +#: src/mp3splt.c:704 #, c-format msgid " Processing file '%s' ...\n" msgstr " Datei »%s« wird verarbeitet …\n" -#: src/mp3splt.c:623 src/options_checker.c:49 +#: src/mp3splt.c:710 +#, fuzzy msgid "" "cannot use -k option (or STDIN) with one of the following options: -S -s -r -" -"w -l -e -i -a -p" +"w -l -e -i -a -p -K" msgstr "" -"Option -k (oder STDIN) kann nicht mit einer der folgenden Optionen verwendet " -"werden : -S -s -r -w -l -e -i -a -p" +"die -k option (oder STDIN) kann mit einer der folgenden Optionen nicht " +"verwendet werden: -S -s -r -w -l -e -i -a -p" -#: src/mp3splt.c:679 +#: src/mp3splt.c:786 msgid "freedb query format ambigous !" msgstr "Format der Freedb-Abfrage ist nicht eindeutig!" -#: src/mp3splt.c:723 +#: src/mp3splt.c:832 msgid "tags format ambiguous !" msgstr "Tag-Format ist nicht eindeutig!" -#: src/mp3splt.c:755 +#: src/mp3splt.c:864 #, c-format msgid " Average silence level: %.2f dB" msgstr " Durchschnittlicher Pegel der Stille: %.2f dB" -#: src/mp3splt.c:772 +#: src/mp3splt.c:880 msgid "" "\n" " +-----------------------------------------------------------------------------" @@ -152,228 +162,6 @@ " +-----------------------------------------------------------------------------" "+\n" -#: src/freedb.c:58 -#, c-format -msgid " Freedb search type: %s , Site: %s , Port: %d\n" -msgstr " Freedb-Suchtyp: %s , Seite: %s , Port: %d\n" - -#: src/freedb.c:61 -#, c-format -msgid " Freedb get type: %s , Site: %s , Port: %d\n" -msgstr " Freedb-Ermittlungstyp: %s , Seite: %s , Port: %d\n" - -#: src/freedb.c:71 -msgid "CDDB QUERY. Insert album and artist informations to find cd." -msgstr "" -"CDDB-Abfrage. Geben Sie Informationen über Album und Künstler an, um eine CD " -"zu finden." - -#: src/freedb.c:79 -msgid "" -"\n" -"Please search something ..." -msgstr "" -"\n" -"Bitte suchen Sie nach etwas …" - -#: src/freedb.c:85 -#, c-format -msgid "\r Search: [" -msgstr "\r Suche: [" - -#: src/freedb.c:102 -#, c-format -msgid "" -"\n" -" Search string: %s\n" -msgstr "" -"\n" -" Zu suchende Zeichenkette: %s\n" - -#: src/freedb.c:103 -#, c-format -msgid "" -"\n" -"Searching from %s on port %d using %s ...\n" -msgstr "" -"\n" -"Suchen von %s auf Port %d mittels %s ...\n" - -#: src/freedb.c:116 -msgid "No results found" -msgstr "Keine Suchergebnisse" - -#: src/freedb.c:126 -msgid "List of found cd:" -msgstr "Liste der gefundenen CDs:" - -#: src/freedb.c:140 -#, c-format -msgid "Revision: %d\n" -msgstr "Revision: %d\n" - -#: src/freedb.c:147 -#, c-format -msgid "-- 'q' to select cd, Enter for more:" -msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:" - -#: src/freedb.c:165 -#, c-format -msgid "-- 'q' to select cd, Enter for more: " -msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:" - -#: src/freedb.c:192 -#, c-format -msgid "Select cd #: " -msgstr "CD-Nummer wählen:" - -#: src/freedb.c:207 -#, c-format -msgid "Please " -msgstr "Bitte" - -#: src/freedb.c:232 -#, c-format -msgid "" -"\n" -"Getting file from %s on port %d using %s ...\n" -msgstr "" -"\n" -"Holen der Datei von %s auf Port %d mittels %s ...\n" - -#: src/options_checker.c:66 -msgid "the -w option can only be used with -m, -d, -q and -Q" -msgstr "Die Option -w kann nur zusammen mit -m, -d, -q und -Q verwendet werden" - -#: src/options_checker.c:82 -msgid "the -l option can only be used with -q" -msgstr "Die Option -l kann nur zusammen mit -q verwendet werden" - -#: src/options_checker.c:96 -msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" -msgstr "" -"Die Option -e kann nur zusammen mit -m, -f, -o, -d, -q, -Q verwendet werden" - -#: src/options_checker.c:111 -msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S" -msgstr "" -"Die Option -c kann nicht zusammen mit -t, -g, -G, -s, -r, -A, -i oder -S " -"verwendet werden" - -#: src/options_checker.c:119 -msgid "the -A option cannot be used with -t, -s, -r, -i or -S" -msgstr "" -"Die Option -A kann nicht zusammen mit -t, -s, -r, -i oder -S verwendet werden" - -#: src/options_checker.c:127 -msgid "the -t option cannot be used with -s, -r, -i or -S" -msgstr "" -"Die Option -t kann nicht zusammen mit -s, -r, -i oder -S verwendet werden" - -#: src/options_checker.c:135 -msgid "-s option cannot be used with -a, -r, -i or -S" -msgstr "" -"Die Option -s kann nicht zusammen mit -a, -r, -i oder -S verwendet werden" - -#: src/options_checker.c:143 -msgid "-a option cannot be used with -i" -msgstr "Die Option -a kann nicht zusammen mit -i verwendet werden" - -#: src/options_checker.c:155 -msgid "the -p option cannot be used without -a, -s, -r or -i" -msgstr "Die Option -p kann nicht ohne -a, -s, -r oder -i verwendet werden" - -#: src/options_checker.c:163 -msgid "the -o option cannot be used with -i" -msgstr "Die Option -o kann nicht zusammen mit -i verwendet werden" - -#: src/options_checker.c:169 -msgid "cannot use '-o -' (STDOUT) with -m or -d" -msgstr "" -"»-o« (Standardausgabe) kann nicht zusammen mit -m oder -d verwendet werden" - -#: src/options_checker.c:178 -msgid "the -g option cannot be used with -n, -i or -G" -msgstr "Die Option -g kann nicht zusammen mit -n, -i oder -G verwendet werden" - -#: src/options_checker.c:186 -msgid "the -d option cannot be used with -i" -msgstr "Die Option -d kann nicht zusammen mit -i verwendet werden" - -#: src/options_checker.c:194 -msgid "the -n option cannot be used with -i or -T" -msgstr "Die Option -n kann nicht zusammen mit -i oder -T verwendet werden" - -#: src/options_checker.c:202 -msgid "the -m option cannot be used with -i" -msgstr "Die Option -m kann nicht zusammen mit -i verwendet werden" - -#: src/options_checker.c:220 -msgid "the -Q option cannot be used with STDOUT output ('-o -')" -msgstr "" -"Die Option -Q kann nicht zusammen mit -o verwendet werden (Standardausgabe)" - -#: src/options_checker.c:228 -msgid "the -Q option cannot be used with interactive freedb query ('-c query')" -msgstr "" -"Die Option -Q kann nicht zusammen mit -c verwendet werden (interaktive " -"Freedb-Abfrage)" - -#: src/options_checker.c:238 -msgid "the -N option must be used with silence detection (-s option)" -msgstr "" -"Die Option -N muss zusammen mit -s verwendet werden (Erkennung von Stille)" - -#: src/options_checker.c:248 -msgid "the -O option cannot be used with -w, -e, -l or -i" -msgstr "" -"Die Option -O kann nicht zusammen mit -w, -e, -l oder -i verwendet werden" - -#: src/options_parsers.c:45 -msgid "bad gap argument. It will be ignored !" -msgstr "Falsches gap-Argument. Wird ignoriert!" - -#: src/options_parsers.c:60 -msgid "bad threshold argument. It will be ignored !" -msgstr "Falsches threshold-Argument. Wird ignoriert!" - -#: src/options_parsers.c:75 -msgid "bad tracknumber argument. It will be ignored !" -msgstr "Falsches tracknumber-Argument. Wird ignoriert!" - -#: src/options_parsers.c:99 -msgid "bad offset argument. It will be ignored!" -msgstr "Falsches offset-Argument. Wird ignoriert!" - -#: src/options_parsers.c:114 -msgid "bad minimum track length argument. It will be ignored !" -msgstr "Falsches Argument zur minimalen Titellänge. Wird ignoriert!" - -#: src/options_parsers.c:133 -msgid "bad minimum silence length argument. It will be ignored !" -msgstr "Falsches minimum silence length-Argument. Wird ignoriert!" - -#: src/options_parsers.c:156 -msgid "no regular expression found as argument." -msgstr "Kein regulärer Ausdruck als Argument gefunden." - -#: src/options_parsers.c:332 -msgid "found non digits characters in port ! (switched to default)" -msgstr "Keine verwertbaren Zeichen im Port gefunden! (Vorgabe wird benutzt)" - -#: src/options_parsers.c:357 -msgid "unknown search type ! (switched to default)" -msgstr "Unbekannter Suchtyp! (Vorgabe wird benutzt)" - -#: src/options_parsers.c:373 -msgid "freedb web search not implemented yet ! (switched to default)" -msgstr "" -"Die Freedb-Websuche wird noch nicht unterstützt! (Vorgabe wird verwendet)" - -#: src/options_parsers.c:379 -msgid "unknown get type ! (switched to default)" -msgstr "Unbekannter Ermittlungstyp (Vorgabe wird verwendet)" - #: src/print_utils.c:39 #, c-format msgid " Warning: %s\n" @@ -384,41 +172,41 @@ msgid " Error: %s\n" msgstr " Fehler: %s\n" -#: src/print_utils.c:75 +#: src/print_utils.c:127 #, c-format msgid " File \"%s\" created%s\n" msgstr " Datei »%s« erzeugt%s\n" -#: src/print_utils.c:87 +#: src/print_utils.c:142 #, c-format msgid " preparing \"%s\" (%d of %d)" msgstr "»%s« wird vorbereitet (%d von %d)" -#: src/print_utils.c:94 +#: src/print_utils.c:149 #, c-format msgid " creating \"%s\" (%d of %d)" msgstr "»%s« wird erzeugt (%d von %d)" -#: src/print_utils.c:101 +#: src/print_utils.c:156 #, c-format msgid " searching for sync errors..." msgstr "Nach Synchronfehlern wird gesucht …" -#: src/print_utils.c:107 +#: src/print_utils.c:165 #, c-format msgid "S: %02d, Level: %.2f dB; scanning for silence..." msgstr "S: %02d, Pegel: %.2f dB; nach Stille suchen …" -#: src/print_utils.c:112 +#: src/print_utils.c:170 #, c-format msgid "Level: %.2f dB; scanning for silence..." -msgstr "Pegel: %.2f dB; nach Stille wird gesucht …" +msgstr "Pegel: %.2f dB; nach Stille wird gesucht…" -#: src/print_utils.c:155 +#: src/print_utils.c:202 msgid "using" msgstr "verwendet" -#: src/print_utils.c:167 +#: src/print_utils.c:215 #, c-format msgid "" "THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" @@ -426,7 +214,7 @@ "FÜR DIESE SOFTWARE ÜBERNEHMEN WIR KEINERLEI GARANTIE! BENUTZUNG NUR AUF " "EIGENE GEFAHR!\n" -#: src/print_utils.c:216 +#: src/print_utils.c:264 msgid "" "\n" "All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" @@ -435,7 +223,7 @@ "Alle Dateien wurden korrekt geteilt. Besuchen Sie http://mp3wrap.sourceforge." "net!" -#: src/print_utils.c:225 +#: src/print_utils.c:273 msgid "" "\n" "USAGE:\n" @@ -444,14 +232,8 @@ " TIME FORMAT: min.sec[.0-99], even if minutes are over 59\n" " or EOF-min.sec[.0-99] (or EOF for End Of File). " msgstr "" -"\n" -"AUFRUF:\n" -" mp3splt [OPTIONEN] DATEI1 [DATEI2] ... [STARTZEIT] [ZEIT] ... " -"[ENDZEIT]\n" -" ZEITFORMAT: min.sec[.0-99], auch wenn Minuten über 59 hinausgehen\n" -" oder EOF-min.sec[.0-99] (oder EOF für Ende der Datei). " -#: src/print_utils.c:230 +#: src/print_utils.c:278 msgid "" "\n" "OPTIONS (split mode options)\n" @@ -470,7 +252,7 @@ "im Internet abfragen (»Abfrage«).\n" " Benutzen Sie -a, um Teilungspunkte automatisch einzustellen." -#: src/print_utils.c:235 +#: src/print_utils.c:283 msgid "" " -s Silence detection: automatically find splitpoint. (Use -p for " "arguments)\n" @@ -485,22 +267,22 @@ " -e Fehlermodus: Teilt mp3 mit Erkennung von Synchronisationsfehlern.\n" " (Für zusammengefügtes mp3)" -#: src/print_utils.c:239 +#: src/print_utils.c:287 msgid " -r Trim using silence detection (Use -p for arguments)" -msgstr " -r Mittels Stille-Erkennung trimmen (-p für Argumente verwenden)" +msgstr "-R Trim mit Stille-Erkennung (Use-p für Argumente) " -#: src/print_utils.c:241 +#: src/print_utils.c:289 msgid "" " -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" msgstr "" " -A + AUDACITY-DATEI: Teilungspunkte anhand einer Labels-Datei von\n" " Audacity festzulegen." -#: src/print_utils.c:242 +#: src/print_utils.c:290 msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" msgstr " -S + TEIL_ANZAHL: In TEIL_ANZAHL gleich lange Teile teilen" -#: src/print_utils.c:247 +#: src/print_utils.c:295 msgid "" "\n" "(other options)\n" @@ -515,7 +297,7 @@ " & 2 erzwingen. TAGS_VERSION kann 1, 2 oder 12 sein\n" " (Vorgabe ist die gleiche Version wie die der zu teilenden Datei)" -#: src/print_utils.c:251 +#: src/print_utils.c:299 msgid "" " -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" " -f Frame mode (mp3 only): process all frames. For higher precision and " @@ -529,10 +311,11 @@ " -a Automatische Einstellung der Teilungspunkte durch Stille-Erkennung.\n" " (-p für weitere Argumente)" -#: src/print_utils.c:254 +#: src/print_utils.c:302 +#, fuzzy msgid "" -" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -" -"s and -a.\n" +" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " +"user arguments for -s, -a, -t.\n" " -o + FORMAT: output filename pattern. Can contain those variables:\n" " @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" " @t: title tag, @n: track number identifier, @N: track tag number\n" @@ -540,17 +323,11 @@ "output),\n" " @f: original filename, @g: genre" msgstr "" -" -p + PARAMETER (th, nt, off, min, rm, gap, trackmin): Benutzerargumente für " -"-s und -a.\n" -" -o + FORMAT: Muster des Ausgabedateinamens. Kann folgende Variablen " -"enthalten:\n" -" @a: Künstler, @p: Interpret (könnte nicht vorhanden sein), @b: Album\n" -" @t: Titel, @n: Titelnummer-Bezeichner, @N: Titel-Tagnummer\n" -" (einer Ziffer kann »n« oder »N« für die Anzahl der ausgegebenen " -"Stellen folgen),\n" -" @f: Original-Dateiname, @g: Genre" +"AUFRUF: mp3splt [OPTIONEN] DATEI1 [DATEI2] ... [STARTZEIT] [ZEIT] ... " +"[ENDZEIT] ZEITFORMAT: min.sec[.0-99], auch wenn Minuten über 59 hinausgehen " +"(oder EOF für Ende der Datei). " -#: src/print_utils.c:260 +#: src/print_utils.c:309 msgid "" " -g + TAGS: custom tags for the split files.\n" " TAGS can contain those variables: \n" @@ -559,15 +336,13 @@ " TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" " (% means that we set the tags for all remaining files)" msgstr "" -" -g + TAGS: Benutzerdefinierte Tags für geteilte Dateien.\n" -" TAGS kan folgende Variablen enthalten: \n" -" @a, @b, @t, @y, @c, @n, @g, @o (Original-Tags festlegen),\n" -" @N (Titelnummer automatisch hochzählen).\n" -" TAGS-Format entspricht [@a=Künstler1,@t=Titel1]%[@o,@N=2," -"@a=Künstler2]\n" -" (% bedeutet, dass Tags für alle verbleibenden Dateien gesetzt werden)" +"-g + TAGS: . benutzerdefinierte Tags für die aufgeteilten Dateien ⏎ TAGS " +"können diese Variablen enthalten: ⏎ @ a , @ b @ t @ y, @ c, @ n @ g, @ o " +"(Set Original-Tags ), ⏎ @ N ( Autoinkrement Titelnummer ). ⏎ TAGS Format ist " +"wie [ @ a = Artist1 , @ t = title1 ]% [ @ o @ N = 2, @ a = ARTIST2 ] ⏎ (% " +"bedeutet, dass wir die Tags gesetzt für alle übrigen Dateien) " -#: src/print_utils.c:266 +#: src/print_utils.c:315 msgid "" " -G + regex=REGEX: set tags from input filename. REGEX defines how to " "extract\n" @@ -575,14 +350,12 @@ " (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" "<comment>), (?<genre>)" msgstr "" -" -G + regex=REGEX: Tags aus dem Namen der Eingabedatei setzen. REGEX " -"definiert, wie die Tags\n" -" aus dem Dateinamen ermittelt werden. Kann folgende Variablen " -"enthalten:\n" -" (?<Künstler>), (?<Album>), (?<Titel>), (?<Titelnr.>), (?<Jahr>), (?" -"<Kommentar>), (?<Genre>)" +"-G + regex=REGEX: set tags from input filename. REGEX defines how to " +"extract⏎ the tags from the filename. It can contain those variables:⏎ (?" +"<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?<comment>), (?" +"<genre>)" -#: src/print_utils.c:270 +#: src/print_utils.c:319 msgid "" " -d + DIRNAME: to put all output files in the directory DIRNAME.\n" " -k Consider input not seekable (slower). Default when input is STDIN " @@ -594,7 +367,7 @@ " Vorgabe, wenn Eingabe STDIN ist (-).\n" " -O + ZEIT : Teilungsdateien um ZEIT überlappen (langsamer)." -#: src/print_utils.c:273 +#: src/print_utils.c:322 msgid "" " -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " "files.\n" @@ -608,7 +381,7 @@ " falls Sie die Teilungsdateien zusammenführen wollen\n" " -N Keine Protokolldatei »mp3splt.log« schreiben bei »-s«." -#: src/print_utils.c:277 +#: src/print_utils.c:326 msgid "" " -P Pretend to split: simulation of the process, without creating any\n" " files or directories" @@ -616,13 +389,13 @@ " -P Teilung simulieren: Der Vorgang wird simuliert, ohne dass\n" " Dateien oder Ordner erstellt werden" -#: src/print_utils.c:279 +#: src/print_utils.c:328 msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" msgstr "" " -E + CUE_DATEI: Exportiert Teilungspunkte in eine CUE-Datei,\n" " wenn nötig, zusammen mit -P verwenden" -#: src/print_utils.c:280 +#: src/print_utils.c:329 msgid "" " -q Quiet mode: try not to prompt (if possible) and print less messages.\n" " -Q Very quiet mode: don't print anything to stdout and no progress bar\n" @@ -639,6 +412,245 @@ "\n" " Lesen Die die Handbuchseite für eine vollständige Dokumentation.\n" +#: src/options_checker.c:49 +#, fuzzy +msgid "" +"cannot use -k option (or STDIN) with one of the following options: -S -s -r -" +"w -l -e -i -a -p -F" +msgstr "" +"die -k option (oder STDIN) kann mit einer der folgenden Optionen nicht " +"verwendet werden: -S -s -r -w -l -e -i -a -p" + +#: src/options_checker.c:67 +msgid "the -w option can only be used with -m, -d, -q and -Q" +msgstr "Die Option -w kann nur zusammen mit -m, -d, -q und -Q verwendet werden" + +#: src/options_checker.c:84 +msgid "the -l option can only be used with -q" +msgstr "Die Option -l kann nur zusammen mit -q verwendet werden" + +#: src/options_checker.c:98 +msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" +msgstr "" +"Die Option -e kann nur zusammen mit -m, -f, -o, -d, -q, -Q verwendet werden" + +#: src/options_checker.c:114 +#, fuzzy +msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F" +msgstr "" +"Die -c option kann nicht verwendet werden mit -t, -g, -G, -s, -r, -A, -i " +"oder -S" + +#: src/options_checker.c:124 +#, fuzzy +msgid "the -A option cannot be used with -t, -s, -r, -i, -S or -F" +msgstr "Die -A Option kann nicht verwendet werden mit -t, -s, -r, -i oder -S" + +#: src/options_checker.c:134 +#, fuzzy +msgid "the -t option cannot be used with -s, -r, -i, -S or -F" +msgstr "Die -t Option kann nicht verwendet werden mit -s, -r, -i oder -S" + +#: src/options_checker.c:143 +msgid "-s option cannot be used with -a, -r, -i or -S" +msgstr "Die Option -s kann nicht zusammen mit -a, -i oder -S verwendet werden" + +#: src/options_checker.c:151 +msgid "-a option cannot be used with -i" +msgstr "Die Option -a kann nicht zusammen mit -i verwendet werden" + +#: src/options_checker.c:163 +msgid "the -p option cannot be used without -a, -s, -r or -i" +msgstr "" +"Die Option -p kann nicht zusammen mit -a, -s, -r oder -i verwendet werden" + +#: src/options_checker.c:171 +msgid "the -o option cannot be used with -i" +msgstr "Die Option -o kann nicht zusammen mit -i verwendet werden" + +#: src/options_checker.c:177 +msgid "cannot use '-o -' (STDOUT) with -m or -d" +msgstr "" +"»-o« (Standardausgabe) kann nicht zusammen mit -m oder -d verwendet werden" + +#: src/options_checker.c:186 +msgid "the -g option cannot be used with -n, -i or -G" +msgstr "Die -g option kann nicht verwendet werden mit -n, -i oder -G" + +#: src/options_checker.c:194 +msgid "the -d option cannot be used with -i" +msgstr "Die Option -d kann nicht zusammen mit -i verwendet werden" + +#: src/options_checker.c:202 +msgid "the -n option cannot be used with -i or -T" +msgstr "Die Option -n kann nicht zusammen mit -i oder -T verwendet werden" + +#: src/options_checker.c:210 +msgid "the -m option cannot be used with -i" +msgstr "Die Option -m kann nicht zusammen mit -i verwendet werden" + +#: src/options_checker.c:228 +msgid "the -Q option cannot be used with STDOUT output ('-o -')" +msgstr "" +"Die Option -Q kann nicht zusammen mit -o verwendet werden (Standardausgabe)" + +#: src/options_checker.c:236 +msgid "the -Q option cannot be used with interactive freedb query ('-c query')" +msgstr "" +"Die Option -Q kann nicht zusammen mit -c verwendet werden (interaktive " +"Freedb-Abfrage)" + +#: src/options_checker.c:246 +msgid "the -N option must be used with silence detection (-s option)" +msgstr "" +"Die Option -N muss zusammen mit -s verwendet werden (Erkennung von Stille)" + +#: src/options_checker.c:255 +msgid "the -O option cannot be used with -w, -e, -l or -i" +msgstr "" +"Die Option -O kann nicht zusammen mit -w, -e, -l oder -i verwendet werden" + +#: src/options_checker.c:281 +#, fuzzy +msgid "the -F option cannot be used without -s" +msgstr "Die Option -o kann nicht zusammen mit -i verwendet werden" + +#: src/options_checker.c:289 +#, fuzzy +msgid "the -K option cannot be used without -c" +msgstr "Die Option -o kann nicht zusammen mit -i verwendet werden" + +#: src/freedb.c:118 +#, c-format +msgid " Freedb search type: %s , Site: %s , Port: %d\n" +msgstr " Freedb-Suchtyp: %s , Seite: %s , Port: %d\n" + +#: src/freedb.c:121 +#, c-format +msgid " Freedb get type: %s , Site: %s , Port: %d\n" +msgstr " Freedb-Ermittlungstyp: %s , Seite: %s , Port: %d\n" + +#: src/freedb.c:130 +msgid "CDDB QUERY. Insert album and artist informations to find cd." +msgstr "" +"CDDB-Abfrage. Geben Sie Informationen über Album und Künstler an, um eine CD " +"zu finden." + +#: src/freedb.c:136 +msgid "" +"\n" +"Please search something ..." +msgstr "" +"\n" +"Bitte suchen Sie nach etwas …" + +#: src/freedb.c:142 +#, c-format +msgid "\r Search: [" +msgstr "\r Suche: [" + +#: src/freedb.c:158 +#, c-format +msgid "" +"\n" +" Search string: %s\n" +msgstr "" +"\n" +" Zu suchende Zeichenkette: %s\n" + +#: src/freedb.c:159 +#, c-format +msgid "" +"\n" +"Searching from %s on port %d using %s ...\n" +msgstr "" +"\n" +"Suchen von %s auf Port %d mittels %s ...\n" + +#: src/freedb.c:172 +msgid "No results found" +msgstr "Keine Ergebnisse gefunden" + +#: src/freedb.c:182 +msgid "List of found cd:" +msgstr "Liste der gefundenen CDs:" + +#: src/freedb.c:201 +#, c-format +msgid "Revision: %d\n" +msgstr "Revision: %d\n" + +#: src/freedb.c:208 +#, c-format +msgid "-- 'q' to select cd, Enter for more:" +msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:" + +#: src/freedb.c:226 +#, c-format +msgid "-- 'q' to select cd, Enter for more: " +msgstr "-- »q« zur Auswahl einer CD, Eingabetaste für mehr:" + +#: src/freedb.c:253 +#, c-format +msgid "Select cd #: " +msgstr "CD-Nummer wählen:" + +#: src/freedb.c:268 +#, c-format +msgid "Please " +msgstr "Bitte" + +#: src/freedb.c:288 +#, c-format +msgid "" +"\n" +"Getting file from %s on port %d using %s ...\n" +msgstr "" +"\n" +"Holen der Datei von %s auf Port %d mittels %s ...\n" + +#: src/freedb.c:426 +msgid "the configuration file is malformed !" +msgstr "" + +#: src/freedb.c:462 +msgid "can't open the configuration file !" +msgstr "" + +#: src/freedb.c:470 +#, c-format +msgid "Will you use a proxy ? (y/n): " +msgstr "" + +#: src/freedb.c:477 +#, c-format +msgid "Proxy Address: " +msgstr "" + +#: src/freedb.c:481 +#, c-format +msgid "Proxy Port: " +msgstr "" + +#: src/freedb.c:485 +#, c-format +msgid "Need authentication ? (y/n): " +msgstr "" + +#: src/freedb.c:493 +#, c-format +msgid "Would you like to save the password (insecure) ? (y/n): " +msgstr "" + +#: src/freedb.c:522 +#, c-format +msgid "Username: " +msgstr "" + +#: src/freedb.c:526 +msgid "Password: " +msgstr "" + #: src/utils.c:127 msgid "List of found files:\n" msgstr "Liste der gefundenen Dateien:\n" @@ -669,6 +681,63 @@ "\n" "-- »s« für Teilen, »c« für Abbrechen:" +#: src/options_parsers.c:46 +msgid "bad gap argument. It will be ignored !" +msgstr "Falsches gap-Argument. Wird ignoriert!" + +#: src/options_parsers.c:61 +msgid "bad shots argument. It will be ignored !" +msgstr "falsches bad shots argument. Wird ignoriert!" + +#: src/options_parsers.c:76 +msgid "bad trackjoin argument. It will be ignored !" +msgstr "Falsches bad trackjoin argument. Wird ignoriert!" + +#: src/options_parsers.c:91 +msgid "bad threshold argument. It will be ignored !" +msgstr "Falsches threshold-Argument. Wird ignoriert!" + +#: src/options_parsers.c:106 +msgid "bad tracknumber argument. It will be ignored !" +msgstr "Falsches tracknumber-Argument. Wird ignoriert!" + +#: src/options_parsers.c:119 +msgid "Bad values for the rm argument. rm parameter will be ignored!" +msgstr "Schlechte Werte für das rm Argument. rm Parameter werden ignoriert! " + +#: src/options_parsers.c:141 +msgid "bad offset argument. It will be ignored!" +msgstr "Falsches offset-Argument. Wird ignoriert!" + +#: src/options_parsers.c:156 +msgid "bad minimum track length argument. It will be ignored !" +msgstr "Falsches minimum silence length-Argument. Wird ignoriert!" + +#: src/options_parsers.c:175 +msgid "bad minimum silence length argument. It will be ignored !" +msgstr "Falsches minimum silence length-Argument. Wird ignoriert!" + +#: src/options_parsers.c:198 +msgid "no regular expression found as argument." +msgstr "kein regulärer Ausdruck als Argument gefunden. " + +#: src/options_parsers.c:374 +msgid "found non digits characters in port ! (switched to default)" +msgstr "Keine verwertbaren Zeichen im Port gefunden! (Vorgabe wird benutzt)" + +#: src/options_parsers.c:399 +msgid "unknown search type ! (switched to default)" +msgstr "Unbekannter Suchtyp! (Vorgabe wird benutzt)" + +#: src/options_parsers.c:415 +msgid "freedb web search not implemented yet ! (switched to default)" +msgstr "" +"Die Freedb-Websuche wird noch nicht unterstützt! (Vorgabe wird verwendet)" + +#: src/options_parsers.c:421 +msgid "unknown get type ! (switched to default)" +msgstr "Unbekannter Ermittlungstyp (Vorgabe wird verwendet)" + #: src/windows_utils.c:49 msgid "CommandLineToArgvW failed (oh !)" msgstr "CommandLineToArgvW gescheitert (oh !)" @@ -676,15 +745,3 @@ #: src/windows_utils.c:58 msgid "failed to allocate argv_utf8 memory" msgstr "argv_utf8-Speicher kann nicht zugewiesen werden" - -#~ msgid "" -#~ " -i Count how many silence splitpoints we have with silence detection\n" -#~ " (Use -p for arguments) - DEPRECATED: use -s with -P)\n" -#~ " -v Prints current version and exits\n" -#~ " -h Shows this help" -#~ msgstr "" -#~ " -i Anzahl der durch Stille-Erkennung ermittelten Teilungspunkte " -#~ "bestimmen\n" -#~ " (-p für Argumente verwenden) - VERALTET: -s mit -P verwenden)\n" -#~ " -v Aktuelle Version anzeigen und beenden\n" -#~ " -h Diese Hilfe anzeigen" Binary files /tmp/JzeX6fzWNb/mp3splt-2.4.1/po/es.gmo and /tmp/Tv_0YIe6LM/mp3splt-2.6.0/po/es.gmo differ diff -Nru mp3splt-2.4.1/po/es.po mp3splt-2.6.0/po/es.po --- mp3splt-2.4.1/po/es.po 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/po/es.po 2013-07-20 07:11:03.000000000 +0000 @@ -1,99 +1,96 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Alexandru Munteanu # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Translators: +# freddy sequera <nemecis000@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: mp3splt-gtk\n" -"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n" -"POT-Creation-Date: 2011-11-14 00:12+0100\n" -"PO-Revision-Date: 2011-02-22 00:08+0000\n" -"Last-Translator: nemecis1000 <nemecis000@gmail.com>\n" +"Report-Msgid-Bugs-To: m@ioalex.net\n" +"POT-Creation-Date: 2013-07-20 09:11+0200\n" +"PO-Revision-Date: 2013-04-29 08:36+0000\n" +"Last-Translator: Peter Pall <gunter@peterpall.de>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52 +#: src/mp3splt.c:310 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36 +#: src/utils.c:52 msgid "cannot allocate memory !" msgstr "no puede asignar memoria!" -#: src/mp3splt.c:278 -#, fuzzy +#: src/mp3splt.c:331 msgid "" "bad overlap time expression.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"expresión mal momento para la división del tiempo. <span class=\"whitespace " -"other\" title=\"Ficha\">»Debe</span> ser min.sec, lea la página man para más " -"detalles." -#: src/mp3splt.c:296 -#, fuzzy +#: src/mp3splt.c:352 msgid "" "bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"expresión mal momento para la división del tiempo. <span class=\"whitespace " -"other\" title=\"Ficha\">»Debe</span> ser min.sec, lea la página man para más " -"detalles." -#: src/mp3splt.c:359 +#: src/mp3splt.c:361 +msgid "" +"bad minimum time expression.\n" +"\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." +msgstr "" + +#: src/mp3splt.c:429 msgid "read man page for documentation or type 'mp3splt -h'." msgstr "lea la página del manual de documentación o de tipo 'Mp3Splt-h'." -#: src/mp3splt.c:423 +#: src/mp3splt.c:495 msgid "bad argument for -p option. No valid value was recognized !" msgstr "mal argumento para la opción-p. No fue reconocido valor válido!" -#: src/mp3splt.c:554 +#: src/mp3splt.c:642 msgid "no input filename(s)." msgstr "sin entrada de nombre de archivo (s)." -#: src/mp3splt.c:567 +#: src/mp3splt.c:655 msgid "multiple splitpoints with stdout !" msgstr "splitpoints múltiples con la salida estándar!" -#: src/mp3splt.c:571 +#: src/mp3splt.c:659 msgid "using time mode with stdout !" msgstr "usando el modo de tiempo con la salida estándar!" -#: src/mp3splt.c:612 +#: src/mp3splt.c:700 #, c-format msgid " Pretending to split file '%s' ...\n" msgstr "" -#: src/mp3splt.c:616 +#: src/mp3splt.c:704 #, c-format msgid " Processing file '%s' ...\n" msgstr "" -#: src/mp3splt.c:623 src/options_checker.c:49 -#, fuzzy +#: src/mp3splt.c:710 msgid "" "cannot use -k option (or STDIN) with one of the following options: -S -s -r -" -"w -l -e -i -a -p" +"w -l -e -i -a -p -K" msgstr "" -"no puede utilizar la opción-k (o STDIN) con una de las siguientes opciones:-" -"S-s-w-l-e-i-p-" -#: src/mp3splt.c:679 +#: src/mp3splt.c:786 msgid "freedb query format ambigous !" msgstr "freedb ambigua consulta formato!" -#: src/mp3splt.c:723 +#: src/mp3splt.c:832 msgid "tags format ambiguous !" msgstr "Etiquetas de formato ambiguo!" -#: src/mp3splt.c:755 +#: src/mp3splt.c:864 #, c-format msgid " Average silence level: %.2f dB" msgstr "" -#: src/mp3splt.c:772 +#: src/mp3splt.c:880 msgid "" "\n" " +-----------------------------------------------------------------------------" @@ -119,217 +116,6 @@ "+\n" msgstr "" -#: src/freedb.c:58 -#, c-format -msgid " Freedb search type: %s , Site: %s , Port: %d\n" -msgstr "" - -#: src/freedb.c:61 -#, c-format -msgid " Freedb get type: %s , Site: %s , Port: %d\n" -msgstr "" - -#: src/freedb.c:71 -msgid "CDDB QUERY. Insert album and artist informations to find cd." -msgstr "" -"PREGUNTA CDDB. Introduzca la información de álbum y artista para encontrar " -"cd." - -#: src/freedb.c:79 -msgid "" -"\n" -"Please search something ..." -msgstr "" - -#: src/freedb.c:85 -#, c-format -msgid "\r Search: [" -msgstr "Búsqueda: [" - -#: src/freedb.c:102 -#, c-format -msgid "" -"\n" -" Search string: %s\n" -msgstr "" - -#: src/freedb.c:103 -#, c-format -msgid "" -"\n" -"Searching from %s on port %d using %s ...\n" -msgstr "" - -#: src/freedb.c:116 -msgid "No results found" -msgstr "" - -#: src/freedb.c:126 -msgid "List of found cd:" -msgstr "Lista de cd que se encuentran:" - -#: src/freedb.c:140 -#, c-format -msgid "Revision: %d\n" -msgstr "" - -#: src/freedb.c:147 -#, c-format -msgid "-- 'q' to select cd, Enter for more:" -msgstr "- 'Q' para seleccionar cd, Enter para más:" - -#: src/freedb.c:165 -#, c-format -msgid "-- 'q' to select cd, Enter for more: " -msgstr "- 'Q' para seleccionar cd, Enter para más:" - -#: src/freedb.c:192 -#, c-format -msgid "Select cd #: " -msgstr "Seleccione cd #:" - -#: src/freedb.c:207 -#, c-format -msgid "Please " -msgstr "Por favor," - -#: src/freedb.c:232 -#, c-format -msgid "" -"\n" -"Getting file from %s on port %d using %s ...\n" -msgstr "" - -#: src/options_checker.c:66 -msgid "the -w option can only be used with -m, -d, -q and -Q" -msgstr "" - -#: src/options_checker.c:82 -msgid "the -l option can only be used with -q" -msgstr "la opción-l sólo puede ser utilizado con-q" - -#: src/options_checker.c:96 -msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" -msgstr "la opción-e sólo se puede utilizar con-m, f,-o,-d,-q,-Q" - -#: src/options_checker.c:111 -#, fuzzy -msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S" -msgstr "la opción-A no se puede utilizar con-t,-s,-i o S-" - -#: src/options_checker.c:119 -#, fuzzy -msgid "the -A option cannot be used with -t, -s, -r, -i or -S" -msgstr "la opción-A no se puede utilizar con-t,-s,-i o S-" - -#: src/options_checker.c:127 -#, fuzzy -msgid "the -t option cannot be used with -s, -r, -i or -S" -msgstr "la opción-t no se puede utilizar con-s,-i o S-" - -#: src/options_checker.c:135 -#, fuzzy -msgid "-s option cannot be used with -a, -r, -i or -S" -msgstr "Opción-s no se puede utilizar con-a,-i o S-" - -#: src/options_checker.c:143 -msgid "-a option cannot be used with -i" -msgstr "-Una opción no puede utilizarse con-i" - -#: src/options_checker.c:155 -#, fuzzy -msgid "the -p option cannot be used without -a, -s, -r or -i" -msgstr "la opción-p no se puede utilizar sin-a,-s o-i" - -#: src/options_checker.c:163 -msgid "the -o option cannot be used with -i" -msgstr "la opción-o no se puede utilizar con-i" - -#: src/options_checker.c:169 -msgid "cannot use '-o -' (STDOUT) with -m or -d" -msgstr "No se puede utilizar \"-o - '(STDOUT) m-o-d" - -#: src/options_checker.c:178 -msgid "the -g option cannot be used with -n, -i or -G" -msgstr "" - -#: src/options_checker.c:186 -msgid "the -d option cannot be used with -i" -msgstr "la opción-d no se puede utilizar con-i" - -#: src/options_checker.c:194 -msgid "the -n option cannot be used with -i or -T" -msgstr "la opción-n no se puede utilizar con-i o-T" - -#: src/options_checker.c:202 -msgid "the -m option cannot be used with -i" -msgstr "la opción-m no se puede utilizar con-i" - -#: src/options_checker.c:220 -msgid "the -Q option cannot be used with STDOUT output ('-o -')" -msgstr "la opción-Q-no se puede utilizar con salida STDOUT ('-o -')" - -#: src/options_checker.c:228 -msgid "the -Q option cannot be used with interactive freedb query ('-c query')" -msgstr "" -"la opción-Q-no se puede utilizar con la consulta interactiva freedb ('c-" -"consulta')" - -#: src/options_checker.c:238 -msgid "the -N option must be used with silence detection (-s option)" -msgstr "" -"opción de la N-debe ser utilizado con la detección de silencio (opción-s)" - -#: src/options_checker.c:248 -msgid "the -O option cannot be used with -w, -e, -l or -i" -msgstr "" - -#: src/options_parsers.c:45 -msgid "bad gap argument. It will be ignored !" -msgstr "argumento brecha mal. Será tenida en cuenta!" - -#: src/options_parsers.c:60 -msgid "bad threshold argument. It will be ignored !" -msgstr "argumento umbral mal. Será tenida en cuenta!" - -#: src/options_parsers.c:75 -msgid "bad tracknumber argument. It will be ignored !" -msgstr "argumento de número de pista mal. Será tenida en cuenta!" - -#: src/options_parsers.c:99 -msgid "bad offset argument. It will be ignored!" -msgstr "mal argumento de compensación. Será tenida en cuenta!" - -#: src/options_parsers.c:114 -#, fuzzy -msgid "bad minimum track length argument. It will be ignored !" -msgstr "mala silencio mínimo argumento de longitud. Será tenida en cuenta!" - -#: src/options_parsers.c:133 -msgid "bad minimum silence length argument. It will be ignored !" -msgstr "mala silencio mínimo argumento de longitud. Será tenida en cuenta!" - -#: src/options_parsers.c:156 -msgid "no regular expression found as argument." -msgstr "" - -#: src/options_parsers.c:332 -msgid "found non digits characters in port ! (switched to default)" -msgstr "" -"dígitos que se encuentran personajes no en el puerto! (Activado por defecto)" - -#: src/options_parsers.c:357 -msgid "unknown search type ! (switched to default)" -msgstr "tipo de búsqueda desconocido! (Activado por defecto)" - -#: src/options_parsers.c:373 -msgid "freedb web search not implemented yet ! (switched to default)" -msgstr "búsqueda freedb web no se ha aplicado todavía! (Activado por defecto)" - -#: src/options_parsers.c:379 -msgid "unknown get type ! (switched to default)" -msgstr "desconocidos obtener el tipo! (Activado por defecto)" - #: src/print_utils.c:39 #, c-format msgid " Warning: %s\n" @@ -340,53 +126,53 @@ msgid " Error: %s\n" msgstr "" -#: src/print_utils.c:75 +#: src/print_utils.c:127 #, c-format msgid " File \"%s\" created%s\n" msgstr "" -#: src/print_utils.c:87 +#: src/print_utils.c:142 #, c-format msgid " preparing \"%s\" (%d of %d)" msgstr "" -#: src/print_utils.c:94 +#: src/print_utils.c:149 #, c-format msgid " creating \"%s\" (%d of %d)" msgstr "" -#: src/print_utils.c:101 +#: src/print_utils.c:156 #, c-format msgid " searching for sync errors..." msgstr "en busca de errores de sincronización ..." -#: src/print_utils.c:107 +#: src/print_utils.c:165 #, c-format msgid "S: %02d, Level: %.2f dB; scanning for silence..." msgstr "" -#: src/print_utils.c:112 +#: src/print_utils.c:170 #, c-format msgid "Level: %.2f dB; scanning for silence..." msgstr "" -#: src/print_utils.c:155 +#: src/print_utils.c:202 msgid "using" msgstr "utilizando" -#: src/print_utils.c:167 +#: src/print_utils.c:215 #, c-format msgid "" "THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" msgstr "" -#: src/print_utils.c:216 +#: src/print_utils.c:264 msgid "" "\n" "All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" msgstr "" -#: src/print_utils.c:225 +#: src/print_utils.c:273 msgid "" "\n" "USAGE:\n" @@ -396,7 +182,7 @@ " or EOF-min.sec[.0-99] (or EOF for End Of File). " msgstr "" -#: src/print_utils.c:230 +#: src/print_utils.c:278 msgid "" "\n" "OPTIONS (split mode options)\n" @@ -408,7 +194,7 @@ " Use -a to auto-adjust splitpoints." msgstr "" -#: src/print_utils.c:235 +#: src/print_utils.c:283 msgid "" " -s Silence detection: automatically find splitpoint. (Use -p for " "arguments)\n" @@ -422,21 +208,21 @@ "envuelto mp3)-e modo de error: dividir mp3 con la detección de errores de " "sincronización. (Para concatenados mp3)" -#: src/print_utils.c:239 +#: src/print_utils.c:287 msgid " -r Trim using silence detection (Use -p for arguments)" msgstr "" -#: src/print_utils.c:241 +#: src/print_utils.c:289 msgid "" " -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" msgstr "" "-A + AUDACITY_FILE: se separó de splitpoints del archivo audacia etiquetas" -#: src/print_utils.c:242 +#: src/print_utils.c:290 msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" msgstr "-S + SPLIT_NUMBER: dividir en archivos SPLIT_NUMBER el mismo tiempo" -#: src/print_utils.c:247 +#: src/print_utils.c:295 msgid "" "\n" "(other options)\n" @@ -446,7 +232,7 @@ " (default is to set the same version as the file to split)" msgstr "" -#: src/print_utils.c:251 +#: src/print_utils.c:299 msgid "" " -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" " -f Frame mode (mp3 only): process all frames. For higher precision and " @@ -458,10 +244,10 @@ "precisión y VBR. -Un auto-ajuste splitpoints con detección de silencio. (Uso-" "p para los argumentos)" -#: src/print_utils.c:254 +#: src/print_utils.c:302 msgid "" -" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -" -"s and -a.\n" +" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " +"user arguments for -s, -a, -t.\n" " -o + FORMAT: output filename pattern. Can contain those variables:\n" " @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" " @t: title tag, @n: track number identifier, @N: track tag number\n" @@ -470,7 +256,7 @@ " @f: original filename, @g: genre" msgstr "" -#: src/print_utils.c:260 +#: src/print_utils.c:309 msgid "" " -g + TAGS: custom tags for the split files.\n" " TAGS can contain those variables: \n" @@ -480,7 +266,7 @@ " (% means that we set the tags for all remaining files)" msgstr "" -#: src/print_utils.c:266 +#: src/print_utils.c:315 msgid "" " -G + regex=REGEX: set tags from input filename. REGEX defines how to " "extract\n" @@ -489,7 +275,7 @@ "<comment>), (?<genre>)" msgstr "" -#: src/print_utils.c:270 +#: src/print_utils.c:319 msgid "" " -d + DIRNAME: to put all output files in the directory DIRNAME.\n" " -k Consider input not seekable (slower). Default when input is STDIN " @@ -501,7 +287,7 @@ "cuando la entrada es STDIN (-). -O + TIME: Los archivos de superposición " "dividir con el tiempo (más lento)." -#: src/print_utils.c:273 +#: src/print_utils.c:322 msgid "" " -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " "files.\n" @@ -515,7 +301,7 @@ "desea concatenar el dividir los archivos-N No cree el archivo 'mp3splt.log' " "registro cuando se utiliza '-s'." -#: src/print_utils.c:277 +#: src/print_utils.c:326 msgid "" " -P Pretend to split: simulation of the process, without creating any\n" " files or directories" @@ -523,13 +309,13 @@ "-P Pretende dividida: la simulación del proceso, sin crear archivos o " "directorios" -#: src/print_utils.c:279 +#: src/print_utils.c:328 msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" msgstr "" "-E + CUE_FILE: splitpoints exportación a archivo CUE (uso con-P, si es " "necesario)" -#: src/print_utils.c:280 +#: src/print_utils.c:329 msgid "" " -q Quiet mode: try not to prompt (if possible) and print less messages.\n" " -Q Very quiet mode: don't print anything to stdout and no progress bar\n" @@ -539,6 +325,227 @@ " Please read man page for complete documentation.\n" msgstr "" +#: src/options_checker.c:49 +msgid "" +"cannot use -k option (or STDIN) with one of the following options: -S -s -r -" +"w -l -e -i -a -p -F" +msgstr "" + +#: src/options_checker.c:67 +msgid "the -w option can only be used with -m, -d, -q and -Q" +msgstr "" + +#: src/options_checker.c:84 +msgid "the -l option can only be used with -q" +msgstr "la opción-l sólo puede ser utilizado con-q" + +#: src/options_checker.c:98 +msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" +msgstr "la opción-e sólo se puede utilizar con-m, f,-o,-d,-q,-Q" + +#: src/options_checker.c:114 +#, fuzzy +msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F" +msgstr "la opción-e sólo se puede utilizar con-m, f,-o,-d,-q,-Q" + +#: src/options_checker.c:124 +#, fuzzy +msgid "the -A option cannot be used with -t, -s, -r, -i, -S or -F" +msgstr "la opción-n no se puede utilizar con-i o-T" + +#: src/options_checker.c:134 +#, fuzzy +msgid "the -t option cannot be used with -s, -r, -i, -S or -F" +msgstr "la opción-n no se puede utilizar con-i o-T" + +#: src/options_checker.c:143 +msgid "-s option cannot be used with -a, -r, -i or -S" +msgstr "" + +#: src/options_checker.c:151 +msgid "-a option cannot be used with -i" +msgstr "-Una opción no puede utilizarse con-i" + +#: src/options_checker.c:163 +msgid "the -p option cannot be used without -a, -s, -r or -i" +msgstr "" + +#: src/options_checker.c:171 +msgid "the -o option cannot be used with -i" +msgstr "la opción-o no se puede utilizar con-i" + +#: src/options_checker.c:177 +msgid "cannot use '-o -' (STDOUT) with -m or -d" +msgstr "No se puede utilizar \"-o - '(STDOUT) m-o-d" + +#: src/options_checker.c:186 +msgid "the -g option cannot be used with -n, -i or -G" +msgstr "" + +#: src/options_checker.c:194 +msgid "the -d option cannot be used with -i" +msgstr "la opción-d no se puede utilizar con-i" + +#: src/options_checker.c:202 +msgid "the -n option cannot be used with -i or -T" +msgstr "la opción-n no se puede utilizar con-i o-T" + +#: src/options_checker.c:210 +msgid "the -m option cannot be used with -i" +msgstr "la opción-m no se puede utilizar con-i" + +#: src/options_checker.c:228 +msgid "the -Q option cannot be used with STDOUT output ('-o -')" +msgstr "la opción-Q-no se puede utilizar con salida STDOUT ('-o -')" + +#: src/options_checker.c:236 +msgid "the -Q option cannot be used with interactive freedb query ('-c query')" +msgstr "" +"la opción-Q-no se puede utilizar con la consulta interactiva freedb ('c-" +"consulta')" + +#: src/options_checker.c:246 +msgid "the -N option must be used with silence detection (-s option)" +msgstr "" +"opción de la N-debe ser utilizado con la detección de silencio (opción-s)" + +#: src/options_checker.c:255 +msgid "the -O option cannot be used with -w, -e, -l or -i" +msgstr "" + +#: src/options_checker.c:281 +#, fuzzy +msgid "the -F option cannot be used without -s" +msgstr "la opción-o no se puede utilizar con-i" + +#: src/options_checker.c:289 +#, fuzzy +msgid "the -K option cannot be used without -c" +msgstr "la opción-o no se puede utilizar con-i" + +#: src/freedb.c:118 +#, c-format +msgid " Freedb search type: %s , Site: %s , Port: %d\n" +msgstr "" + +#: src/freedb.c:121 +#, c-format +msgid " Freedb get type: %s , Site: %s , Port: %d\n" +msgstr "" + +#: src/freedb.c:130 +msgid "CDDB QUERY. Insert album and artist informations to find cd." +msgstr "" +"PREGUNTA CDDB. Introduzca la información de álbum y artista para encontrar " +"cd." + +#: src/freedb.c:136 +msgid "" +"\n" +"Please search something ..." +msgstr "" + +#: src/freedb.c:142 +#, c-format +msgid "\r Search: [" +msgstr "Búsqueda: [" + +#: src/freedb.c:158 +#, c-format +msgid "" +"\n" +" Search string: %s\n" +msgstr "" + +#: src/freedb.c:159 +#, c-format +msgid "" +"\n" +"Searching from %s on port %d using %s ...\n" +msgstr "" + +#: src/freedb.c:172 +msgid "No results found" +msgstr "" + +#: src/freedb.c:182 +msgid "List of found cd:" +msgstr "Lista de cd que se encuentran:" + +#: src/freedb.c:201 +#, c-format +msgid "Revision: %d\n" +msgstr "" + +#: src/freedb.c:208 +#, c-format +msgid "-- 'q' to select cd, Enter for more:" +msgstr "- 'Q' para seleccionar cd, Enter para más:" + +#: src/freedb.c:226 +#, c-format +msgid "-- 'q' to select cd, Enter for more: " +msgstr "- 'Q' para seleccionar cd, Enter para más:" + +#: src/freedb.c:253 +#, c-format +msgid "Select cd #: " +msgstr "Seleccione cd #:" + +#: src/freedb.c:268 +#, c-format +msgid "Please " +msgstr "Por favor," + +#: src/freedb.c:288 +#, c-format +msgid "" +"\n" +"Getting file from %s on port %d using %s ...\n" +msgstr "" + +#: src/freedb.c:426 +msgid "the configuration file is malformed !" +msgstr "" + +#: src/freedb.c:462 +msgid "can't open the configuration file !" +msgstr "" + +#: src/freedb.c:470 +#, c-format +msgid "Will you use a proxy ? (y/n): " +msgstr "" + +#: src/freedb.c:477 +#, c-format +msgid "Proxy Address: " +msgstr "" + +#: src/freedb.c:481 +#, c-format +msgid "Proxy Port: " +msgstr "" + +#: src/freedb.c:485 +#, c-format +msgid "Need authentication ? (y/n): " +msgstr "" + +#: src/freedb.c:493 +#, c-format +msgid "Would you like to save the password (insecure) ? (y/n): " +msgstr "" + +#: src/freedb.c:522 +#, c-format +msgid "Username: " +msgstr "" + +#: src/freedb.c:526 +msgid "Password: " +msgstr "" + #: src/utils.c:127 msgid "List of found files:\n" msgstr "" @@ -563,6 +570,63 @@ "-- 's' to split, 'c' to cancel:" msgstr "" +#: src/options_parsers.c:46 +msgid "bad gap argument. It will be ignored !" +msgstr "argumento brecha mal. Será tenida en cuenta!" + +#: src/options_parsers.c:61 +msgid "bad shots argument. It will be ignored !" +msgstr "" + +#: src/options_parsers.c:76 +msgid "bad trackjoin argument. It will be ignored !" +msgstr "" + +#: src/options_parsers.c:91 +msgid "bad threshold argument. It will be ignored !" +msgstr "argumento umbral mal. Será tenida en cuenta!" + +#: src/options_parsers.c:106 +msgid "bad tracknumber argument. It will be ignored !" +msgstr "argumento de número de pista mal. Será tenida en cuenta!" + +#: src/options_parsers.c:119 +msgid "Bad values for the rm argument. rm parameter will be ignored!" +msgstr "" + +#: src/options_parsers.c:141 +msgid "bad offset argument. It will be ignored!" +msgstr "mal argumento de compensación. Será tenida en cuenta!" + +#: src/options_parsers.c:156 +msgid "bad minimum track length argument. It will be ignored !" +msgstr "" + +#: src/options_parsers.c:175 +msgid "bad minimum silence length argument. It will be ignored !" +msgstr "mala silencio mínimo argumento de longitud. Será tenida en cuenta!" + +#: src/options_parsers.c:198 +msgid "no regular expression found as argument." +msgstr "" + +#: src/options_parsers.c:374 +msgid "found non digits characters in port ! (switched to default)" +msgstr "" +"dígitos que se encuentran personajes no en el puerto! (Activado por defecto)" + +#: src/options_parsers.c:399 +msgid "unknown search type ! (switched to default)" +msgstr "tipo de búsqueda desconocido! (Activado por defecto)" + +#: src/options_parsers.c:415 +msgid "freedb web search not implemented yet ! (switched to default)" +msgstr "búsqueda freedb web no se ha aplicado todavía! (Activado por defecto)" + +#: src/options_parsers.c:421 +msgid "unknown get type ! (switched to default)" +msgstr "desconocidos obtener el tipo! (Activado por defecto)" + #: src/windows_utils.c:49 msgid "CommandLineToArgvW failed (oh !)" msgstr "CommandLineToArgvW no (oh!)" Binary files /tmp/JzeX6fzWNb/mp3splt-2.4.1/po/fr_FR.gmo and /tmp/Tv_0YIe6LM/mp3splt-2.6.0/po/fr_FR.gmo differ diff -Nru mp3splt-2.4.1/po/fr_FR.po mp3splt-2.6.0/po/fr_FR.po --- mp3splt-2.4.1/po/fr_FR.po 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/po/fr_FR.po 2013-07-20 07:11:03.000000000 +0000 @@ -1,99 +1,110 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Alexandru Munteanu # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Translators: +# Peter Pall <gunter@peterpall.de>, 2011 msgid "" msgstr "" "Project-Id-Version: mp3splt-gtk\n" -"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n" -"POT-Creation-Date: 2011-11-14 00:12+0100\n" -"PO-Revision-Date: 2011-02-22 00:08+0000\n" -"Last-Translator: peterpall <gunter@peterpall.de>\n" +"Report-Msgid-Bugs-To: m@ioalex.net\n" +"POT-Creation-Date: 2013-07-20 09:11+0200\n" +"PO-Revision-Date: 2013-04-29 18:38+0000\n" +"Last-Translator: Chris38 <ch.daudin@free.fr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52 +#: src/mp3splt.c:310 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36 +#: src/utils.c:52 msgid "cannot allocate memory !" msgstr "impossible d'allouer de la mémoire !" -#: src/mp3splt.c:278 -#, fuzzy +#: src/mp3splt.c:331 msgid "" "bad overlap time expression.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"mauvaise valeur pour la division en plusieurs pistes de même taille.\n" -"\tDoit être min.sec, lisez le manuel pour les détails." +"Temps de chevauchement incorrect.\n" +"\tDoit être min.sec[.0-99] ou EOF-min.sec[.0-99], voir manuel pour les " +"détails." -#: src/mp3splt.c:296 -#, fuzzy +#: src/mp3splt.c:352 msgid "" "bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -"mauvaise valeur pour la division en plusieurs pistes de même taille.\n" -"\tDoit être min.sec, lisez le manuel pour les détails." +"Durée pour le découpage incorrecte.\n" +"\tDoit être min.sec[.0-99] ou EOF-min.sec[.0-99], voir manuel pour les " +"details." + +#: src/mp3splt.c:361 +#, fuzzy +msgid "" +"bad minimum time expression.\n" +"\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." +msgstr "" +"Temps de chevauchement incorrect.\n" +"\tDoit être min.sec[.0-99] ou EOF-min.sec[.0-99], voir manuel pour les " +"détails." -#: src/mp3splt.c:359 +#: src/mp3splt.c:429 msgid "read man page for documentation or type 'mp3splt -h'." msgstr "lisez le manuel pour la documentation ou tapez 'mp3splt -h'." -#: src/mp3splt.c:423 +#: src/mp3splt.c:495 msgid "bad argument for -p option. No valid value was recognized !" msgstr "" "mauvais argument pour l'option -p. Aucune valeur valide n'a été réconnue !" -#: src/mp3splt.c:554 +#: src/mp3splt.c:642 msgid "no input filename(s)." msgstr "aucun fichier d'entrée." -#: src/mp3splt.c:567 +#: src/mp3splt.c:655 msgid "multiple splitpoints with stdout !" msgstr "plusieurs points de coupure avec le flux de sortie standard (stdout) !" -#: src/mp3splt.c:571 +#: src/mp3splt.c:659 msgid "using time mode with stdout !" msgstr "" -"utilisation du mode de division 'temps' avec la sortie standard (stdout) !" +"utilisation du mode de découpage 'temps' avec la sortie standard (stdout) !" -#: src/mp3splt.c:612 +#: src/mp3splt.c:700 #, c-format msgid " Pretending to split file '%s' ...\n" -msgstr " Simulation de division du fichier '%s' ...\n" +msgstr " Simulation de découpage du fichier '%s' ...\n" -#: src/mp3splt.c:616 +#: src/mp3splt.c:704 #, c-format msgid " Processing file '%s' ...\n" msgstr " Fichier '%s' ...\n" -#: src/mp3splt.c:623 src/options_checker.c:49 +#: src/mp3splt.c:710 #, fuzzy msgid "" "cannot use -k option (or STDIN) with one of the following options: -S -s -r -" -"w -l -e -i -a -p" +"w -l -e -i -a -p -K" msgstr "" -"impossible d'utiliser l'option -k (ou flux d'entrée standard) avec une des " -"options suivantes : -S -s -w -l -e -i -a -p" +"l'option -k (ou STDIN) est incompatible avec : -S -s -r -w -l -e -i -a -p" -#: src/mp3splt.c:679 +#: src/mp3splt.c:786 msgid "freedb query format ambigous !" msgstr "format freedb 'query' ambigu !" -#: src/mp3splt.c:723 +#: src/mp3splt.c:832 msgid "tags format ambiguous !" msgstr "format des tags ambigu !" -#: src/mp3splt.c:755 +#: src/mp3splt.c:864 #, c-format msgid " Average silence level: %.2f dB" msgstr " Niveau de silence moyen : %.2f dB" -#: src/mp3splt.c:772 +#: src/mp3splt.c:880 msgid "" "\n" " +-----------------------------------------------------------------------------" @@ -144,227 +155,6 @@ " +-----------------------------------------------------------------------------" "+\n" -#: src/freedb.c:58 -#, c-format -msgid " Freedb search type: %s , Site: %s , Port: %d\n" -msgstr " Type de recherche freedb : %s , Site : %s , Port : %d\n" - -#: src/freedb.c:61 -#, c-format -msgid " Freedb get type: %s , Site: %s , Port: %d\n" -msgstr " Type de récupération freedb : %s , Site : %s , Port : %d\n" - -#: src/freedb.c:71 -msgid "CDDB QUERY. Insert album and artist informations to find cd." -msgstr "" -"RECHERCHE CDDB. Entrez des informations sur l'album et l'artiste pour " -"trouver un CD." - -#: src/freedb.c:79 -msgid "" -"\n" -"Please search something ..." -msgstr "" -"\n" -"S'il vous plaît, cherchez quelque chose ..." - -#: src/freedb.c:85 -#, c-format -msgid "\r Search: [" -msgstr "\r Chercher : [" - -#: src/freedb.c:102 -#, c-format -msgid "" -"\n" -" Search string: %s\n" -msgstr "" -"\n" -" Chaîne cherchée : %s\n" - -#: src/freedb.c:103 -#, c-format -msgid "" -"\n" -"Searching from %s on port %d using %s ...\n" -msgstr "" -"\n" -"Recherche sur %s et le port %d utilisant %s ...\n" - -#: src/freedb.c:116 -msgid "No results found" -msgstr "" - -#: src/freedb.c:126 -msgid "List of found cd:" -msgstr "Liste de CD trouvés :" - -#: src/freedb.c:140 -#, c-format -msgid "Revision: %d\n" -msgstr "Révision : %d\n" - -#: src/freedb.c:147 -#, c-format -msgid "-- 'q' to select cd, Enter for more:" -msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :" - -#: src/freedb.c:165 -#, c-format -msgid "-- 'q' to select cd, Enter for more: " -msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :" - -#: src/freedb.c:192 -#, c-format -msgid "Select cd #: " -msgstr "Sélectionnez le CD numéro # :" - -#: src/freedb.c:207 -#, c-format -msgid "Please " -msgstr "S'il vous plaît " - -#: src/freedb.c:232 -#, c-format -msgid "" -"\n" -"Getting file from %s on port %d using %s ...\n" -msgstr "" -"\n" -"Récupération du fichier à partir de %s et le port %d utilisant %s ...\n" - -#: src/options_checker.c:66 -msgid "the -w option can only be used with -m, -d, -q and -Q" -msgstr "l'option -w peut seulement être utilisée avec -m, -d, -q et -Q" - -#: src/options_checker.c:82 -msgid "the -l option can only be used with -q" -msgstr "l'option -l peut seulement être utilisée avec -q" - -#: src/options_checker.c:96 -msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" -msgstr "l'option -e peut seulement être utilisée avec -m, -f, -o, -d, -q, -Q" - -#: src/options_checker.c:111 -#, fuzzy -msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S" -msgstr "l'option -A ne peut pas être utilisée avec -t, -s, -i ou -S" - -#: src/options_checker.c:119 -#, fuzzy -msgid "the -A option cannot be used with -t, -s, -r, -i or -S" -msgstr "l'option -A ne peut pas être utilisée avec -t, -s, -i ou -S" - -#: src/options_checker.c:127 -#, fuzzy -msgid "the -t option cannot be used with -s, -r, -i or -S" -msgstr "l'option -t ne peut pas être utilisée avec -s, -i ou -S" - -#: src/options_checker.c:135 -#, fuzzy -msgid "-s option cannot be used with -a, -r, -i or -S" -msgstr "l'option -s ne peut être utilisée avec -a, -i ou -S" - -#: src/options_checker.c:143 -msgid "-a option cannot be used with -i" -msgstr "l'option -a ne peut être utilisée avec -i" - -#: src/options_checker.c:155 -#, fuzzy -msgid "the -p option cannot be used without -a, -s, -r or -i" -msgstr "l'option -p ne peut être utilisée sans -a, -s ou -i" - -#: src/options_checker.c:163 -msgid "the -o option cannot be used with -i" -msgstr "l'option -o ne peut être utilisée sans -i" - -#: src/options_checker.c:169 -msgid "cannot use '-o -' (STDOUT) with -m or -d" -msgstr "impossible d'utiliser '-o -' (flux de sortie standard) avec -m ou -d" - -#: src/options_checker.c:178 -msgid "the -g option cannot be used with -n, -i or -G" -msgstr "" - -#: src/options_checker.c:186 -msgid "the -d option cannot be used with -i" -msgstr "l'option -d ne peut être utilisée avec -i" - -#: src/options_checker.c:194 -msgid "the -n option cannot be used with -i or -T" -msgstr "l'option -n ne peut être utilisée avec -i ou -T" - -#: src/options_checker.c:202 -msgid "the -m option cannot be used with -i" -msgstr "l'option -m ne peut être utilisée avec -i" - -#: src/options_checker.c:220 -msgid "the -Q option cannot be used with STDOUT output ('-o -')" -msgstr "" -"l'option -Q ne peut être utilisée avec le flux standard de sortie ('-o -')" - -#: src/options_checker.c:228 -msgid "the -Q option cannot be used with interactive freedb query ('-c query')" -msgstr "l'option -Q ne peut être utilisée avec la requête freedb ('-c query')" - -#: src/options_checker.c:238 -msgid "the -N option must be used with silence detection (-s option)" -msgstr "" -"l'option -N doit être utilisée avec la détection de silence (option -s)" - -#: src/options_checker.c:248 -msgid "the -O option cannot be used with -w, -e, -l or -i" -msgstr "l'option -O ne peut être utilisée avec -w, -e, -l ou -i" - -#: src/options_parsers.c:45 -msgid "bad gap argument. It will be ignored !" -msgstr "mauvais argument pour l'écart. Sera ignoré !" - -#: src/options_parsers.c:60 -msgid "bad threshold argument. It will be ignored !" -msgstr "mauvais argument pour le seuil. Sera ignoré !" - -#: src/options_parsers.c:75 -msgid "bad tracknumber argument. It will be ignored !" -msgstr "mauvais argument pour le nombre de pistes. Sera ignoré !" - -#: src/options_parsers.c:99 -msgid "bad offset argument. It will be ignored!" -msgstr "mauvais argument pour la compensation. Sera ignoré !" - -#: src/options_parsers.c:114 -#, fuzzy -msgid "bad minimum track length argument. It will be ignored !" -msgstr "mauvais argument pour la taille minimum du silence. Sera ignoré !" - -#: src/options_parsers.c:133 -msgid "bad minimum silence length argument. It will be ignored !" -msgstr "mauvais argument pour la taille minimum du silence. Sera ignoré !" - -#: src/options_parsers.c:156 -msgid "no regular expression found as argument." -msgstr "" - -#: src/options_parsers.c:332 -msgid "found non digits characters in port ! (switched to default)" -msgstr "" -"détection des caractères autre que des chiffres dans le port ! (utilisation " -"du port par défaut)" - -#: src/options_parsers.c:357 -msgid "unknown search type ! (switched to default)" -msgstr "type de recherche freedb inconnu ! (utilisation du type par défaut)" - -#: src/options_parsers.c:373 -msgid "freedb web search not implemented yet ! (switched to default)" -msgstr "" -"recherche web freedb pas encore implementée ! (utilisation de la recherche " -"par défaut)" - -#: src/options_parsers.c:379 -msgid "unknown get type ! (switched to default)" -msgstr "type de récupération freedb inconnu ! (utilisation du type par défaut)" - #: src/print_utils.c:39 #, c-format msgid " Warning: %s\n" @@ -375,41 +165,41 @@ msgid " Error: %s\n" msgstr " Erreur : %s\n" -#: src/print_utils.c:75 +#: src/print_utils.c:127 #, c-format msgid " File \"%s\" created%s\n" msgstr " Fichier \"%s\" créé%s\n" -#: src/print_utils.c:87 +#: src/print_utils.c:142 #, c-format msgid " preparing \"%s\" (%d of %d)" msgstr " préparation de \"%s\" (%d sur %d)" -#: src/print_utils.c:94 +#: src/print_utils.c:149 #, c-format msgid " creating \"%s\" (%d of %d)" msgstr " création de \"%s\" (%d sur %d)" -#: src/print_utils.c:101 +#: src/print_utils.c:156 #, c-format msgid " searching for sync errors..." msgstr " recherche des erreurs de synchronisation ..." -#: src/print_utils.c:107 +#: src/print_utils.c:165 #, c-format msgid "S: %02d, Level: %.2f dB; scanning for silence..." msgstr "S : %02d, Niveau : %.2f dB; recherche du silence..." -#: src/print_utils.c:112 -#, fuzzy, c-format +#: src/print_utils.c:170 +#, c-format msgid "Level: %.2f dB; scanning for silence..." -msgstr "S : %02d, Niveau : %.2f dB; recherche du silence..." +msgstr "Seuil : %.2f dB ; recherche de silences..." -#: src/print_utils.c:155 +#: src/print_utils.c:202 msgid "using" msgstr "utilisant" -#: src/print_utils.c:167 +#: src/print_utils.c:215 #, c-format msgid "" "THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" @@ -417,7 +207,7 @@ "CE PROGRAMME EST FOURNI SANS AUCUNE GARANTIE ! UTILISEZ-LE SOUS VOTRE " "RESPONSABILITE !\n" -#: src/print_utils.c:216 +#: src/print_utils.c:264 msgid "" "\n" "All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" @@ -426,8 +216,7 @@ "Tous les fichiers ont été divisés avec succès. Visitez http://mp3wrap." "sourceforge.net!" -#: src/print_utils.c:225 -#, fuzzy +#: src/print_utils.c:273 msgid "" "\n" "USAGE:\n" @@ -437,14 +226,13 @@ " or EOF-min.sec[.0-99] (or EOF for End Of File). " msgstr "" "\n" -"UTILISATION :\n" -" mp3splt [OPTIONS] FICHIER1 [FICHIER2] ... [TEMPS_DEBUT] [TEMPS] ... " -"[TEMPS_FIN]\n" -" Format du TEMPS: min.sec[.0-99], même si les minutes sont supérieurs à " -"59\n" -" (ou EOF pour la fin du fichier). " +"Utilisation :\n" +" mp3splt [OPTIONS] Fichier1 [Fichier2] ... [Temps début] [Durée] ... " +"[Temps fin]\n" +" Format temps : min.sec[.0-99], même si les minutes vont au-delà de 59\n" +" ou EOF-min.sec[.0-99] (ou EOF pour Fin de Fichier). " -#: src/print_utils.c:230 +#: src/print_utils.c:278 msgid "" "\n" "OPTIONS (split mode options)\n" @@ -465,7 +253,7 @@ "d'internet (\"query\").\n" " Utiliser -a pour ajuster les points de coupure en fonction du silence." -#: src/print_utils.c:235 +#: src/print_utils.c:283 msgid "" " -s Silence detection: automatically find splitpoint. (Use -p for " "arguments)\n" @@ -483,20 +271,22 @@ "les fichiers mp3\n" " concaténés)" -#: src/print_utils.c:239 +#: src/print_utils.c:287 msgid " -r Trim using silence detection (Use -p for arguments)" msgstr "" +" -r Troncature grâce à la détection de silence (utiliser -p pour les " +"paramètres)" -#: src/print_utils.c:241 +#: src/print_utils.c:289 msgid "" " -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" msgstr " -A + FICHIER_AUDACITY : division à partir de marqueurs audacity" -#: src/print_utils.c:242 +#: src/print_utils.c:290 msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" msgstr " -S + NOMBRE : diviser en NOMBRE morceaux egaux" -#: src/print_utils.c:247 +#: src/print_utils.c:295 msgid "" "\n" "(other options)\n" @@ -511,7 +301,7 @@ " comme 1, 2 ou 1 et 2. VERSION_TAGS peut être 1, 2 ou 12\n" " (par défaut: la même version que dans le fichier d'entrée)" -#: src/print_utils.c:251 +#: src/print_utils.c:299 msgid "" " -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" " -f Frame mode (mp3 only): process all frames. For higher precision and " @@ -526,10 +316,11 @@ " -a Ajustement des points de coupure avec recherche du silence.\n" " (Utiliser -p pour les arguments)" -#: src/print_utils.c:254 +#: src/print_utils.c:302 +#, fuzzy msgid "" -" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -" -"s and -a.\n" +" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " +"user arguments for -s, -a, -t.\n" " -o + FORMAT: output filename pattern. Can contain those variables:\n" " @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" " @t: title tag, @n: track number identifier, @N: track tag number\n" @@ -537,8 +328,19 @@ "output),\n" " @f: original filename, @g: genre" msgstr "" +" -p + Paramètres (th, nt, off, min, rm, gap, trackmin, shots, trackjoin) : " +"paramètres utilisateur pour -r, -s et -a.\n" +" -o + Format : modèle pour le nom du fichier de sortie. Peut contenir ces " +"variables :\n" +" @a : tag artiste, @p : tag interprète (peut ne pas exister), @b : tag " +"album\n" +" @t : tag titre, @n : identifiant de numéro de piste, @N : tag numéro " +"de piste\n" +" (un chiffre peut suivre 'n' or 'N' pour le nombre de chiffres en " +"sortie),\n" +" @f : nom du fichier original, @g : tag genre" -#: src/print_utils.c:260 +#: src/print_utils.c:309 msgid "" " -g + TAGS: custom tags for the split files.\n" " TAGS can contain those variables: \n" @@ -547,8 +349,16 @@ " TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" " (% means that we set the tags for all remaining files)" msgstr "" +" -g + Tags : tags définis pour les fichiers découpés.\n" +" Tags acceptent ces variables : \n" +" @a, @b, @t, @y, @c, @n, @g, @o (recopie les tags originaux),\n" +" @N (auto incrémente le numéro de piste).\n" +" Exemple de format de Tags [@a=artiste1,@t=titre1]%[@o,@N=2," +"@a=artiste2]\n" +" (% signifie que nous réglons les tags pour toutes les fichiers " +"restants)" -#: src/print_utils.c:266 +#: src/print_utils.c:315 msgid "" " -G + regex=REGEX: set tags from input filename. REGEX defines how to " "extract\n" @@ -556,8 +366,12 @@ " (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" "<comment>), (?<genre>)" msgstr "" +" -G + regex=REGEX : définit les tags à extraire du nom du fichier source. Il " +"peut contenir ces variables :\n" +" (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" +"<comment>), (?<genre>)" -#: src/print_utils.c:270 +#: src/print_utils.c:319 msgid "" " -d + DIRNAME: to put all output files in the directory DIRNAME.\n" " -k Consider input not seekable (slower). Default when input is STDIN " @@ -572,7 +386,7 @@ " -O + TEMPS : Chevaucher les fichiers créés sur un intervalle de TEMPS (plus " "lent)." -#: src/print_utils.c:273 +#: src/print_utils.c:322 msgid "" " -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " "files.\n" @@ -589,7 +403,7 @@ " -N Ne pas créer le fichier de log 'mp3splt.log' avec les points desilence " "quand -s est utilisé." -#: src/print_utils.c:277 +#: src/print_utils.c:326 msgid "" " -P Pretend to split: simulation of the process, without creating any\n" " files or directories" @@ -597,12 +411,12 @@ " -P Simulation du processus de division, sans créer des fichiers ou\n" " des répertoires" -#: src/print_utils.c:279 +#: src/print_utils.c:328 msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" msgstr "" " -E + FICHIER_CUE : exporter les points vers un fichier CUE (voir aussi -P)" -#: src/print_utils.c:280 +#: src/print_utils.c:329 msgid "" " -q Quiet mode: try not to prompt (if possible) and print less messages.\n" " -Q Very quiet mode: don't print anything to stdout and no progress bar\n" @@ -620,6 +434,236 @@ "\n" " Lire le manuel pour une documentation complète.\n" +#: src/options_checker.c:49 +#, fuzzy +msgid "" +"cannot use -k option (or STDIN) with one of the following options: -S -s -r -" +"w -l -e -i -a -p -F" +msgstr "" +"l'option -k (ou STDIN) est incompatible avec : -S -s -r -w -l -e -i -a -p" + +#: src/options_checker.c:67 +msgid "the -w option can only be used with -m, -d, -q and -Q" +msgstr "l'option -w peut seulement être utilisée avec -m, -d, -q et -Q" + +#: src/options_checker.c:84 +msgid "the -l option can only be used with -q" +msgstr "l'option -l peut seulement être utilisée avec -q" + +#: src/options_checker.c:98 +msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" +msgstr "l'option -e peut seulement être utilisée avec -m, -f, -o, -d, -q, -Q" + +#: src/options_checker.c:114 +#, fuzzy +msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F" +msgstr "l'option -c est incompatible avec -t, -g, -G, -s, -r, -A, -i or -S" + +#: src/options_checker.c:124 +#, fuzzy +msgid "the -A option cannot be used with -t, -s, -r, -i, -S or -F" +msgstr "l'option -A est incompatible avec -t, -s, -r, -i or -S" + +#: src/options_checker.c:134 +#, fuzzy +msgid "the -t option cannot be used with -s, -r, -i, -S or -F" +msgstr "l'option -t est incompatible avec -s, -r, -i or -S" + +#: src/options_checker.c:143 +msgid "-s option cannot be used with -a, -r, -i or -S" +msgstr "l'option -s est incompatible avec -a, -r, -i or -S" + +#: src/options_checker.c:151 +msgid "-a option cannot be used with -i" +msgstr "l'option -a ne peut être utilisée avec -i" + +#: src/options_checker.c:163 +msgid "the -p option cannot be used without -a, -s, -r or -i" +msgstr "l'option -p est incompatible avec -a, -s, -r or -i" + +#: src/options_checker.c:171 +msgid "the -o option cannot be used with -i" +msgstr "l'option -o ne peut être utilisée sans -i" + +#: src/options_checker.c:177 +msgid "cannot use '-o -' (STDOUT) with -m or -d" +msgstr "impossible d'utiliser '-o -' (flux de sortie standard) avec -m ou -d" + +#: src/options_checker.c:186 +msgid "the -g option cannot be used with -n, -i or -G" +msgstr "l'option -g est incompatible avec -n, -i or -G" + +#: src/options_checker.c:194 +msgid "the -d option cannot be used with -i" +msgstr "l'option -d ne peut être utilisée avec -i" + +#: src/options_checker.c:202 +msgid "the -n option cannot be used with -i or -T" +msgstr "l'option -n ne peut être utilisée avec -i ou -T" + +#: src/options_checker.c:210 +msgid "the -m option cannot be used with -i" +msgstr "l'option -m ne peut être utilisée avec -i" + +#: src/options_checker.c:228 +msgid "the -Q option cannot be used with STDOUT output ('-o -')" +msgstr "" +"l'option -Q ne peut être utilisée avec le flux standard de sortie ('-o -')" + +#: src/options_checker.c:236 +msgid "the -Q option cannot be used with interactive freedb query ('-c query')" +msgstr "l'option -Q ne peut être utilisée avec la requête freedb ('-c query')" + +#: src/options_checker.c:246 +msgid "the -N option must be used with silence detection (-s option)" +msgstr "" +"l'option -N doit être utilisée avec la détection de silence (option -s)" + +#: src/options_checker.c:255 +msgid "the -O option cannot be used with -w, -e, -l or -i" +msgstr "l'option -O ne peut être utilisée avec -w, -e, -l ou -i" + +#: src/options_checker.c:281 +#, fuzzy +msgid "the -F option cannot be used without -s" +msgstr "l'option -o ne peut être utilisée sans -i" + +#: src/options_checker.c:289 +#, fuzzy +msgid "the -K option cannot be used without -c" +msgstr "l'option -o ne peut être utilisée sans -i" + +#: src/freedb.c:118 +#, c-format +msgid " Freedb search type: %s , Site: %s , Port: %d\n" +msgstr " Type de recherche freedb : %s , Site : %s , Port : %d\n" + +#: src/freedb.c:121 +#, c-format +msgid " Freedb get type: %s , Site: %s , Port: %d\n" +msgstr " Type de récupération freedb : %s , Site : %s , Port : %d\n" + +#: src/freedb.c:130 +msgid "CDDB QUERY. Insert album and artist informations to find cd." +msgstr "" +"RECHERCHE CDDB. Entrez des informations sur l'album et l'artiste pour " +"trouver un CD." + +#: src/freedb.c:136 +msgid "" +"\n" +"Please search something ..." +msgstr "" +"\n" +"S'il vous plaît, cherchez quelque chose ..." + +#: src/freedb.c:142 +#, c-format +msgid "\r Search: [" +msgstr "\r Chercher : [" + +#: src/freedb.c:158 +#, c-format +msgid "" +"\n" +" Search string: %s\n" +msgstr "" +"\n" +" Chaîne cherchée : %s\n" + +#: src/freedb.c:159 +#, c-format +msgid "" +"\n" +"Searching from %s on port %d using %s ...\n" +msgstr "" +"\n" +"Recherche sur %s et le port %d utilisant %s ...\n" + +#: src/freedb.c:172 +msgid "No results found" +msgstr "Aucun résultat trouvé" + +#: src/freedb.c:182 +msgid "List of found cd:" +msgstr "Liste de CD trouvés :" + +#: src/freedb.c:201 +#, c-format +msgid "Revision: %d\n" +msgstr "Révision : %d\n" + +#: src/freedb.c:208 +#, c-format +msgid "-- 'q' to select cd, Enter for more:" +msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :" + +#: src/freedb.c:226 +#, c-format +msgid "-- 'q' to select cd, Enter for more: " +msgstr "-- 'q' pour sélectionner un CD, Entrée pour plus de CDs :" + +#: src/freedb.c:253 +#, c-format +msgid "Select cd #: " +msgstr "Sélectionnez le CD numéro # :" + +#: src/freedb.c:268 +#, c-format +msgid "Please " +msgstr "S'il vous plaît " + +#: src/freedb.c:288 +#, c-format +msgid "" +"\n" +"Getting file from %s on port %d using %s ...\n" +msgstr "" +"\n" +"Récupération du fichier à partir de %s et le port %d utilisant %s ...\n" + +#: src/freedb.c:426 +msgid "the configuration file is malformed !" +msgstr "" + +#: src/freedb.c:462 +msgid "can't open the configuration file !" +msgstr "" + +#: src/freedb.c:470 +#, c-format +msgid "Will you use a proxy ? (y/n): " +msgstr "" + +#: src/freedb.c:477 +#, c-format +msgid "Proxy Address: " +msgstr "" + +#: src/freedb.c:481 +#, c-format +msgid "Proxy Port: " +msgstr "" + +#: src/freedb.c:485 +#, c-format +msgid "Need authentication ? (y/n): " +msgstr "" + +#: src/freedb.c:493 +#, c-format +msgid "Would you like to save the password (insecure) ? (y/n): " +msgstr "" + +#: src/freedb.c:522 +#, c-format +msgid "Username: " +msgstr "" + +#: src/freedb.c:526 +msgid "Password: " +msgstr "" + #: src/utils.c:127 msgid "List of found files:\n" msgstr "Liste de CD trouvés :\n" @@ -648,7 +692,67 @@ "-- 's' to split, 'c' to cancel:" msgstr "" "\n" -"-- 's' pour diviser, 'c' pour annuler :" +"-- 's' pour découper, 'c' pour annuler :" + +#: src/options_parsers.c:46 +msgid "bad gap argument. It will be ignored !" +msgstr "mauvais argument pour l'écart. Sera ignoré !" + +#: src/options_parsers.c:61 +msgid "bad shots argument. It will be ignored !" +msgstr "Paramètre de l'option 'grésillement' incorrect. Il sera ignoré !" + +#: src/options_parsers.c:76 +msgid "bad trackjoin argument. It will be ignored !" +msgstr "paramètre de l'option'trackjoin' incorrect . Il sera ignoré !" + +#: src/options_parsers.c:91 +msgid "bad threshold argument. It will be ignored !" +msgstr "mauvais argument pour le seuil. Sera ignoré !" + +#: src/options_parsers.c:106 +msgid "bad tracknumber argument. It will be ignored !" +msgstr "mauvais argument pour le nombre de pistes. Sera ignoré !" + +#: src/options_parsers.c:119 +msgid "Bad values for the rm argument. rm parameter will be ignored!" +msgstr "paramètre de l'option 'rm' incorrect. Il sera ignoré !" + +#: src/options_parsers.c:141 +msgid "bad offset argument. It will be ignored!" +msgstr "mauvais argument pour la compensation. Sera ignoré !" + +#: src/options_parsers.c:156 +msgid "bad minimum track length argument. It will be ignored !" +msgstr "argument de longueur minimum de piste incorrect. Il sera ignoré !" + +#: src/options_parsers.c:175 +msgid "bad minimum silence length argument. It will be ignored !" +msgstr "mauvais argument pour la taille minimum du silence. Sera ignoré !" + +#: src/options_parsers.c:198 +msgid "no regular expression found as argument." +msgstr "aucune expression régulière trouvée en paramètre." + +#: src/options_parsers.c:374 +msgid "found non digits characters in port ! (switched to default)" +msgstr "" +"détection des caractères autre que des chiffres dans le port ! (utilisation " +"du port par défaut)" + +#: src/options_parsers.c:399 +msgid "unknown search type ! (switched to default)" +msgstr "type de recherche freedb inconnu ! (utilisation du type par défaut)" + +#: src/options_parsers.c:415 +msgid "freedb web search not implemented yet ! (switched to default)" +msgstr "" +"recherche web freedb pas encore implementée ! (utilisation de la recherche " +"par défaut)" + +#: src/options_parsers.c:421 +msgid "unknown get type ! (switched to default)" +msgstr "type de récupération freedb inconnu ! (utilisation du type par défaut)" #: src/windows_utils.c:49 msgid "CommandLineToArgvW failed (oh !)" diff -Nru mp3splt-2.4.1/po/mp3splt.pot mp3splt-2.6.0/po/mp3splt.pot --- mp3splt-2.4.1/po/mp3splt.pot 2011-11-13 23:12:40.000000000 +0000 +++ mp3splt-2.6.0/po/mp3splt.pot 2013-07-20 07:11:03.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: io_fx@yahoo.fr\n" -"POT-Creation-Date: 2011-11-14 00:12+0100\n" +"Report-Msgid-Bugs-To: m@ioalex.net\n" +"POT-Creation-Date: 2013-07-20 09:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,72 +17,79 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/mp3splt.c:257 src/utils.c:36 src/utils.c:52 +#: src/mp3splt.c:310 src/print_utils.c:55 src/freedb.c:434 src/utils.c:36 +#: src/utils.c:52 msgid "cannot allocate memory !" msgstr "" -#: src/mp3splt.c:278 +#: src/mp3splt.c:331 msgid "" "bad overlap time expression.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -#: src/mp3splt.c:296 +#: src/mp3splt.c:352 msgid "" "bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." msgstr "" -#: src/mp3splt.c:359 +#: src/mp3splt.c:361 +msgid "" +"bad minimum time expression.\n" +"\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details." +msgstr "" + +#: src/mp3splt.c:429 msgid "read man page for documentation or type 'mp3splt -h'." msgstr "" -#: src/mp3splt.c:423 +#: src/mp3splt.c:495 msgid "bad argument for -p option. No valid value was recognized !" msgstr "" -#: src/mp3splt.c:554 +#: src/mp3splt.c:642 msgid "no input filename(s)." msgstr "" -#: src/mp3splt.c:567 +#: src/mp3splt.c:655 msgid "multiple splitpoints with stdout !" msgstr "" -#: src/mp3splt.c:571 +#: src/mp3splt.c:659 msgid "using time mode with stdout !" msgstr "" -#: src/mp3splt.c:612 +#: src/mp3splt.c:700 #, c-format msgid " Pretending to split file '%s' ...\n" msgstr "" -#: src/mp3splt.c:616 +#: src/mp3splt.c:704 #, c-format msgid " Processing file '%s' ...\n" msgstr "" -#: src/mp3splt.c:623 src/options_checker.c:49 +#: src/mp3splt.c:710 msgid "" "cannot use -k option (or STDIN) with one of the following options: -S -s -r -" -"w -l -e -i -a -p" +"w -l -e -i -a -p -K" msgstr "" -#: src/mp3splt.c:679 +#: src/mp3splt.c:786 msgid "freedb query format ambigous !" msgstr "" -#: src/mp3splt.c:723 +#: src/mp3splt.c:832 msgid "tags format ambiguous !" msgstr "" -#: src/mp3splt.c:755 +#: src/mp3splt.c:864 #, c-format msgid " Average silence level: %.2f dB" msgstr "" -#: src/mp3splt.c:772 +#: src/mp3splt.c:880 msgid "" "\n" " +-----------------------------------------------------------------------------" @@ -108,414 +115,482 @@ "+\n" msgstr "" -#: src/freedb.c:58 +#: src/print_utils.c:39 #, c-format -msgid " Freedb search type: %s , Site: %s , Port: %d\n" +msgid " Warning: %s\n" msgstr "" -#: src/freedb.c:61 +#: src/print_utils.c:45 #, c-format -msgid " Freedb get type: %s , Site: %s , Port: %d\n" +msgid " Error: %s\n" msgstr "" -#: src/freedb.c:71 -msgid "CDDB QUERY. Insert album and artist informations to find cd." +#: src/print_utils.c:127 +#, c-format +msgid " File \"%s\" created%s\n" msgstr "" -#: src/freedb.c:79 -msgid "" -"\n" -"Please search something ..." +#: src/print_utils.c:142 +#, c-format +msgid " preparing \"%s\" (%d of %d)" msgstr "" -#: src/freedb.c:85 +#: src/print_utils.c:149 #, c-format -msgid "\r Search: [" +msgid " creating \"%s\" (%d of %d)" +msgstr "" + +#: src/print_utils.c:156 +#, c-format +msgid " searching for sync errors..." +msgstr "" + +#: src/print_utils.c:165 +#, c-format +msgid "S: %02d, Level: %.2f dB; scanning for silence..." +msgstr "" + +#: src/print_utils.c:170 +#, c-format +msgid "Level: %.2f dB; scanning for silence..." +msgstr "" + +#: src/print_utils.c:202 +msgid "using" msgstr "" -#: src/freedb.c:102 +#: src/print_utils.c:215 #, c-format msgid "" +"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" +msgstr "" + +#: src/print_utils.c:264 +msgid "" "\n" -" Search string: %s\n" +"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" msgstr "" -#: src/freedb.c:103 -#, c-format +#: src/print_utils.c:273 msgid "" "\n" -"Searching from %s on port %d using %s ...\n" +"USAGE:\n" +" mp3splt [OPTIONS] FILE1 [FILE2] ... [BEGIN_TIME] [TIME] ... " +"[END_TIME]\n" +" TIME FORMAT: min.sec[.0-99], even if minutes are over 59\n" +" or EOF-min.sec[.0-99] (or EOF for End Of File). " msgstr "" -#: src/freedb.c:116 -msgid "No results found" +#: src/print_utils.c:278 +msgid "" +"\n" +"OPTIONS (split mode options)\n" +" -t + TIME: to split files every fixed time len. (TIME format same as " +"above). \n" +" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints " +"and\n" +" filenames from a .cddb or .cue file or from Internet (\"query\").\n" +" Use -a to auto-adjust splitpoints." msgstr "" -#: src/freedb.c:126 -msgid "List of found cd:" +#: src/print_utils.c:283 +msgid "" +" -s Silence detection: automatically find splitpoint. (Use -p for " +"arguments)\n" +" -w Splits wrapped files created with Mp3Wrap or AlbumWrap.\n" +" -l Lists the tracks from file without extraction. (Only for wrapped mp3)\n" +" -e Error mode: split mp3 with sync error detection. (For concatenated mp3)" msgstr "" -#: src/freedb.c:140 -#, c-format -msgid "Revision: %d\n" +#: src/print_utils.c:287 +msgid " -r Trim using silence detection (Use -p for arguments)" msgstr "" -#: src/freedb.c:147 -#, c-format -msgid "-- 'q' to select cd, Enter for more:" +#: src/print_utils.c:289 +msgid "" +" -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" msgstr "" -#: src/freedb.c:165 -#, c-format -msgid "-- 'q' to select cd, Enter for more: " +#: src/print_utils.c:290 +msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" msgstr "" -#: src/freedb.c:192 -#, c-format -msgid "Select cd #: " +#: src/print_utils.c:295 +msgid "" +"\n" +"(other options)\n" +" -T + TAGS_VERSION: for mp3 files, force output tags as version 1, 2 or 1 & " +"2.\n" +" TAGS_VERSION can be 1, 2 or 12\n" +" (default is to set the same version as the file to split)" msgstr "" -#: src/freedb.c:207 -#, c-format -msgid "Please " +#: src/print_utils.c:299 +msgid "" +" -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" +" -f Frame mode (mp3 only): process all frames. For higher precision and " +"VBR.\n" +" -a Auto-Adjust splitpoints with silence detection. (Use -p for arguments)" msgstr "" -#: src/freedb.c:232 -#, c-format +#: src/print_utils.c:302 +msgid "" +" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " +"user arguments for -s, -a, -t.\n" +" -o + FORMAT: output filename pattern. Can contain those variables:\n" +" @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" +" @t: title tag, @n: track number identifier, @N: track tag number\n" +" (a digit may follow the 'n' or 'N' for the number of digits to " +"output),\n" +" @f: original filename, @g: genre" +msgstr "" + +#: src/print_utils.c:309 +msgid "" +" -g + TAGS: custom tags for the split files.\n" +" TAGS can contain those variables: \n" +" @a, @b, @t, @y, @c, @n, @g, @o (set original tags),\n" +" @N (auto increment track number).\n" +" TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" +" (% means that we set the tags for all remaining files)" +msgstr "" + +#: src/print_utils.c:315 +msgid "" +" -G + regex=REGEX: set tags from input filename. REGEX defines how to " +"extract\n" +" the tags from the filename. It can contain those variables:\n" +" (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" +"<comment>), (?<genre>)" +msgstr "" + +#: src/print_utils.c:319 +msgid "" +" -d + DIRNAME: to put all output files in the directory DIRNAME.\n" +" -k Consider input not seekable (slower). Default when input is STDIN " +"(-).\n" +" -O + TIME: Overlap split files with TIME (slower)." +msgstr "" + +#: src/print_utils.c:322 msgid "" +" -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " +"files.\n" +" -x No Xing header: does not write the Xing header. Use with -n if you " +"wish\n" +" to concatenate the split files\n" +" -N Don't create the 'mp3splt.log' log file when using '-s'." +msgstr "" + +#: src/print_utils.c:326 +msgid "" +" -P Pretend to split: simulation of the process, without creating any\n" +" files or directories" +msgstr "" + +#: src/print_utils.c:328 +msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" +msgstr "" + +#: src/print_utils.c:329 +msgid "" +" -q Quiet mode: try not to prompt (if possible) and print less messages.\n" +" -Q Very quiet mode: don't print anything to stdout and no progress bar\n" +" (also enables -q).\n" +" -D Debug mode: used to debug the program.\n" "\n" -"Getting file from %s on port %d using %s ...\n" +" Please read man page for complete documentation.\n" msgstr "" -#: src/options_checker.c:66 +#: src/options_checker.c:49 +msgid "" +"cannot use -k option (or STDIN) with one of the following options: -S -s -r -" +"w -l -e -i -a -p -F" +msgstr "" + +#: src/options_checker.c:67 msgid "the -w option can only be used with -m, -d, -q and -Q" msgstr "" -#: src/options_checker.c:82 +#: src/options_checker.c:84 msgid "the -l option can only be used with -q" msgstr "" -#: src/options_checker.c:96 +#: src/options_checker.c:98 msgid "the -e option can only be used with -m, -f, -o, -d, -q, -Q" msgstr "" -#: src/options_checker.c:111 -msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S" +#: src/options_checker.c:114 +msgid "the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F" msgstr "" -#: src/options_checker.c:119 -msgid "the -A option cannot be used with -t, -s, -r, -i or -S" +#: src/options_checker.c:124 +msgid "the -A option cannot be used with -t, -s, -r, -i, -S or -F" msgstr "" -#: src/options_checker.c:127 -msgid "the -t option cannot be used with -s, -r, -i or -S" +#: src/options_checker.c:134 +msgid "the -t option cannot be used with -s, -r, -i, -S or -F" msgstr "" -#: src/options_checker.c:135 +#: src/options_checker.c:143 msgid "-s option cannot be used with -a, -r, -i or -S" msgstr "" -#: src/options_checker.c:143 +#: src/options_checker.c:151 msgid "-a option cannot be used with -i" msgstr "" -#: src/options_checker.c:155 +#: src/options_checker.c:163 msgid "the -p option cannot be used without -a, -s, -r or -i" msgstr "" -#: src/options_checker.c:163 +#: src/options_checker.c:171 msgid "the -o option cannot be used with -i" msgstr "" -#: src/options_checker.c:169 +#: src/options_checker.c:177 msgid "cannot use '-o -' (STDOUT) with -m or -d" msgstr "" -#: src/options_checker.c:178 +#: src/options_checker.c:186 msgid "the -g option cannot be used with -n, -i or -G" msgstr "" -#: src/options_checker.c:186 +#: src/options_checker.c:194 msgid "the -d option cannot be used with -i" msgstr "" -#: src/options_checker.c:194 +#: src/options_checker.c:202 msgid "the -n option cannot be used with -i or -T" msgstr "" -#: src/options_checker.c:202 +#: src/options_checker.c:210 msgid "the -m option cannot be used with -i" msgstr "" -#: src/options_checker.c:220 +#: src/options_checker.c:228 msgid "the -Q option cannot be used with STDOUT output ('-o -')" msgstr "" -#: src/options_checker.c:228 +#: src/options_checker.c:236 msgid "the -Q option cannot be used with interactive freedb query ('-c query')" msgstr "" -#: src/options_checker.c:238 +#: src/options_checker.c:246 msgid "the -N option must be used with silence detection (-s option)" msgstr "" -#: src/options_checker.c:248 +#: src/options_checker.c:255 msgid "the -O option cannot be used with -w, -e, -l or -i" msgstr "" -#: src/options_parsers.c:45 -msgid "bad gap argument. It will be ignored !" +#: src/options_checker.c:281 +msgid "the -F option cannot be used without -s" msgstr "" -#: src/options_parsers.c:60 -msgid "bad threshold argument. It will be ignored !" +#: src/options_checker.c:289 +msgid "the -K option cannot be used without -c" msgstr "" -#: src/options_parsers.c:75 -msgid "bad tracknumber argument. It will be ignored !" +#: src/freedb.c:118 +#, c-format +msgid " Freedb search type: %s , Site: %s , Port: %d\n" msgstr "" -#: src/options_parsers.c:99 -msgid "bad offset argument. It will be ignored!" +#: src/freedb.c:121 +#, c-format +msgid " Freedb get type: %s , Site: %s , Port: %d\n" msgstr "" -#: src/options_parsers.c:114 -msgid "bad minimum track length argument. It will be ignored !" +#: src/freedb.c:130 +msgid "CDDB QUERY. Insert album and artist informations to find cd." msgstr "" -#: src/options_parsers.c:133 -msgid "bad minimum silence length argument. It will be ignored !" +#: src/freedb.c:136 +msgid "" +"\n" +"Please search something ..." msgstr "" -#: src/options_parsers.c:156 -msgid "no regular expression found as argument." +#: src/freedb.c:142 +#, c-format +msgid "\r Search: [" msgstr "" -#: src/options_parsers.c:332 -msgid "found non digits characters in port ! (switched to default)" +#: src/freedb.c:158 +#, c-format +msgid "" +"\n" +" Search string: %s\n" msgstr "" -#: src/options_parsers.c:357 -msgid "unknown search type ! (switched to default)" +#: src/freedb.c:159 +#, c-format +msgid "" +"\n" +"Searching from %s on port %d using %s ...\n" msgstr "" -#: src/options_parsers.c:373 -msgid "freedb web search not implemented yet ! (switched to default)" +#: src/freedb.c:172 +msgid "No results found" msgstr "" -#: src/options_parsers.c:379 -msgid "unknown get type ! (switched to default)" +#: src/freedb.c:182 +msgid "List of found cd:" msgstr "" -#: src/print_utils.c:39 +#: src/freedb.c:201 #, c-format -msgid " Warning: %s\n" +msgid "Revision: %d\n" msgstr "" -#: src/print_utils.c:45 +#: src/freedb.c:208 #, c-format -msgid " Error: %s\n" +msgid "-- 'q' to select cd, Enter for more:" msgstr "" -#: src/print_utils.c:75 +#: src/freedb.c:226 #, c-format -msgid " File \"%s\" created%s\n" +msgid "-- 'q' to select cd, Enter for more: " msgstr "" -#: src/print_utils.c:87 +#: src/freedb.c:253 #, c-format -msgid " preparing \"%s\" (%d of %d)" +msgid "Select cd #: " msgstr "" -#: src/print_utils.c:94 +#: src/freedb.c:268 #, c-format -msgid " creating \"%s\" (%d of %d)" +msgid "Please " msgstr "" -#: src/print_utils.c:101 +#: src/freedb.c:288 #, c-format -msgid " searching for sync errors..." +msgid "" +"\n" +"Getting file from %s on port %d using %s ...\n" msgstr "" -#: src/print_utils.c:107 -#, c-format -msgid "S: %02d, Level: %.2f dB; scanning for silence..." +#: src/freedb.c:426 +msgid "the configuration file is malformed !" +msgstr "" + +#: src/freedb.c:462 +msgid "can't open the configuration file !" msgstr "" -#: src/print_utils.c:112 +#: src/freedb.c:470 #, c-format -msgid "Level: %.2f dB; scanning for silence..." +msgid "Will you use a proxy ? (y/n): " msgstr "" -#: src/print_utils.c:155 -msgid "using" +#: src/freedb.c:477 +#, c-format +msgid "Proxy Address: " msgstr "" -#: src/print_utils.c:167 +#: src/freedb.c:481 #, c-format -msgid "" -"THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY! USE AT YOUR OWN RISK!\n" +msgid "Proxy Port: " msgstr "" -#: src/print_utils.c:216 -msgid "" -"\n" -"All files have been split correctly. Visit http://mp3wrap.sourceforge.net!" +#: src/freedb.c:485 +#, c-format +msgid "Need authentication ? (y/n): " msgstr "" -#: src/print_utils.c:225 -msgid "" -"\n" -"USAGE:\n" -" mp3splt [OPTIONS] FILE1 [FILE2] ... [BEGIN_TIME] [TIME] ... " -"[END_TIME]\n" -" TIME FORMAT: min.sec[.0-99], even if minutes are over 59\n" -" or EOF-min.sec[.0-99] (or EOF for End Of File). " +#: src/freedb.c:493 +#, c-format +msgid "Would you like to save the password (insecure) ? (y/n): " msgstr "" -#: src/print_utils.c:230 -msgid "" -"\n" -"OPTIONS (split mode options)\n" -" -t + TIME: to split files every fixed time len. (TIME format same as " -"above). \n" -" -c + file.cddb, file.cue or \"query\" or \"query{album}\". Get splitpoints " -"and\n" -" filenames from a .cddb or .cue file or from Internet (\"query\").\n" -" Use -a to auto-adjust splitpoints." +#: src/freedb.c:522 +#, c-format +msgid "Username: " msgstr "" -#: src/print_utils.c:235 -msgid "" -" -s Silence detection: automatically find splitpoint. (Use -p for " -"arguments)\n" -" -w Splits wrapped files created with Mp3Wrap or AlbumWrap.\n" -" -l Lists the tracks from file without extraction. (Only for wrapped mp3)\n" -" -e Error mode: split mp3 with sync error detection. (For concatenated mp3)" +#: src/freedb.c:526 +msgid "Password: " msgstr "" -#: src/print_utils.c:239 -msgid " -r Trim using silence detection (Use -p for arguments)" +#: src/utils.c:127 +msgid "List of found files:\n" msgstr "" -#: src/print_utils.c:241 +#: src/utils.c:135 +#, c-format msgid "" -" -A + AUDACITY_FILE: split with splitpoints from the audacity labels file" +"\n" +"-- 'Enter' for more, 's' to split, 'c' to cancel:" msgstr "" -#: src/print_utils.c:242 -msgid " -S + SPLIT_NUMBER: split in SPLIT_NUMBER equal time files" +#: src/utils.c:144 src/utils.c:167 +msgid "" +"\n" +" split aborted." msgstr "" -#: src/print_utils.c:247 +#: src/utils.c:158 +#, c-format msgid "" "\n" -"(other options)\n" -" -T + TAGS_VERSION: for mp3 files, force output tags as version 1, 2 or 1 & " -"2.\n" -" TAGS_VERSION can be 1, 2 or 12\n" -" (default is to set the same version as the file to split)" +"-- 's' to split, 'c' to cancel:" msgstr "" -#: src/print_utils.c:251 -msgid "" -" -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" -" -f Frame mode (mp3 only): process all frames. For higher precision and " -"VBR.\n" -" -a Auto-Adjust splitpoints with silence detection. (Use -p for arguments)" +#: src/options_parsers.c:46 +msgid "bad gap argument. It will be ignored !" msgstr "" -#: src/print_utils.c:254 -msgid "" -" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -" -"s and -a.\n" -" -o + FORMAT: output filename pattern. Can contain those variables:\n" -" @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" -" @t: title tag, @n: track number identifier, @N: track tag number\n" -" (a digit may follow the 'n' or 'N' for the number of digits to " -"output),\n" -" @f: original filename, @g: genre" +#: src/options_parsers.c:61 +msgid "bad shots argument. It will be ignored !" msgstr "" -#: src/print_utils.c:260 -msgid "" -" -g + TAGS: custom tags for the split files.\n" -" TAGS can contain those variables: \n" -" @a, @b, @t, @y, @c, @n, @g, @o (set original tags),\n" -" @N (auto increment track number).\n" -" TAGS format is like [@a=artist1,@t=title1]%[@o,@N=2,@a=artist2]\n" -" (% means that we set the tags for all remaining files)" +#: src/options_parsers.c:76 +msgid "bad trackjoin argument. It will be ignored !" msgstr "" -#: src/print_utils.c:266 -msgid "" -" -G + regex=REGEX: set tags from input filename. REGEX defines how to " -"extract\n" -" the tags from the filename. It can contain those variables:\n" -" (?<artist>), (?<album>), (?<title>), (?<tracknum>), (?<year>), (?" -"<comment>), (?<genre>)" +#: src/options_parsers.c:91 +msgid "bad threshold argument. It will be ignored !" msgstr "" -#: src/print_utils.c:270 -msgid "" -" -d + DIRNAME: to put all output files in the directory DIRNAME.\n" -" -k Consider input not seekable (slower). Default when input is STDIN " -"(-).\n" -" -O + TIME: Overlap split files with TIME (slower)." +#: src/options_parsers.c:106 +msgid "bad tracknumber argument. It will be ignored !" msgstr "" -#: src/print_utils.c:273 -msgid "" -" -n No Tag: does not write ID3v1 or vorbis comment. If you need clean " -"files.\n" -" -x No Xing header: does not write the Xing header. Use with -n if you " -"wish\n" -" to concatenate the split files\n" -" -N Don't create the 'mp3splt.log' log file when using '-s'." +#: src/options_parsers.c:119 +msgid "Bad values for the rm argument. rm parameter will be ignored!" msgstr "" -#: src/print_utils.c:277 -msgid "" -" -P Pretend to split: simulation of the process, without creating any\n" -" files or directories" +#: src/options_parsers.c:141 +msgid "bad offset argument. It will be ignored!" msgstr "" -#: src/print_utils.c:279 -msgid " -E + CUE_FILE: export splitpoints to CUE file (use with -P if needed)" +#: src/options_parsers.c:156 +msgid "bad minimum track length argument. It will be ignored !" msgstr "" -#: src/print_utils.c:280 -msgid "" -" -q Quiet mode: try not to prompt (if possible) and print less messages.\n" -" -Q Very quiet mode: don't print anything to stdout and no progress bar\n" -" (also enables -q).\n" -" -D Debug mode: used to debug the program.\n" -"\n" -" Please read man page for complete documentation.\n" +#: src/options_parsers.c:175 +msgid "bad minimum silence length argument. It will be ignored !" msgstr "" -#: src/utils.c:127 -msgid "List of found files:\n" +#: src/options_parsers.c:198 +msgid "no regular expression found as argument." msgstr "" -#: src/utils.c:135 -#, c-format -msgid "" -"\n" -"-- 'Enter' for more, 's' to split, 'c' to cancel:" +#: src/options_parsers.c:374 +msgid "found non digits characters in port ! (switched to default)" msgstr "" -#: src/utils.c:144 src/utils.c:167 -msgid "" -"\n" -" split aborted." +#: src/options_parsers.c:399 +msgid "unknown search type ! (switched to default)" msgstr "" -#: src/utils.c:158 -#, c-format -msgid "" -"\n" -"-- 's' to split, 'c' to cancel:" +#: src/options_parsers.c:415 +msgid "freedb web search not implemented yet ! (switched to default)" +msgstr "" + +#: src/options_parsers.c:421 +msgid "unknown get type ! (switched to default)" msgstr "" #: src/windows_utils.c:49 diff -Nru mp3splt-2.4.1/src/Makefile.am mp3splt-2.6.0/src/Makefile.am --- mp3splt-2.4.1/src/Makefile.am 2011-02-13 20:17:03.000000000 +0000 +++ mp3splt-2.6.0/src/Makefile.am 2013-04-10 21:25:54.000000000 +0000 @@ -12,8 +12,8 @@ common.h \ mp3splt.c -INCLUDES = @MP3SPLT_CFLAGS@ -mp3splt_LDADD = @MP3SPLT_LIBS@ @LIBINTL@ +INCLUDES = @LIBMP3SPLT_CFLAGS@ +mp3splt_LDADD = @LIBMP3SPLT_LIBS@ @LIBINTL@ if WIN32 mp3splt_LDADD += -lwsock32 -lshlwapi @@ -24,13 +24,22 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ install-exec-hook: -if DO_SYMLINK +if DO_OGG_SYMLINK -cd $(DESTDIR)/$(bindir) && $(LN_S) mp3splt oggsplt endif +if DO_FLAC_SYMLINK + -cd $(DESTDIR)/$(bindir) && $(LN_S) mp3splt flacsplt +endif + uninstall-hook: -if DO_SYMLINK +if DO_OGG_SYMLINK if [ -L $(DESTDIR)/$(bindir)/oggsplt ];then \ echo "The $(DESTDIR)/$(bindir)/oggsplt symlink still exists. You may want to remove it."; \ fi endif +if DO_FLAC_SYMLINK + if [ -L $(DESTDIR)/$(bindir)/flacsplt ];then \ + echo "The $(DESTDIR)/$(bindir)/flacsplt symlink still exists. You may want to remove it."; \ + fi +endif diff -Nru mp3splt-2.4.1/src/Makefile.in mp3splt-2.6.0/src/Makefile.in --- mp3splt-2.4.1/src/Makefile.in 2011-11-13 23:12:36.000000000 +0000 +++ mp3splt-2.6.0/src/Makefile.in 2013-07-20 07:11:00.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.13.3 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-2013 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,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,14 +81,14 @@ bin_PROGRAMS = mp3splt$(EXEEXT) @WIN32_TRUE@am__append_1 = -lwsock32 -lshlwapi subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(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 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/mp3splt.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -61,21 +105,64 @@ mp3splt_OBJECTS = $(am_mp3splt_OBJECTS) am__DEPENDENCIES_1 = mp3splt_DEPENDENCIES = $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(mp3splt_SOURCES) DIST_SOURCES = $(mp3splt_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -104,6 +191,8 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMP3SPLT_CFLAGS = @LIBMP3SPLT_CFLAGS@ +LIBMP3SPLT_LIBS = @LIBMP3SPLT_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ @@ -114,8 +203,6 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MP3SPLT_CFLAGS = @MP3SPLT_CFLAGS@ -MP3SPLT_LIBS = @MP3SPLT_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ @@ -127,6 +214,9 @@ PACKAGE_URL = @PACKAGE_URL@ 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@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -198,8 +288,8 @@ common.h \ mp3splt.c -INCLUDES = @MP3SPLT_CFLAGS@ -mp3splt_LDADD = @MP3SPLT_LIBS@ @LIBINTL@ $(am__append_1) +INCLUDES = @LIBMP3SPLT_CFLAGS@ +mp3splt_LDADD = @LIBMP3SPLT_LIBS@ @LIBINTL@ $(am__append_1) all: all-am .SUFFIXES: @@ -236,14 +326,18 @@ $(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; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -264,16 +358,18 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -mp3splt$(EXEEXT): $(mp3splt_OBJECTS) $(mp3splt_DEPENDENCIES) + +mp3splt$(EXEEXT): $(mp3splt_OBJECTS) $(mp3splt_DEPENDENCIES) $(EXTRA_mp3splt_DEPENDENCIES) @rm -f mp3splt$(EXEEXT) - $(LINK) $(mp3splt_OBJECTS) $(mp3splt_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(mp3splt_OBJECTS) $(mp3splt_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -292,39 +388,28 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows_utils.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -336,15 +421,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -353,6 +434,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + 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 @@ -404,10 +500,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: @@ -492,27 +593,32 @@ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: install-am install-exec-am install-strip uninstall-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic 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 \ - install-exec install-exec-am install-exec-hook 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-hook +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ + 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-exec-hook 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-hook install-exec-hook: -@DO_SYMLINK_TRUE@ -cd $(DESTDIR)/$(bindir) && $(LN_S) mp3splt oggsplt +@DO_OGG_SYMLINK_TRUE@ -cd $(DESTDIR)/$(bindir) && $(LN_S) mp3splt oggsplt +@DO_FLAC_SYMLINK_TRUE@ -cd $(DESTDIR)/$(bindir) && $(LN_S) mp3splt flacsplt + uninstall-hook: -@DO_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(bindir)/oggsplt ];then \ -@DO_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(bindir)/oggsplt symlink still exists. You may want to remove it."; \ -@DO_SYMLINK_TRUE@ fi +@DO_OGG_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(bindir)/oggsplt ];then \ +@DO_OGG_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(bindir)/oggsplt symlink still exists. You may want to remove it."; \ +@DO_OGG_SYMLINK_TRUE@ fi +@DO_FLAC_SYMLINK_TRUE@ if [ -L $(DESTDIR)/$(bindir)/flacsplt ];then \ +@DO_FLAC_SYMLINK_TRUE@ echo "The $(DESTDIR)/$(bindir)/flacsplt symlink still exists. You may want to remove it."; \ +@DO_FLAC_SYMLINK_TRUE@ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru mp3splt-2.4.1/src/common.h mp3splt-2.6.0/src/common.h --- mp3splt-2.4.1/src/common.h 2011-11-13 23:11:41.000000000 +0000 +++ mp3splt-2.6.0/src/common.h 2013-07-20 07:09:10.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2010 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2010 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef COMMON_H @@ -43,7 +43,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #else -#define VERSION "2.4.1" +#define VERSION "2.6" #define PACKAGE_NAME "mp3splt" #endif @@ -58,11 +58,11 @@ # define _(STR) ((const char *)STR) #endif -#define MP3SPLT_DATE "14/11/11" +#define MP3SPLT_DATE "20/07/13" #define MP3SPLT_AUTHOR1 "Matteo Trotta" #define MP3SPLT_AUTHOR2 "Alexandru Munteanu" #define MP3SPLT_EMAIL1 "<mtrotta AT users.sourceforge.net>" -#define MP3SPLT_EMAIL2 "<io_fx AT yahoo.fr>" +#define MP3SPLT_EMAIL2 "<m AT ioalex.net>" #define MP3SPLT_CDDBFILE "query.cddb" #define COMMON_H diff -Nru mp3splt-2.4.1/src/data_manager.c mp3splt-2.6.0/src/data_manager.c --- mp3splt-2.4.1/src/data_manager.c 2011-07-13 22:14:00.000000000 +0000 +++ mp3splt-2.6.0/src/data_manager.c 2013-02-08 09:23:32.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,10 +18,12 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <string.h> +#include <stdlib.h> +#include <stdio.h> #include "data_manager.h" #include "utils.h" @@ -54,6 +56,8 @@ data->argv = orig_argv; #endif + data->printed_value_length = 0; + return data; } @@ -65,7 +69,7 @@ if (data) { //try to stop the split - mp3splt_stop_split(data->state, NULL); + mp3splt_stop_split(data->state); //free options free_options(&data->opt); @@ -113,8 +117,7 @@ } #endif - //free left variables in the state - mp3splt_free_state(data->state, NULL); + mp3splt_free_state(data->state); data->state = NULL; free(data); diff -Nru mp3splt-2.4.1/src/data_manager.h mp3splt-2.6.0/src/data_manager.h --- mp3splt-2.4.1/src/data_manager.h 2011-02-23 20:48:17.000000000 +0000 +++ mp3splt-2.6.0/src/data_manager.h 2013-02-08 09:23:34.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef DATA_MANAGER_H @@ -53,6 +53,7 @@ //keep the ones transformed to utf8 and free them later char **argv; int argc; + int printed_value_length; } main_data; diff -Nru mp3splt-2.4.1/src/freedb.c mp3splt-2.6.0/src/freedb.c --- mp3splt-2.4.1/src/freedb.c 2011-05-27 20:20:19.000000000 +0000 +++ mp3splt-2.6.0/src/freedb.c 2013-03-17 19:11:23.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,40 +18,100 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <unistd.h> + +#ifdef __WIN32__ +#include <conio.h> +#endif + #include "common.h" +#include "utils.h" #include "print_utils.h" #include "freedb.h" +static void handle_proxy(main_data *data); +static void query_for_proxy_and_write_configuration_file(main_data *data); +static void read_proxy_settings_from_configuration_file(main_data *data); +static char *get_configuration_filename(); +static char *query_for_proxy_login(); +static char *get_input_line(FILE *input_file, char *key); + extern FILE *console_out; +#if defined(__BEOS__) && !defined (HAS_GETPASS) +#warning Faking getpass() !!! +char *getpass(char *p) +{ + char *ret = malloc(30); + if (!ret) + return NULL; + puts(p); + fgets(ret, 30, stdin); + return ret; +} +#endif + +#ifdef __WIN32__ +char *getpass(char *s) +{ + char *pass, c; + int i=0; + fputs(s, stdout); + pass = malloc(100); + do { + c = _getch(); + if (c!='\r') { + if (c=='\b') { + if (i>0) { + printf ("\b \b"); + i--; + } + } + else { + printf ("*"); + pass[i++] = c; + } + } + else break; + } while (i<100); + + pass[i]='\0'; + + printf("\n"); + + return pass; +} +#endif + void do_freedb_search(main_data *data) { + handle_proxy(data); + int err = SPLT_OK; options *opt = data->opt; splt_state *state = data->state; - //we find out what search and get type we have char search_type[30] = ""; char get_type[30] = ""; if (opt->freedb_search_type == SPLT_FREEDB_SEARCH_TYPE_CDDB_CGI) { - snprintf(search_type,30,"%s","cddb_cgi"); + snprintf(search_type, 30, "%s", "cddb_cgi"); } else { - snprintf(search_type,30,"%s","web_search"); + snprintf(search_type, 30 ,"%s", "web_search"); } if (opt->freedb_get_type == SPLT_FREEDB_GET_FILE_TYPE_CDDB_CGI) { - snprintf(get_type,30,"%s","cddb_cgi"); + snprintf(get_type, 30, "%s", "cddb_cgi"); } else { - snprintf(get_type,30,"%s","cddb_protocol"); + snprintf(get_type, 30, "%s", "cddb_protocol"); } //print out infos about the servers @@ -67,12 +127,9 @@ //if we haven't chosen to search from the arguments, interactive search if (opt->freedb_arg_search_string[0] == '\0') { - //freedb search - print_message(_("CDDB QUERY. Insert album and" - " artist informations to find cd.")); + print_message(_("CDDB QUERY. Insert album and artist informations to find cd.")); short first_time = SPLT_TRUE; - //here we search freedb do { if (!first_time) { @@ -89,7 +146,6 @@ first_time = SPLT_FALSE; freedb_input[strlen(freedb_input)-1] = '\0'; - } while (strlen(freedb_input)==0); freedb_search_string = freedb_input; @@ -104,12 +160,12 @@ opt->freedb_search_server,opt->freedb_search_port, search_type); fflush(console_out); - const splt_freedb_results *f_results = NULL; + splt_freedb_results *f_results = + mp3splt_get_freedb_search(state, freedb_search_string, + &err, opt->freedb_search_type, + opt->freedb_search_server, + opt->freedb_search_port); - f_results = mp3splt_get_freedb_search(state, freedb_search_string, - &err, opt->freedb_search_type, - opt->freedb_search_server, - opt->freedb_search_port); process_confirmation_error(err, data); if (!f_results) { @@ -127,20 +183,25 @@ int cd_number = 0; short end = SPLT_FALSE; - while (cd_number < f_results->number) { - fprintf(console_out,"%3d) %s\n", - f_results->results[cd_number].id, - f_results->results[cd_number].name); + + mp3splt_freedb_init_iterator(f_results); + const splt_freedb_one_result *f_result = NULL; + while ((f_result = mp3splt_freedb_next(f_results))) { + int cd_id = mp3splt_freedb_get_id(f_result); + + const char *cd_name = mp3splt_freedb_get_name(f_result); + fprintf(console_out,"%3d) %s\n", cd_id, cd_name); int i = 0; - for(i = 0; i < f_results->results[cd_number].revision_number; i++) + int number_of_revisions = mp3splt_freedb_get_number_of_revisions(f_result); + for(i = 0; i < number_of_revisions; i++) { fprintf(console_out, " |\\=>"); - fprintf(console_out, "%3d) ", f_results->results[cd_number].id+i+1); + fprintf(console_out, "%3d) ", cd_id+i+1); fprintf(console_out, _("Revision: %d\n"), i+2); //break at 22 - if (((f_results->results[cd_number].id+i+2)%22)==0) + if (((cd_id+i+2) % 22) == 0) { //duplicate, see below char junk[18]; @@ -158,7 +219,7 @@ //we read result from the char, q tu select cd or //enter to show more results - if (((f_results->results[cd_number].id+1)%22)==0) + if (((cd_id + 1) % 22) == 0) { //duplicate, see ^^ char junk[18]; @@ -217,26 +278,285 @@ selected_cd = atoi(sel_cd_input); } - } while ((selected_cd >= f_results->number) - || (selected_cd < 0)); + } while ((selected_cd < 0) || (selected_cd >= cd_number)); } else { selected_cd = opt->freedb_arg_result_option; - if (selected_cd >= f_results->number) - { - selected_cd = 0; - } } fprintf(console_out, _("\nGetting file from %s on port %d using %s ...\n"), opt->freedb_get_server,opt->freedb_get_port, get_type); fflush(console_out); - mp3splt_write_freedb_file_result(state, selected_cd, - MP3SPLT_CDDBFILE, &err, opt->freedb_get_type, + err = mp3splt_write_freedb_file_result(state, selected_cd, + MP3SPLT_CDDBFILE, opt->freedb_get_type, opt->freedb_get_server, opt->freedb_get_port); process_confirmation_error(err, data); + + mp3splt_clear_proxy(data->state); +} + +static void handle_proxy(main_data *data) +{ + mp3splt_clear_proxy(data->state); + query_for_proxy_and_write_configuration_file(data); + read_proxy_settings_from_configuration_file(data); +} + +static void read_proxy_settings_from_configuration_file(main_data *data) +{ + char *config_file = get_configuration_filename(); + + FILE *input_file = fopen(config_file, "r"); + if (!input_file) + { + free(config_file); + return; + } + free(config_file); + + fseek(input_file, 0, SEEK_SET); + + char *proxy_address = get_input_line(input_file, "PROXYADDR"); + if (!proxy_address) { goto end; } + + char *proxy_port = get_input_line(input_file, "PROXYPORT"); + if (!proxy_port) { free(proxy_address); goto end; } + int port = atoi(proxy_port); + + fprintf(stderr, " Using proxy %s on port %d\n", proxy_address, port); + + mp3splt_use_proxy(data->state, proxy_address, port); + + if (proxy_address != NULL) + { + free(proxy_address); + } + if (proxy_port != NULL) + { + free(proxy_port); + } + + char *use_proxy_auth = get_input_line(input_file, "PROXYAUTH"); + if (!use_proxy_auth) { goto end; } + if (use_proxy_auth[0] != '1') + { + free(use_proxy_auth); + goto end; + } + free(use_proxy_auth); + + char *authentification = get_input_line(input_file, NULL); + if (authentification) + { + mp3splt_use_base64_authentification(data->state, authentification); + free(authentification); + } + else + { + splt_code error = SPLT_OK; + + char *proxy_authentification = query_for_proxy_login(); + char *authentification_as_base64 = + mp3splt_encode_in_base64(data->state, proxy_authentification, &error); + process_confirmation_error(error, data); + + memset(proxy_authentification, 0x00, strlen(proxy_authentification)); + free(proxy_authentification); + + mp3splt_use_base64_authentification(data->state, authentification_as_base64); + + memset(authentification_as_base64, 0x00, strlen(authentification_as_base64)); + free(authentification_as_base64); + } + +end: + fclose(input_file); +} + +static char *get_input_line(FILE *input_file, char *key) +{ + char *line = NULL; + size_t length = 0; + +#ifndef HAVE_GETLINE + char junk[512]; + fgets(junk, 511, input_file); + junk[strlen(junk)] = '\0'; + + length = strlen(junk) + 1; + line = my_malloc(sizeof(char) * length); + snprintf(line, length, junk); +#else + if (getline(&line, &length, input_file) == -1) + { + if (line) { free(line); } + return NULL; + } +#endif + + if (!line) { return NULL; } + + int line_length = strlen(line); + if (line_length < 3) + { + free(line); + return NULL; + } + + line[line_length-1] = '\0'; + if (line[line_length-2] == '\r') + { + line[line_length-2] = '\0'; + } + + if (key == NULL) + { + return line; + } + + if (strstr(line, key) == NULL) { + free(line); + return NULL; + } + + char *value_start = NULL; + if ((value_start = strchr(line, '=')) == NULL) { + print_warning(_("the configuration file is malformed !")); + free(line); + return NULL; + } + + char *value = strdup(value_start + 1); + if (!value) + { + print_warning(_("cannot allocate memory !")); + } + + free(line); + + return value; } +static void query_for_proxy_and_write_configuration_file(main_data *data) +{ + char *config_file = get_configuration_filename(); + + FILE *output_file = NULL; + if ((output_file = fopen(config_file, "r"))) + { + free(config_file); + fclose(output_file); + return; + } + + if (data->opt->q_option) + { + return; + } + + if (!(output_file = fopen(config_file, "w+"))) + { + free(config_file); + print_warning(_("can't open the configuration file !")); + return; + } + free(config_file); + + int user_input_length = 1024; + char user_input[1024] = { '\0' }; + + fprintf(stderr, _("Will you use a proxy ? (y/n): ")); + fgets(user_input, user_input_length, stdin); + if (user_input[0] != 'y') + { + goto close_file; + } + + fprintf(stderr, _("Proxy Address: ")); + fgets(user_input, user_input_length, stdin); + fprintf(output_file, "PROXYADDR=%s", user_input); + + fprintf(stderr, _("Proxy Port: ")); + fgets(user_input, user_input_length, stdin); + fprintf(output_file, "PROXYPORT=%s", user_input); + + fprintf(stderr, _("Need authentication ? (y/n): ")); + fgets(user_input, user_input_length, stdin); + if (user_input[0] != 'y') + { + goto close_file; + } + + fprintf(output_file, "PROXYAUTH=1\n"); + fprintf(stderr, _("Would you like to save the password (insecure) ? (y/n): ")); + fgets(user_input, user_input_length, stdin); + if (user_input[0] != 'y') + { + goto close_file; + } + + char *authentification = query_for_proxy_login(); + + splt_code error = SPLT_OK; + char *authentification_as_base64 = + mp3splt_encode_in_base64(data->state, authentification, &error); + process_confirmation_error(error, data); + + memset(authentification, 0x00, strlen(authentification)); + free(authentification); + + fprintf(output_file, "%s\n", authentification_as_base64); + + memset(authentification_as_base64, 0x00, strlen(authentification_as_base64)); + free(authentification_as_base64); + +close_file: + fclose(output_file); +} + +static char *query_for_proxy_login() +{ + char user_input[130]; + fprintf(console_out, _("Username: ")); + fgets(user_input, 128, stdin); + user_input[strlen(user_input)-1] = '\0'; + + char *pass = getpass(_("Password: ")); + + size_t login_size = strlen(user_input) + strlen(pass) + 2; + char *login = my_malloc(sizeof(char) * login_size); + snprintf(login, login_size, "%s:%s", user_input, pass); + + memset(pass, 0x00, strlen(pass)); + free(pass); + + return login; +} + +static char *get_configuration_filename() +{ + char *home_directory = getenv("HOME"); + + size_t home_directory_length = 0; + if (home_directory) + { + home_directory_length = strlen(home_directory); + } + + size_t maximum_length = home_directory_length + strlen(PROXY_CONFIG_FILE) + 2; + char *config_file = my_malloc(sizeof(char) * maximum_length); + + if (home_directory != NULL) + { + snprintf(config_file, maximum_length, "%s%c"PROXY_CONFIG_FILE, home_directory, SPLT_DIRCHAR); + } + else + { + snprintf(config_file, maximum_length, PROXY_CONFIG_FILE); + } + + return config_file; +} diff -Nru mp3splt-2.4.1/src/freedb.h mp3splt-2.6.0/src/freedb.h --- mp3splt-2.4.1/src/freedb.h 2011-02-23 20:48:17.000000000 +0000 +++ mp3splt-2.6.0/src/freedb.h 2013-02-08 09:23:34.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,13 +18,15 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef FREEDB_H #include "data_manager.h" +#define PROXY_CONFIG_FILE ".mp3splt" + void do_freedb_search(main_data *data); #define FREEDB_H diff -Nru mp3splt-2.4.1/src/mp3splt.c mp3splt-2.6.0/src/mp3splt.c --- mp3splt-2.4.1/src/mp3splt.c 2011-10-18 19:43:15.000000000 +0000 +++ mp3splt-2.6.0/src/mp3splt.c 2013-07-20 06:16:25.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "common.h" @@ -45,10 +45,17 @@ void sigint_handler(int sig) { - mp3splt_stop_split(state, NULL); + mp3splt_stop_split(state); exit(1); } +static int is_stdin(const char *current_filename) +{ + return strcmp(current_filename, "-") == 0 || + strcmp(current_filename, "o-") == 0 || + strcmp(current_filename, "f-") == 0; +} + int main(int argc, char **orig_argv) { setlocale(LC_ALL, ""); @@ -66,9 +73,7 @@ main_data *data = create_main_struct(argc, orig_argv); -#ifdef ENABLE_NLS - -# ifdef __WIN32__ +#ifdef __WIN32__ char mp3splt_uninstall_file[2048] = { '\0' }; DWORD dwType, dwSize = sizeof(mp3splt_uninstall_file) - 1; SHGetValue(HKEY_LOCAL_MACHINE, @@ -98,13 +103,22 @@ } } +# ifdef ENABLE_NLS bindtextdomain(MP3SPLT_GETTEXT_DOMAIN, "translations"); - bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, "translations"); - + bindtextdomain(LIBMP3SPLT_WITH_SONAME, "translations"); # else + #error No NLS detected +# endif + +#else + +# ifdef ENABLE_NLS bindtextdomain(MP3SPLT_GETTEXT_DOMAIN, LOCALEDIR); # endif +#endif + +#ifdef ENABLE_NLS bind_textdomain_codeset(MP3SPLT_GETTEXT_DOMAIN, "UTF-8"); #endif @@ -120,10 +134,10 @@ signal(SIGINT, sigint_handler); //callback for the library messages - mp3splt_set_message_function(state, put_library_message); + mp3splt_set_message_function(state, put_library_message, data); mp3splt_set_silence_level_function(state, get_silence_level, data->sl); //callback for the split files - mp3splt_set_split_filename_function(state, put_split_file); + mp3splt_set_split_filename_function(state, put_split_file, data); //default we write mins_secs_hundr for normal split mp3splt_set_int_option(state, SPLT_OPT_OUTPUT_FILENAMES, SPLT_OUTPUT_DEFAULT); @@ -132,7 +146,7 @@ //parse command line options int option; while ((option = getopt(data->argc, data->argv, - "m:O:Dvifkwleqnasrc:d:o:t:p:g:hQN12T:XxPE:A:S:G:")) != -1) + "m:O:DvifKkwleqnasrc:d:o:t:p:g:hQN12T:XxPE:A:S:G:F:C:I:")) != -1) { switch (option) { @@ -156,8 +170,7 @@ break; case 'T': opt->T_option_value = atoi(optarg); - mp3splt_set_int_option(state, SPLT_OPT_FORCE_TAGS_VERSION, - opt->T_option_value); + mp3splt_set_int_option(state, SPLT_OPT_FORCE_TAGS_VERSION, opt->T_option_value); opt->T_option = SPLT_TRUE; break; case 'D': @@ -177,6 +190,9 @@ mp3splt_set_int_option(state, SPLT_OPT_INPUT_NOT_SEEKABLE, SPLT_TRUE); opt->k_option = SPLT_TRUE; break; + case 'K': + opt->K_option = SPLT_TRUE; + break; case 'w': mp3splt_set_int_option(state, SPLT_OPT_SPLIT_MODE, SPLT_OPTION_WRAP_MODE); opt->w_option = SPLT_TRUE; @@ -217,6 +233,38 @@ opt->c_option = SPLT_TRUE; opt->cddb_arg = strdup(optarg); break; + case 'C': + ; + int intarg = atoi(optarg); + if (intarg == 8) + { + mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_UTF8); + } + else if (intarg == 16) + { + mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_UTF16); + } + else if (intarg == 1) + { + mp3splt_set_int_option(state, SPLT_OPT_ID3V2_ENCODING, SPLT_ID3V2_LATIN1); + } + break; + case 'I': + ; + int intarg2 = atoi(optarg); + if (intarg2 == 8) + { + mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_UTF8); + } + else if (intarg2 == 16) + { + mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_UTF16); + } + else if (intarg2 == 1) + { + mp3splt_set_int_option(state, SPLT_OPT_INPUT_TAGS_ENCODING, SPLT_ID3V2_LATIN1); + } + break; case 'P': opt->P_option = SPLT_TRUE; mp3splt_set_int_option(state, SPLT_OPT_PRETEND_TO_SPLIT, SPLT_TRUE); @@ -234,6 +282,11 @@ opt->m3u_arg = strdup(optarg); mp3splt_set_m3u_filename(state, opt->m3u_arg); break; + case 'F': + opt->F_option = SPLT_TRUE; + opt->full_log_arg = strdup(optarg); + mp3splt_set_silence_full_log_filename(state, opt->full_log_arg); + break; case 'S': opt->S_option = SPLT_TRUE; opt->S_option_value = atoi(optarg); @@ -284,18 +337,35 @@ break; case 't': mp3splt_set_int_option(state, SPLT_OPT_SPLIT_MODE, SPLT_OPTION_TIME_MODE); - long converted_time = c_hundreths(optarg); + // Token will point to "SEVERAL". + char *first = strtok(optarg, ">"); + char *second = strtok(NULL, ">"); + + long converted_time = c_hundreths(first); if (converted_time != -LONG_MAX) { - float split_time = (float)converted_time / 100.0; - mp3splt_set_float_option(state, SPLT_OPT_SPLIT_TIME, split_time); + mp3splt_set_long_option(state, SPLT_OPT_SPLIT_TIME, converted_time); } else { print_error_exit(_("bad time expression for the time split.\n" "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details."), data); } + + if (second != NULL) + { + long time_minimum_length = c_hundreths(second); + if (time_minimum_length == -LONG_MAX) + { + print_error_exit(_("bad minimum time expression.\n" + "\tMust be min.sec[.0-99] or EOF-min.sec[.0-99], read man page for details."), data); + } + + mp3splt_set_long_option(state, SPLT_OPT_TIME_MINIMUM_THEORETICAL_LENGTH, + time_minimum_length); + } + opt->t_option = SPLT_TRUE; break; case 'p': @@ -356,8 +426,7 @@ fclose(stdout); break; default: - print_error_exit(_("read man page for documentation" - " or type 'mp3splt -h'."), data); + print_error_exit(_("read man page for documentation or type 'mp3splt -h'."), data); break; } } @@ -365,7 +434,7 @@ //callback for the progress bar if (!opt->q_option && !opt->X_option) { - mp3splt_set_progress_function(state, put_progress_bar); + mp3splt_set_progress_function(state, put_progress_bar, data); } //if quiet, does not write authors and other @@ -414,29 +483,48 @@ //if we have parameter options if (opt->p_option) { - float th = -200,off = -200,min = -200, min_track_length = -200; - int gap = -200,nt = -200,rm = -200; - int parsed_p_options = parse_silence_options(opt->param_args, &th, &gap, - &nt, &off, &rm, &min, &min_track_length); + float th = -200, off = -200, min = -200, min_track_length = -200; + int gap = -200, nt = -200, rm = -200, shots = -200; + float min_track_join = -200; + float keep_silence_left = -200, keep_silence_right = -200; + int parsed_p_options = + parse_silence_options(opt->param_args, &th, &gap, &nt, &off, &rm, &min, &min_track_length, + &shots, &min_track_join, &keep_silence_left, &keep_silence_right); if (parsed_p_options < 1) { - print_error_exit(_("bad argument for -p option. No valid value" - " was recognized !"), data); + print_error_exit(_("bad argument for -p option. No valid value was recognized !"), data); } - if (th != -200) + if (keep_silence_left >= 0) + { + mp3splt_set_float_option(state, SPLT_OPT_KEEP_SILENCE_LEFT, keep_silence_left); + } + if (keep_silence_right >= 0) + { + mp3splt_set_float_option(state, SPLT_OPT_KEEP_SILENCE_RIGHT, keep_silence_right); + } + + if (min_track_join > 0) + { + mp3splt_set_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_JOIN, min_track_join); + } + if (shots != -200) + { + mp3splt_set_int_option(state, SPLT_OPT_PARAM_SHOTS, shots); + } + if (th > -100) { mp3splt_set_float_option(state, SPLT_OPT_PARAM_THRESHOLD, th); } - if (off != -200) + if (off > -3) { mp3splt_set_float_option(state, SPLT_OPT_PARAM_OFFSET, off); } - if (min != -200) + if (min >= 0) { mp3splt_set_float_option(state, SPLT_OPT_PARAM_MIN_LENGTH, min); } - if (min_track_length != -200) + if (min_track_length > 0) { mp3splt_set_float_option(state, SPLT_OPT_PARAM_MIN_TRACK_LENGTH, min_track_length); } @@ -458,7 +546,7 @@ if (opt->o_option) { mp3splt_set_int_option(state, SPLT_OPT_CREATE_DIRS_FROM_FILENAMES, SPLT_TRUE); - mp3splt_set_oformat(state, opt->output_format,&output_format_error); + output_format_error = mp3splt_set_oformat(state, opt->output_format); process_confirmation_error(output_format_error, data); } @@ -498,7 +586,7 @@ } else { - if (mp3splt_u_check_if_directory(argument)) + if (mp3splt_check_if_directory(argument)) { we_had_directory_as_argument = SPLT_TRUE; @@ -617,32 +705,42 @@ } fflush(console_out); - if ((strcmp(current_filename, "-") == 0 || strcmp(current_filename, "o-") == 0) && - we_have_incompatible_stdin_option(opt)) + if (is_stdin(current_filename) && we_have_incompatible_stdin_option(opt)) { print_error_exit(_("cannot use -k option (or STDIN) with" - " one of the following options: -S -s -r -w -l -e -i -a -p"), data); + " one of the following options: -S -s -r -w -l -e -i -a -p -K"), data); } //we put the filename err = mp3splt_set_filename_to_split(state, current_filename); process_confirmation_error(err, data); + if (opt->K_option) + { + mp3splt_read_original_tags(state); + mp3splt_set_int_option(state, SPLT_OPT_CUE_CDDB_ADD_TAGS_WITH_KEEP_ORIGINAL_TAGS, + SPLT_TRUE); + } + //if we list wrap files if (opt->l_option) { //if no error when putting the filename to split - const splt_wrap *wrap_files; - wrap_files = mp3splt_get_wrap_files(state,&err); + splt_wrap *wrap_files = mp3splt_get_wrap_files(state, &err); process_confirmation_error(err, data); //if no error when getting the wrap files - int wrap_files_number = wrap_files->wrap_files_num; - int i = 0; + mp3splt_wrap_init_iterator(wrap_files); fprintf(stdout,"\n"); - for (i = 0;i < wrap_files_number;i++) + const splt_one_wrap *one_wrap = NULL; + while ((one_wrap = mp3splt_wrap_next(wrap_files))) { - fprintf(stdout,"%s\n",wrap_files->wrap_files[i]); + char *wrap_file = mp3splt_wrap_get_wrapped_file(one_wrap); + if (wrap_file) + { + fprintf(stdout,"%s\n", wrap_file); + free(wrap_file); + } } fprintf(stdout,"\n"); fflush(stdout); @@ -654,7 +752,7 @@ if (opt->i_option) { err = SPLT_OK; - mp3splt_count_silence_points(state, &err); + mp3splt_set_silence_points(state, &err); process_confirmation_error(err, data); } else @@ -664,12 +762,21 @@ if ((strstr(opt->cddb_arg, ".cue")!=NULL)|| (strstr(opt->cddb_arg, ".CUE")!=NULL)) { - mp3splt_put_cue_splitpoints_from_file(state, opt->cddb_arg, &err); + err = mp3splt_import(state, CUE_IMPORT, opt->cddb_arg); + process_confirmation_error(err, data); + + err = SPLT_OK; + splt_point *splitpoint = mp3splt_point_new(LONG_MAX, &err); + process_confirmation_error(err, data); + err = mp3splt_append_splitpoint(state, splitpoint); + process_confirmation_error(err, data); + + err = mp3splt_remove_tags_of_skippoints(state); process_confirmation_error(err, data); } else { - if (strncmp(opt->cddb_arg, "query", 5)==0) + if (strncmp(opt->cddb_arg, "query", 5) == 0) { if (j == 0) { @@ -682,19 +789,19 @@ do_freedb_search(data); } - mp3splt_put_cddb_splitpoints_from_file(state, MP3SPLT_CDDBFILE, &err); + err = mp3splt_import(state, CDDB_IMPORT, MP3SPLT_CDDBFILE); process_confirmation_error(err, data); } else { - mp3splt_put_cddb_splitpoints_from_file(state, opt->cddb_arg, &err); + err = mp3splt_import(state, CDDB_IMPORT, opt->cddb_arg); process_confirmation_error(err, data); } } } else if (opt->audacity_labels_arg) { - mp3splt_put_audacity_labels_splitpoints_from_file(state, opt->audacity_labels_arg, &err); + err = mp3splt_import(state, AUDACITY_LABELS_IMPORT, opt->audacity_labels_arg); process_confirmation_error(err, data); } else if (normal_split) @@ -702,8 +809,10 @@ //we set the splitpoints to the library for (i = 0;i < data->number_of_splitpoints; i++) { - long point = data->splitpoints[i]; - err = mp3splt_append_splitpoint(state, point, NULL, SPLT_SPLITPOINT); + splt_point *splitpoint = mp3splt_point_new(data->splitpoints[i], &err); + process_confirmation_error(err, data); + + err = mp3splt_append_splitpoint(state, splitpoint); process_confirmation_error(err, data); } } @@ -762,8 +871,7 @@ if (opt->E_option) { - err = SPLT_OK; - mp3splt_export_to_cue(state, opt->export_cue_arg, SPLT_TRUE, &err); + err = mp3splt_export(state, CUE_EXPORT, opt->export_cue_arg, SPLT_TRUE); process_confirmation_error(err, data); } @@ -788,12 +896,10 @@ fflush(console_out); } - err = SPLT_OK; - mp3splt_erase_all_tags(state, &err); + err = mp3splt_erase_all_tags(state); process_confirmation_error(err, data); - err = SPLT_OK; - mp3splt_erase_all_splitpoints(state,&err); + err = mp3splt_erase_all_splitpoints(state); process_confirmation_error(err, data); } diff -Nru mp3splt-2.4.1/src/options_checker.c mp3splt-2.6.0/src/options_checker.c --- mp3splt-2.4.1/src/options_checker.c 2011-06-26 19:00:43.000000000 +0000 +++ mp3splt-2.6.0/src/options_checker.c 2013-02-08 09:23:32.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <string.h> @@ -39,233 +39,254 @@ { console_out = stderr; show_small_help_exit(data); + return; } - else + + if (opt->k_option) { - if (opt->k_option) + if (we_have_incompatible_stdin_option(opt)) { - if (we_have_incompatible_stdin_option(opt)) - { - print_error_exit(_("cannot use -k option (or STDIN) with" - " one of the following options: -S -s -r -w -l -e -i -a -p"), data); - } + print_error_exit(_("cannot use -k option (or STDIN) with" + " one of the following options: -S -s -r -w -l -e -i -a -p -F"), data); } + } - if (opt->w_option) + if (opt->w_option) + { + if (opt->t_option || opt->c_option || + opt->s_option || opt->l_option || + opt->e_option || opt->i_option || + opt->f_option || opt->a_option || + opt->p_option || opt->o_option || + opt->g_option || opt->n_option || + opt->x_option || opt->A_option || + opt->E_option || opt->S_option || + opt->G_option || opt->r_option || + opt->F_option) { - if (opt->t_option || opt->c_option || - opt->s_option || opt->l_option || - opt->e_option || opt->i_option || - opt->f_option || opt->a_option || - opt->p_option || opt->o_option || - opt->g_option || opt->n_option || - opt->x_option || opt->A_option || - opt->E_option || opt->S_option || - opt->G_option || opt->r_option) - { - print_error_exit(_("the -w option can only be used with -m, -d, -q and -Q"), data); - } + print_error_exit(_("the -w option can only be used with -m, -d, -q and -Q"), data); } + } - if (opt->l_option) + if (opt->l_option) + { + if (opt->t_option || opt->c_option || + opt->s_option || opt->e_option || + opt->i_option || opt->m_option || + opt->f_option || opt->a_option || + opt->p_option || opt->o_option || + opt->g_option || opt->d_option || + opt->n_option || opt->qq_option || + opt->x_option || opt->A_option || + opt->S_option || opt->G_option || + opt->r_option || opt->F_option) { - if (opt->t_option || opt->c_option || - opt->s_option || opt->e_option || - opt->i_option || opt->m_option || - opt->f_option || opt->a_option || - opt->p_option || opt->o_option || - opt->g_option || opt->d_option || - opt->n_option || opt->qq_option || - opt->x_option || opt->A_option || - opt->S_option || opt->G_option || opt->r_option) - { - print_error_exit(_("the -l option can only be used with -q"), data); - } + print_error_exit(_("the -l option can only be used with -q"), data); } + } - if (opt->e_option) + if (opt->e_option) + { + if (opt->t_option || opt->c_option || + opt->s_option || opt->i_option || + opt->a_option || opt->p_option || + opt->g_option || opt->n_option || + opt->A_option || opt->E_option || + opt->S_option || opt->G_option || + opt->r_option || opt->F_option) { - if (opt->t_option || opt->c_option || - opt->s_option || opt->i_option || - opt->a_option || opt->p_option || - opt->g_option || opt->n_option || - opt->A_option || opt->E_option || - opt->S_option || opt->G_option || - opt->r_option) - { - print_error_exit(_("the -e option can only be used with -m, -f, -o, -d, -q, -Q"), data); - } + print_error_exit(_("the -e option can only be used with -m, -f, -o, -d, -q, -Q"), data); } + } - if (opt->f_option) - { - } + if (opt->f_option) + { + } - if (opt->c_option) + if (opt->c_option) + { + if (opt->t_option || opt->s_option || + opt->i_option || opt->g_option || + opt->A_option || opt->S_option || + opt->G_option || opt->r_option || + opt->F_option) { - if (opt->t_option || opt->s_option || - opt->i_option || opt->g_option || - opt->A_option || opt->S_option || - opt->G_option || opt->r_option) - { - print_error_exit(_("the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i or -S"), data); - } + print_error_exit(_("the -c option cannot be used with -t, -g, -G, -s, -r, -A, -i, -S or -F"), data); } + } - if (opt->A_option) + if (opt->A_option) + { + if (opt->t_option || opt->s_option || + opt->i_option || opt->S_option || + opt->r_option || opt->F_option) { - if (opt->t_option || opt->s_option || opt->i_option || opt->S_option || opt->r_option) - { - print_error_exit(_("the -A option cannot be used with -t, -s, -r, -i or -S"), data); - } + print_error_exit(_("the -A option cannot be used with -t, -s, -r, -i, -S or -F"), data); } + } - if (opt->t_option) + if (opt->t_option) + { + if (opt->s_option || opt->i_option || + opt->S_option || opt->r_option || + opt->F_option) { - if (opt->s_option || opt->i_option || opt->S_option || opt->r_option) - { - print_error_exit(_("the -t option cannot be used with -s, -r, -i or -S"), data); - } + print_error_exit(_("the -t option cannot be used with -s, -r, -i, -S or -F"), data); } + } - if (opt->s_option) + if (opt->s_option) + { + if (opt->a_option || opt->i_option || + opt->S_option || opt->r_option) { - if (opt->a_option || opt->i_option || opt->S_option || opt->r_option) - { - print_error_exit(_("-s option cannot be used with -a, -r, -i or -S"), data); - } + print_error_exit(_("-s option cannot be used with -a, -r, -i or -S"), data); } + } - if (opt->a_option) + if (opt->a_option) + { + if (opt->i_option) { - if (opt->i_option) - { - print_error_exit(_("-a option cannot be used with -i"), data); - } + print_error_exit(_("-a option cannot be used with -i"), data); } + } - if (opt->S_option) - { - } + if (opt->S_option) + { + } - if (opt->p_option) + if (opt->p_option) + { + if (!opt->a_option && !opt->s_option && !opt->i_option && !opt->r_option) { - if (!opt->a_option && !opt->s_option && !opt->i_option && !opt->r_option) - { - print_error_exit(_("the -p option cannot be used without -a, -s, -r or -i"), data); - } + print_error_exit(_("the -p option cannot be used without -a, -s, -r or -i"), data); } + } - if (opt->o_option) + if (opt->o_option) + { + if (opt->i_option) { - if (opt->i_option) - { - print_error_exit(_("the -o option cannot be used with -i"), data); - } - if (opt->output_format) - { - if ((strcmp(opt->output_format,"-") == 0) && (opt->m_option || opt->d_option)) - { - print_error_exit(_("cannot use '-o -' (STDOUT) with -m or -d"), data); - } - } + print_error_exit(_("the -o option cannot be used with -i"), data); } - - if (opt->g_option) + if (opt->output_format) { - if (opt->i_option || opt->n_option || opt->G_option) + if ((strcmp(opt->output_format,"-") == 0) && (opt->m_option || opt->d_option)) { - print_error_exit(_("the -g option cannot be used with -n, -i or -G"), data); + print_error_exit(_("cannot use '-o -' (STDOUT) with -m or -d"), data); } } + } - if (opt->d_option) + if (opt->g_option) + { + if (opt->i_option || opt->n_option || opt->G_option) { - if (opt->i_option) - { - print_error_exit(_("the -d option cannot be used with -i"), data); - } + print_error_exit(_("the -g option cannot be used with -n, -i or -G"), data); } + } - if (opt->n_option) + if (opt->d_option) + { + if (opt->i_option) { - if (opt->i_option || opt->T_option) - { - print_error_exit(_("the -n option cannot be used with -i or -T"), data); - } + print_error_exit(_("the -d option cannot be used with -i"), data); } + } - if (opt->m_option) + if (opt->n_option) + { + if (opt->i_option || opt->T_option) { - if (opt->i_option) - { - print_error_exit(_("the -m option cannot be used with -i"), data); - } + print_error_exit(_("the -n option cannot be used with -i or -T"), data); } + } + if (opt->m_option) + { if (opt->i_option) { + print_error_exit(_("the -m option cannot be used with -i"), data); } + } - if (opt->q_option) - { - } + if (opt->i_option) + { + } + + if (opt->q_option) + { + } - if (opt->qq_option) + if (opt->qq_option) + { + if (opt->o_option) { - if (opt->o_option) + if (strcmp(opt->output_format,"-") == 0) { - if (strcmp(opt->output_format,"-") == 0) - { - print_error_exit(_("the -Q option cannot be used with" - " STDOUT output ('-o -')"), data); - } + print_error_exit(_("the -Q option cannot be used with" + " STDOUT output ('-o -')"), data); } - if (opt->c_option) + } + if (opt->c_option) + { + if (strncmp(opt->cddb_arg, "query", 5) == 0) { - if (strncmp(opt->cddb_arg,"query",5) == 0) - { - print_error_exit(_("the -Q option cannot be used with" - " interactive freedb query ('-c query')"), data); - } + print_error_exit(_("the -Q option cannot be used with" + " interactive freedb query ('-c query')"), data); } } + } - if (opt->N_option) + if (opt->N_option) + { + if (!opt->s_option) { - if (!opt->s_option) - { - print_error_exit(_("the -N option must be used with" - " silence detection (-s option)"), data); - } + print_error_exit(_("the -N option must be used with silence detection (-s option)"), data); } + } - if (opt->O_option) + if (opt->O_option) + { + if (opt->w_option || opt->e_option || + opt->l_option || opt->i_option) { - if (opt->w_option || opt->e_option || - opt->l_option || opt->i_option) - { - print_error_exit(_("the -O option cannot be used with" - " -w, -e, -l or -i"), data); - } + print_error_exit(_("the -O option cannot be used with -w, -e, -l or -i"), data); } + } - if (opt->x_option) + if (opt->x_option) + { + } + + if (opt->T_option) + { + int force_tags_version = opt->T_option_value; + if ((force_tags_version != 1) && (force_tags_version != 2) && + (force_tags_version != 12)) { + print_error_exit("the -T option can only have values 1, 2 or 12", data); } + } - if (opt->T_option) + if (opt->G_option) + { + } + + if (opt->F_option) + { + if (!opt->s_option) { - int force_tags_version = opt->T_option_value; - if ((force_tags_version != 1) && (force_tags_version != 2) && - (force_tags_version != 12)) - { - print_error_exit("the -T option can only have values 1, 2 or 12", data); - } + print_error_exit(_("the -F option cannot be used without -s"), data); } + } - if (opt->G_option) + if (opt->K_option) + { + if (!opt->c_option) { + print_error_exit(_("the -K option cannot be used without -c"), data); } } } @@ -275,6 +296,6 @@ return opt->s_option || opt->w_option || opt->l_option || opt->e_option || opt->i_option || opt->a_option || - opt->p_option || opt->S_option || opt->r_option; + opt->p_option || opt->S_option || opt->r_option || opt->F_option || opt->K_option; } diff -Nru mp3splt-2.4.1/src/options_checker.h mp3splt-2.6.0/src/options_checker.h --- mp3splt-2.4.1/src/options_checker.h 2011-02-23 20:48:17.000000000 +0000 +++ mp3splt-2.6.0/src/options_checker.h 2013-02-08 09:23:34.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef OPTIONS_CHECKER_H diff -Nru mp3splt-2.4.1/src/options_manager.c mp3splt-2.6.0/src/options_manager.c --- mp3splt-2.4.1/src/options_manager.c 2011-06-26 18:59:05.000000000 +0000 +++ mp3splt-2.6.0/src/options_manager.c 2013-02-08 09:23:33.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "common.h" @@ -86,6 +86,12 @@ (*opt)->m3u_arg = NULL; } + if ((*opt)->full_log_arg) + { + free((*opt)->full_log_arg); + (*opt)->full_log_arg = NULL; + } + if ((*opt)->param_args) { free((*opt)->param_args); @@ -128,6 +134,7 @@ opt->r_option = SPLT_FALSE; opt->p_option = SPLT_FALSE; opt->o_option = SPLT_FALSE; opt->d_option = SPLT_FALSE; opt->k_option = SPLT_FALSE; + opt->K_option = SPLT_FALSE; opt->g_option = SPLT_FALSE; opt->n_option = SPLT_FALSE; opt->q_option = SPLT_FALSE; opt->i_option = SPLT_FALSE; opt->N_option = SPLT_FALSE; opt->O_option = SPLT_FALSE; @@ -139,6 +146,7 @@ opt->qq_option = SPLT_FALSE; opt->A_option = SPLT_FALSE; opt->m_option = SPLT_FALSE; + opt->F_option = SPLT_FALSE; opt->S_option = SPLT_FALSE; opt->S_option_value = 0; opt->tags_from_fname_regex_arg = NULL; @@ -146,8 +154,9 @@ opt->dir_arg = NULL; opt->export_cue_arg = NULL; opt->audacity_labels_arg = NULL; - opt->param_args = NULL; opt->m3u_arg = NULL; + opt->full_log_arg = NULL; + opt->param_args = NULL; opt->output_format = NULL; opt->custom_tags = NULL; diff -Nru mp3splt-2.4.1/src/options_manager.h mp3splt-2.6.0/src/options_manager.h --- mp3splt-2.4.1/src/options_manager.h 2011-06-26 18:59:14.000000000 +0000 +++ mp3splt-2.6.0/src/options_manager.h 2013-02-08 09:23:35.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef OPTIONS_MANAGER_H @@ -37,6 +37,8 @@ short r_option; //output filename, output directory, seekable short o_option; short d_option; short k_option; + //keep original tags when using cddb or cue import + short K_option; //custom tags, no tags, quiet option short g_option; short n_option; short q_option; short E_option; @@ -52,6 +54,7 @@ //info -i option, m3u file option short i_option; short m_option; + short F_option; short S_option; int S_option_value; char *tags_from_fname_regex_arg; @@ -59,10 +62,10 @@ char *cddb_arg; char *dir_arg; char *param_args; char *export_cue_arg; char *audacity_labels_arg; - //the m3u filename - char *m3u_arg; //custom tags with -g char *custom_tags; + char *m3u_arg; + char *full_log_arg; //output format (-o) char *output_format; //the parsed freedb_search_type diff -Nru mp3splt-2.4.1/src/options_parsers.c mp3splt-2.6.0/src/options_parsers.c --- mp3splt-2.4.1/src/options_parsers.c 2011-07-30 21:11:06.000000000 +0000 +++ mp3splt-2.6.0/src/options_parsers.c 2013-02-08 09:23:33.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "common.h" @@ -27,7 +27,8 @@ #include "utils.h" int parse_silence_options(char *arg, float *th, int *gap, - int *nt, float *off, int *rm, float *min, float *min_track_length) + int *nt, float *off, int *rm, float *min, float *min_track_length, int *shots, + float *min_track_join, float *keep_silence_left, float *keep_silence_right) { char *ptr = NULL; int found = 0; @@ -47,6 +48,36 @@ } } + if ((shots != NULL) && ((ptr = strstr(arg, "shots"))!=NULL)) + { + if ((ptr=strchr(ptr, '='))!=NULL) + { + if (sscanf(ptr+1, "%d", shots)==1) + { + found++; + } + else + { + print_warning(_("bad shots argument. It will be ignored !")); + } + } + } + + if ((min_track_join != NULL) && ((ptr = strstr(arg, "trackjoin"))!=NULL)) + { + if ((ptr=strchr(ptr, '='))!=NULL) + { + if (sscanf(ptr+1, "%f", min_track_join)==1) + { + found++; + } + else + { + print_warning(_("bad trackjoin argument. It will be ignored !")); + } + } + } + if ((th!=NULL) && ((ptr=strstr(arg, "th"))!=NULL)) { if ((ptr=strchr(ptr, '='))!=NULL) @@ -77,9 +108,20 @@ } } - if (rm!=NULL) + if (rm != NULL) { - if ((ptr=strstr(arg, "rm"))!=NULL) + if ((ptr = strstr(arg, "rm=")) != NULL) + { + if (sscanf(ptr+3, "%f_%f", keep_silence_left, keep_silence_right) != 2) + { + *keep_silence_left = -200; + *keep_silence_right = -200; + print_warning(_("Bad values for the rm argument. rm parameter will be ignored!")); + } + found++; + *rm = 1; + } + else if ((ptr = strstr(arg, "rm")) != NULL) { found++; *rm = 1; diff -Nru mp3splt-2.4.1/src/options_parsers.h mp3splt-2.6.0/src/options_parsers.h --- mp3splt-2.4.1/src/options_parsers.h 2011-07-30 21:11:05.000000000 +0000 +++ mp3splt-2.6.0/src/options_parsers.h 2013-02-08 09:23:35.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -27,7 +27,8 @@ #include "options_manager.h" int parse_silence_options(char *arg, float *th, int *gap, - int *nt, float *off, int *rm, float *min, float *min_track_length); + int *nt, float *off, int *rm, float *min, float *min_track_length, int *shots, + float *min_track_join, float *keep_silence_left, float *keep_silence_right); int parse_query_arg(options *opt, const char *query); regex_options *parse_tags_from_fname_regex_options(const char *parameters, int *error); diff -Nru mp3splt-2.4.1/src/print_utils.c mp3splt-2.6.0/src/print_utils.c --- mp3splt-2.4.1/src/print_utils.c 2011-11-11 21:50:31.000000000 +0000 +++ mp3splt-2.6.0/src/print_utils.c 2013-02-08 09:23:33.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "common.h" @@ -46,12 +46,62 @@ fflush(console_err); } -void put_library_message(const char *message, splt_message_type mess_type) +static void print_with_spaces_after(const char *printed_value, int print_carriage_return, + FILE *file, main_data *data) +{ + char *value = strdup(printed_value); + if (!value) + { + print_warning(_("cannot allocate memory !")); + } + + char temp[2048] = ""; + int this_spaces = strlen(value); + int counter = strlen(value); + while (counter <= data->printed_value_length) + { + temp[counter-this_spaces] = ' '; + counter++; + } + temp[counter] = '\0'; + + if (print_carriage_return) + { + fprintf(file, "%s%s\r", value, temp); + } + else + { + int has_slash_n = SPLT_FALSE; + if (strlen(value) > 0) + { + if (value[strlen(value)-1] == '\n') + { + has_slash_n = SPLT_TRUE; + } + } + + if (has_slash_n) + { + value[strlen(value)-1] = '\0'; + fprintf(file, "%s%s\n", value, temp); + } + else + { + fprintf(file, "%s%s", value, temp); + } + } + + fflush(file); + + free(value); +} + +void put_library_message(const char *message, splt_message_type mess_type, void *user_data) { if (mess_type == SPLT_MESSAGE_INFO) { - fprintf(console_out,"%s",message); - fflush(console_out); + main_data *data = (main_data *) user_data; + print_with_spaces_after(message, SPLT_FALSE, console_out, data); } else if (mess_type == SPLT_MESSAGE_DEBUG) { @@ -60,12 +110,14 @@ } } -void put_split_file(const char *file, int progress_data) +void put_split_file(const char *file, void *user_data) { + main_data *data = (main_data *) user_data; + char temp[1024] = ""; int this_spaces = strlen(file)+16; int counter = strlen(file)+16; - while (counter <= progress_data) + while (counter <= data->printed_value_length) { temp[counter-this_spaces] = ' '; counter++; @@ -76,41 +128,47 @@ fflush(console_out); } -void put_progress_bar(splt_progress *p_bar) +void put_progress_bar(splt_progress *p_bar, void *user_data) { + main_data *data = (main_data *)user_data; + char progress_text[2048] = " "; + char *filename_shorted = mp3splt_progress_get_filename_shorted(p_bar); - switch (p_bar->progress_type) + switch (mp3splt_progress_get_type(p_bar)) { case SPLT_PROGRESS_PREPARE: snprintf(progress_text,2047, _(" preparing \"%s\" (%d of %d)"), - p_bar->filename_shorted, - p_bar->current_split, - p_bar->max_splits); + filename_shorted, + mp3splt_progress_get_current_split(p_bar), + mp3splt_progress_get_max_splits(p_bar)); break; case SPLT_PROGRESS_CREATE: snprintf(progress_text,2047, _(" creating \"%s\" (%d of %d)"), - p_bar->filename_shorted, - p_bar->current_split, - p_bar->max_splits); + filename_shorted, + mp3splt_progress_get_current_split(p_bar), + mp3splt_progress_get_max_splits(p_bar)); break; case SPLT_PROGRESS_SEARCH_SYNC: snprintf(progress_text,2047, _(" searching for sync errors...")); break; case SPLT_PROGRESS_SCAN_SILENCE: - if (p_bar->silence_found_tracks > 0) + ; + int silence_found_tracks = mp3splt_progress_get_silence_found_tracks(p_bar); + float silence_db_level = mp3splt_progress_get_silence_db_level(p_bar); + if (silence_found_tracks > 0) { snprintf(progress_text,2047, _("S: %02d, Level: %.2f dB; scanning for silence..."), - p_bar->silence_found_tracks, p_bar->silence_db_level); + silence_found_tracks, silence_db_level); } else { snprintf(progress_text,2047, _("Level: %.2f dB; scanning for silence..."), - p_bar->silence_db_level); + silence_db_level); } break; default: @@ -118,42 +176,32 @@ break; } + float percent_progress = mp3splt_progress_get_percent_progress(p_bar); + char printed_value[2048] = ""; //we update the progress - if (p_bar->percent_progress <= 0.01) + if (percent_progress <= 0.01) { - snprintf(printed_value,2047," [ - %%] %s", progress_text); + snprintf(printed_value, 2047," [ - %%] %s", progress_text); } else { - snprintf(printed_value,2047," [ %.2f %%] %s", - p_bar->percent_progress * 100, progress_text); - } - - //we put necessary spaces - char temp[2048] = ""; - int this_spaces = strlen(printed_value); - int counter = strlen(printed_value); - while (counter <= p_bar->user_data) - { - temp[counter-this_spaces] = ' '; - counter++; + snprintf(printed_value, 2047," [ %.2f %%] %s", percent_progress * 100, progress_text); } - temp[counter] = '\0'; - fprintf(console_progress,"%s%s\r",printed_value,temp); - fflush(console_progress); + print_with_spaces_after(printed_value, SPLT_TRUE, console_progress, data); + data->printed_value_length = strlen(printed_value) + 1; - p_bar->user_data = strlen(printed_value)+1; + free(filename_shorted); } void print_version(FILE *std) { - char version[128] = { '\0' }; - mp3splt_get_version(version); + char *version = mp3splt_get_version(); fprintf(std, PACKAGE_NAME" "VERSION" ("MP3SPLT_DATE") -" - " %s libmp3splt %s\n",_("using"),version); + " %s libmp3splt %s\n",_("using"), version); fflush(std); + free(version); } void print_authors(FILE *std) @@ -251,7 +299,8 @@ print_message(_(" -m + M3U_FILE: Appends to the specified m3u file the split filenames.\n" " -f Frame mode (mp3 only): process all frames. For higher precision and VBR.\n" " -a Auto-Adjust splitpoints with silence detection. (Use -p for arguments)")); - print_message(_(" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin): user arguments for -s and -a.\n" + print_message(_(" -p + PARAMETERS (th, nt, off, min, rm, gap, trackmin, shots, trackjoin): " + "user arguments for -s, -a, -t.\n" " -o + FORMAT: output filename pattern. Can contain those variables:\n" " @a: artist tag, @p: performer tag (might not exists), @b: album tag\n" " @t: title tag, @n: track number identifier, @N: track tag number\n" diff -Nru mp3splt-2.4.1/src/print_utils.h mp3splt-2.6.0/src/print_utils.h --- mp3splt-2.4.1/src/print_utils.h 2011-02-23 20:48:17.000000000 +0000 +++ mp3splt-2.6.0/src/print_utils.h 2013-02-08 09:23:35.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef PRINT_UTILS_H @@ -30,9 +30,9 @@ void print_message(const char *m); void print_warning(const char *w); void print_error(const char *e); -void put_library_message(const char *message, splt_message_type mess_type); -void put_split_file(const char *file, int progress_data); -void put_progress_bar(splt_progress *p_bar); +void put_library_message(const char *message, splt_message_type mess_type, void *data); +void put_split_file(const char *file, void *data); +void put_progress_bar(splt_progress *p_bar, void *data); void print_version(FILE *std); void print_authors(FILE *std); void print_no_warranty(FILE *std); diff -Nru mp3splt-2.4.1/src/utils.c mp3splt-2.6.0/src/utils.c --- mp3splt-2.4.1/src/utils.c 2011-07-11 20:08:44.000000000 +0000 +++ mp3splt-2.6.0/src/utils.c 2013-02-08 09:23:33.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <stdlib.h> diff -Nru mp3splt-2.4.1/src/utils.h mp3splt-2.6.0/src/utils.h --- mp3splt-2.4.1/src/utils.h 2011-02-23 20:48:17.000000000 +0000 +++ mp3splt-2.6.0/src/utils.h 2013-02-08 09:23:35.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef UTILS_H diff -Nru mp3splt-2.4.1/src/windows_utils.c mp3splt-2.6.0/src/windows_utils.c --- mp3splt-2.4.1/src/windows_utils.c 2011-08-31 05:20:11.000000000 +0000 +++ mp3splt-2.6.0/src/windows_utils.c 2013-02-08 09:23:34.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef __WIN32__ diff -Nru mp3splt-2.4.1/src/windows_utils.h mp3splt-2.6.0/src/windows_utils.h --- mp3splt-2.4.1/src/windows_utils.h 2011-08-31 05:20:11.000000000 +0000 +++ mp3splt-2.6.0/src/windows_utils.h 2013-02-08 09:23:36.000000000 +0000 @@ -2,7 +2,7 @@ * Mp3Splt -- Utility for mp3/ogg splitting without decoding * * Copyright (c) 2002-2005 M. Trotta - <mtrotta@users.sourceforge.net> - * Copyright (c) 2005-2011 Alexandru Munteanu - <io_fx@yahoo.fr> + * Copyright (c) 2005-2013 Alexandru Munteanu - <m@ioalex.net> * * http://mp3splt.sourceforge.net * @@ -18,7 +18,7 @@ * * 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, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef __WIN32__ @@ -32,9 +32,10 @@ wchar_t *win32_get_current_directory(); void win32_set_current_working_directory(const wchar_t *dir); +char **win32_get_utf8_args(main_data *data); + #define WINDOWS_UTILS_H #endif - #endif