Browse Source

Cleanup lib-src

Removing:

id3lib
libresample
libsamplerate
taglib
mac-2.1.1-vi
Leland Lucius 7 years ago
parent
commit
a03d65ef4d
  1. 8
      Makefile.in
  2. 514
      configure
  3. 54
      configure.ac
  4. 8
      help/Makefile.in
  5. 8
      images/Makefile.in
  6. 17
      lib-src/Makefile.am
  7. 44
      lib-src/Makefile.in
  8. 42
      lib-src/audacity-patches.txt
  9. 4
      lib-src/id3lib/AUTHORS
  10. 482
      lib-src/id3lib/COPYING
  11. 315
      lib-src/id3lib/HISTORY
  12. 84
      lib-src/id3lib/Makefile.am
  13. 460
      lib-src/id3lib/Makefile.in
  14. 315
      lib-src/id3lib/NEWS
  15. 98
      lib-src/id3lib/README
  16. 106
      lib-src/id3lib/THANKS
  17. 42
      lib-src/id3lib/TODO
  18. 204
      lib-src/id3lib/acconfig
  19. 105
      lib-src/id3lib/acconfig.h
  20. 997
      lib-src/id3lib/config.guess
  21. 177
      lib-src/id3lib/config.h.in
  22. 175
      lib-src/id3lib/config.h.win32
  23. 175
      lib-src/id3lib/config.h.win32.in
  24. 979
      lib-src/id3lib/config.sub
  25. 115
      lib-src/id3lib/config.win32
  26. 4129
      lib-src/id3lib/configure
  27. 226
      lib-src/id3lib/configure.in
  28. 1748
      lib-src/id3lib/cvs2cl.pl
  29. 583
      lib-src/id3lib/id3lib.kdevprj
  30. 15
      lib-src/id3lib/id3lib.lsm
  31. 189
      lib-src/id3lib/id3lib.spec.in
  32. 4235
      lib-src/id3lib/libtool
  33. 3017
      lib-src/id3lib/ltconfig
  34. 3975
      lib-src/id3lib/ltmain.sh
  35. 178
      lib-src/id3lib/macconfig.h
  36. 190
      lib-src/id3lib/missing
  37. 40
      lib-src/id3lib/mkinstalldirs
  38. 24
      lib-src/id3lib/reconf
  39. 58
      lib-src/id3lib/rename.pl
  40. 1
      lib-src/id3lib/stamp-h.in
  41. 463
      lib-src/libresample/LICENSE.txt
  42. 58
      lib-src/libresample/Makefile.in
  43. 84
      lib-src/libresample/README.txt
  44. 1554
      lib-src/libresample/config.guess
  45. 1717
      lib-src/libresample/config.sub
  46. 4788
      lib-src/libresample/configure
  47. 79
      lib-src/libresample/configure.in
  48. 44
      lib-src/libresample/include/libresample.h
  49. 251
      lib-src/libresample/install-sh
  50. 49
      lib-src/libresample/src/configtemplate.h
  51. 215
      lib-src/libresample/src/filterkit.c
  52. 28
      lib-src/libresample/src/filterkit.h
  53. 347
      lib-src/libresample/src/resample.c
  54. 86
      lib-src/libresample/src/resample_defs.h
  55. 123
      lib-src/libresample/src/resamplesubs.c
  56. 183
      lib-src/libresample/tests/compareresample.c
  57. 213
      lib-src/libresample/tests/resample-sndfile.c
  58. 182
      lib-src/libresample/tests/testresample.c
  59. 776
      lib-src/libresample/win/libresample.vcproj
  60. 1
      lib-src/libsamplerate/AUTHORS
  61. 340
      lib-src/libsamplerate/COPYING
  62. 347
      lib-src/libsamplerate/Cfg/compile
  63. 1558
      lib-src/libsamplerate/Cfg/config.guess
  64. 1791
      lib-src/libsamplerate/Cfg/config.sub
  65. 791
      lib-src/libsamplerate/Cfg/depcomp
  66. 527
      lib-src/libsamplerate/Cfg/install-sh
  67. 9661
      lib-src/libsamplerate/Cfg/ltmain.sh
  68. 215
      lib-src/libsamplerate/Cfg/missing
  69. 978
      lib-src/libsamplerate/ChangeLog
  70. 370
      lib-src/libsamplerate/INSTALL
  71. 124
      lib-src/libsamplerate/M4/clip_mode.m4
  72. 158
      lib-src/libsamplerate/M4/endian.m4
  73. 7991
      lib-src/libsamplerate/M4/libtool.m4
  74. 38
      lib-src/libsamplerate/M4/llrint.m4
  75. 37
      lib-src/libsamplerate/M4/lrint.m4
  76. 37
      lib-src/libsamplerate/M4/lrintf.m4
  77. 384
      lib-src/libsamplerate/M4/ltoptions.m4
  78. 123
      lib-src/libsamplerate/M4/ltsugar.m4
  79. 23
      lib-src/libsamplerate/M4/ltversion.m4
  80. 98
      lib-src/libsamplerate/M4/lt~obsolete.m4
  81. 155
      lib-src/libsamplerate/M4/pkg.m4
  82. 24
      lib-src/libsamplerate/M4/signal.m4
  83. 22
      lib-src/libsamplerate/Make.bat
  84. 24
      lib-src/libsamplerate/Makefile.am
  85. 842
      lib-src/libsamplerate/Makefile.in
  86. 33
      lib-src/libsamplerate/NEWS
  87. 50
      lib-src/libsamplerate/README
  88. 2
      lib-src/libsamplerate/Win32/Makefile.am
  89. 407
      lib-src/libsamplerate/Win32/Makefile.in
  90. 155
      lib-src/libsamplerate/Win32/Makefile.mingw.in
  91. 150
      lib-src/libsamplerate/Win32/Makefile.msvc
  92. 204
      lib-src/libsamplerate/Win32/config.h
  93. 28
      lib-src/libsamplerate/Win32/libsamplerate-0.def
  94. 901
      lib-src/libsamplerate/Win32/libsamplerate.vcproj
  95. 22
      lib-src/libsamplerate/Win32/unistd.h
  96. 74
      lib-src/libsamplerate/autotools.patch
  97. 15648
      lib-src/libsamplerate/configure
  98. 316
      lib-src/libsamplerate/configure.ac
  99. 978
      lib-src/libsamplerate/doc/ChangeLog
  100. 5
      lib-src/libsamplerate/doc/Makefile.am

