Revert twolame update

lib-src/audacity-patches.txt

@@ -164,11 +164,11 @@ twolame
 -------
 http://www.twolame.org/
 MPEG I layer 2 audio encoding library used for MP2 exports
-Version in Audacity SVN: master (8c47401)
+Version in Audacity SVN: 0.3.13
 Patches: fix-tests.patch: Terminate AM_TESTS_ENVIRONMENT by a semicolon.
 AM_MAINTAINER_MODE has been added to configure.ac to disable autotools rebuilds
 by default
-Upstream Version: master (8c47401)
+Upstream Version: 0.3.13
 
 Crib notes on upgrading lib-src trees
 =====================================

lib-src/twolame/AUTHORS

@@ -4,17 +4,12 @@ TwoLAME Authors
 
 .Nicholas J Humfrey - <njh at aelius.com>
  -  Current Maintainer
- -    New automake build system
- -    Added libsndfile support
+ -	New automake build system
+ -	Added libsndfile support
  -  Reference documentation for API
- -    Lots of cleaning and improving!
+ -	Lots of cleaning and improving!
  -  New frontend
 
-.Elio Blanca - <eblanca76 at users.sourceforge.net>
- -  Memory allocation improvements
- -  Code optimisations
- -  Cleanups and bug fixes
-
 
 .Christophe Massiot - <cmassiot at freebox.fr>
  -  Changes to make libtwolame thread-safe
@@ -26,52 +21,52 @@ TwoLAME Authors
 
 
 .Mike Cheng <mikecheng at NOT planckenergy.com> (remove the NOT)
- -    Author of tooLAME, which TwoLAME is based on.
+ -	Author of tooLAME, which TwoLAME is based on.
 
 
 .ISO Dist10 code writers
  -  original basis of toolame
 
 
 .LAME specific contributions
