diff --git a/audacity.dox.in b/audacity.dox.in index aa7fe512212453b493d22c777cde36231d4e5c15..17a8935640a2b5085d5cf7acc1a1b5e12264cd0b 100644 --- a/audacity.dox.in +++ b/audacity.dox.in @@ -2071,7 +2071,6 @@ PREDEFINED = AUDACITY_DLL_API \ USE_AUDIO_UNITS \ USE_MIDI=1 \ USE_LIBVORBIS=1 \ - USE_LIBMAD=1 \ USE_LIBFLAC=1 \ USE_SBSMS=1 \ USE_GSTREAMER \ diff --git a/help/audacity.1 b/help/audacity.1 index 5ef26888670e3059c64849600b549d36cd5b6565..05daa7cbc4ac386d7ee9f628ebf3c0bedba4549e 100644 --- a/help/audacity.1 +++ b/help/audacity.1 @@ -33,7 +33,6 @@ Audacity currently uses .B libsndfile to open many uncompressed audio formats such as WAV, AIFF, and AU, and it can also be linked to -.B libmad, .B libvorbis, and .B libflac, diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt index 416312b1bdbf944559a6a6ff41faba94c98ca465..085f4f40f10dc100e5c78bec82d93b16404f91f7 100644 --- a/lib-src/audacity-patches.txt +++ b/lib-src/audacity-patches.txt @@ -24,28 +24,6 @@ Patches: mac-asm-fixes.patch. Fixes build on OS X Intel 10.4 by creating and gcc (4.0)...not need after we upgrade past Xcode 3.2.6. Upstream version: 1.3.1 -libid3tag ---------- -MP3 tag manipulation library. Comes with libmad (below) -arguments ([-Wall foreign]) added to AM_INIT_AUTOMAKE to avoid autoreconf -failures -arguments (--no-verify) removed from ltconfig execution to prevent configure -failures -Patches: libid3tag-srcdir.patch Adds srcdir handling - -libmad ------- -http://www.underbit.com/products/mad/ -MP3 decoding library -Version in Audacity SVN: 0.15.1 (beta) -Patches: libmad-mp2-out-of-spec.patch: Import some forms of MP2 file that are -theoretically out of spec but in practise work fine (msmeyer) -osx-universal-build.patch: Makes build work on OS X for universal binary by -using compiler-defined symbols for targets as well as hosts. -autotools.patch: Update to autotools to work with recent auto{conf, -make} -Upstream version: 0.15.1 (beta) - libnyquist ---------- Digital Audio scripting language, with our own library interface added to it diff --git a/linux/packages/arch/PKGBUILD b/linux/packages/arch/PKGBUILD index 0112b911b153c8a1919ef6ab9e862f3cc8b0a9e2..6918491cc7e392ba3907950250c20b3b05fdb47d 100644 --- a/linux/packages/arch/PKGBUILD +++ b/linux/packages/arch/PKGBUILD @@ -18,7 +18,6 @@ depends=(zlib flac lame twolame - libmad libsndfile jack lilv diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh index 3c8b25e03b61fe74d4f4313dd768bd6ab92f86cf..ac296eeecb5bf992811554a20bd48814b108563e 100755 --- a/linux/packages/arch/dependencies.sh +++ b/linux/packages/arch/dependencies.sh @@ -18,7 +18,6 @@ deps=( flac lame twolame - libmad libsndfile jack lilv diff --git a/linux/packages/fedora34/audacity.spec b/linux/packages/fedora34/audacity.spec index 71678e0de33246caf429cd29de5a2266e9d53144..deffb976b5b4220188d4129ce328b7029bc935e9 100644 --- a/linux/packages/fedora34/audacity.spec +++ b/linux/packages/fedora34/audacity.spec @@ -32,7 +32,6 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel BuildRequires: lame-devel BuildRequires: libid3tag-devel -BuildRequires: libmad-devel BuildRequires: taglib-devel BuildRequires: twolame-devel BuildRequires: libogg-devel diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh index b25de51c2b9a88d265655c66865b7355dc15c891..64cc26426df1ab7a1956370cff6806cdcc049aeb 100755 --- a/linux/packages/fedora34/dependencies.sh +++ b/linux/packages/fedora34/dependencies.sh @@ -22,7 +22,6 @@ deps=( ladspa-devel lame-devel libid3tag-devel - libmad-devel taglib-devel twolame-devel libogg-devel diff --git a/linux/packages/ubuntu-20.04/debian/control b/linux/packages/ubuntu-20.04/debian/control index 96f764ce24353dacb01f863d024fdce1c7388822..5c47b526434a977a2dcd797a22fb706800695a36 100644 --- a/linux/packages/ubuntu-20.04/debian/control +++ b/linux/packages/ubuntu-20.04/debian/control @@ -23,7 +23,6 @@ Build-Depends: cmake, libavformat-dev, libavutil-dev, libid3tag0-dev, - libmad0-dev, libvamp-hostsdk3v5, libogg-dev, libvorbis-dev, diff --git a/linux/packages/ubuntu-20.04/dependencies.sh b/linux/packages/ubuntu-20.04/dependencies.sh index b8c4d011ff82bd5e4fa3aaa44c4fb547755d37bb..09cb2a6eb39577aef08dfd49fca4e31ad12734a0 100755 --- a/linux/packages/ubuntu-20.04/dependencies.sh +++ b/linux/packages/ubuntu-20.04/dependencies.sh @@ -36,7 +36,6 @@ deps=( libavformat-dev libavutil-dev libid3tag0-dev - libmad0-dev libvamp-hostsdk3v5 libogg-dev libvorbis-dev diff --git a/linux/required_libraries.md b/linux/required_libraries.md index 8de6e7718260a080bbfa6d40a399e83399aeb063..6e9a89a921b2fe63afe0fe06447993152f4f591d 100644 --- a/linux/required_libraries.md +++ b/linux/required_libraries.md @@ -10,7 +10,6 @@ | libcurl | >= 7.68.0 | libcurl-dev | | ffmpeg | >= 4.2.4 | libavcodec-dev libavformat-dev libavutil-dev | | libid3tag | >= 0.15.1b | libid3tag0-dev | -| libmad | >= 0.15.1b | libmad0-dev | | vamp-host-sdk | >= 2.9.0 | N/A | | libogg | >= 1.3.4 | libogg-dev | | libvorbis | >= 1.3.6 | libvorbis-dev | diff --git a/linux/ubuntu-focal/dependencies.sh b/linux/ubuntu-focal/dependencies.sh index 23b3cd74730fc20f342a311f10464df8dbeb60e3..ac40ad32bd4829f1957278e672096b53c48b96ea 100644 --- a/linux/ubuntu-focal/dependencies.sh +++ b/linux/ubuntu-focal/dependencies.sh @@ -30,7 +30,6 @@ apt_packages_full_deps=( libavformat-dev libavutil-dev libid3tag0-dev - libmad0-dev libvamp-hostsdk3v5 libogg-dev libvorbis-dev diff --git a/linux/ubuntu-focal/entrypoint.sh b/linux/ubuntu-focal/entrypoint.sh index ee818961af333ba60164a0f9d35a69f8f334c7e0..c74af6b09796f117d97255143bfc10ded087b70c 100644 --- a/linux/ubuntu-focal/entrypoint.sh +++ b/linux/ubuntu-focal/entrypoint.sh @@ -25,7 +25,6 @@ cmake_options=( -Daudacity_use_sqlite=local # We prefer using the latest version of SQLite -Daudacity_use_ffmpeg=loaded -Daudacity_use_id3tag=system # This library has bugs, that are fixed in *local* version - -Daudacity_use_mad=system # This library has bugs, that are fixed in *local* version -Daudacity_use_nyquist=local # This library is not available -Daudacity_use_vamp=local # The dev package for this library is not available -Daudacity_use_ogg=system diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 3961b4c4b50c9f50197d8f24ca40ffaefdc64816..83ef2611f0d8fce5a393fc840d62e46eeb8e535c 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -241,7 +241,6 @@ void AboutDialog::CreateCreditsList() AddCredit(wxT("[[https://libexpat.github.io/|expat]]"), roleLibrary); AddCredit(wxT("[[https://xiph.org/flac/|FLAC]]"), roleLibrary); AddCredit(wxT("[[http://lame.sourceforge.net/|LAME]]"), roleLibrary); - AddCredit(wxT("[[https://www.underbit.com/products/mad/|libmad]]"), roleLibrary); AddCredit(wxT("[[http://www.mega-nerd.com/libsndfile/|libsndfile]]"), roleLibrary); AddCredit(wxT("[[https://sourceforge.net/p/soxr/wiki/Home/|libsoxr]]"), roleLibrary); AddCredit(