8
Makefile.in

@ -104,8 +104,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
$(top_srcdir)/m4/audacity_checklib_libid3tag.m4 \
$(top_srcdir)/m4/audacity_checklib_libmad.m4 \
$(top_srcdir)/m4/audacity_checklib_libnyquist.m4 \
$(top_srcdir)/m4/audacity_checklib_libresample.m4 \
$(top_srcdir)/m4/audacity_checklib_libsamplerate.m4 \
$(top_srcdir)/m4/audacity_checklib_libsbsms.m4 \
$(top_srcdir)/m4/audacity_checklib_libsndfile.m4 \
$(top_srcdir)/m4/audacity_checklib_libsoundtouch.m4 \
@ -354,11 +352,7 @@ LIBMAD_LIBS = @LIBMAD_LIBS@
LIBNYQUIST_CFLAGS = @LIBNYQUIST_CFLAGS@
LIBNYQUIST_LIBS = @LIBNYQUIST_LIBS@
LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@ -402,8 +396,6 @@ PORTSMF_LIBS = @PORTSMF_LIBS@
POSUB = @POSUB@
PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
RANLIB = @RANLIB@
SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
SBSMS_CFLAGS = @SBSMS_CFLAGS@
SBSMS_LIBS = @SBSMS_LIBS@
SED = @SED@

514
configure

