From 2279cffc0fca905bdfca68f06f82e4b3492e3f5d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 24 Sep 2023 08:51:02 +0300
Subject: [PATCH] mpg123-1.32.0
---
ChangeLog | 4 +-
Makefile.am | 35 +-
Makefile.in | 2807 ++---
NEWS | 54 +
NEWS.libmpg123 | 120 +-
NEWS.libout123 | 15 +-
NEWS.libsyn123 | 18 +-
aclocal.m4 | 97 +-
build/compile | 6 +-
build/config.guess | 1500 ++-
build/config.sub | 2609 ++---
build/depcomp | 2 +-
build/install-sh | 161 +-
build/ltmain.sh | 4 +-
build/missing | 2 +-
build/test-driver | 19 +-
configure | 10003 ++++++++++-------
configure.ac | 642 +-
doc/LARGEFILE | 112 +
doc/Makemodule.am | 3 +
doc/READERS | 209 +
doc/README.remote | 4 +
doc/doxyhead.xhtml | 8 +-
doc/examples/Makefile | 4 +
doc/examples/extract_frames.c | 15 +-
doc/examples/mpg123_to_wav_reader64.c | 203 +
doc/examples/mpg123_to_wav_replaced_io.c | 185 +
m4/libtool.m4 | 4 +-
man1/mpg123.1 | 643 --
man1/out123.1 | 335 -
mpg123.spec | 2 +-
ports/README | 6 +-
ports/Sony_PSP/Makefile.psp | 38 -
ports/Sony_PSP/README | 11 -
ports/Sony_PSP/config.h | 368 -
ports/Sony_PSP/readers.c.patch | 2 -
ports/cmake/CMakeLists.txt | 4 +-
ports/cmake/cmake/read_api_version.cmake | 23 +-
ports/cmake/src/CMakeLists.txt | 63 +-
ports/cmake/src/config.cmake.h.in | 29 +-
ports/cmake/src/libmpg123/CMakeLists.txt | 8 +-
ports/cmake/src/libout123/CMakeLists.txt | 4 +-
ports/cmake/src/libsyn123/CMakeLists.txt | 4 +-
src/Makemodule.am | 14 +-
src/common.c | 112 +-
src/common.h | 14 +-
src/compat/compat.c | 68 +-
src/compat/compat.h | 113 +-
src/compat/compat_dl.c | 6 +-
src/compat/compat_str.c | 38 +-
src/compat/wpathconv.h | 6 +-
src/config.h.in | 58 +-
src/control_generic.c | 62 +-
src/filters.c | 4 +-
src/getlopt.c | 2 +-
src/httpget.c | 5 +-
src/intsym.h | 367 -
src/libmpg123/Makemodule.am | 17 +-
src/libmpg123/abi_align.h | 15 +-
src/libmpg123/calctables.c | 20 +-
src/libmpg123/check_neon.S | 6 +-
src/libmpg123/dct36_3dnow.S | 22 +-
src/libmpg123/dct36_3dnowext.S | 24 +-
src/libmpg123/dct36_avx.S | 4 +-
src/libmpg123/dct36_neon.S | 6 +-
src/libmpg123/dct36_neon64.S | 6 +-
src/libmpg123/dct36_sse.S | 4 +-
src/libmpg123/dct36_x86_64.S | 4 +-
src/libmpg123/dct64.c | 14 +-
src/libmpg123/dct64_3dnow.S | 30 +-
src/libmpg123/dct64_3dnowext.S | 16 +-
src/libmpg123/dct64_altivec.c | 14 +-
src/libmpg123/dct64_avx.S | 4 +-
src/libmpg123/dct64_avx_float.S | 4 +-
src/libmpg123/dct64_i386.c | 20 +-
src/libmpg123/dct64_i486.c | 6 +-
src/libmpg123/dct64_mmx.S | 16 +-
src/libmpg123/dct64_neon.S | 6 +-
src/libmpg123/dct64_neon64.S | 6 +-
src/libmpg123/dct64_neon64_float.S | 6 +-
src/libmpg123/dct64_neon_float.S | 6 +-
src/libmpg123/dct64_sse.S | 12 +-
src/libmpg123/dct64_sse_float.S | 12 +-
src/libmpg123/dct64_x86_64.S | 8 +-
src/libmpg123/dct64_x86_64_float.S | 8 +-
src/libmpg123/decode.h | 298 +-
src/libmpg123/dither.c | 1 -
src/libmpg123/dither.h | 2 +-
src/libmpg123/dither_impl.h | 2 +-
src/libmpg123/equalizer.c | 2 +-
src/libmpg123/equalizer_3dnow.S | 6 +-
src/libmpg123/format.c | 42 +-
src/libmpg123/frame.c | 241 +-
src/libmpg123/frame.h | 102 +-
src/libmpg123/gapless.h | 34 +-
src/libmpg123/getcpuflags.S | 6 +-
src/libmpg123/getcpuflags.h | 8 +-
src/libmpg123/getcpuflags_arm.c | 8 +-
src/libmpg123/getcpuflags_x86_64.S | 4 +-
src/libmpg123/icy.c | 15 +-
src/libmpg123/icy.h | 24 +-
src/libmpg123/icy2utf8.c | 9 +-
src/libmpg123/icy2utf8.h | 2 +-
src/libmpg123/id3.c | 45 +-
src/libmpg123/id3.h | 36 +-
src/libmpg123/index.c | 35 +-
src/libmpg123/index.h | 22 +-
src/libmpg123/init_costabs.h | 2 +-
src/libmpg123/init_layer12.h | 8 +-
src/libmpg123/init_layer3.h | 6 +-
src/libmpg123/l12tabs.h | 864 +-
src/libmpg123/l3tabs.h | 4450 ++++----
src/libmpg123/layer1.c | 2 +-
src/libmpg123/layer2.c | 8 +-
src/libmpg123/layer3.c | 38 +-
src/libmpg123/lfs_alias.c | 236 -
src/libmpg123/lfs_wrap.c | 1201 +-
src/libmpg123/lfs_wrap.h | 43 +
src/libmpg123/libmpg123.c | 403 +-
src/libmpg123/mangle.h | 21 +-
src/libmpg123/{mpg123.h.in => mpg123.h} | 309 +-
src/libmpg123/mpg123lib_intern.h | 27 +-
src/libmpg123/ntom.c | 60 +-
src/libmpg123/optimize.c | 278 +-
src/libmpg123/optimize.h | 36 +-
src/libmpg123/parse.c | 128 +-
src/libmpg123/parse.h | 19 +-
src/libmpg123/reader.h | 88 +-
src/libmpg123/readers.c | 470 +-
src/libmpg123/stringbuf.c | 18 +-
src/libmpg123/synth.c | 410 +-
src/libmpg123/synth.h | 8 +-
src/libmpg123/synth_3dnow.S | 12 +-
src/libmpg123/synth_3dnowext.S | 8 +-
src/libmpg123/synth_8bit.c | 48 +-
src/libmpg123/synth_8bit.h | 2 +-
src/libmpg123/synth_altivec.c | 66 +-
src/libmpg123/synth_arm.S | 6 +-
src/libmpg123/synth_arm_accurate.S | 6 +-
src/libmpg123/synth_i486.c | 6 +-
src/libmpg123/synth_i586.S | 10 +-
src/libmpg123/synth_i586_dither.S | 12 +-
src/libmpg123/synth_mmx.S | 10 +-
src/libmpg123/synth_mono.h | 2 +-
src/libmpg123/synth_neon.S | 6 +-
src/libmpg123/synth_neon64.S | 6 +-
src/libmpg123/synth_neon64_accurate.S | 6 +-
src/libmpg123/synth_neon64_float.S | 6 +-
src/libmpg123/synth_neon64_s32.S | 6 +-
src/libmpg123/synth_neon_accurate.S | 6 +-
src/libmpg123/synth_neon_float.S | 6 +-
src/libmpg123/synth_neon_s32.S | 6 +-
src/libmpg123/synth_ntom.h | 14 +-
src/libmpg123/synth_real.c | 198 +-
src/libmpg123/synth_s32.c | 198 +-
src/libmpg123/synth_sse.S | 8 +-
src/libmpg123/synth_sse3d.h | 2 +-
src/libmpg123/synth_sse_accurate.S | 4 +-
src/libmpg123/synth_sse_float.S | 4 +-
src/libmpg123/synth_sse_s32.S | 4 +-
src/libmpg123/synth_stereo_avx.S | 4 +-
src/libmpg123/synth_stereo_avx_accurate.S | 4 +-
src/libmpg123/synth_stereo_avx_float.S | 4 +-
src/libmpg123/synth_stereo_avx_s32.S | 4 +-
src/libmpg123/synth_stereo_neon.S | 6 +-
src/libmpg123/synth_stereo_neon64.S | 6 +-
src/libmpg123/synth_stereo_neon64_accurate.S | 6 +-
src/libmpg123/synth_stereo_neon64_float.S | 6 +-
src/libmpg123/synth_stereo_neon64_s32.S | 6 +-
src/libmpg123/synth_stereo_neon_accurate.S | 6 +-
src/libmpg123/synth_stereo_neon_float.S | 6 +-
src/libmpg123/synth_stereo_neon_s32.S | 6 +-
src/libmpg123/synth_stereo_sse_accurate.S | 4 +-
src/libmpg123/synth_stereo_sse_float.S | 4 +-
src/libmpg123/synth_stereo_sse_s32.S | 4 +-
src/libmpg123/synth_stereo_x86_64.S | 8 +-
src/libmpg123/synth_stereo_x86_64_accurate.S | 8 +-
src/libmpg123/synth_stereo_x86_64_float.S | 8 +-
src/libmpg123/synth_stereo_x86_64_s32.S | 12 +-
src/libmpg123/synth_x86_64.S | 8 +-
src/libmpg123/synth_x86_64_accurate.S | 8 +-
src/libmpg123/synth_x86_64_float.S | 8 +-
src/libmpg123/synth_x86_64_s32.S | 12 +-
src/libmpg123/tabinit.c | 14 +-
src/libmpg123/tabinit_mmx.S | 8 +-
src/libmpg123/testcpu.c | 2 +-
src/libout123/Makemodule.am | 30 +-
src/libout123/buffer.c | 160 +-
src/libout123/buffer.h | 36 +-
src/libout123/hextxt.c | 12 +-
src/libout123/legacy_module.c | 14 +-
src/libout123/libout123.c | 350 +-
src/libout123/module.c | 47 +-
src/libout123/module.h | 6 +-
src/libout123/modules/alib.c | 2 +-
src/libout123/modules/jack.c | 4 +-
src/libout123/modules/win32_wasapi.c | 6 +-
src/libout123/{out123.h.in => out123.h} | 35 +-
src/libout123/out123_int.h | 15 +-
src/libout123/stringlists.c | 8 +-
src/libout123/stringlists.h | 2 +-
src/libout123/wav.c | 53 +-
src/libout123/wav.h | 26 +-
src/libout123/xfermem.c | 52 +-
src/libout123/xfermem.h | 26 +-
src/libsyn123/Makemodule.am | 10 +-
src/libsyn123/filter.c | 2 +-
src/libsyn123/geiger.c | 8 +-
src/libsyn123/libsyn123.c | 29 +-
src/libsyn123/resample.c | 607 +-
src/libsyn123/sampleconv.c | 32 +-
src/libsyn123/{syn123.h.in => syn123.h} | 189 +-
src/libsyn123/syn123_int.h | 20 +-
src/local.c | 26 +-
src/mpg123-id3dump.c | 17 +-
src/mpg123-strip.c | 15 +-
src/mpg123.c | 49 +-
src/mpg123app.h | 9 +
src/net123_exec.c | 52 +-
src/net123_winhttp.c | 9 +-
src/net123_wininet.c | 9 +-
src/out123.c | 27 +-
src/playlist.c | 8 +-
src/playlist.h | 2 +-
src/resolver.c | 10 +-
src/streamdump.c | 40 +-
src/streamdump.h | 2 +-
src/sysutil.c | 2 +-
src/term.c | 110 +-
src/term.h | 5 +-
src/term_posix.c | 10 +-
src/tests/Makemodule.am | 11 +-
src/tests/decode_fixed.c | 2 +-
src/tests/resample_total.c | 34 +-
src/tests/sweeper.c | 17 +-
src/tests/text.c | 25 +
src/version.h | 30 +
src/win32_net.c | 28 +-
src/win32_support.c | 6 +-
src/win32_support.h | 6 +-
windows-builds.sh | 9 +-
241 files changed, 18709 insertions(+), 16129 deletions(-)
mode change 100644 => 100755 build/ltmain.sh
create mode 100644 doc/READERS
create mode 100644 doc/examples/mpg123_to_wav_reader64.c
create mode 100644 doc/examples/mpg123_to_wav_replaced_io.c
delete mode 100644 man1/mpg123.1
delete mode 100644 man1/out123.1
delete mode 100644 ports/Sony_PSP/Makefile.psp
delete mode 100644 ports/Sony_PSP/README
delete mode 100644 ports/Sony_PSP/config.h
delete mode 100644 ports/Sony_PSP/readers.c.patch
delete mode 100644 src/intsym.h
delete mode 100644 src/libmpg123/lfs_alias.c
create mode 100644 src/libmpg123/lfs_wrap.h
rename src/libmpg123/{mpg123.h.in => mpg123.h} (88%)
rename src/libout123/{out123.h.in => out123.h} (97%)
rename src/libsyn123/{syn123.h.in => syn123.h} (91%)
create mode 100644 src/version.h
diff --git a/ChangeLog b/ChangeLog
index e8d40a1..6847a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
This is a dummy file. If you want to see the change log, use subversion:
- svn log -v svn://orgis.org/mpg123
+ svn log -v svn://scm.orgis.org/mpg123
+
+The tool svn2cl provides nice formatting in traditional ChangeLog style.
diff --git a/Makefile.am b/Makefile.am
index 044611a..a543f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,13 +10,21 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS =
EXTRA_PROGRAMS =
EXTRA_DIST =
+if NEED_LIB
pkglib_LTLIBRARIES =
lib_LTLIBRARIES =
+endif
noinst_LIBRARIES =
noinst_LTLIBRARIES =
nodist_include_HEADERS =
+if NEED_MAINLIB
+if NEED_LIB
include_HEADERS =
+endif
+endif
+if NEED_MAN
dist_man_MANS =
+endif
CLEANFILES =
TESTS =
XFAIL_TESTS =
@@ -31,22 +39,37 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/compat \
-I$(top_srcdir)/src/libmpg123 \
+ -I$(top_srcdir)/src/libsyn123 \
-I$(top_srcdir)/src/libout123 \
-I$(top_builddir)/src/libmpg123 \
-I$(top_builddir)/src/libsyn123 \
-I$(top_builddir)/src/libout123
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
-
# Include Make modules from subdirectories.
include src/Makemodule.am
include doc/Makemodule.am
+if NEED_MAINLIB
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA =
+
# Stuff from this directory.
-pkgconfig_DATA += libmpg123.pc libout123.pc libsyn123.pc
+if BUILD_LIBMPG123
+pkgconfig_DATA += libmpg123.pc
+endif
+if BUILD_LIBOUT123
+pkgconfig_DATA += libout123.pc
+endif
+if BUILD_LIBSYN123
+pkgconfig_DATA += libsyn123.pc
+endif
+endif
+if BUILD_PROGRAMS
+if NEED_MAN
dist_man_MANS += man1/mpg123.1 man1/out123.1
+endif
+endif
# mpg123.spec is autogenerated but needs to be present in tarball!
EXTRA_DIST += \
@@ -73,10 +96,6 @@ EXTRA_DIST += \
ports/cmake/src/tests/CMakeLists.txt \
ports/cmake/src/compat/CMakeLists.txt \
ports/README \
- ports/Sony_PSP/config.h \
- ports/Sony_PSP/README \
- ports/Sony_PSP/Makefile.psp \
- ports/Sony_PSP/readers.c.patch \
scripts/benchmark-cpu.pl \
scripts/tag_lyrics.py \
scripts/conplay \
diff --git a/Makefile.in b/Makefile.in
index 1ea1286..9ad8742 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,20 @@
# Module for non-recursive mpg123 build system.
+# Component selection:
+# If HAVE_MODULES, the library can be built fully independently.
+# If not, the library depends on the one builtin module from
+# the subdirectory.
+
# Module for non-recursive mpg123 build system.
+# Gah! Not even re-defining that variable is allowed in automake!
+# I WANT TO USE PROPER MAKE!
+# makedir := src/libout123/modules
+# Experiment: Does automake pick that up in a Make variable?
+# Damn, no! It complains wildly.
+# I just want to use GNU Make and be done with it!
+# Perhaps the next build system rewrite ...
+#makenam=src_libout123_modules
# Module for non-recursive mpg123 build system.
# Gah! Not even re-defining that variable is allowed in automake!
@@ -34,6 +47,8 @@
# Module for non-recursive mpg123 build system.
+# Module for non-recursive mpg123 build system.
+
# This bulds libsyn123, a basic library for some sound synthesis
# and format conversion for the mpg123 project.
@@ -117,23 +132,141 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = src/mpg123$(EXEEXT) src/out123$(EXEEXT) \
- src/mpg123-id3dump$(EXEEXT) src/mpg123-strip$(EXEEXT)
-EXTRA_PROGRAMS = src/tests/volume$(EXEEXT) \
- src/tests/decode_fixed$(EXEEXT) src/tests/seek_whence$(EXEEXT) \
- src/tests/seek_accuracy$(EXEEXT) src/tests/noise$(EXEEXT) \
- src/tests/sweeper$(EXEEXT) src/libmpg123/testcpu$(EXEEXT) \
- src/libmpg123/calctables$(EXEEXT)
-TESTS = src/tests/decode_fixed.sh src/tests/seek_whence.sh \
- src/tests/seek_accuracy.sh src/tests/resample_total$(EXEEXT) \
- src/tests/text$(EXEEXT) src/tests/textprint$(EXEEXT) \
- src/tests/plain_id3.sh
-check_PROGRAMS = src/tests/decode_fixed$(EXEEXT) \
- src/tests/seek_whence$(EXEEXT) \
- src/tests/seek_accuracy$(EXEEXT) \
- src/tests/resample_total$(EXEEXT) src/tests/text$(EXEEXT) \
- src/tests/textprint$(EXEEXT) src/tests/plain_id3$(EXEEXT)
-@HAVE_SYNTH16_FALSE@am__append_1 = src/tests/decode_fixed.sh
+bin_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+TESTS = $(am__append_1) $(am__EXEEXT_6)
+check_PROGRAMS = $(am__EXEEXT_5)
+@BUILD_LIBMPG123_TRUE@@BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@am__append_1 = \
+@BUILD_LIBMPG123_TRUE@@BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@ src/tests/decode_fixed.sh
+
+@BUILD_LIBMPG123_TRUE@am__append_2 = \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_whence.sh \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_accuracy.sh \
+@BUILD_LIBMPG123_TRUE@ src/tests/resample_total \
+@BUILD_LIBMPG123_TRUE@ src/tests/text \
+@BUILD_LIBMPG123_TRUE@ src/tests/textprint \
+@BUILD_LIBMPG123_TRUE@ src/tests/plain_id3.sh
+
+@HAVE_SYNTH16_FALSE@am__append_3 = src/tests/decode_fixed.sh
+@BUILD_LIBMPG123_TRUE@am__append_4 = \
+@BUILD_LIBMPG123_TRUE@ src/tests/decode_fixed \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_whence \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_accuracy \
+@BUILD_LIBMPG123_TRUE@ src/tests/resample_total \
+@BUILD_LIBMPG123_TRUE@ src/tests/text \
+@BUILD_LIBMPG123_TRUE@ src/tests/textprint \
+@BUILD_LIBMPG123_TRUE@ src/tests/plain_id3
+
+@BUILD_LIBMPG123_TRUE@am__append_5 = \
+@BUILD_LIBMPG123_TRUE@ src/tests/volume \
+@BUILD_LIBMPG123_TRUE@ src/tests/decode_fixed \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_whence \
+@BUILD_LIBMPG123_TRUE@ src/tests/seek_accuracy \
+@BUILD_LIBMPG123_TRUE@ src/tests/noise \
+@BUILD_LIBMPG123_TRUE@ src/tests/sweeper
+
+
+# Use that sh/perl script to generate the module entries:
+# Confused as to when to use _LIBADD and when _LDADD.
+# _LDADD gives errors from autotools.
+#echo \
+#dummy tinyalsa alsa qsa coreaudio esd jack nas oss portaudio \
+#pulse sdl sndio sun win32 win32_wasapi aix alib arts hp os2 \
+#sgi mint openal \
+#| tr ' ' '\n' |
+#perl -ne 'chomp; $big = uc($_); print <<EOT;
+#
+#if HAVE_MODULES
+#if HAVE_$big
+#pkglib_LTLIBRARIES += \src/libout123/modules/output_$_.la
+#src_libout123_modules_output_${_}_la_SOURCES = \\
+# src/libout123/modules/$_.c
+#src_libout123_modules_output_${_}_la_LDFLAGS = \$(MODULE_LDFLAGS) \@${big}_LDFLAGS\@
+#src_libout123_modules_output_${_}_la_CFLAGS = \$(MODULE_CFLAGS) \@${big}_CFLAGS\@
+#src_libout123_modules_output_${_}_la_LIBADD = \@PROG_LIBS\@ \\
+# src/compat/libcompat_str.la \\
+# \@${big}_LIBS\@
+#src_libout123_modules_outout_${_}_la_CPPFLAGS = \\
+# \$(AM_CPPFLAGS) \\
+# \$(libout123_mod_cppflags)
+#endif
+#else
+#if BUILD_$big
+#src_libout123_modules_libdefaultmodule_la_SOURCES = \\
+# src/libout123/modules/$_.c
+#src_libout123_modules_libdefaultmodule_la_CFLAGS = \@${big}_CFLAGS\@
+#src_libout123_modules_libdefaultmodule_la_LDFLAGS = \@${big}_LDFLAGS\@
+#src_libout123_modules_libdefaultmodule_la_LIBADD = \@PROG_LIBS\@ \@${big}_LIBS\@
+#src_libout123_modules_libdefaultmodule_la_CPPFLAGS = \\
+# \$(AM_CPPFLAGS) \\
+# \$(libout123_mod_cppflags)
+#endif
+#endif
+#EOT
+#'
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_6 = src/libout123/modules/output_dummy.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@@NEED_LIB_TRUE@am__append_7 = src/libout123/modules/output_tinyalsa.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_8 = src/libout123/modules/output_alsa.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@@NEED_LIB_TRUE@am__append_9 = src/libout123/modules/output_qsa.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_10 = src/libout123/modules/output_coreaudio.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_11 = src/libout123/modules/output_esd.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_JACK_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_12 = src/libout123/modules/output_jack.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_NAS_TRUE@@NEED_LIB_TRUE@am__append_13 = src/libout123/modules/output_nas.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_OSS_TRUE@@NEED_LIB_TRUE@am__append_14 = src/libout123/modules/output_oss.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_PORTAUDIO_TRUE@@NEED_LIB_TRUE@am__append_15 = src/libout123/modules/output_portaudio.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_PULSE_TRUE@@NEED_LIB_TRUE@am__append_16 = src/libout123/modules/output_pulse.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_SDL_TRUE@@NEED_LIB_TRUE@am__append_17 = src/libout123/modules/output_sdl.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_SNDIO_TRUE@@NEED_LIB_TRUE@am__append_18 = src/libout123/modules/output_sndio.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_SUN_TRUE@@NEED_LIB_TRUE@am__append_19 = src/libout123/modules/output_sun.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@@NEED_LIB_TRUE@am__append_20 = src/libout123/modules/output_win32.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@@NEED_LIB_TRUE@am__append_21 = src/libout123/modules/output_win32_wasapi.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_AIX_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_22 = src/libout123/modules/output_aix.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ALIB_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_23 = src/libout123/modules/output_alib.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ARTS_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_24 = src/libout123/modules/output_arts.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_HP_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_25 = src/libout123/modules/output_hp.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_OS2_TRUE@@NEED_LIB_TRUE@am__append_26 = src/libout123/modules/output_os2.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_SGI_TRUE@@NEED_LIB_TRUE@am__append_27 = src/libout123/modules/output_sgi.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MINT_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_28 = src/libout123/modules/output_mint.la
+@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_OPENAL_TRUE@@NEED_LIB_TRUE@am__append_29 = src/libout123/modules/output_openal.la
+
+# Optionally containing the one static module to use.
+@BUILD_LIBOUT123_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_30 = src/libout123/modules/libdefaultmodule.la
+
+# For dynamic modules.
+
+# Just for libdefaultmodule.la.
+@BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_31 = src/libout123/out123.h
+@BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_32 = src/libout123/libmodule.la
+@BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_33 = src/libout123/libout123.la
+@BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@am__append_34 = \
+@BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@ src/libout123/buffer.c \
+@BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@ src/libout123/buffer.h \
+@BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@ src/libout123/xfermem.c \
+@BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@ src/libout123/xfermem.h
+
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_35 = \
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@ src/compat/libcompat_dl.la
+
+@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@am__append_36 = \
+@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@ src/libout123/modules/libdefaultmodule.la
+
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_37 = src/libout123/module.c
+@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@am__append_38 = src/libout123/legacy_module.c
+
+# The sfifo code is directly used in some modules.
+@NEED_LIB_TRUE@am__append_39 = \
+@NEED_LIB_TRUE@ src/libout123/sfifo.c \
+@NEED_LIB_TRUE@ src/libout123/sfifo.h
+
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_40 = \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/testcpu \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@ src/libmpg123/calctables
+
+# Necessary?
+#CLEANFILES += src/libmpg123/*.a
+@BUILD_LIBMPG123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_41 = src/libmpg123/libmpg123.la
+@BUILD_LIBMPG123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_42 = src/libmpg123/mpg123.h
+@NEED_FMT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_43 = src/libmpg123/fmt123.h
# All the optional sources leading to objects need to be explicitly
# handled so that libtool builds the objects in a consistent manner,
@@ -168,7 +301,6 @@ check_PROGRAMS = src/tests/decode_fixed$(EXEEXT) \
#SYNTH16 synth.c
#SYNTH32 synth_s32.c
#SYNTHREAL synth_real.c
-#LFS_ALIAS lfs_alias.c
#LFS_WRAP lfs_wrap.c
#ICY icy.c icy2utf8.c
#FEATURE feature.c
@@ -226,172 +358,105 @@ check_PROGRAMS = src/tests/decode_fixed$(EXEEXT) \
#NEON64+ACCURATE synth_neon64_accurate.S synth_stereo_neon64_accurate.S
#NEON64+!ACCURATE dct64_neon64.S synth_neon64.S synth_stereo_neon64.S
#EOT
-@HAVE_LAYER1_TRUE@am__append_2 = src/libmpg123/layer1.c
-@HAVE_LAYER2_TRUE@am__append_3 = src/libmpg123/layer2.c
-@HAVE_LAYER3_TRUE@am__append_4 = src/libmpg123/layer3.c
-@HAVE_EQUALIZER_TRUE@am__append_5 = src/libmpg123/equalizer.c
-@HAVE_DITHER_TRUE@am__append_6 = src/libmpg123/dither.c
-@HAVE_SYNTH8_TRUE@am__append_7 = src/libmpg123/synth_8bit.c
-@HAVE_SYNTH16_TRUE@am__append_8 = src/libmpg123/synth.c
-@HAVE_SYNTH32_TRUE@am__append_9 = src/libmpg123/synth_s32.c
-@HAVE_SYNTHREAL_TRUE@am__append_10 = src/libmpg123/synth_real.c
-@HAVE_LFS_ALIAS_TRUE@am__append_11 = src/libmpg123/lfs_alias.c
-@HAVE_LFS_WRAP_TRUE@am__append_12 = src/libmpg123/lfs_wrap.c
-@HAVE_ICY_TRUE@am__append_13 = src/libmpg123/icy.c src/libmpg123/icy2utf8.c
-@HAVE_FEATURE_TRUE@am__append_14 = src/libmpg123/feature.c
-@HAVE_NTOM_TRUE@am__append_15 = src/libmpg123/ntom.c
-@HAVE_STRING_TRUE@am__append_16 = src/libmpg123/stringbuf.c
-@HAVE_GETCPUFLAGS_TRUE@am__append_17 = src/libmpg123/getcpuflags.S
-@HAVE_GETCPUFLAGS_X86_64_TRUE@am__append_18 = src/libmpg123/getcpuflags_x86_64.S
-@HAVE_GETCPUFLAGS_ARM_TRUE@am__append_19 = src/libmpg123/getcpuflags_arm.c src/libmpg123/check_neon.S
-@HAVE_ALTIVEC_TRUE@am__append_20 = src/libmpg123/synth_altivec.c src/libmpg123/dct64_altivec.c
-@HAVE_I386_TRUE@am__append_21 = src/libmpg123/dct64_i386.c
-@HAVE_I486_TRUE@am__append_22 = src/libmpg123/synth_i486.c src/libmpg123/dct64_i486.c
-@HAVE_I586_TRUE@am__append_23 = src/libmpg123/synth_i586.S
-@HAVE_I586_DITHER_TRUE@am__append_24 = src/libmpg123/synth_i586_dither.S
-@HAVE_3DNOW_TRUE@am__append_25 = src/libmpg123/synth_3dnow.S src/libmpg123/dct64_3dnow.S
-@HAVE_3DNOW_TRUE@@HAVE_EQUALIZER_TRUE@am__append_26 = src/libmpg123/equalizer_3dnow.S
-@HAVE_3DNOW_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@am__append_27 = src/libmpg123/dct36_3dnow.S
-@HAVE_3DNOWEXT_TRUE@am__append_28 = src/libmpg123/dct64_3dnowext.S src/libmpg123/synth_3dnowext.S
-@HAVE_3DNOWEXT_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@am__append_29 = src/libmpg123/dct36_3dnowext.S
-@HAVE_MMXTAB_TRUE@am__append_30 = src/libmpg123/tabinit_mmx.S
-@HAVE_MMX_TRUE@am__append_31 = src/libmpg123/dct64_mmx.S src/libmpg123/synth_mmx.S
-@HAVE_FLOATDCT_TRUE@@HAVE_SSE_VINTAGE_TRUE@am__append_32 = src/libmpg123/dct64_sse_float.S
-@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTHREAL_TRUE@am__append_33 = src/libmpg123/synth_sse_float.S src/libmpg123/synth_stereo_sse_float.S
-@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTH32_TRUE@am__append_34 = src/libmpg123/synth_sse_s32.S src/libmpg123/synth_stereo_sse_s32.S
-@HAVE_LAYER3_TRUE@@HAVE_SSE_TRUE@am__append_35 = src/libmpg123/dct36_sse.S
-@HAVE_ACCURATE_TRUE@@HAVE_SSE_VINTAGE_TRUE@am__append_36 = src/libmpg123/synth_sse_accurate.S src/libmpg123/synth_stereo_sse_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_SSE_VINTAGE_TRUE@am__append_37 = src/libmpg123/dct64_sse.S src/libmpg123/synth_sse.S
-@HAVE_LAYER3_TRUE@@HAVE_X86_64_TRUE@am__append_38 = src/libmpg123/dct36_x86_64.S
-@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_TRUE@am__append_39 = src/libmpg123/synth_stereo_x86_64_float.S
-@HAVE_SYNTH32_TRUE@@HAVE_X86_64_TRUE@am__append_40 = src/libmpg123/synth_stereo_x86_64_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_X86_64_TRUE@am__append_41 = src/libmpg123/synth_stereo_x86_64_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_X86_64_TRUE@am__append_42 = src/libmpg123/dct64_x86_64.S src/libmpg123/synth_stereo_x86_64.S
-@HAVE_FLOATDCT_TRUE@@HAVE_X86_64_TRUE@am__append_43 = src/libmpg123/dct64_x86_64_float.S
-@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_MONO_TRUE@am__append_44 = src/libmpg123/
(Patch may be truncated, please check the link at the top of this post.)