- -    fht routines from Ron Mayer <mayer at acuson.com>
- -    fht tweaking by Mathew Hendry <math at vissci.com>
- -    window_subband & filter subband from LAME circa v3.30
-        (multiple LAME authors)
-        (before Takehiro's window/filter/mdct combination)
+ -	fht routines from Ron Mayer <mayer at acuson.com>
+ -	fht tweaking by Mathew Hendry <math at vissci.com>
+ -	window_subband & filter subband from LAME circa v3.30 
+		(multiple LAME authors)
+		(before Takehiro's window/filter/mdct combination)
 
 
 .Oliver Lietz <lietz at nanocosmos.de>
- -    Tables now included in the exe!  (yay! :)
+ -	Tables now included in the exe!  (yay! :)
 
 
 .Patrick de Smet <pds at telin.rug.ac.be>
- -    scale_factor calc speedup.
- -    subband_quantization speedup
+ -	scale_factor calc speedup.
+ -	subband_quantization speedup
 
 
 .Bill Eldridge <bill at hk.rfa.org> and Federico Grau <grauf at rfa.org>
- -    option for "no padding"
+ -	option for "no padding"
 
 
 .Nick Burch  <gagravarr at SoftHome.net>
- -    WAV file reading
- -    os/2 Makefile mods.
+ -	WAV file reading
+ -	os/2 Makefile mods.
 
 
 .Phillipe Jouguet <philippe.jouguet at vdldiffusion.com>
- -    DAB extensions
- -    spelling, LSF using psyII, WAVE reading
+ -	DAB extensions
+ -	spelling, LSF using psyII, WAVE reading
 
 
 .Henrik Herranen - <leopold at vlsi.fi>
- -    WAVE reading
+ -	WAVE reading
 
 
 .Andreas Neukoetter - <anti at webhome.de>
- -    verbosity patch '-t' switch for transcode plugin
+ -	verbosity patch '-t' switch for transcode plugin
 
 
 .Sami Sallinen - <sami.sallinen at g-cluster.com>
- -    filter subband loop unroll psychoi fix for "% 1408" calcs
+ -	filter subband loop unroll psychoi fix for "% 1408" calcs
 

lib-src/twolame/COPYING

@@ -146,7 +146,7 @@ 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

lib-src/twolame/NEWS.md → lib-src/twolame/ChangeLog

@@ -1,44 +1,7 @@
-What is new in TwoLAME
+What is new in TwoLAME 
 ======================
 
-Version 1.0.0 (????-??-??)
---------------------------
-
-- (libtwolame) Removed the long deprecated `twolame_get_VBR_q()` / `twolame_set_VBR_q()`
-
-
-Version 0.4.0 (2019-10-11)
---------------------------
-- Added free format encoding (now up to 450 kbps)
-- Added DAB utility methods for ScF-CRC handling
-- Added `twolame_get_original()` and `twolame_set_original()`
-- Added `twolame_get_extension()` and `twolame_set_extension()`
-- Bundled .spec file in tarball for building RPM for twolame
-- Make libsndfile dependency (and therefore the frontend) optional
-- Fixed VBR encoding
-- Fixed setting for error protection flag
-- New check for invalid bitrate/channel encoder settings
-- New checks against failed memory allocations
-- Fixed padding policy (now adding an empty slot)
-- Fixed build when maintainer mode is disabled
-- Fixed scaling of floating point input source through libsndfile
-- Removed `slotinfo` global variables to fix thread safety bug
-- Switched to handling reading from STDIN using libsndfile
-- Fix for potential buffer overrun relating to `MAX_NAME_SIZE` in CLI tool
-- Install AUTHORS, COPYING, README, NEWS in `$prefix/share/doc/twolame/`
-- Zero the whole of the data structure when calling `twolame_init()`
-- Prefixed all global symbols with `twolame_` to prevent symbol conflicts
-- Fix for `twolame_get_framelength()` returning the correct frame size when padding is enabled
-- Fix progress counter in twolame CLI
-- Fix compilation on mingw or mxe cross compiler
-- Fix symbols visibility on Windows
-- Add `-no-undefined` for compilation on Windows
-- Added `win32-dll` option to `LT_INIT`
-- Compiler and Valgrind warning fixes
-- Various other minor fixes
-
-
-Version 0.3.13 (2011-01-21)
+Version 0.3.13 (2010-01-21)
 ---------------------------
 
 - Fixed documentation location (--docdir in configure)
@@ -97,13 +60,13 @@ Version 0.3.9 (2006-12-31)
 - Buffer overrun fix in new_extension()
 - (libtwolame) Added warning that DAB support is still broken
 - (libtwolame) Added twolame_get_framelength() to return number of bytes per frame
-- Added TWOLAME_SAMPLES_PER_FRAME macro, clarifying that there are
+- Added TWOLAME_SAMPLES_PER_FRAME macro, clarifying that there are 
   always 1152 samples per frame in Layer 2
 - Frontend now displays extra information
    * Duration of input file (if known)
    * Total number of frames to be encoded and percentage complete
    * The filesize of the output file
- - Cleaned up source files so that it is consistent and all uses tabs (tab width 4)
+ - Cleaned up source files so that it is consistent and all uses tabs (tab width 4)  
 
 
 

lib-src/twolame/Makefile.am

@@ -1,6 +1,8 @@
+
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I build-scripts
 
-SUBDIRS = . libtwolame frontend simplefrontend doc tests
+SUBDIRS = libtwolame frontend simplefrontend doc tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = twolame.pc
@@ -9,30 +11,9 @@ INDENT = indent -npro -kr -nsob -fca -blf -ip1 -hnl -l100 -lc100 -nut -ts4 -v
 indent:
 	find $(top_srcdir) -type f -name "*.[ch]" -print -exec $(INDENT) {} ';'
 
-
-# Copy README.md to README and NEWS.md to NEWS when building distribution
-all-local: README NEWS ChangeLog
-
-README:
-	[ -f README.md ] && fgrep -v "Build Status]" $(top_srcdir)/README.md > $@ || true
-
-NEWS:
-	[ -f NEWS.md ] && cat $(top_srcdir)/NEWS.md > $@ || true
-
-ChangeLog:
-	[ -d .git ] && git log > ChangeLog || true
-
-pkgdocdir = @docdir@
-pkgdoc_DATA = \
-	AUTHORS \
-	COPYING \
-	README \
-	NEWS
-
 EXTRA_DIST = \
-	$(pkgdoc_DATA) \
+	autogen.sh \
 	twolame.pc.in \
-	twolame.spec \
 	win32/configwin.h \
 	win32/libtwolame_dll.sln \
 	win32/libtwolame_dll.vcproj \