@ -677,8 +677,6 @@ USE_LIBTWOLAME_FALSE
USE_LIBTWOLAME_TRUE
USE_LOCAL_LIBSOXR_FALSE
USE_LOCAL_LIBSOXR_TRUE
USE_LIBSOXR_FALSE
USE_LIBSOXR_TRUE
USE_LOCAL_LIBSOUNDTOUCH_FALSE
USE_LOCAL_LIBSOUNDTOUCH_TRUE
USE_LIBSOUNDTOUCH_FALSE
@ -689,18 +687,6 @@ USE_LOCAL_SBSMS_FALSE
USE_LOCAL_SBSMS_TRUE
USE_SBSMS_FALSE
USE_SBSMS_TRUE
USE_LOCAL_LIBSAMPLERATE_FALSE
USE_LOCAL_LIBSAMPLERATE_TRUE
USE_LIBSAMPLERATE_FALSE
USE_LIBSAMPLERATE_TRUE
SAMPLERATE_LIBS
SAMPLERATE_CFLAGS
USE_LOCAL_LIBRESAMPLE_FALSE
USE_LOCAL_LIBRESAMPLE_TRUE
USE_LIBRESAMPLE_FALSE
USE_LIBRESAMPLE_TRUE
LIBRESAMPLE_LIBS
LIBRESAMPLE_CFLAGS
USE_LOCAL_LIBNYQUIST_FALSE
USE_LOCAL_LIBNYQUIST_TRUE
USE_LIBNYQUIST_FALSE
@ -759,8 +745,6 @@ SNDFILE_LIBS
SNDFILE_CFLAGS
SBSMS_LIBS
SBSMS_CFLAGS
LIBSAMPLERATE_SYSTEM_LIBS
LIBSAMPLERATE_SYSTEM_CFLAGS
LIBMAD_LIBS
LIBMAD_CFLAGS
ID3TAG_LIBS
@ -964,8 +948,6 @@ with_libflac
with_libid3tag
with_libmad
enable_nyquist
with_libresample
with_libsamplerate
with_sbsms
with_libsndfile
with_soundtouch
@ -1011,8 +993,6 @@ ID3TAG_CFLAGS
ID3TAG_LIBS
LIBMAD_CFLAGS
LIBMAD_LIBS
LIBSAMPLERATE_SYSTEM_CFLAGS
LIBSAMPLERATE_SYSTEM_LIBS
SBSMS_CFLAGS
SBSMS_LIBS
SNDFILE_CFLAGS
@ -1045,8 +1025,6 @@ lib-src/libflac
lib-src/libid3tag
lib-src/libmad
lib-src/libnyquist
lib-src/libresample
lib-src/libsamplerate
lib-src/sbsms
lib-src/libsndfile
lib-src/soundtouch
@ -1732,12 +1710,11 @@ Optional Packages:
--with-libflac use libFLAC for FLAC support
--with-libid3tag use libid3tag for mp3 id3 tag support
--with-libmad use libmad for mp2/3 decoding support
--with-libresample use libresample for sample rate conversion
--with-libsamplerate use libsamplerate for sample rate conversion
--with-sbsms use libsbsms for pitch and tempo changing
--with-libsndfile which libsndfile to use (required): [system,local]
--with-soundtouch use libSoundTouch for pitch and tempo changing
--with-libsoxr use libsoxr for sample rate conversion
--with-libsoxr use libsoxr for sample rate conversion (required):
[system,local]
--with-libtwolame use libtwolame for MP2 export support
--with-libvamp use libvamp for Vamp plug-in support [default=yes]
--with-libvorbis use libvorbis for Ogg Vorbis support
@ -1783,10 +1760,6 @@ Some influential environment variables:
LIBMAD_CFLAGS
C compiler flags for LIBMAD, overriding pkg-config
LIBMAD_LIBS linker flags for LIBMAD, overriding pkg-config
LIBSAMPLERATE_SYSTEM_CFLAGS
C compiler flags for LIBSAMPLERATE_SYSTEM, overriding pkg-config
LIBSAMPLERATE_SYSTEM_LIBS
linker flags for LIBSAMPLERATE_SYSTEM, overriding pkg-config
SBSMS_CFLAGS
C compiler flags for SBSMS, overriding pkg-config
SBSMS_LIBS linker flags for SBSMS, overriding pkg-config
@ -2916,7 +2889,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
am__api_version='1.13'
am__api_version='1.14'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@ -3569,6 +3542,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
# POSIX will say in a future version that running "rm -f" with no argument
# is OK; and we want to be able to make that assumption in our Makefile
# recipes. So use an aggressive probe to check that the usage we want is
# actually supported "in the wild" to an acceptable degree.
# See automake bug#10828.
# To make any issue more visible, cause the running configure to be aborted
# by default if the 'rm' program in use doesn't match our expectations; the
# user can still override this though.
if rm -f && rm -fr && rm -rf; then : OK; else
cat >&2 <<'END'
Oops!
Your 'rm' program seems unable to run without file operands specified
on the command line, even when the '-f' option is present. This is contrary
to the behaviour of most rm programs out there, and not conforming with
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
Please tell bug-automake@gnu.org about your system, including the value
of your $PATH and any error possibly output before this message. This
can help us improve future automake versions.
END
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
echo 'Configuration will proceed anyway, since you have set the' >&2
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
echo >&2
else
cat >&2 <<'END'
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
to "yes", and re-run configure.
END
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
{ $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; }
@ -4769,6 +4783,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
if ${am_cv_prog_cc_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
# Make sure it works both with $CC and with simple cc.
# Following AC_PROG_CC_C_O, we do the test twice because some
# compilers refuse to overwrite an existing .o file with -o,
# though they will create one.
am_cv_prog_cc_c_o=yes
for am_i in 1 2; do
if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } \
&& test -f conftest2.$ac_objext; then
: OK
else
am_cv_prog_cc_c_o=no
break
fi
done
rm -f core conftest*
unset am_i
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
$as_echo "$am_cv_prog_cc_c_o" >&6; }
if test "$am_cv_prog_cc_c_o" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@ -7518,6 +7591,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
if ${am_cv_prog_cc_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
# Make sure it works both with $CC and with simple cc.
# Following AC_PROG_CC_C_O, we do the test twice because some
# compilers refuse to overwrite an existing .o file with -o,
# though they will create one.
am_cv_prog_cc_c_o=yes
for am_i in 1 2; do
if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } \
&& test -f conftest2.$ac_objext; then
: OK
else
am_cv_prog_cc_c_o=no
break
fi
done
rm -f core conftest*
unset am_i
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
$as_echo "$am_cv_prog_cc_c_o" >&6; }
if test "$am_cv_prog_cc_c_o" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@ -8174,7 +8306,6 @@ CFLAGS="$cflags_save"
CPPFLAGS="$cppflags_save"
CXXFLAGS="$cxxflags_save"
if test -n "$ac_tool_prefix"; then
for ac_prog in ar lib "link -lib"
do
@ -8282,12 +8413,18 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
if ${am_cv_ar_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_ar_interface=ar
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
am_cv_ar_interface=ar
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int some_variable = 0;
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
if ac_fn_c_try_compile "$LINENO"; then :
am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
(eval $am_ar_try) 2>&5
@ -8313,6 +8450,11 @@ if ac_fn_cxx_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
@ -9725,6 +9867,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
if test -n "$ac_tool_prefix"; then
for ac_prog in ar
do
@ -19723,7 +19866,7 @@ CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog"
FILEDIALOG_LIBS='$(top_builddir)/lib-src/FileDialog/libFileDialog.la'
LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA"
LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA"
{ $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5
$as_echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
@ -20970,173 +21113,6 @@ $as_echo "$as_me: nyquist libraries are NOT available in the local tree" >&6;}
# Check whether --with-libresample was given.
if test "${with_libresample+set}" = set; then :
withval=$with_libresample; LIBRESAMPLE_ARGUMENT=$withval
else
LIBRESAMPLE_ARGUMENT="unspecified"
fi
LIBRESAMPLE_SYSTEM_AVAILABLE="no"
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libresample/include/libresample.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libresample/include/libresample.h" >&5
$as_echo_n "checking for ${srcdir}/lib-src/libresample/include/libresample.h... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "${srcdir}/lib-src/libresample/include/libresample.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
LIBRESAMPLE_LOCAL_AVAILABLE="yes"
else
LIBRESAMPLE_LOCAL_AVAILABLE="no"
fi
if test "$LIBRESAMPLE_LOCAL_AVAILABLE" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: libresample libraries are available in the local tree" >&5
$as_echo "$as_me: libresample libraries are available in the local tree" >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: libresample libraries are NOT available in the local tree" >&5
$as_echo "$as_me: libresample libraries are NOT available in the local tree" >&6;}
fi
# Check whether --with-libsamplerate was given.
if test "${with_libsamplerate+set}" = set; then :
withval=$with_libsamplerate; LIBSAMPLERATE_ARGUMENT=$withval
else
LIBSAMPLERATE_ARGUMENT="unspecified"
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE_SYSTEM" >&5
$as_echo_n "checking for LIBSAMPLERATE_SYSTEM... " >&6; }
if test -n "$LIBSAMPLERATE_SYSTEM_CFLAGS"; then
pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS="$LIBSAMPLERATE_SYSTEM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5
($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$LIBSAMPLERATE_SYSTEM_LIBS"; then
pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS="$LIBSAMPLERATE_SYSTEM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5
($PKG_CONFIG --exists --print-errors "samplerate >= 0.1.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBSAMPLERATE_SYSTEM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "samplerate >= 0.1.2" 2>&1`
else
LIBSAMPLERATE_SYSTEM_PKG_ERRORS=`$PKG_CONFIG --print-errors "samplerate >= 0.1.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSAMPLERATE_SYSTEM_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
elif test $pkg_failed = untried; then
LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
else
LIBSAMPLERATE_SYSTEM_CFLAGS=$pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS
LIBSAMPLERATE_SYSTEM_LIBS=$pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LIBSAMPLERATE_SYSTEM_AVAILABLE="yes"
fi
if test "$LIBSAMPLERATE_SYSTEM_AVAILABLE" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate libraries are available as system libraries" >&5
$as_echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate libraries are NOT available as system libraries" >&5
$as_echo "$as_me: Libsamplerate libraries are NOT available as system libraries" >&6;}
fi
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsamplerate/src/samplerate.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h" >&5
$as_echo_n "checking for ${srcdir}/lib-src/libsamplerate/src/samplerate.h... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "${srcdir}/lib-src/libsamplerate/src/samplerate.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
LIBSAMPLERATE_LOCAL_AVAILABLE="yes"
else
LIBSAMPLERATE_LOCAL_AVAILABLE="no"
fi
if test "$LIBSAMPLERATE_LOCAL_AVAILABLE" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: libsamplerate libraries are available in the local tree" >&5
$as_echo "$as_me: libsamplerate libraries are available in the local tree" >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: libsamplerate libraries are NOT available in the local tree" >&5
$as_echo "$as_me: libsamplerate libraries are NOT available in the local tree" >&6;}
fi
# Check whether --with-sbsms was given.
if test "${with_sbsms+set}" = set; then :
withval=$with_sbsms; LIBSBSMS_ARGUMENT=$withval
@ -22725,7 +22701,7 @@ done
# * we need to have libwidgetextra one way or another
# * we need to have libsndfile one way or another
# * we need to have portaudio way or another
# * we can only use one of libsoxr, libsamplerate and libresample
# * we need to have libsoxr
if test "$EXPAT_USE_LOCAL" != "yes" -a "$EXPAT_USE_SYSTEM" != "yes"; then
as_fn_error $? "Audacity requires expat to be enabled." "$LINENO" 5
@ -22743,38 +22719,10 @@ if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes"
as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
fi
if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
LIBSAMPLERATE_USE_LOCAL="no"
LIBSAMPLERATE_USE_SYSTEM="no"
fi
if test x"$LIBRESAMPLE_ARGUMENT" = x"unspecified" ; then
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
fi
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSOXR_USE_LOCAL" = "yes" || test "$LIBSOXR_USE_SYSTEM" = "yes"); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsoxr were requested: favouring libsoxr." >&5
$as_echo "$as_me: Both libresample and libsoxr were requested: favouring libsoxr." >&6;}
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
fi
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate were requested: favouring libsamplerate" >&5
$as_echo "$as_me: Both libresample and libsamplerate were requested: favouring libsamplerate" >&6;}
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
if test "$LIBSOXR_USE_LOCAL" != "yes" && test "$LIBSOXR_USE_SYSTEM" != "yes" ; then
as_fn_error $? "Audacity requires libsoxr to be enabled" "$LINENO" 5
fi
if ( test "$LIBSOXR_USE_LOCAL" = "yes" || test "$LIBSOXR_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libsoxr and libsamplerate were requested: favouring libsoxr" >&5
$as_echo "$as_me: Both libsoxr and libsamplerate were requested: favouring libsoxr" >&6;}
LIBSOXR_USE_LOCAL="no"
LIBSOXR_USE_SYSTEM="no"
fi
for lib in $LIBRARIES ; do
eval LIB_USE_LOCAL=\$${lib}_USE_LOCAL
eval LIB_USE_SYSTEM=\$${lib}_USE_SYSTEM
@ -23067,74 +23015,6 @@ $as_echo "#define USE_NYQUIST 1" >>confdefs.h
fi
if test "$LIBRESAMPLE_USE_LOCAL" = yes; then
LIBRESAMPLE_CFLAGS='-I$(top_srcdir)/lib-src/libresample/include'
LIBRESAMPLE_LIBS='$(top_builddir)/lib-src/libresample/libresample.a'
subdirs="$subdirs lib-src/libresample"
fi
if test "$LIBRESAMPLE_USE_LOCAL" = yes -o "$LIBRESAMPLE_USE_SYSTEM" = yes; then
USE_LIBRESAMPLE_TRUE=
USE_LIBRESAMPLE_FALSE='#'
else
USE_LIBRESAMPLE_TRUE='#'
USE_LIBRESAMPLE_FALSE=
fi
if test "$LIBRESAMPLE_USE_LOCAL" = yes; then
USE_LOCAL_LIBRESAMPLE_TRUE=
USE_LOCAL_LIBRESAMPLE_FALSE='#'
else
USE_LOCAL_LIBRESAMPLE_TRUE='#'
USE_LOCAL_LIBRESAMPLE_FALSE=
fi
if test "$LIBRESAMPLE_USE_LOCAL" = yes -o "$LIBRESAMPLE_USE_SYSTEM" = yes; then
$as_echo "#define USE_LIBRESAMPLE 1" >>confdefs.h
fi
if test "$LIBSAMPLERATE_USE_LOCAL" = yes; then
SAMPLERATE_CFLAGS='-I$(top_srcdir)/lib-src/libsamplerate/src'
SAMPLERATE_LIBS='$(top_builddir)/lib-src/libsamplerate/libsamplerate.a'
subdirs="$subdirs lib-src/libsamplerate"
fi
if test "$LIBSAMPLERATE_USE_LOCAL" = yes -o "$LIBSAMPLERATE_USE_SYSTEM" = yes; then
USE_LIBSAMPLERATE_TRUE=
USE_LIBSAMPLERATE_FALSE='#'
else
USE_LIBSAMPLERATE_TRUE='#'
USE_LIBSAMPLERATE_FALSE=
fi
if test "$LIBSAMPLERATE_USE_LOCAL" = yes; then
USE_LOCAL_LIBSAMPLERATE_TRUE=
USE_LOCAL_LIBSAMPLERATE_FALSE='#'
else
USE_LOCAL_LIBSAMPLERATE_TRUE='#'
USE_LOCAL_LIBSAMPLERATE_FALSE=
fi
if test "$LIBSAMPLERATE_USE_LOCAL" = yes -o "$LIBSAMPLERATE_USE_SYSTEM" = yes; then
$as_echo "#define USE_LIBSAMPLERATE 1" >>confdefs.h
fi
if test "$LIBSBSMS_USE_LOCAL" = yes; then
SBSMS_CFLAGS='-I$(top_srcdir)/lib-src/sbsms/include'
SBSMS_LIBS='$(top_builddir)/lib-src/sbsms/src/.libs/libsbsms.a'
@ -23233,14 +23113,6 @@ $as_echo "#define USE_SOUNDTOUCH 1" >>confdefs.h
if test "$LIBSOXR_USE_LOCAL" = yes -o "$LIBSOXR_USE_SYSTEM" = yes; then
USE_LIBSOXR_TRUE=
USE_LIBSOXR_FALSE='#'
else
USE_LIBSOXR_TRUE='#'
USE_LIBSOXR_FALSE=
fi
if test "$LIBSOXR_USE_LOCAL" = yes; then
USE_LOCAL_LIBSOXR_TRUE=
USE_LOCAL_LIBSOXR_FALSE='#'
@ -23250,12 +23122,6 @@ else
fi
if test "$LIBSOXR_USE_LOCAL" = yes -o "$LIBSOXR_USE_SYSTEM" = yes; then
$as_echo "#define USE_LIBSOXR 1" >>confdefs.h
fi
if test "$LIBTWOLAME_USE_LOCAL" = yes; then
LIBTWOLAME_CFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame'
@ -24460,22 +24326,6 @@ if test -z "${USE_LOCAL_LIBNYQUIST_TRUE}" && test -z "${USE_LOCAL_LIBNYQUIST_FAL
as_fn_error $? "conditional \"USE_LOCAL_LIBNYQUIST\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LIBRESAMPLE_TRUE}" && test -z "${USE_LIBRESAMPLE_FALSE}"; then
as_fn_error $? "conditional \"USE_LIBRESAMPLE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LOCAL_LIBRESAMPLE_TRUE}" && test -z "${USE_LOCAL_LIBRESAMPLE_FALSE}"; then
as_fn_error $? "conditional \"USE_LOCAL_LIBRESAMPLE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LIBSAMPLERATE_TRUE}" && test -z "${USE_LIBSAMPLERATE_FALSE}"; then
as_fn_error $? "conditional \"USE_LIBSAMPLERATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LOCAL_LIBSAMPLERATE_TRUE}" && test -z "${USE_LOCAL_LIBSAMPLERATE_FALSE}"; then
as_fn_error $? "conditional \"USE_LOCAL_LIBSAMPLERATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_SBSMS_TRUE}" && test -z "${USE_SBSMS_FALSE}"; then
as_fn_error $? "conditional \"USE_SBSMS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -24496,10 +24346,6 @@ if test -z "${USE_LOCAL_LIBSOUNDTOUCH_TRUE}" && test -z "${USE_LOCAL_LIBSOUNDTOU
as_fn_error $? "conditional \"USE_LOCAL_LIBSOUNDTOUCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LIBSOXR_TRUE}" && test -z "${USE_LIBSOXR_FALSE}"; then
as_fn_error $? "conditional \"USE_LIBSOXR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_LOCAL_LIBSOXR_TRUE}" && test -z "${USE_LOCAL_LIBSOXR_FALSE}"; then
as_fn_error $? "conditional \"USE_LOCAL_LIBSOXR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

54
configure.ac

@ -336,7 +336,7 @@ dnl Optional library support. Lots of things we could use, but
dnl can do without if they aren't available.
dnl-------------------------------------------------------------
dnl GSTREAMER removed for 2.0.6 release
LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA"
LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA"
AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
@ -348,8 +348,6 @@ AUDACITY_CHECKLIB_LIBFLAC
AUDACITY_CHECKLIB_LIBID3TAG
AUDACITY_CHECKLIB_LIBMAD
AUDACITY_CHECKLIB_LIBNYQUIST
AUDACITY_CHECKLIB_LIBRESAMPLE
AUDACITY_CHECKLIB_LIBSAMPLERATE
AUDACITY_CHECKLIB_LIBSBSMS
AUDACITY_CHECKLIB_LIBSNDFILE
AUDACITY_CHECKLIB_LIBSOUNDTOUCH
@ -417,7 +415,7 @@ done
# * we need to have libwidgetextra one way or another
# * we need to have libsndfile one way or another
# * we need to have portaudio way or another
# * we can only use one of libsoxr, libsamplerate and libresample
# * we need to have libsoxr
if test "$EXPAT_USE_LOCAL" != "yes" -a "$EXPAT_USE_SYSTEM" != "yes"; then
AC_MSG_ERROR([Audacity requires expat to be enabled.])
@ -435,51 +433,9 @@ if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes"
AC_MSG_ERROR([Audacity requires portaudio to be enabled])
fi
dnl we can only have one alternative resampling library used.
dnl by now we will have multiple enabled if they are present, regardless of whether
dnl they were requested, unless some were specifically disabled.
dnl we would like to honour requests at this stage, so need to know about
dnl the original options, not just which LIB_USE variables have been set.
if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
dnl they didn't ask for libsamplerate, they don't get it
LIBSAMPLERATE_USE_LOCAL="no"
LIBSAMPLERATE_USE_SYSTEM="no"
if test "$LIBSOXR_USE_LOCAL" != "yes" && test "$LIBSOXR_USE_SYSTEM" != "yes" ; then
AC_MSG_ERROR([Audacity requires libsoxr to be enabled])
fi
if test x"$LIBRESAMPLE_ARGUMENT" = x"unspecified" ; then
dnl they didn't ask for libresample, they don't get it
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
fi
dnl The above favours libsoxr (by ommission) if no options are passed
dnl favour libsoxr over libresample
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSOXR_USE_LOCAL" = "yes" || test "$LIBSOXR_USE_SYSTEM" = "yes"); then
dnl if we get here, both libsoxr and libresample available and have been
dnl requested: use libsoxr, disable libresample
AC_MSG_NOTICE([Both libresample and libsoxr were requested: favouring libsoxr.])
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
fi
dnl favour libsamplerate over libresample
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
dnl if we get here, both libresample and libsamplerate available and requested:
dnl use libsamplerate, disable libresample.
AC_MSG_NOTICE([Both libresample and libsamplerate were requested: favouring libsamplerate])
LIBRESAMPLE_USE_LOCAL="no"
LIBRESAMPLE_USE_SYSTEM="no"
fi
dnl by now the only possible combination is libsamplerate and libsoxr: favour libsoxr.
if ( test "$LIBSOXR_USE_LOCAL" = "yes" || test "$LIBSOXR_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
dnl if we get here, both libsoxr and libsamplerate available and requested:
dnl use libsoxr, disable libsamplerate.
AC_MSG_NOTICE([Both libsoxr and libsamplerate were requested: favouring libsoxr])
LIBSOXR_USE_LOCAL="no"
LIBSOXR_USE_SYSTEM="no"
fi
dnl-----------------------------------------------------------------
dnl Based on the optional lib selections, modify CXXFLAGS, etc
@ -520,8 +476,6 @@ AUDACITY_CONFIG_LIBFLAC
AUDACITY_CONFIG_LIBID3TAG
AUDACITY_CONFIG_LIBMAD
AUDACITY_CONFIG_LIBNYQUIST
AUDACITY_CONFIG_LIBRESAMPLE
AUDACITY_CONFIG_LIBSAMPLERATE
AUDACITY_CONFIG_LIBSBSMS
AUDACITY_CONFIG_LIBSNDFILE
AUDACITY_CONFIG_LIBSOUNDTOUCH

8
help/Makefile.in

@ -92,8 +92,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
$(top_srcdir)/m4/audacity_checklib_libid3tag.m4 \
$(top_srcdir)/m4/audacity_checklib_libmad.m4 \
$(top_srcdir)/m4/audacity_checklib_libnyquist.m4 \
$(top_srcdir)/m4/audacity_checklib_libresample.m4 \
$(top_srcdir)/m4/audacity_checklib_libsamplerate.m4 \
$(top_srcdir)/m4/audacity_checklib_libsbsms.m4 \
$(top_srcdir)/m4/audacity_checklib_libsndfile.m4 \
$(top_srcdir)/m4/audacity_checklib_libsoundtouch.m4 \
@ -263,11 +261,7 @@ LIBMAD_LIBS = @LIBMAD_LIBS@
LIBNYQUIST_CFLAGS = @LIBNYQUIST_CFLAGS@
LIBNYQUIST_LIBS = @LIBNYQUIST_LIBS@
LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@ -311,8 +305,6 @@ PORTSMF_LIBS = @PORTSMF_LIBS@
POSUB = @POSUB@
PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
RANLIB = @RANLIB@
SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
SBSMS_CFLAGS = @SBSMS_CFLAGS@
SBSMS_LIBS = @SBSMS_LIBS@
SED = @SED@

8
images/Makefile.in

@ -94,8 +94,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
$(top_srcdir)/m4/audacity_checklib_libid3tag.m4 \
$(top_srcdir)/m4/audacity_checklib_libmad.m4 \
$(top_srcdir)/m4/audacity_checklib_libnyquist.m4 \
$(top_srcdir)/m4/audacity_checklib_libresample.m4 \
$(top_srcdir)/m4/audacity_checklib_libsamplerate.m4 \
$(top_srcdir)/m4/audacity_checklib_libsbsms.m4 \
$(top_srcdir)/m4/audacity_checklib_libsndfile.m4 \
$(top_srcdir)/m4/audacity_checklib_libsoundtouch.m4 \
@ -267,11 +265,7 @@ LIBMAD_LIBS = @LIBMAD_LIBS@
LIBNYQUIST_CFLAGS = @LIBNYQUIST_CFLAGS@
LIBNYQUIST_LIBS = @LIBNYQUIST_LIBS@
LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@ -315,8 +309,6 @@ PORTSMF_LIBS = @PORTSMF_LIBS@
POSUB = @POSUB@
PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
RANLIB = @RANLIB@
SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
SBSMS_CFLAGS = @SBSMS_CFLAGS@
SBSMS_LIBS = @SBSMS_LIBS@
SED = @SED@

17
lib-src/Makefile.am

@ -89,6 +89,7 @@ EXTRA_DIST += audacity-patches.txt \
DIST_SUBDIRS = \
FileDialog \
libnyquist \
libsoxr \
lib-widget-extra \
lv2 \
portmixer \
@ -122,24 +123,16 @@ if USE_LOCAL_LIBNYQUIST
SUBDIRS += libnyquist
endif
if USE_LOCAL_LIBRESAMPLE
OPTIONAL_SUBDIRS += libresample
endif
if USE_LOCAL_LIBSAMPLERATE
OPTIONAL_SUBDIRS += libsamplerate
endif
if USE_LOCAL_LIBSNDFILE
OPTIONAL_SUBDIRS += libsndfile
endif
if USE_LOCAL_LIBSOUNDTOUCH
OPTIONAL_SUBDIRS += soundtouch
if USE_LOCAL_LIBSOXR
OPTIONAL_SUBDIRS += libsoxr
endif
if USE_LOCAL_LIBSOXR
SUBDIRS += libsoxr
if USE_LOCAL_LIBSOUNDTOUCH
OPTIONAL_SUBDIRS += soundtouch
endif
if USE_LOCAL_LIBTWOLAME

44
lib-src/Makefile.in

@ -84,22 +84,20 @@ DIST_COMMON = $(srcdir)/dist-libsoxr.mk $(srcdir)/dist-libvamp.mk \
@USE_LOCAL_LIBID3TAG_TRUE@am__append_2 = libid3tag
@USE_LOCAL_LIBMAD_TRUE@am__append_3 = libmad
@USE_LOCAL_LIBNYQUIST_TRUE@am__append_4 = libnyquist
@USE_LOCAL_LIBRESAMPLE_TRUE@am__append_5 = libresample
@USE_LOCAL_LIBSAMPLERATE_TRUE@am__append_6 = libsamplerate
@USE_LOCAL_LIBSNDFILE_TRUE@am__append_7 = libsndfile
@USE_LOCAL_LIBSOUNDTOUCH_TRUE@am__append_8 = soundtouch
@USE_LOCAL_LIBSOXR_TRUE@am__append_9 = libsoxr
@USE_LOCAL_LIBTWOLAME_TRUE@am__append_10 = twolame
@USE_LOCAL_LIBVORBIS_TRUE@am__append_11 = libogg libvorbis
@USE_LOCAL_LIBSNDFILE_TRUE@am__append_5 = libsndfile
@USE_LOCAL_LIBSOXR_TRUE@am__append_6 = libsoxr
@USE_LOCAL_LIBSOUNDTOUCH_TRUE@am__append_7 = soundtouch
@USE_LOCAL_LIBTWOLAME_TRUE@am__append_8 = twolame
@USE_LOCAL_LIBVORBIS_TRUE@am__append_9 = libogg libvorbis
# Note: libflac needs to be linked against (the local or system) libogg.
@USE_LOCAL_LIBFLAC_TRUE@am__append_12 = libflac
@USE_LOCAL_LV2_TRUE@am__append_13 = lv2
@USE_LOCAL_PORTAUDIO_TRUE@am__append_14 = portaudio-v19
@USE_LOCAL_PORTSMF_TRUE@am__append_15 = portsmf
@USE_LOCAL_SBSMS_TRUE@am__append_16 = sbsms
@USE_LOCAL_VAMP_TRUE@am__append_17 = libvamp
@USE_LOCAL_WIDGETEXTRA_TRUE@am__append_18 = lib-widget-extra
@USE_LOCAL_LIBFLAC_TRUE@am__append_10 = libflac
@USE_LOCAL_LV2_TRUE@am__append_11 = lv2
@USE_LOCAL_PORTAUDIO_TRUE@am__append_12 = portaudio-v19
@USE_LOCAL_PORTSMF_TRUE@am__append_13 = portsmf
@USE_LOCAL_SBSMS_TRUE@am__append_14 = sbsms
@USE_LOCAL_VAMP_TRUE@am__append_15 = libvamp
@USE_LOCAL_WIDGETEXTRA_TRUE@am__append_16 = lib-widget-extra
subdir = lib-src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
@ -112,8 +110,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
$(top_srcdir)/m4/audacity_checklib_libid3tag.m4 \
$(top_srcdir)/m4/audacity_checklib_libmad.m4 \
$(top_srcdir)/m4/audacity_checklib_libnyquist.m4 \
$(top_srcdir)/m4/audacity_checklib_libresample.m4 \
$(top_srcdir)/m4/audacity_checklib_libsamplerate.m4 \
$(top_srcdir)/m4/audacity_checklib_libsbsms.m4 \
$(top_srcdir)/m4/audacity_checklib_libsndfile.m4 \
$(top_srcdir)/m4/audacity_checklib_libsoundtouch.m4 \
@ -310,11 +306,7 @@ LIBMAD_LIBS = @LIBMAD_LIBS@
LIBNYQUIST_CFLAGS = @LIBNYQUIST_CFLAGS@
LIBNYQUIST_LIBS = @LIBNYQUIST_LIBS@
LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@ -358,8 +350,6 @@ PORTSMF_LIBS = @PORTSMF_LIBS@
POSUB = @POSUB@
PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
RANLIB = @RANLIB@
SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
SBSMS_CFLAGS = @SBSMS_CFLAGS@
SBSMS_LIBS = @SBSMS_LIBS@
SED = @SED@
@ -937,6 +927,7 @@ EXTRA_DIST = ffmpeg/libavcodec/avcodec.h ffmpeg/libavcodec/avfft.h \
DIST_SUBDIRS = \
FileDialog \
libnyquist \
libsoxr \
lib-widget-extra \
lv2 \
portmixer \
@ -951,13 +942,12 @@ DIST_SUBDIRS = \
# Note: portmixer needs to be linked against (the local or system) portaudio.
# Note: These optional libraries will not be distributed in the source tarball.
SUBDIRS = FileDialog $(am__append_4) $(am__append_9) $(am__append_13) \
$(am__append_14) portmixer $(am__append_15) $(am__append_16) \
$(am__append_17) $(am__append_18) $(OPTIONAL_SUBDIRS)
SUBDIRS = FileDialog $(am__append_4) $(am__append_11) $(am__append_12) \
portmixer $(am__append_13) $(am__append_14) $(am__append_15) \
$(am__append_16) $(OPTIONAL_SUBDIRS)
OPTIONAL_SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_5) $(am__append_6) $(am__append_7) \
$(am__append_8) $(am__append_10) $(am__append_11) \
$(am__append_12)
$(am__append_8) $(am__append_9) $(am__append_10)
all: all-recursive
.SUFFIXES:

42
lib-src/audacity-patches.txt

@ -18,10 +18,6 @@ The customised file saving dialogs for wxwidgets to provide the options
button for format preferences. This is written and maintained by us so doesn't
have an upstream at the moment.
id3lib
------
disused?
libflac
-------
http://flac.sourceforge.net/
@ -75,27 +71,6 @@ AM_MAINTAINER_MODE has been called with "disable" in configure.ac to disable
autotools rebuilds by default.
Upstream Version: 1.3.1
libresample
-----------
Audio sample rate conversion library. Maintained by Audacity project.
(Depreciated in favour of libsoxr)
libsamplerate
-------------
Erik de Castro Lopo's high quality sample rate conversion library. Not used
in release builds, could probably be removed altogther except for comparision
purposes.
Version in Audacity SVN: 0.1.7
Patches: endian.m4, lrint.m4, llrint.m4, lrintf.m4, clip_mode.m4 copied from
libsndfile's M4/.
signal.m4 created out of the tail of acinclude.m4 with the remaining
necessary macro
autotools.patch: Fix autotools warnings.
libsndfile-srcdir.patch: Add srcdir handling
AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
by default
Upstream Version: 0.1.8
libsndfile
----------
Erik de Castro Lopo's uncompressed audio file I/O library. Core and essential
@ -222,10 +197,6 @@ Patches: autotools.patch: Fix all autotools warnings.
autotools-fix-make-dist.patch: Correct file lists to make dist target work.
Upstream Version: SVN revision 227
portburn
--------
Doesn't do anything yet
portmixer
---------
cross-platform audio mixer control library, hooked onto portaudio. Maintained
@ -260,14 +231,6 @@ Patches: autotools.patch: Fix all autotools warnings.
AM_MAINTAINER_MODE([disable]) has been added to configure.ac to disable autotools rebuilds.
Upstream Version: 1.7.1
taglib
------
http://taglib.github.io/
Audio Meta-Data Library
Version in Audacity SVN: 1.9.1
Patches: none
Upstream Version: 1.9.1
twolame
-------
http://www.twolame.org/
@ -278,11 +241,6 @@ AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
by default
Upstream Version: 0.3.13
wave++
------
http://www.scs.ryerson.ca/~lkolasa/CppWavelets.html
disused?
Crib notes on upgrading lib-src trees
=====================================
With extensive reference to

4
lib-src/id3lib/AUTHORS

@ -1,4 +0,0 @@
eldamitri: Scott Thomas Haug <scott@id3.org>
scott: Scott Thomas Haug <scott@id3.org>
johnadcock: John Adcock <johnadcock@hotmail.com>
dirk: Dirk Mahoney <dirk@id3.org>

482
lib-src/id3lib/COPYING

@ -1,482 +0,0 @@
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it. You can use it for
your libraries, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if
you distribute copies of the library, or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
Our method of protecting your rights has two steps: (1) copyright
the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library.
Also, for each distributor's protection, we want to make certain
that everyone understands that there is no warranty for this free
library. If the library is modified by someone else and passed on, we
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
transforming the program into proprietary software. To prevent this,
we have made it clear that any patent must be licensed for everyone's
free use or not licensed at all.
Most GNU software, including some libraries, is covered by the ordinary
GNU General Public License, which was designed for utility programs. This
license, the GNU Library General Public License, applies to certain
designated libraries. This license is quite different from the ordinary
one; be sure to read it in full, and don't assume that anything in it is
the same as in the ordinary license.
The reason we have a separate public license for some libraries is that
they blur the distinction we usually make between modifying or adding to a
program and simply using it. Linking a program with a library, without
changing the library, is in some sense simply using the library, and is
analogous to running a utility program or application program. However, in
a textual and legal sense, the linked executable is a combined work, a
derivative of the original library, and the ordinary General Public License
treats it as such.
Because of this blurred distinction, using the ordinary General
Public License for libraries did not effectively promote software
sharing, because most developers did not use the libraries. We
concluded that weaker conditions might promote sharing better.
However, unrestricted linking of non-free programs would deprive the
users of those programs of all benefit from the free status of the
libraries themselves. This Library General Public License is intended to
permit developers of non-free programs to use free libraries, while
preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them. (We have not seen how to achieve
this as regards changes in header files, but we have achieved it as regards
changes in the actual functions of the Library.) The hope is that this
will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, while the latter only
works together with the library.
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
c) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
d) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the source code distributed need not include anything that is normally
distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.