diff --git a/jni/love/Android.mk b/jni/love/Android.mk index f6d8b0e6..a31a8df9 100644 --- a/jni/love/Android.mk +++ b/jni/love/Android.mk @@ -30,7 +30,7 @@ LOCAL_C_INCLUDES := \ ${LOCAL_PATH}/../freetype2-android/include \ ${LOCAL_PATH}/../freetype2-android/src \ ${LOCAL_PATH}/../physfs-2.0.3 \ - ${LOCAL_PATH}/../mpg123-1.13.4/src/libmpg123 \ + ${LOCAL_PATH}/../mpg123-1.17.0/src/libmpg123 \ ${LOCAL_PATH}/../libmodplug-0.8.8.4/src \ ${LOCAL_PATH}/../libvorbis-1.3.4/include \ ${LOCAL_PATH}/../LuaJIT-2.0.1/src \ diff --git a/jni/mpg123-1.13.4/INSTALL b/jni/mpg123-1.13.4/INSTALL deleted file mode 100644 index a51b7fda..00000000 --- a/jni/mpg123-1.13.4/INSTALL +++ /dev/null @@ -1,118 +0,0 @@ -mpg123 install hints --------------------- - -(This file has very long lines - die-hard terminal nostalgists can be satisfied by `fmt -s -w 75 < INSTALL | less`. I think it's better to let the reader's preference rule than to preformat the stuff to some arbitrary width.) - -There are now two basic ways to get your mpg123 installation consisting of - - a) the mpg123 binary file - - with libmpg123 as shared library or statically linked - - with audio output plugins, or one statically linked - b) a man page - -(you may want to copy some of the documentation - README, etc - to /usr/share/doc/mpg123 or the like, too) - - -0. Prerequesites - -You really need: - -- a C compiler; we try to keep the code ANSI C89/ISO C90 compatible - gcc from 2.95 on should work, others, too - please report any issues - Actually, we have a confirmed working build (svn trunk leading to release 0.67) on SunOS 4.1.4 with gcc-2.7.0 . - -- an (UNIX-like) operating system with standard tools; MinGW32 and Cygwin are working for Microsoft Windows, too. -- For the library only, you may get lucky with MSVC++ using the project files under ports/ -- For other exotic platforms, see ports/ - -You want: - -- working assembler (recent GNU binutils) if using certain CPU optimizations - -- headers and lib for certain audio output drivers (libasound for alsa, sdl for sdl...) - -- libtool's libltdl for runtime output modules (this used to be included, but now we rely on an existing install) - - -1. New installation via GNU autotools - -The GNU 3-step procedure: - - ./configure - make - make install - -Run - - ./configure --help - -for a list of possible parameters you can specify. The obvious are --prefix and the normal GNU autotool bunch, but others include what audio subsystem to use and what CPU optimizations to build in. -For the optimizations (decoder choice), the default on 32bit x86 systems since version 0.66 is a build that combines all possible optimizations and chooses one at runtime (see --cpu, --list-cpu and --test-cpu parameters). - -Another possibly important choice is --with-seektable= for setting the size for the table of stored frame addresses to make seeking faster. When you want a minimal memory footprint, you can set number to 0. Seeking will always start from the beginning, then - being accurate, but rather slow, what doesn't matter if you don't use interactive seeking forth and back. - -There are various library features you can leave out via --disable options (like output formats, resampling modes). Please note that this is only configured/tested for the generic (fpu) decoder, not optimized ones. Perhaps that changes in future. - -1a. Large file support - -The libmpg123 API includes the generic off_t type for file offsets and thus is subject to shape-shifting on systems that change off_t depending on build flags. -To deal with the incompatibilities that can cause, the library needs to separate code paths for small and large off_t. -Since version 1.12.0, a large-file-enabled libmpg123 (the default set by configure) provides a dual-mode ABI. Depending on _FILE_OFFSET_BITS, the mpg123.h header file selects different library symbols to use for your app. -In both large-file and normal mode, the library should just work for your app. - - -2. The classic way via the provided Makefile - -No, the Makefile is not provided anymore. Even if autotools is complicated, it is more cumbersome to take care of two build systems in parallel. -You can dig in SVN for MakeLegacy.sh and src/Makefile.legacy and src/config.h.legacy, if you want. - -Again, to be clear: There is no classic way anymore. - - -3. Do something different on a special platform/compiler/... - -Look into the ports/ directory for some traces of "porting" mpg123 or usually libmpg123 alone to different systems and compilers. - -3a. Preparing Win32 binary packages. - -Caution: You should make sure to use some gcc >= 4.2.0, even if it's still the experimental package for MinGW32. -This helps preventing incompatibilities between generated DLL files and other compilers (it's about stack alignment). - -Get MinGW/MSYS installed, run the MSYS shell. -Enter the mpg123 source directory. -Execute sh ./windows-builds.sh . - -After some time, you should have some relevant files under releases/ (or releases\, for Windows people;-). -You don't just get one build -- there are several variants, corresponding to what usually is to be found under http://mpg123.org/download/win32 . - - -4. Have fun! - - -These are some remarks from Michael that could still bear some relevance: - - - There is currently no direct audio hardware support for the - "dec" and "generic" targets. That means that you have to use - the "-s" commandline option to write the decoded audio data - to stdout. - - - On Solaris, use Sun's SparcWorks compiler ("make solaris") - if at all possible. It generates faster code than gcc, so - use gcc only if there's no other way. - - - The macro "htons" causes a compiler warning in httpget.c - (at least on FreeBSD 2.1.x). This can be safely ignored. - - - For Solaris 2.4: append the options "-L/usr/ucblib -lucb" - at the end of the link command line. Do this ONLY for - Solaris 2.4, NOT for Solaris 2.5 or newer versions. - - - The HP-UX port might be broken. I was able to compile it - on an HP-UX 9 account, but there were some problems with - libraries on HP-UX 10. I'm not an HP expert, but perhaps - someone else can fix it. - [note: some people report NO problems also with HP-UX 10] - - - IRIX: some people reported compile problems on IRIX 5.x (5.3) - but 6.x seems to compile without problems - diff --git a/jni/mpg123-1.13.4/build/missing b/jni/mpg123-1.13.4/build/missing deleted file mode 100755 index 28055d2a..00000000 --- a/jni/mpg123-1.13.4/build/missing +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/jni/mpg123-1.13.4/config.log b/jni/mpg123-1.13.4/config.log deleted file mode 100644 index 87d092b8..00000000 --- a/jni/mpg123-1.13.4/config.log +++ /dev/null @@ -1,2659 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by mpg123 configure 1.13.4, which was -generated by GNU Autoconf 2.68. Invocation command line was - - $ ./configure --with-default-audio=dummy --enable-network=no --with-cpu=generic_fpu --with-audio=dummy - -## --------- ## -## Platform. ## -## --------- ## - -hostname = dormouse -uname -m = i686 -uname -r = 2.6.38-13-generic-pae -uname -s = Linux -uname -v = #52-Ubuntu SMP Tue Nov 8 17:50:45 UTC 2011 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/lib/git-core -PATH: /usr/local/sbin -PATH: /usr/local/bin -PATH: /usr/sbin -PATH: /usr/bin -PATH: /sbin -PATH: /bin -PATH: /usr/games - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:2732: checking build system type -configure:2746: result: i686-pc-linux-gnu -configure:2766: checking host system type -configure:2779: result: i686-pc-linux-gnu -configure:2816: checking for a BSD-compatible install -configure:2884: result: /usr/bin/install -c -configure:2895: checking whether build environment is sane -configure:2945: result: yes -configure:3086: checking for a thread-safe mkdir -p -configure:3125: result: /bin/mkdir -p -configure:3138: checking for gawk -configure:3154: found /usr/bin/gawk -configure:3165: result: gawk -configure:3176: checking whether make sets $(MAKE) -configure:3198: result: yes -configure:3285: checking for -Werror in CFLAGS (It breaks tests) -configure:3295: result: no -configure:3306: checking if you are up to something totally static with LDFLAGS/CFLAGS -configure:3326: result: no -configure:3346: checking for style of include used by make -configure:3374: result: GNU -configure:3444: checking for gcc -configure:3460: found /usr/bin/gcc -configure:3471: result: gcc -configure:3700: checking for C compiler version -configure:3709: gcc --version >&5 -gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 -Copyright (C) 2010 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:3720: $? = 0 -configure:3709: gcc -v >&5 -Using built-in specs. -COLLECT_GCC=gcc -COLLECT_LTO_WRAPPER=/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2/lto-wrapper -Target: i686-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.5.2-8ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib/i386-linux-gnu --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib/i386-linux-gnu --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-plugin --enable-gold --enable-ld=default --with-plugin-ld=ld.gold --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu -Thread model: posix -gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4) -configure:3720: $? = 0 -configure:3709: gcc -V >&5 -gcc: '-V' option must have argument -configure:3720: $? = 1 -configure:3709: gcc -qversion >&5 -gcc: unrecognized option '-qversion' -gcc: no input files -configure:3720: $? = 1 -configure:3740: checking whether the C compiler works -configure:3762: gcc conftest.c >&5 -configure:3766: $? = 0 -configure:3814: result: yes -configure:3817: checking for C compiler default output file name -configure:3819: result: a.out -configure:3825: checking for suffix of executables -configure:3832: gcc -o conftest conftest.c >&5 -configure:3836: $? = 0 -configure:3858: result: -configure:3880: checking whether we are cross compiling -configure:3888: gcc -o conftest conftest.c >&5 -configure:3892: $? = 0 -configure:3899: ./conftest -configure:3903: $? = 0 -configure:3918: result: no -configure:3923: checking for suffix of object files -configure:3945: gcc -c conftest.c >&5 -configure:3949: $? = 0 -configure:3970: result: o -configure:3974: checking whether we are using the GNU C compiler -configure:3993: gcc -c conftest.c >&5 -configure:3993: $? = 0 -configure:4002: result: yes -configure:4011: checking whether gcc accepts -g -configure:4031: gcc -c -g conftest.c >&5 -configure:4031: $? = 0 -configure:4072: result: yes -configure:4089: checking for gcc option to accept ISO C89 -configure:4153: gcc -c -g -O2 conftest.c >&5 -configure:4153: $? = 0 -configure:4166: result: none needed -configure:4188: checking dependency style of gcc -configure:4298: result: gcc3 -configure:4322: checking dependency style of gcc -configure:4430: result: gcc3 -configure:4493: checking for gcc -configure:4520: result: gcc -configure:4749: checking for C compiler version -configure:4758: gcc --version >&5 -gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 -Copyright (C) 2010 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:4769: $? = 0 -configure:4758: gcc -v >&5 -Using built-in specs. -COLLECT_GCC=gcc -COLLECT_LTO_WRAPPER=/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2/lto-wrapper -Target: i686-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.5.2-8ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.5/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.5 --enable-shared --enable-multiarch --with-multiarch-defaults=i386-linux-gnu --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib/i386-linux-gnu --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.5 --libdir=/usr/lib/i386-linux-gnu --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-plugin --enable-gold --enable-ld=default --with-plugin-ld=ld.gold --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu -Thread model: posix -gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4) -configure:4769: $? = 0 -configure:4758: gcc -V >&5 -gcc: '-V' option must have argument -configure:4769: $? = 1 -configure:4758: gcc -qversion >&5 -gcc: unrecognized option '-qversion' -gcc: no input files -configure:4769: $? = 1 -configure:4773: checking whether we are using the GNU C compiler -configure:4801: result: yes -configure:4810: checking whether gcc accepts -g -configure:4871: result: yes -configure:4888: checking for gcc option to accept ISO C89 -configure:4965: result: none needed -configure:4987: checking dependency style of gcc -configure:5097: result: gcc3 -configure:5117: checking how to run the C preprocessor -configure:5148: gcc -E conftest.c -configure:5148: $? = 0 -configure:5162: gcc -E conftest.c -conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory -compilation terminated. -configure:5162: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| /* end confdefs.h. */ -| #include -configure:5187: result: gcc -E -configure:5207: gcc -E conftest.c -configure:5207: $? = 0 -configure:5221: gcc -E conftest.c -conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory -compilation terminated. -configure:5221: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| /* end confdefs.h. */ -| #include -configure:5250: checking for grep that handles long lines and -e -configure:5308: result: /bin/grep -configure:5313: checking for egrep -configure:5375: result: /bin/grep -E -configure:5381: checking for an ANSI C-conforming const -configure:5446: gcc -c -g -O2 conftest.c >&5 -configure:5446: $? = 0 -configure:5453: result: yes -configure:5461: checking for inline -configure:5477: gcc -c -g -O2 conftest.c >&5 -configure:5477: $? = 0 -configure:5485: result: inline -configure:5504: checking for ANSI C header files -configure:5524: gcc -c -g -O2 conftest.c >&5 -configure:5524: $? = 0 -configure:5597: gcc -o conftest -g -O2 conftest.c >&5 -configure:5597: $? = 0 -configure:5597: ./conftest -configure:5597: $? = 0 -configure:5608: result: yes -configure:5621: checking for sys/types.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for sys/stat.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for stdlib.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for string.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for memory.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for strings.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for inttypes.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for stdint.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5621: checking for unistd.h -configure:5621: gcc -c -g -O2 conftest.c >&5 -configure:5621: $? = 0 -configure:5621: result: yes -configure:5633: checking whether byte ordering is bigendian -configure:5648: gcc -c -g -O2 conftest.c >&5 -conftest.c:22:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'a' -configure:5648: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| /* end confdefs.h. */ -| #ifndef __APPLE_CC__ -| not a universal capable compiler -| #endif -| typedef int dummy; -| -configure:5693: gcc -c -g -O2 conftest.c >&5 -configure:5693: $? = 0 -configure:5711: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:28:4: error: 'not' undeclared (first use in this function) -conftest.c:28:4: note: each undeclared identifier is reported only once for each function it appears in -conftest.c:28:8: error: expected ';' before 'big' -configure:5711: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| /* end confdefs.h. */ -| #include -| #include -| -| int -| main () -| { -| #if BYTE_ORDER != BIG_ENDIAN -| not big endian -| #endif -| -| ; -| return 0; -| } -configure:5839: result: no -configure:5959: checking for lt_dlinit in -lltdl -configure:5984: gcc -o conftest -g -O2 conftest.c -lltdl >&5 -/usr/bin/ld: cannot find -lltdl -collect2: ld returned 1 exit status -configure:5984: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| /* end confdefs.h. */ -| -| /* Override any GCC internal prototype to avoid an error. -| Use char because int might match the return type of a GCC -| builtin and then its argument prototype would still apply. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| char lt_dlinit (); -| int -| main () -| { -| return lt_dlinit (); -| ; -| return 0; -| } -configure:5993: result: no -configure:6015: WARNING: ltdl library not found -configure:6395: checking how to print strings -configure:6422: result: printf -configure:6443: checking for a sed that does not truncate output -configure:6507: result: /bin/sed -configure:6525: checking for fgrep -configure:6587: result: /bin/grep -F -configure:6622: checking for ld used by gcc -configure:6689: result: /usr/bin/ld -configure:6696: checking if the linker (/usr/bin/ld) is GNU ld -configure:6711: result: yes -configure:6723: checking for BSD- or MS-compatible name lister (nm) -configure:6772: result: /usr/bin/nm -B -configure:6902: checking the name lister (/usr/bin/nm -B) interface -configure:6909: gcc -c -g -O2 conftest.c >&5 -configure:6912: /usr/bin/nm -B "conftest.o" -configure:6915: output -00000000 B some_variable -configure:6922: result: BSD nm -configure:6925: checking whether ln -s works -configure:6929: result: yes -configure:6937: checking the maximum length of command line arguments -configure:7062: result: 1572864 -configure:7079: checking whether the shell understands some XSI constructs -configure:7089: result: yes -configure:7093: checking whether the shell understands "+=" -configure:7099: result: yes -configure:7134: checking how to convert i686-pc-linux-gnu file names to i686-pc-linux-gnu format -configure:7174: result: func_convert_file_noop -configure:7181: checking how to convert i686-pc-linux-gnu file names to toolchain format -configure:7201: result: func_convert_file_noop -configure:7208: checking for /usr/bin/ld option to reload object files -configure:7215: result: -r -configure:7289: checking for objdump -configure:7316: result: objdump -configure:7345: checking how to recognize dependent libraries -configure:7547: result: pass_all -configure:7632: checking for dlltool -configure:7659: result: dlltool -configure:7689: checking how to associate runtime and link libraries -configure:7716: result: printf %s\n -configure:7776: checking for ar -configure:7792: found /usr/bin/ar -configure:7803: result: ar -configure:7840: checking for archiver @FILE support -configure:7857: gcc -c -g -O2 conftest.c >&5 -configure:7857: $? = 0 -configure:7860: ar cru libconftest.a @conftest.lst >&5 -configure:7863: $? = 0 -configure:7868: ar cru libconftest.a @conftest.lst >&5 -ar: conftest.o: No such file or directory -configure:7871: $? = 1 -configure:7883: result: @ -configure:7941: checking for strip -configure:7957: found /usr/bin/strip -configure:7968: result: strip -configure:8040: checking for ranlib -configure:8056: found /usr/bin/ranlib -configure:8067: result: ranlib -configure:8169: checking command to parse /usr/bin/nm -B output from gcc object -configure:8288: gcc -c -g -O2 conftest.c >&5 -configure:8291: $? = 0 -configure:8295: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm -configure:8298: $? = 0 -configure:8364: gcc -o conftest -g -O2 conftest.c conftstm.o >&5 -configure:8367: $? = 0 -configure:8405: result: ok -configure:8442: checking for sysroot -configure:8472: result: no -configure:8715: checking for mt -configure:8731: found /bin/mt -configure:8742: result: mt -configure:8765: checking if mt is a manifest tool -configure:8771: mt '-?' -configure:8779: result: no -configure:9408: checking for dlfcn.h -configure:9408: gcc -c -g -O2 conftest.c >&5 -configure:9408: $? = 0 -configure:9408: result: yes -configure:9533: checking for objdir -configure:9548: result: .libs -configure:9819: checking if gcc supports -fno-rtti -fno-exceptions -configure:9837: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 -cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C -configure:9841: $? = 0 -configure:9854: result: no -configure:10164: checking for gcc option to produce PIC -configure:10171: result: -fPIC -DPIC -configure:10179: checking if gcc PIC flag -fPIC -DPIC works -configure:10197: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 -configure:10201: $? = 0 -configure:10214: result: yes -configure:10243: checking if gcc static flag -static works -configure:10271: result: yes -configure:10286: checking if gcc supports -c -o file.o -configure:10307: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 -configure:10311: $? = 0 -configure:10333: result: yes -configure:10341: checking if gcc supports -c -o file.o -configure:10388: result: yes -configure:10421: checking whether the gcc linker (/usr/bin/ld) supports shared libraries -configure:11579: result: yes -configure:11616: checking whether -lc should be explicitly linked in -configure:11624: gcc -c -g -O2 conftest.c >&5 -configure:11627: $? = 0 -configure:11642: gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 -configure:11645: $? = 0 -configure:11659: result: no -configure:11824: checking dynamic linker characteristics -configure:12338: gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 -configure:12338: $? = 0 -configure:12560: result: GNU/Linux ld.so -configure:12667: checking how to hardcode library paths into programs -configure:12692: result: immediate -configure:13232: checking whether stripping libraries is possible -configure:13237: result: yes -configure:13272: checking if libtool supports shared libraries -configure:13274: result: yes -configure:13277: checking whether to build shared libraries -configure:13298: result: yes -configure:13301: checking whether to build static libraries -configure:13305: result: no -configure:14069: checking if .align takes 2-exponent -configure:14078: result: no -configure:14091: checking __attribute__((aligned(16))) -configure:14097: result: yes -configure:14108: checking for ANSI C header files -configure:14212: result: yes -configure:14223: checking stdio.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking stdio.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for stdio.h -configure:14223: result: yes -configure:14223: checking for stdlib.h -configure:14223: result: yes -configure:14223: checking for string.h -configure:14223: result: yes -configure:14223: checking for unistd.h -configure:14223: result: yes -configure:14223: checking sched.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sched.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sched.h -configure:14223: result: yes -configure:14223: checking sys/ioctl.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sys/ioctl.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sys/ioctl.h -configure:14223: result: yes -configure:14223: checking for sys/types.h -configure:14223: result: yes -configure:14223: checking for stdint.h -configure:14223: result: yes -configure:14223: checking limits.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking limits.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for limits.h -configure:14223: result: yes -configure:14223: checking for inttypes.h -configure:14223: result: yes -configure:14223: checking sys/time.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sys/time.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sys/time.h -configure:14223: result: yes -configure:14223: checking sys/wait.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sys/wait.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sys/wait.h -configure:14223: result: yes -configure:14223: checking sys/resource.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sys/resource.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sys/resource.h -configure:14223: result: yes -configure:14223: checking sys/signal.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking sys/signal.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for sys/signal.h -configure:14223: result: yes -configure:14223: checking signal.h usability -configure:14223: gcc -c -g -O2 conftest.c >&5 -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking signal.h presence -configure:14223: gcc -E conftest.c -configure:14223: $? = 0 -configure:14223: result: yes -configure:14223: checking for signal.h -configure:14223: result: yes -configure:14243: checking for special C compiler options needed for large files -configure:14288: result: no -configure:14294: checking for _FILE_OFFSET_BITS value needed for large files -configure:14319: gcc -c -g -O2 conftest.c >&5 -conftest.c:49:3: warning: left shift count >= width of type -conftest.c:49:3: warning: left shift count >= width of type -conftest.c:50:10: warning: left shift count >= width of type -conftest.c:50:10: warning: left shift count >= width of type -conftest.c:49:7: error: size of array 'off_t_is_large' is negative -conftest.c:51:9: warning: variably modified 'off_t_is_large' at file scope -configure:14319: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| /* end confdefs.h. */ -| #include -| /* Check that off_t can represent 2**63 - 1 correctly. -| We can't simply define LARGE_OFF_T to be 9223372036854775807, -| since some C++ compilers masquerading as C compilers -| incorrectly reject 9223372036854775807. */ -| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -| int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -| && LARGE_OFF_T % 2147483647 == 1) -| ? 1 : -1]; -| int -| main () -| { -| -| ; -| return 0; -| } -configure:14343: gcc -c -g -O2 conftest.c >&5 -configure:14343: $? = 0 -configure:14351: result: 64 -configure:14442: checking for size_t -configure:14442: gcc -c -g -O2 conftest.c >&5 -configure:14442: $? = 0 -configure:14442: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:21: error: expected expression before ')' token -configure:14442: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((size_t))) -| return 0; -| ; -| return 0; -| } -configure:14442: result: yes -configure:14453: checking for uintptr_t -configure:14453: gcc -c -g -O2 conftest.c >&5 -configure:14453: $? = 0 -configure:14453: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:24: error: expected expression before ')' token -configure:14453: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((uintptr_t))) -| return 0; -| ; -| return 0; -| } -configure:14453: result: yes -configure:14464: checking for ssize_t -configure:14464: gcc -c -g -O2 conftest.c >&5 -configure:14464: $? = 0 -configure:14464: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:22: error: expected expression before ')' token -configure:14464: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((ssize_t))) -| return 0; -| ; -| return 0; -| } -configure:14464: result: yes -configure:14475: checking for off_t -configure:14475: gcc -c -g -O2 conftest.c >&5 -configure:14475: $? = 0 -configure:14475: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:20: error: expected expression before ')' token -configure:14475: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((off_t))) -| return 0; -| ; -| return 0; -| } -configure:14475: result: yes -configure:14486: checking for int32_t -configure:14486: gcc -c -g -O2 conftest.c >&5 -configure:14486: $? = 0 -configure:14486: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:22: error: expected expression before ')' token -configure:14486: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((int32_t))) -| return 0; -| ; -| return 0; -| } -configure:14486: result: yes -configure:14497: checking for uint32_t -configure:14497: gcc -c -g -O2 conftest.c >&5 -configure:14497: $? = 0 -configure:14497: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:23: error: expected expression before ')' token -configure:14497: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((uint32_t))) -| return 0; -| ; -| return 0; -| } -configure:14497: result: yes -configure:14508: checking for int16_t -configure:14508: gcc -c -g -O2 conftest.c >&5 -configure:14508: $? = 0 -configure:14508: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:22: error: expected expression before ')' token -configure:14508: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((int16_t))) -| return 0; -| ; -| return 0; -| } -configure:14508: result: yes -configure:14519: checking for uint16_t -configure:14519: gcc -c -g -O2 conftest.c >&5 -configure:14519: $? = 0 -configure:14519: gcc -c -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:80:23: error: expected expression before ')' token -configure:14519: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| int -| main () -| { -| if (sizeof ((uint16_t))) -| return 0; -| ; -| return 0; -| } -configure:14519: result: yes -configure:14534: checking size of size_t -configure:14539: gcc -o conftest -g -O2 conftest.c >&5 -configure:14539: $? = 0 -configure:14539: ./conftest -configure:14539: $? = 0 -configure:14553: result: 4 -configure:14567: checking size of ssize_t -configure:14572: gcc -o conftest -g -O2 conftest.c >&5 -configure:14572: $? = 0 -configure:14572: ./conftest -configure:14572: $? = 0 -configure:14586: result: 4 -configure:14600: checking size of off_t -configure:14605: gcc -o conftest -g -O2 conftest.c >&5 -configure:14605: $? = 0 -configure:14605: ./conftest -configure:14605: $? = 0 -configure:14619: result: 8 -configure:14633: checking size of int32_t -configure:14638: gcc -o conftest -g -O2 conftest.c >&5 -configure:14638: $? = 0 -configure:14638: ./conftest -configure:14638: $? = 0 -configure:14652: result: 4 -configure:14666: checking size of long -configure:14671: gcc -o conftest -g -O2 conftest.c >&5 -configure:14671: $? = 0 -configure:14671: ./conftest -configure:14671: $? = 0 -configure:14685: result: 4 -configure:14731: checking if we want to enable alias wrappers for largefile -configure:14734: result: yes -configure:14752: checking for stdlib.h -configure:14752: result: yes -configure:14752: checking for unistd.h -configure:14752: result: yes -configure:14752: checking for sys/param.h -configure:14752: gcc -c -g -O2 conftest.c >&5 -configure:14752: $? = 0 -configure:14752: result: yes -configure:14772: checking for getpagesize -configure:14772: gcc -o conftest -g -O2 conftest.c >&5 -configure:14772: $? = 0 -configure:14772: result: yes -configure:14781: checking for working mmap -configure:14928: gcc -o conftest -g -O2 conftest.c >&5 -configure:14928: $? = 0 -configure:14928: ./conftest -configure:14928: $? = 0 -configure:14938: result: yes -configure:14949: checking POSIX termios -configure:14969: gcc -o conftest -g -O2 conftest.c >&5 -configure:14969: $? = 0 -configure:14977: result: yes -configure:14991: checking for random -configure:14991: gcc -o conftest -g -O2 conftest.c >&5 -configure:14991: $? = 0 -configure:14991: result: yes -configure:15005: checking for sched_setscheduler -configure:15005: gcc -o conftest -g -O2 conftest.c >&5 -configure:15005: $? = 0 -configure:15005: result: yes -configure:15005: checking for setuid -configure:15005: gcc -o conftest -g -O2 conftest.c >&5 -configure:15005: $? = 0 -configure:15005: result: yes -configure:15005: checking for getuid -configure:15005: gcc -o conftest -g -O2 conftest.c >&5 -configure:15005: $? = 0 -configure:15005: result: yes -configure:15019: checking for setpriority -configure:15019: gcc -o conftest -g -O2 conftest.c >&5 -configure:15019: $? = 0 -configure:15019: result: yes -configure:15032: checking for strerror -configure:15032: gcc -o conftest -g -O2 conftest.c >&5 -configure:15032: $? = 0 -configure:15032: result: yes -configure:15045: checking for setlocale -configure:15045: gcc -o conftest -g -O2 conftest.c >&5 -configure:15045: $? = 0 -configure:15045: result: yes -configure:15045: checking for nl_langinfo -configure:15045: gcc -o conftest -g -O2 conftest.c >&5 -configure:15045: $? = 0 -configure:15045: result: yes -configure:15058: checking for strdup -configure:15058: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c:87:6: warning: conflicting types for built-in function 'strdup' -configure:15058: $? = 0 -configure:15058: result: yes -configure:15071: checking for atoll -configure:15071: gcc -o conftest -g -O2 conftest.c >&5 -configure:15071: $? = 0 -configure:15071: result: yes -configure:15083: checking for mkfifo -configure:15083: gcc -o conftest -g -O2 conftest.c >&5 -configure:15083: $? = 0 -configure:15083: result: yes -configure:15117: checking locale.h usability -configure:15117: gcc -c -g -O2 conftest.c >&5 -configure:15117: $? = 0 -configure:15117: result: yes -configure:15117: checking locale.h presence -configure:15117: gcc -E conftest.c -configure:15117: $? = 0 -configure:15117: result: yes -configure:15117: checking for locale.h -configure:15117: result: yes -configure:15117: checking langinfo.h usability -configure:15117: gcc -c -g -O2 conftest.c >&5 -configure:15117: $? = 0 -configure:15117: result: yes -configure:15117: checking langinfo.h presence -configure:15117: gcc -E conftest.c -configure:15117: $? = 0 -configure:15117: result: yes -configure:15117: checking for langinfo.h -configure:15117: result: yes -configure:15132: checking netdb.h usability -configure:15132: gcc -c -g -O2 conftest.c >&5 -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking netdb.h presence -configure:15132: gcc -E conftest.c -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking for netdb.h -configure:15132: result: yes -configure:15132: checking for sys/param.h -configure:15132: result: yes -configure:15132: checking sys/socket.h usability -configure:15132: gcc -c -g -O2 conftest.c >&5 -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking sys/socket.h presence -configure:15132: gcc -E conftest.c -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking for sys/socket.h -configure:15132: result: yes -configure:15132: checking netinet/in.h usability -configure:15132: gcc -c -g -O2 conftest.c >&5 -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking netinet/in.h presence -configure:15132: gcc -E conftest.c -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking for netinet/in.h -configure:15132: result: yes -configure:15132: checking arpa/inet.h usability -configure:15132: gcc -c -g -O2 conftest.c >&5 -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking arpa/inet.h presence -configure:15132: gcc -E conftest.c -configure:15132: $? = 0 -configure:15132: result: yes -configure:15132: checking for arpa/inet.h -configure:15132: result: yes -configure:15153: checking for library containing gethostbyname -configure:15184: gcc -o conftest -g -O2 conftest.c >&5 -configure:15184: $? = 0 -configure:15201: result: none required -configure:15209: checking for library containing socket -configure:15240: gcc -o conftest -g -O2 conftest.c >&5 -configure:15240: $? = 0 -configure:15257: result: none required -configure:15268: checking for getaddrinfo -configure:15268: gcc -o conftest -g -O2 conftest.c >&5 -configure:15268: $? = 0 -configure:15268: result: yes -configure:15281: checking for working AI_ADDRCONFIG -configure:15316: gcc -o conftest -g -O2 conftest.c >&5 -configure:15316: $? = 0 -configure:15316: ./conftest -configure:15316: $? = 0 -configure:15326: result: yes -configure:15360: checking for sqrt in -lm -configure:15385: gcc -o conftest -g -O2 conftest.c -lm >&5 -conftest.c:84:6: warning: conflicting types for built-in function 'sqrt' -configure:15385: $? = 0 -configure:15394: result: yes -configure:15405: checking for powf in -lmx -configure:15430: gcc -o conftest -g -O2 conftest.c -lmx -lm >&5 -conftest.c:85:6: warning: conflicting types for built-in function 'powf' -/usr/bin/ld: cannot find -lmx -collect2: ld returned 1 exit status -configure:15430: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| #define SIZEOF_SIZE_T 4 -| #define SIZEOF_SSIZE_T 4 -| #define SIZEOF_OFF_T 8 -| #define SIZEOF_INT32_T 4 -| #define SIZEOF_LONG 4 -| #define LFS_ALIAS_BITS 32 -| #define HAVE_STDLIB_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_GETPAGESIZE 1 -| #define HAVE_MMAP 1 -| #define HAVE_TERMIOS 1 -| #define HAVE_RANDOM 1 -| #define HAVE_SCHED_SETSCHEDULER 1 -| #define HAVE_SETUID 1 -| #define HAVE_GETUID 1 -| #define HAVE_SETPRIORITY 1 -| #define HAVE_STRERROR 1 -| #define HAVE_SETLOCALE 1 -| #define HAVE_NL_LANGINFO 1 -| #define HAVE_STRDUP 1 -| #define HAVE_ATOLL 1 -| #define HAVE_MKFIFO 1 -| #define FIFO 1 -| #define HAVE_LOCALE_H 1 -| #define HAVE_LANGINFO_H 1 -| #define HAVE_NETDB_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_ARPA_INET_H 1 -| #define HAVE_GETADDRINFO 1 -| #define HAVE_GAI_ADDRCONFIG 1 -| #define HAVE_LIBM 1 -| /* end confdefs.h. */ -| -| /* Override any GCC internal prototype to avoid an error. -| Use char because int might match the return type of a GCC -| builtin and then its argument prototype would still apply. */ -| #ifdef __cplusplus -| extern "C" -| #endif -| char powf (); -| int -| main () -| { -| return powf (); -| ; -| return 0; -| } -configure:15439: result: no -configure:15468: checking os2.h usability -configure:15468: gcc -c -g -O2 conftest.c >&5 -conftest.c:111:17: fatal error: os2.h: No such file or directory -compilation terminated. -configure:15468: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| #define SIZEOF_SIZE_T 4 -| #define SIZEOF_SSIZE_T 4 -| #define SIZEOF_OFF_T 8 -| #define SIZEOF_INT32_T 4 -| #define SIZEOF_LONG 4 -| #define LFS_ALIAS_BITS 32 -| #define HAVE_STDLIB_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_GETPAGESIZE 1 -| #define HAVE_MMAP 1 -| #define HAVE_TERMIOS 1 -| #define HAVE_RANDOM 1 -| #define HAVE_SCHED_SETSCHEDULER 1 -| #define HAVE_SETUID 1 -| #define HAVE_GETUID 1 -| #define HAVE_SETPRIORITY 1 -| #define HAVE_STRERROR 1 -| #define HAVE_SETLOCALE 1 -| #define HAVE_NL_LANGINFO 1 -| #define HAVE_STRDUP 1 -| #define HAVE_ATOLL 1 -| #define HAVE_MKFIFO 1 -| #define FIFO 1 -| #define HAVE_LOCALE_H 1 -| #define HAVE_LANGINFO_H 1 -| #define HAVE_NETDB_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_ARPA_INET_H 1 -| #define HAVE_GETADDRINFO 1 -| #define HAVE_GAI_ADDRCONFIG 1 -| #define HAVE_LIBM 1 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| #include -configure:15468: result: no -configure:15468: checking os2.h presence -configure:15468: gcc -E conftest.c -conftest.c:78:17: fatal error: os2.h: No such file or directory -compilation terminated. -configure:15468: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| #define SIZEOF_SIZE_T 4 -| #define SIZEOF_SSIZE_T 4 -| #define SIZEOF_OFF_T 8 -| #define SIZEOF_INT32_T 4 -| #define SIZEOF_LONG 4 -| #define LFS_ALIAS_BITS 32 -| #define HAVE_STDLIB_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_GETPAGESIZE 1 -| #define HAVE_MMAP 1 -| #define HAVE_TERMIOS 1 -| #define HAVE_RANDOM 1 -| #define HAVE_SCHED_SETSCHEDULER 1 -| #define HAVE_SETUID 1 -| #define HAVE_GETUID 1 -| #define HAVE_SETPRIORITY 1 -| #define HAVE_STRERROR 1 -| #define HAVE_SETLOCALE 1 -| #define HAVE_NL_LANGINFO 1 -| #define HAVE_STRDUP 1 -| #define HAVE_ATOLL 1 -| #define HAVE_MKFIFO 1 -| #define FIFO 1 -| #define HAVE_LOCALE_H 1 -| #define HAVE_LANGINFO_H 1 -| #define HAVE_NETDB_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_ARPA_INET_H 1 -| #define HAVE_GETADDRINFO 1 -| #define HAVE_GAI_ADDRCONFIG 1 -| #define HAVE_LIBM 1 -| /* end confdefs.h. */ -| #include -configure:15468: result: no -configure:15468: checking for os2.h -configure:15468: result: no -configure:15665: checking if we want feature report function -configure:15681: result: yes -configure:15770: checking for pkg-config -configure:15788: found /usr/bin/pkg-config -configure:15800: result: /usr/bin/pkg-config -configure:15825: checking pkg-config is at least version 0.9.0 -configure:15828: result: yes -configure:15843: checking if you are too dumbing dumb for the dummy -configure:15845: result: no -configure:15843: checking if you are too dumbing dumb for the dummy -configure:15845: result: no -configure:17252: checking windows.h usability -configure:17252: gcc -c -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 -DOPT_GENERIC -DREAL_IS_FLOAT conftest.c >&5 -conftest.c:115:21: fatal error: windows.h: No such file or directory -compilation terminated. -configure:17252: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| #define SIZEOF_SIZE_T 4 -| #define SIZEOF_SSIZE_T 4 -| #define SIZEOF_OFF_T 8 -| #define SIZEOF_INT32_T 4 -| #define SIZEOF_LONG 4 -| #define LFS_ALIAS_BITS 32 -| #define HAVE_STDLIB_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_GETPAGESIZE 1 -| #define HAVE_MMAP 1 -| #define HAVE_TERMIOS 1 -| #define HAVE_RANDOM 1 -| #define HAVE_SCHED_SETSCHEDULER 1 -| #define HAVE_SETUID 1 -| #define HAVE_GETUID 1 -| #define HAVE_SETPRIORITY 1 -| #define HAVE_STRERROR 1 -| #define HAVE_SETLOCALE 1 -| #define HAVE_NL_LANGINFO 1 -| #define HAVE_STRDUP 1 -| #define HAVE_ATOLL 1 -| #define HAVE_MKFIFO 1 -| #define FIFO 1 -| #define HAVE_LOCALE_H 1 -| #define HAVE_LANGINFO_H 1 -| #define HAVE_NETDB_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_ARPA_INET_H 1 -| #define HAVE_GETADDRINFO 1 -| #define HAVE_GAI_ADDRCONFIG 1 -| #define HAVE_LIBM 1 -| #define ABI_ALIGN_FUN 1 -| #define DEFAULT_OUTPUT_MODULE "dummy" -| #define FRAME_INDEX 1 -| #define INDEX_SIZE 1000 -| /* end confdefs.h. */ -| #include -| #ifdef HAVE_SYS_TYPES_H -| # include -| #endif -| #ifdef HAVE_SYS_STAT_H -| # include -| #endif -| #ifdef STDC_HEADERS -| # include -| # include -| #else -| # ifdef HAVE_STDLIB_H -| # include -| # endif -| #endif -| #ifdef HAVE_STRING_H -| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H -| # include -| # endif -| # include -| #endif -| #ifdef HAVE_STRINGS_H -| # include -| #endif -| #ifdef HAVE_INTTYPES_H -| # include -| #endif -| #ifdef HAVE_STDINT_H -| # include -| #endif -| #ifdef HAVE_UNISTD_H -| # include -| #endif -| #include -configure:17252: result: no -configure:17252: checking windows.h presence -configure:17252: gcc -E -DOPT_GENERIC -DREAL_IS_FLOAT conftest.c -conftest.c:82:21: fatal error: windows.h: No such file or directory -compilation terminated. -configure:17252: $? = 1 -configure: failed program was: -| /* confdefs.h */ -| #define PACKAGE_NAME "mpg123" -| #define PACKAGE_TARNAME "mpg123" -| #define PACKAGE_VERSION "1.13.4" -| #define PACKAGE_STRING "mpg123 1.13.4" -| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -| #define PACKAGE_URL "" -| #define PACKAGE "mpg123" -| #define VERSION "1.13.4" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define DYNAMIC_BUILD 1 -| #define HAVE_DLFCN_H 1 -| #define LT_OBJDIR ".libs/" -| #define GAPLESS 1 -| #define IEEE_FLOAT 1 -| #define MODULE_FILE_SUFFIX ".la" -| #define STDC_HEADERS 1 -| #define HAVE_STDIO_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SCHED_H 1 -| #define HAVE_SYS_IOCTL_H 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_LIMITS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_SYS_TIME_H 1 -| #define HAVE_SYS_WAIT_H 1 -| #define HAVE_SYS_RESOURCE_H 1 -| #define HAVE_SYS_SIGNAL_H 1 -| #define HAVE_SIGNAL_H 1 -| #define _FILE_OFFSET_BITS 64 -| #define SIZEOF_SIZE_T 4 -| #define SIZEOF_SSIZE_T 4 -| #define SIZEOF_OFF_T 8 -| #define SIZEOF_INT32_T 4 -| #define SIZEOF_LONG 4 -| #define LFS_ALIAS_BITS 32 -| #define HAVE_STDLIB_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_GETPAGESIZE 1 -| #define HAVE_MMAP 1 -| #define HAVE_TERMIOS 1 -| #define HAVE_RANDOM 1 -| #define HAVE_SCHED_SETSCHEDULER 1 -| #define HAVE_SETUID 1 -| #define HAVE_GETUID 1 -| #define HAVE_SETPRIORITY 1 -| #define HAVE_STRERROR 1 -| #define HAVE_SETLOCALE 1 -| #define HAVE_NL_LANGINFO 1 -| #define HAVE_STRDUP 1 -| #define HAVE_ATOLL 1 -| #define HAVE_MKFIFO 1 -| #define FIFO 1 -| #define HAVE_LOCALE_H 1 -| #define HAVE_LANGINFO_H 1 -| #define HAVE_NETDB_H 1 -| #define HAVE_SYS_PARAM_H 1 -| #define HAVE_SYS_SOCKET_H 1 -| #define HAVE_NETINET_IN_H 1 -| #define HAVE_ARPA_INET_H 1 -| #define HAVE_GETADDRINFO 1 -| #define HAVE_GAI_ADDRCONFIG 1 -| #define HAVE_LIBM 1 -| #define ABI_ALIGN_FUN 1 -| #define DEFAULT_OUTPUT_MODULE "dummy" -| #define FRAME_INDEX 1 -| #define INDEX_SIZE 1000 -| /* end confdefs.h. */ -| #include -configure:17252: result: no -configure:17252: checking for windows.h -configure:17252: result: no -configure:17728: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by mpg123 config.status 1.13.4, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on dormouse - -config.status:1288: creating Makefile -config.status:1288: creating libmpg123.pc -config.status:1288: creating mpg123.spec -config.status:1288: creating doc/Makefile -config.status:1288: creating src/Makefile -config.status:1288: creating src/output/Makefile -config.status:1288: creating src/libmpg123/Makefile -config.status:1288: creating src/libmpg123/mpg123.h -config.status:1288: creating src/config.h -config.status:1517: executing depfiles commands -config.status:1517: executing libtool commands - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i686-pc-linux-gnu -ac_cv_c_bigendian=no -ac_cv_c_compiler_gnu=yes -ac_cv_c_const=yes -ac_cv_c_inline=inline -ac_cv_env_CCASFLAGS_set= -ac_cv_env_CCASFLAGS_value= -ac_cv_env_CCAS_set= -ac_cv_env_CCAS_value= -ac_cv_env_CC_set= -ac_cv_env_CC_value= -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_ESD_CFLAGS_set= -ac_cv_env_ESD_CFLAGS_value= -ac_cv_env_ESD_LIBS_set= -ac_cv_env_ESD_LIBS_value= -ac_cv_env_JACK_CFLAGS_set= -ac_cv_env_JACK_CFLAGS_value= -ac_cv_env_JACK_LIBS_set= -ac_cv_env_JACK_LIBS_value= -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_PKG_CONFIG_set= -ac_cv_env_PKG_CONFIG_value= -ac_cv_env_PULSE_CFLAGS_set= -ac_cv_env_PULSE_CFLAGS_value= -ac_cv_env_PULSE_LIBS_set= -ac_cv_env_PULSE_LIBS_value= -ac_cv_env_SDL_CFLAGS_set= -ac_cv_env_SDL_CFLAGS_value= -ac_cv_env_SDL_LIBS_set= -ac_cv_env_SDL_LIBS_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_func_atoll=yes -ac_cv_func_getaddrinfo=yes -ac_cv_func_getpagesize=yes -ac_cv_func_getuid=yes -ac_cv_func_mkfifo=yes -ac_cv_func_mmap_fixed_mapped=yes -ac_cv_func_nl_langinfo=yes -ac_cv_func_random=yes -ac_cv_func_sched_setscheduler=yes -ac_cv_func_setlocale=yes -ac_cv_func_setpriority=yes -ac_cv_func_setuid=yes -ac_cv_func_strdup=yes -ac_cv_func_strerror=yes -ac_cv_header_arpa_inet_h=yes -ac_cv_header_dlfcn_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_langinfo_h=yes -ac_cv_header_limits_h=yes -ac_cv_header_locale_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_netdb_h=yes -ac_cv_header_netinet_in_h=yes -ac_cv_header_os2_h=no -ac_cv_header_sched_h=yes -ac_cv_header_signal_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdio_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_ioctl_h=yes -ac_cv_header_sys_param_h=yes -ac_cv_header_sys_resource_h=yes -ac_cv_header_sys_signal_h=yes -ac_cv_header_sys_socket_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_time_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_sys_wait_h=yes -ac_cv_header_unistd_h=yes -ac_cv_header_windows_h=no -ac_cv_host=i686-pc-linux-gnu -ac_cv_lib_ltdl_lt_dlinit=no -ac_cv_lib_m_sqrt=yes -ac_cv_lib_mx_powf=no -ac_cv_objext=o -ac_cv_path_EGREP='/bin/grep -E' -ac_cv_path_FGREP='/bin/grep -F' -ac_cv_path_GREP=/bin/grep -ac_cv_path_SED=/bin/sed -ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=gawk -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_ac_ct_AR=ar -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_DLLTOOL=dlltool -ac_cv_prog_ac_ct_MANIFEST_TOOL=mt -ac_cv_prog_ac_ct_OBJDUMP=objdump -ac_cv_prog_ac_ct_RANLIB=ranlib -ac_cv_prog_ac_ct_STRIP=strip -ac_cv_prog_cc_c89= -ac_cv_prog_cc_g=yes -ac_cv_prog_make_make_set=yes -ac_cv_search_gethostbyname='none required' -ac_cv_search_socket='none required' -ac_cv_sizeof_int32_t=4 -ac_cv_sizeof_long=4 -ac_cv_sizeof_off_t=8 -ac_cv_sizeof_size_t=4 -ac_cv_sizeof_ssize_t=4 -ac_cv_sys_file_offset_bits=64 -ac_cv_sys_largefile_CC=no -ac_cv_sys_posix_termios=yes -ac_cv_type_int16_t=yes -ac_cv_type_int32_t=yes -ac_cv_type_off_t=yes -ac_cv_type_size_t=yes -ac_cv_type_ssize_t=yes -ac_cv_type_uint16_t=yes -ac_cv_type_uint32_t=yes -ac_cv_type_uintptr_t=yes -am_cv_CCAS_dependencies_compiler_type=gcc3 -am_cv_CC_dependencies_compiler_type=gcc3 -apr_cv_gai_addrconfig=yes -lt_cv_ar_at_file=@ -lt_cv_archive_cmds_need_lc=no -lt_cv_deplibs_check_method=pass_all -lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_ld_reload_flag=-r -lt_cv_nm_interface='BSD nm' -lt_cv_objdir=.libs -lt_cv_path_LD=/usr/bin/ld -lt_cv_path_NM='/usr/bin/nm -B' -lt_cv_path_mainfest_tool=no -lt_cv_prog_compiler_c_o=yes -lt_cv_prog_compiler_pic='-fPIC -DPIC' -lt_cv_prog_compiler_pic_works=yes -lt_cv_prog_compiler_rtti_exceptions=no -lt_cv_prog_compiler_static_works=yes -lt_cv_prog_gnu_ld=yes -lt_cv_sharedlib_from_linklib_cmd='printf %s\n' -lt_cv_shlibpath_overrides_runpath=no -lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' -lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\''' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\''' -lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' -lt_cv_sys_max_cmd_len=1572864 -lt_cv_to_host_file_cmd=func_convert_file_noop -lt_cv_to_tool_file_cmd=func_convert_file_noop - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11' -AIX_CFLAGS='' -AIX_LDFLAGS='' -AIX_LIBS='' -ALIB_CFLAGS='' -ALIB_LDFLAGS='' -ALIB_LIBS='' -ALSA_CFLAGS='' -ALSA_LDFLAGS='' -ALSA_LIBS='' -AMDEPBACKSLASH='\' -AMDEP_FALSE='#' -AMDEP_TRUE='' -AMTAR='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar' -API_VERSION='29' -AR='ar' -ARTS_CFLAGS='' -ARTS_LDFLAGS='' -ARTS_LIBS='' -AS='as' -AUTOCONF='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf' -AUTOHEADER='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader' -AUTOMAKE='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11' -AWK='gawk' -CC='gcc' -CCAS='gcc' -CCASDEPMODE='depmode=gcc3' -CCASFLAGS='-g -O2' -CCDEPMODE='depmode=gcc3' -CFLAGS='-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2' -COREAUDIO_CFLAGS='' -COREAUDIO_LDFLAGS='' -COREAUDIO_LIBS='' -CPP='gcc -E' -CPPFLAGS=' -DOPT_GENERIC -DREAL_IS_FLOAT ' -CYGPATH_W='echo' -DECODER_LOBJ=' stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo' -DECODER_OBJ=' stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT)' -DEFS='-DHAVE_CONFIG_H' -DEPDIR='.deps' -DLLTOOL='dlltool' -DSYMUTIL='' -DUMMY_CFLAGS='' -DUMMY_LDFLAGS='' -DUMMY_LIBS='' -DUMPBIN='' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/bin/grep -E' -ESD_CFLAGS='' -ESD_LDFLAGS='' -ESD_LIBS='' -EXEC_LT_LDFLAGS='' -EXEEXT='' -FGREP='/bin/grep -F' -GREP='/bin/grep' -HAVE_AIX_FALSE='' -HAVE_AIX_TRUE='#' -HAVE_ALIB_FALSE='' -HAVE_ALIB_TRUE='#' -HAVE_ALSA_FALSE='' -HAVE_ALSA_TRUE='#' -HAVE_ARTS_FALSE='' -HAVE_ARTS_TRUE='#' -HAVE_COREAUDIO_FALSE='' -HAVE_COREAUDIO_TRUE='#' -HAVE_DUMMY_FALSE='#' -HAVE_DUMMY_TRUE='' -HAVE_ESD_FALSE='' -HAVE_ESD_TRUE='#' -HAVE_HP_FALSE='' -HAVE_HP_TRUE='#' -HAVE_JACK_FALSE='' -HAVE_JACK_TRUE='#' -HAVE_MINT_FALSE='' -HAVE_MINT_TRUE='#' -HAVE_MODULES_FALSE='' -HAVE_MODULES_TRUE='#' -HAVE_NAS_FALSE='' -HAVE_NAS_TRUE='#' -HAVE_OPENAL_FALSE='' -HAVE_OPENAL_TRUE='#' -HAVE_OS2_FALSE='' -HAVE_OS2_TRUE='#' -HAVE_OSS_FALSE='' -HAVE_OSS_TRUE='#' -HAVE_PORTAUDIO_FALSE='' -HAVE_PORTAUDIO_TRUE='#' -HAVE_PULSE_FALSE='' -HAVE_PULSE_TRUE='#' -HAVE_SDL_FALSE='' -HAVE_SDL_TRUE='#' -HAVE_SGI_FALSE='' -HAVE_SGI_TRUE='#' -HAVE_SNDIO_FALSE='' -HAVE_SNDIO_TRUE='#' -HAVE_SUN_FALSE='' -HAVE_SUN_TRUE='#' -HAVE_WIN32_FALSE='' -HAVE_WIN32_TRUE='#' -HP_CFLAGS='' -HP_LDFLAGS='' -HP_LIBS='' -INCLUDE_STDIO_H='#include ' -INCLUDE_STDLIB_H='#include ' -INCLUDE_SYS_TYPE_H='#include ' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -JACK_CFLAGS='' -JACK_LDFLAGS='' -JACK_LIBS='' -LD='/usr/bin/ld' -LDFLAGS=' ' -LFS_LOBJ='lfs_wrap.lo lfs_alias.lo' -LIBMPG123_VERSION='29:6:29' -LIBOBJS='' -LIBS='-lm ' -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -LIPO='' -LN_S='ln -s' -LTLIBOBJS='' -LT_LDFLAGS='-export-dynamic' -MAKEINFO='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo' -MANIFEST_TOOL=':' -MINT_CFLAGS='' -MINT_LDFLAGS='' -MINT_LIBS='' -MKDIR_P='/bin/mkdir -p' -MODULE_OBJ='legacy_module.$(OBJEXT)' -NAS_CFLAGS='' -NAS_LDFLAGS='' -NAS_LIBS='' -NM='/usr/bin/nm -B' -NMEDIT='' -OBJDUMP='objdump' -OBJEXT='o' -OPENAL_CFLAGS='' -OPENAL_LDFLAGS='' -OPENAL_LIBS='' -OS2_CFLAGS='' -OS2_LDFLAGS='' -OS2_LIBS='' -OSS_CFLAGS='' -OSS_LDFLAGS='' -OSS_LIBS='' -OTOOL64='' -OTOOL='' -OUTPUT_CFLAGS='' -OUTPUT_LDFLAGS='' -OUTPUT_LIBS='' -OUTPUT_MOD='dummy' -OUTPUT_OBJ='output/dummy.$(OBJEXT)' -PACKAGE='mpg123' -PACKAGE_BUGREPORT='mpg123-devel@lists.sourceforge.net' -PACKAGE_NAME='mpg123' -PACKAGE_STRING='mpg123 1.13.4' -PACKAGE_TARNAME='mpg123' -PACKAGE_URL='' -PACKAGE_VERSION='1.13.4' -PATH_SEPARATOR=':' -PKG_CONFIG='/usr/bin/pkg-config' -PORTAUDIO_CFLAGS='' -PORTAUDIO_LDFLAGS='' -PORTAUDIO_LIBS='' -PULSE_CFLAGS='' -PULSE_LDFLAGS='' -PULSE_LIBS='' -RANLIB='ranlib' -SDL_CFLAGS='' -SDL_LDFLAGS='' -SDL_LIBS='' -SED='/bin/sed' -SET_MAKE='' -SGI_CFLAGS='' -SGI_LDFLAGS='' -SGI_LIBS='' -SHELL='/bin/bash' -SNDIO_CFLAGS='' -SNDIO_LDFLAGS='' -SNDIO_LIBS='' -STRIP='strip' -SUN_CFLAGS='' -SUN_LDFLAGS='' -SUN_LIBS='' -VERSION='1.13.4' -WIN32_CFLAGS='' -WIN32_CODES_FALSE='' -WIN32_CODES_TRUE='#' -WIN32_LDFLAGS='' -WIN32_LIBS='' -ac_ct_AR='ar' -ac_ct_CC='gcc' -ac_ct_DUMPBIN='' -am__EXEEXT_FALSE='' -am__EXEEXT_TRUE='#' -am__fastdepCCAS_FALSE='#' -am__fastdepCCAS_TRUE='' -am__fastdepCC_FALSE='#' -am__fastdepCC_TRUE='' -am__include='include' -am__isrc='' -am__leading_dot='.' -am__quote='' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -bindir='${exec_prefix}/bin' -build='i686-pc-linux-gnu' -build_alias='' -build_cpu='i686' -build_os='linux-gnu' -build_vendor='pc' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='${prefix}' -host='i686-pc-linux-gnu' -host_alias='' -host_cpu='i686' -host_os='linux-gnu' -host_vendor='pc' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${datarootdir}/info' -install_sh='${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localedir='${datarootdir}/locale' -localstatedir='${prefix}/var' -mandir='${datarootdir}/man' -mkdir_p='/bin/mkdir -p' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr/local' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -/* confdefs.h */ -#define PACKAGE_NAME "mpg123" -#define PACKAGE_TARNAME "mpg123" -#define PACKAGE_VERSION "1.13.4" -#define PACKAGE_STRING "mpg123 1.13.4" -#define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" -#define PACKAGE_URL "" -#define PACKAGE "mpg123" -#define VERSION "1.13.4" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define DYNAMIC_BUILD 1 -#define HAVE_DLFCN_H 1 -#define LT_OBJDIR ".libs/" -#define GAPLESS 1 -#define IEEE_FLOAT 1 -#define MODULE_FILE_SUFFIX ".la" -#define STDC_HEADERS 1 -#define HAVE_STDIO_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_SCHED_H 1 -#define HAVE_SYS_IOCTL_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_LIMITS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_WAIT_H 1 -#define HAVE_SYS_RESOURCE_H 1 -#define HAVE_SYS_SIGNAL_H 1 -#define HAVE_SIGNAL_H 1 -#define _FILE_OFFSET_BITS 64 -#define SIZEOF_SIZE_T 4 -#define SIZEOF_SSIZE_T 4 -#define SIZEOF_OFF_T 8 -#define SIZEOF_INT32_T 4 -#define SIZEOF_LONG 4 -#define LFS_ALIAS_BITS 32 -#define HAVE_STDLIB_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_GETPAGESIZE 1 -#define HAVE_MMAP 1 -#define HAVE_TERMIOS 1 -#define HAVE_RANDOM 1 -#define HAVE_SCHED_SETSCHEDULER 1 -#define HAVE_SETUID 1 -#define HAVE_GETUID 1 -#define HAVE_SETPRIORITY 1 -#define HAVE_STRERROR 1 -#define HAVE_SETLOCALE 1 -#define HAVE_NL_LANGINFO 1 -#define HAVE_STRDUP 1 -#define HAVE_ATOLL 1 -#define HAVE_MKFIFO 1 -#define FIFO 1 -#define HAVE_LOCALE_H 1 -#define HAVE_LANGINFO_H 1 -#define HAVE_NETDB_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_NETINET_IN_H 1 -#define HAVE_ARPA_INET_H 1 -#define HAVE_GETADDRINFO 1 -#define HAVE_GAI_ADDRCONFIG 1 -#define HAVE_LIBM 1 -#define ABI_ALIGN_FUN 1 -#define DEFAULT_OUTPUT_MODULE "dummy" -#define FRAME_INDEX 1 -#define INDEX_SIZE 1000 -#define IPV6 1 - -configure: exit 0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/lfs_alias.c b/jni/mpg123-1.13.4/src/libmpg123/lfs_alias.c deleted file mode 100644 index e9d9789f..00000000 --- a/jni/mpg123-1.13.4/src/libmpg123/lfs_alias.c +++ /dev/null @@ -1,244 +0,0 @@ -/* - lfs_alias: Aliases to the small/native API functions with the size of long int as suffix. - - copyright 2010 by the mpg123 project - free software under the terms of the LGPL 2.1 - see COPYING and AUTHORS files in distribution or http://mpg123.org - initially written by Thomas Orgis - - Use case: Client code on Linux/x86-64 that defines _FILE_OFFSET_BITS to 64, which is the only choice on that platform anyway. It should be no-op, but prompts the platform-agnostic header of mpg123 to define API calls with the corresponding suffix. - This file provides the names for this case. It's cruft, but glibc does it, too -- so people rely on it. - Oh, and it also caters for the lunatics that define _FILE_OFFSET_BITS=32 on 32 bit platforms. - - There is also the strange case that the mpg123 build itself is configured for unnecessary _FILE_OFFSET_BITS == LFS_ALIAS_BITS =^ sizeof(long). In that case, the "native" function will have the suffix and the alias shall be provided without the suffix. - - So, two basic cases: - 1. mpg123_bla_32 alias for mpg123_bla - 2. mpg123_bla alias for mpg123_bla_32 - Confusing, I know. It sucks. -*/ - -#include "config.h" - -/* Hack for Solaris: Some system headers included from compat.h might force _FILE_OFFSET_BITS. Need to follow that here. */ -#include "compat.h" - -#ifndef LFS_ALIAS_BITS -#error "I need the count of alias bits here." -#endif - -#define MACROCAT_REALLY(a, b) a ## b -#define MACROCAT(a, b) MACROCAT_REALLY(a, b) - -/* This is wicked switchery: Decide which way the aliases are facing. */ - -#if _FILE_OFFSET_BITS+0 == LFS_ALIAS_BITS - -/* The native functions are actually _with_ suffix, so let the mpg123 header use large file hackery to define the correct interfaces. */ -#include "mpg123.h" -/* Don't forget to undef the function symbols before usage... */ - -/* The native functions have suffix, the aliases not. */ -#define NATIVE_SUFFIX MACROCAT(_, _FILE_OFFSET_BITS) -#define NATIVE_NAME(func) MACROCAT(func, NATIVE_SUFFIX) -#define ALIAS_NAME(func) func - -#else - -/* Native functions are without suffix... */ -#define MPG123_NO_LARGENAME -#include "mpg123.h" - -/* The alias functions have suffix, the native ones not. */ -#define ALIAS_SUFFIX MACROCAT(_, LFS_ALIAS_BITS) -#define ALIAS_NAME(func) MACROCAT(func, ALIAS_SUFFIX) -#define NATIVE_NAME(func) func - -#endif - -/* Now get the rest of the infrastructure on speed, namely attribute_align_arg, to stay safe. */ -#include "mpg123lib_intern.h" - -/* - Extract the list of functions we need wrappers for, pregenerating the wrappers for simple cases (inline script for nedit): -perl -ne ' -if(/^\s*EXPORT\s+(\S+)\s+(mpg123_\S+)\((.*)\);\s*$/) -{ - my $type = $1; - my $name = $2; - my $args = $3; - next unless ($type =~ /off_t/ or $args =~ /off_t/ or ($name =~ /open/ and $name ne mpg123_open_feed)); - $type =~ s/off_t/long/g; - my @nargs = (); - $args =~ s/off_t/long/g; - foreach my $a (split(/,/, $args)) - { - $a =~ s/^.*\s\**([a-z_]+)$/$1/; - push(@nargs, $a); - } - my $nargs = join(", ", @nargs); - $nargs = "Human: figure me out." if($nargs =~ /\(/); - print </dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="(cd /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/usr/lib/git-core:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games; export PATH; gcc -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 -o \$progdir/\$file audio.o buffer.o common.o compat.o control_generic.o equalizer.o getlopt.o httpget.o resolver.o genre.o mpg123.o metaprint.o local.o playlist.o streamdump.o term.o wav.o xfermem.o legacy_module.o output/dummy.o libmpg123/.libs/libmpg123.so -lm -Wl,-rpath -Wl,/home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/libmpg123/.libs)" - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variables: - generated_by_libtool_version='2.4' - notinst_deplibs=' libmpg123/libmpg123.la' -else - # When we are sourced in execute mode, $file and $ECHO are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - file="$0" - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - ECHO="printf %s\\n" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string --lt- -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's ../libtool value, followed by no. -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=$0 - shift - for lt_opt - do - case "$lt_opt" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'` - test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=. - lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'` - cat "$lt_dump_D/$lt_dump_F" - exit 0 - ;; - --lt-*) - $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n "$lt_option_debug"; then - echo "mpg123:mpg123:${LINENO}: libtool wrapper (GNU libtool) 2.4" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - $ECHO "mpg123:mpg123:${LINENO}: newargv[$lt_dump_args_N]: $lt_arg" - lt_dump_args_N=`expr $lt_dump_args_N + 1` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ - - if test -n "$lt_option_debug"; then - $ECHO "mpg123:mpg123:${LINENO}: newargv[0]: $progdir/$program" 1>&2 - func_lt_dump_args ${1+"$@"} 1>&2 - fi - exec "$progdir/$program" ${1+"$@"} - - $ECHO "$0: cannot exec $program $*" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from $@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - for lt_wr_arg - do - case $lt_wr_arg in - --lt-*) ;; - *) set x "$@" "$lt_wr_arg"; shift;; - esac - shift - done - func_exec_program_core ${1+"$@"} -} - - # Parse options - func_parse_lt_options "$0" ${1+"$@"} - - # Find the directory that this script lives in. - thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$ECHO "$file" | /bin/sed 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no - if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then - # special case for '.' - if test "$thisdir" = "."; then - thisdir=`pwd` - fi - # remove .libs from thisdir - case "$thisdir" in - *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;; - .libs ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program=lt-'mpg123' - progdir="$thisdir/.libs" - - if test ! -f "$progdir/$program" || - { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ - test "X$file" != "X$progdir/$program"; }; then - - file="$$-$program" - - if test ! -d "$progdir"; then - mkdir "$progdir" - else - rm -f "$progdir/$file" - fi - - # relink executable if necessary - if test -n "$relink_command"; then - if relink_command_output=`eval $relink_command 2>&1`; then : - else - printf %s\n "$relink_command_output" >&2 - rm -f "$progdir/$file" - exit 1 - fi - fi - - mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || - { rm -f "$progdir/$program"; - mv -f "$progdir/$file" "$progdir/$program"; } - rm -f "$progdir/$file" - fi - - if test -f "$progdir/$program"; then - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - func_exec_program ${1+"$@"} - fi - else - # The program doesn't exist. - $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2 - $ECHO "This script is just a wrapper for $program." 1>&2 - $ECHO "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi diff --git a/jni/mpg123-1.13.4/src/output/Makefile b/jni/mpg123-1.13.4/src/output/Makefile deleted file mode 100644 index 2f9621fd..00000000 --- a/jni/mpg123-1.13.4/src/output/Makefile +++ /dev/null @@ -1,1187 +0,0 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. -# src/output/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - - -pkgdatadir = $(datadir)/mpg123 -pkgincludedir = $(includedir)/mpg123 -pkglibdir = $(libdir)/mpg123 -pkglibexecdir = $(libexecdir)/mpg123 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu - -# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint - -# Use that sh/perl script to generate the module entries: -#for i in alsa coreaudio esd jack nas oss portaudio pulse sdl sndio sun win32 aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | -#perl -ne 'chomp; $big = uc($_); print < -INCLUDE_STDLIB_H = #include -INCLUDE_SYS_TYPE_H = #include -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -JACK_CFLAGS = -JACK_LDFLAGS = -JACK_LIBS = -LD = /usr/bin/ld -LDFLAGS = -LFS_LOBJ = lfs_wrap.lo lfs_alias.lo -LIBMPG123_VERSION = 29:6:29 -LIBOBJS = -LIBS = -lm -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIPO = -LN_S = ln -s -LTLIBOBJS = -LT_LDFLAGS = -export-dynamic -MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo -MANIFEST_TOOL = : -MINT_CFLAGS = -MINT_LDFLAGS = -MINT_LIBS = -MKDIR_P = /bin/mkdir -p -MODULE_OBJ = legacy_module.$(OBJEXT) -NAS_CFLAGS = -NAS_LDFLAGS = -NAS_LIBS = -NM = /usr/bin/nm -B -NMEDIT = -OBJDUMP = objdump -OBJEXT = o -OPENAL_CFLAGS = -OPENAL_LDFLAGS = -OPENAL_LIBS = -OS2_CFLAGS = -OS2_LDFLAGS = -OS2_LIBS = -OSS_CFLAGS = -OSS_LDFLAGS = -OSS_LIBS = -OTOOL = -OTOOL64 = -OUTPUT_CFLAGS = -OUTPUT_LDFLAGS = -OUTPUT_LIBS = -OUTPUT_MOD = dummy -OUTPUT_OBJ = output/dummy.$(OBJEXT) -PACKAGE = mpg123 -PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net -PACKAGE_NAME = mpg123 -PACKAGE_STRING = mpg123 1.13.4 -PACKAGE_TARNAME = mpg123 -PACKAGE_URL = -PACKAGE_VERSION = 1.13.4 -PATH_SEPARATOR = : -PKG_CONFIG = /usr/bin/pkg-config -PORTAUDIO_CFLAGS = -PORTAUDIO_LDFLAGS = -PORTAUDIO_LIBS = -PULSE_CFLAGS = -PULSE_LDFLAGS = -PULSE_LIBS = -RANLIB = ranlib -SDL_CFLAGS = -SDL_LDFLAGS = -SDL_LIBS = -SED = /bin/sed -SET_MAKE = -SGI_CFLAGS = -SGI_LDFLAGS = -SGI_LIBS = -SHELL = /bin/bash -SNDIO_CFLAGS = -SNDIO_LDFLAGS = -SNDIO_LIBS = -STRIP = strip -SUN_CFLAGS = -SUN_LDFLAGS = -SUN_LIBS = -VERSION = 1.13.4 -WIN32_CFLAGS = -WIN32_LDFLAGS = -WIN32_LIBS = -abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/output -abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/output -abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -ac_ct_AR = ar -ac_ct_CC = gcc -ac_ct_DUMPBIN = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -builddir = . -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr/local -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -srcdir = . -sysconfdir = ${prefix}/etc -target_alias = -top_build_prefix = ../../ -top_builddir = ../.. -top_srcdir = ../.. - -#AM_CPPFLAGS = -I$(top_srcdir)/src/libmpg123 -I$(top_srcdir)/src -INCLUDES = $(LTDLINCL) -I$(top_builddir)/src -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 - -#Do not include uneeded headers from mpg123app.h -AM_CPPFLAGS = -DBUILDING_OUTPUT_MODULES=1 -#pkglib_LTLIBRARIES = $(am__append_1) \ -# $(am__append_2) $(am__append_3) \ -# $(am__append_4) $(am__append_5) \ -# $(am__append_6) $(am__append_7) \ -# $(am__append_8) $(am__append_9) \ -# $(am__append_10) $(am__append_11) \ -# $(am__append_12) $(am__append_13) \ -# $(am__append_14) $(am__append_15) \ -# $(am__append_16) $(am__append_17) \ -# $(am__append_18) $(am__append_19) \ -# $(am__append_20) $(am__append_21) -##output_alsa_la_SOURCES = alsa.c -##output_alsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_alsa_la_CFLAGS = -##output_alsa_la_LIBADD = -##output_coreaudio_la_SOURCES = coreaudio.c -##output_coreaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_coreaudio_la_CFLAGS = -##output_coreaudio_la_LIBADD = -##output_esd_la_SOURCES = esd.c -##output_esd_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_esd_la_CFLAGS = -##output_esd_la_LIBADD = -##output_jack_la_SOURCES = jack.c -##output_jack_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_jack_la_CFLAGS = -##output_jack_la_LIBADD = -##output_nas_la_SOURCES = nas.c -##output_nas_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_nas_la_CFLAGS = -##output_nas_la_LIBADD = -##output_oss_la_SOURCES = oss.c -##output_oss_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_oss_la_CFLAGS = -##output_oss_la_LIBADD = -##output_portaudio_la_SOURCES = portaudio.c -##output_portaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_portaudio_la_CFLAGS = -##output_portaudio_la_LIBADD = -##output_pulse_la_SOURCES = pulse.c -##output_pulse_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_pulse_la_CFLAGS = -##output_pulse_la_LIBADD = -##output_sdl_la_SOURCES = sdl.c -##output_sdl_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_sdl_la_CFLAGS = -##output_sdl_la_LIBADD = -##output_sndio_la_SOURCES = sndio.c -##output_sndio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_sndio_la_CFLAGS = -##output_sndio_la_LIBADD = -##output_sun_la_SOURCES = sun.c -##output_sun_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_sun_la_CFLAGS = -##output_sun_la_LIBADD = -##output_win32_la_SOURCES = win32.c -##output_win32_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_win32_la_CFLAGS = -##output_win32_la_LIBADD = -##output_aix_la_SOURCES = aix.c -##output_aix_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_aix_la_CFLAGS = -##output_aix_la_LIBADD = -##output_alib_la_SOURCES = alib.c -##output_alib_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_alib_la_CFLAGS = -##output_alib_la_LIBADD = -##output_arts_la_SOURCES = arts.c -##output_arts_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_arts_la_CFLAGS = -##output_arts_la_LIBADD = -##output_hp_la_SOURCES = hp.c -##output_hp_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_hp_la_CFLAGS = -##output_hp_la_LIBADD = -##output_os2_la_SOURCES = os2.c -##output_os2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_os2_la_CFLAGS = -##output_os2_la_LIBADD = -##output_sgi_la_SOURCES = sgi.c -##output_sgi_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_sgi_la_CFLAGS = -##output_sgi_la_LIBADD = -##output_mint_la_SOURCES = mint.c -##output_mint_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_mint_la_CFLAGS = -##output_mint_la_LIBADD = -##output_openal_la_SOURCES = openal.c -##output_openal_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -##output_openal_la_CFLAGS = -##output_openal_la_LIBADD = -#output_dummy_la_SOURCES = dummy.c -#output_dummy_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' -#output_dummy_la_CFLAGS = -#output_dummy_la_LIBADD = - -# Static build of one module only. -AM_CFLAGS = -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/output/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/output/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -output_aix.la: $(output_aix_la_OBJECTS) $(output_aix_la_DEPENDENCIES) - $(output_aix_la_LINK) $(am_output_aix_la_rpath) $(output_aix_la_OBJECTS) $(output_aix_la_LIBADD) $(LIBS) -output_alib.la: $(output_alib_la_OBJECTS) $(output_alib_la_DEPENDENCIES) - $(output_alib_la_LINK) $(am_output_alib_la_rpath) $(output_alib_la_OBJECTS) $(output_alib_la_LIBADD) $(LIBS) -output_alsa.la: $(output_alsa_la_OBJECTS) $(output_alsa_la_DEPENDENCIES) - $(output_alsa_la_LINK) $(am_output_alsa_la_rpath) $(output_alsa_la_OBJECTS) $(output_alsa_la_LIBADD) $(LIBS) -output_arts.la: $(output_arts_la_OBJECTS) $(output_arts_la_DEPENDENCIES) - $(output_arts_la_LINK) $(am_output_arts_la_rpath) $(output_arts_la_OBJECTS) $(output_arts_la_LIBADD) $(LIBS) -output_coreaudio.la: $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_DEPENDENCIES) - $(output_coreaudio_la_LINK) $(am_output_coreaudio_la_rpath) $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_LIBADD) $(LIBS) -output_dummy.la: $(output_dummy_la_OBJECTS) $(output_dummy_la_DEPENDENCIES) - $(output_dummy_la_LINK) $(am_output_dummy_la_rpath) $(output_dummy_la_OBJECTS) $(output_dummy_la_LIBADD) $(LIBS) -output_esd.la: $(output_esd_la_OBJECTS) $(output_esd_la_DEPENDENCIES) - $(output_esd_la_LINK) $(am_output_esd_la_rpath) $(output_esd_la_OBJECTS) $(output_esd_la_LIBADD) $(LIBS) -output_hp.la: $(output_hp_la_OBJECTS) $(output_hp_la_DEPENDENCIES) - $(output_hp_la_LINK) $(am_output_hp_la_rpath) $(output_hp_la_OBJECTS) $(output_hp_la_LIBADD) $(LIBS) -output_jack.la: $(output_jack_la_OBJECTS) $(output_jack_la_DEPENDENCIES) - $(output_jack_la_LINK) $(am_output_jack_la_rpath) $(output_jack_la_OBJECTS) $(output_jack_la_LIBADD) $(LIBS) -output_mint.la: $(output_mint_la_OBJECTS) $(output_mint_la_DEPENDENCIES) - $(output_mint_la_LINK) $(am_output_mint_la_rpath) $(output_mint_la_OBJECTS) $(output_mint_la_LIBADD) $(LIBS) -output_nas.la: $(output_nas_la_OBJECTS) $(output_nas_la_DEPENDENCIES) - $(output_nas_la_LINK) $(am_output_nas_la_rpath) $(output_nas_la_OBJECTS) $(output_nas_la_LIBADD) $(LIBS) -output_openal.la: $(output_openal_la_OBJECTS) $(output_openal_la_DEPENDENCIES) - $(output_openal_la_LINK) $(am_output_openal_la_rpath) $(output_openal_la_OBJECTS) $(output_openal_la_LIBADD) $(LIBS) -output_os2.la: $(output_os2_la_OBJECTS) $(output_os2_la_DEPENDENCIES) - $(output_os2_la_LINK) $(am_output_os2_la_rpath) $(output_os2_la_OBJECTS) $(output_os2_la_LIBADD) $(LIBS) -output_oss.la: $(output_oss_la_OBJECTS) $(output_oss_la_DEPENDENCIES) - $(output_oss_la_LINK) $(am_output_oss_la_rpath) $(output_oss_la_OBJECTS) $(output_oss_la_LIBADD) $(LIBS) -output_portaudio.la: $(output_portaudio_la_OBJECTS) $(output_portaudio_la_DEPENDENCIES) - $(output_portaudio_la_LINK) $(am_output_portaudio_la_rpath) $(output_portaudio_la_OBJECTS) $(output_portaudio_la_LIBADD) $(LIBS) -output_pulse.la: $(output_pulse_la_OBJECTS) $(output_pulse_la_DEPENDENCIES) - $(output_pulse_la_LINK) $(am_output_pulse_la_rpath) $(output_pulse_la_OBJECTS) $(output_pulse_la_LIBADD) $(LIBS) -output_sdl.la: $(output_sdl_la_OBJECTS) $(output_sdl_la_DEPENDENCIES) - $(output_sdl_la_LINK) $(am_output_sdl_la_rpath) $(output_sdl_la_OBJECTS) $(output_sdl_la_LIBADD) $(LIBS) -output_sgi.la: $(output_sgi_la_OBJECTS) $(output_sgi_la_DEPENDENCIES) - $(output_sgi_la_LINK) $(am_output_sgi_la_rpath) $(output_sgi_la_OBJECTS) $(output_sgi_la_LIBADD) $(LIBS) -output_sndio.la: $(output_sndio_la_OBJECTS) $(output_sndio_la_DEPENDENCIES) - $(output_sndio_la_LINK) $(am_output_sndio_la_rpath) $(output_sndio_la_OBJECTS) $(output_sndio_la_LIBADD) $(LIBS) -output_sun.la: $(output_sun_la_OBJECTS) $(output_sun_la_DEPENDENCIES) - $(output_sun_la_LINK) $(am_output_sun_la_rpath) $(output_sun_la_OBJECTS) $(output_sun_la_LIBADD) $(LIBS) -output_win32.la: $(output_win32_la_OBJECTS) $(output_win32_la_DEPENDENCIES) - $(output_win32_la_LINK) $(am_output_win32_la_rpath) $(output_win32_la_OBJECTS) $(output_win32_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -include ./$(DEPDIR)/output_aix_la-aix.Plo -include ./$(DEPDIR)/output_alib_la-alib.Plo -include ./$(DEPDIR)/output_alsa_la-alsa.Plo -include ./$(DEPDIR)/output_arts_la-arts.Plo -include ./$(DEPDIR)/output_coreaudio_la-coreaudio.Plo -include ./$(DEPDIR)/output_dummy_la-dummy.Plo -include ./$(DEPDIR)/output_esd_la-esd.Plo -include ./$(DEPDIR)/output_hp_la-hp.Plo -include ./$(DEPDIR)/output_jack_la-jack.Plo -include ./$(DEPDIR)/output_mint_la-mint.Plo -include ./$(DEPDIR)/output_nas_la-nas.Plo -include ./$(DEPDIR)/output_openal_la-openal.Plo -include ./$(DEPDIR)/output_os2_la-os2.Plo -include ./$(DEPDIR)/output_oss_la-oss.Plo -include ./$(DEPDIR)/output_portaudio_la-portaudio.Plo -include ./$(DEPDIR)/output_pulse_la-pulse.Plo -include ./$(DEPDIR)/output_sdl_la-sdl.Plo -include ./$(DEPDIR)/output_sgi_la-sgi.Plo -include ./$(DEPDIR)/output_sndio_la-sndio.Plo -include ./$(DEPDIR)/output_sun_la-sun.Plo -include ./$(DEPDIR)/output_win32_la-win32.Plo - -.c.o: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c $< - -.c.obj: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: - $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ $< - -output_aix_la-aix.lo: aix.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -MT output_aix_la-aix.lo -MD -MP -MF $(DEPDIR)/output_aix_la-aix.Tpo -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c - $(am__mv) $(DEPDIR)/output_aix_la-aix.Tpo $(DEPDIR)/output_aix_la-aix.Plo -# source='aix.c' object='output_aix_la-aix.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c - -output_alib_la-alib.lo: alib.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -MT output_alib_la-alib.lo -MD -MP -MF $(DEPDIR)/output_alib_la-alib.Tpo -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c - $(am__mv) $(DEPDIR)/output_alib_la-alib.Tpo $(DEPDIR)/output_alib_la-alib.Plo -# source='alib.c' object='output_alib_la-alib.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c - -output_alsa_la-alsa.lo: alsa.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -MT output_alsa_la-alsa.lo -MD -MP -MF $(DEPDIR)/output_alsa_la-alsa.Tpo -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c - $(am__mv) $(DEPDIR)/output_alsa_la-alsa.Tpo $(DEPDIR)/output_alsa_la-alsa.Plo -# source='alsa.c' object='output_alsa_la-alsa.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c - -output_arts_la-arts.lo: arts.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -MT output_arts_la-arts.lo -MD -MP -MF $(DEPDIR)/output_arts_la-arts.Tpo -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c - $(am__mv) $(DEPDIR)/output_arts_la-arts.Tpo $(DEPDIR)/output_arts_la-arts.Plo -# source='arts.c' object='output_arts_la-arts.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c - -output_coreaudio_la-coreaudio.lo: coreaudio.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -MT output_coreaudio_la-coreaudio.lo -MD -MP -MF $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c - $(am__mv) $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo $(DEPDIR)/output_coreaudio_la-coreaudio.Plo -# source='coreaudio.c' object='output_coreaudio_la-coreaudio.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c - -output_dummy_la-dummy.lo: dummy.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -MT output_dummy_la-dummy.lo -MD -MP -MF $(DEPDIR)/output_dummy_la-dummy.Tpo -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c - $(am__mv) $(DEPDIR)/output_dummy_la-dummy.Tpo $(DEPDIR)/output_dummy_la-dummy.Plo -# source='dummy.c' object='output_dummy_la-dummy.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c - -output_esd_la-esd.lo: esd.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -MT output_esd_la-esd.lo -MD -MP -MF $(DEPDIR)/output_esd_la-esd.Tpo -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c - $(am__mv) $(DEPDIR)/output_esd_la-esd.Tpo $(DEPDIR)/output_esd_la-esd.Plo -# source='esd.c' object='output_esd_la-esd.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c - -output_hp_la-hp.lo: hp.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -MT output_hp_la-hp.lo -MD -MP -MF $(DEPDIR)/output_hp_la-hp.Tpo -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c - $(am__mv) $(DEPDIR)/output_hp_la-hp.Tpo $(DEPDIR)/output_hp_la-hp.Plo -# source='hp.c' object='output_hp_la-hp.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c - -output_jack_la-jack.lo: jack.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -MT output_jack_la-jack.lo -MD -MP -MF $(DEPDIR)/output_jack_la-jack.Tpo -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c - $(am__mv) $(DEPDIR)/output_jack_la-jack.Tpo $(DEPDIR)/output_jack_la-jack.Plo -# source='jack.c' object='output_jack_la-jack.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c - -output_mint_la-mint.lo: mint.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -MT output_mint_la-mint.lo -MD -MP -MF $(DEPDIR)/output_mint_la-mint.Tpo -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c - $(am__mv) $(DEPDIR)/output_mint_la-mint.Tpo $(DEPDIR)/output_mint_la-mint.Plo -# source='mint.c' object='output_mint_la-mint.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c - -output_nas_la-nas.lo: nas.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -MT output_nas_la-nas.lo -MD -MP -MF $(DEPDIR)/output_nas_la-nas.Tpo -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c - $(am__mv) $(DEPDIR)/output_nas_la-nas.Tpo $(DEPDIR)/output_nas_la-nas.Plo -# source='nas.c' object='output_nas_la-nas.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c - -output_openal_la-openal.lo: openal.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -MT output_openal_la-openal.lo -MD -MP -MF $(DEPDIR)/output_openal_la-openal.Tpo -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c - $(am__mv) $(DEPDIR)/output_openal_la-openal.Tpo $(DEPDIR)/output_openal_la-openal.Plo -# source='openal.c' object='output_openal_la-openal.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c - -output_os2_la-os2.lo: os2.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -MT output_os2_la-os2.lo -MD -MP -MF $(DEPDIR)/output_os2_la-os2.Tpo -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c - $(am__mv) $(DEPDIR)/output_os2_la-os2.Tpo $(DEPDIR)/output_os2_la-os2.Plo -# source='os2.c' object='output_os2_la-os2.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c - -output_oss_la-oss.lo: oss.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -MT output_oss_la-oss.lo -MD -MP -MF $(DEPDIR)/output_oss_la-oss.Tpo -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c - $(am__mv) $(DEPDIR)/output_oss_la-oss.Tpo $(DEPDIR)/output_oss_la-oss.Plo -# source='oss.c' object='output_oss_la-oss.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c - -output_portaudio_la-portaudio.lo: portaudio.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -MT output_portaudio_la-portaudio.lo -MD -MP -MF $(DEPDIR)/output_portaudio_la-portaudio.Tpo -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c - $(am__mv) $(DEPDIR)/output_portaudio_la-portaudio.Tpo $(DEPDIR)/output_portaudio_la-portaudio.Plo -# source='portaudio.c' object='output_portaudio_la-portaudio.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c - -output_pulse_la-pulse.lo: pulse.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -MT output_pulse_la-pulse.lo -MD -MP -MF $(DEPDIR)/output_pulse_la-pulse.Tpo -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c - $(am__mv) $(DEPDIR)/output_pulse_la-pulse.Tpo $(DEPDIR)/output_pulse_la-pulse.Plo -# source='pulse.c' object='output_pulse_la-pulse.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c - -output_sdl_la-sdl.lo: sdl.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -MT output_sdl_la-sdl.lo -MD -MP -MF $(DEPDIR)/output_sdl_la-sdl.Tpo -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c - $(am__mv) $(DEPDIR)/output_sdl_la-sdl.Tpo $(DEPDIR)/output_sdl_la-sdl.Plo -# source='sdl.c' object='output_sdl_la-sdl.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c - -output_sgi_la-sgi.lo: sgi.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -MT output_sgi_la-sgi.lo -MD -MP -MF $(DEPDIR)/output_sgi_la-sgi.Tpo -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c - $(am__mv) $(DEPDIR)/output_sgi_la-sgi.Tpo $(DEPDIR)/output_sgi_la-sgi.Plo -# source='sgi.c' object='output_sgi_la-sgi.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c - -output_sndio_la-sndio.lo: sndio.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -MT output_sndio_la-sndio.lo -MD -MP -MF $(DEPDIR)/output_sndio_la-sndio.Tpo -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c - $(am__mv) $(DEPDIR)/output_sndio_la-sndio.Tpo $(DEPDIR)/output_sndio_la-sndio.Plo -# source='sndio.c' object='output_sndio_la-sndio.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c - -output_sun_la-sun.lo: sun.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -MT output_sun_la-sun.lo -MD -MP -MF $(DEPDIR)/output_sun_la-sun.Tpo -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c - $(am__mv) $(DEPDIR)/output_sun_la-sun.Tpo $(DEPDIR)/output_sun_la-sun.Plo -# source='sun.c' object='output_sun_la-sun.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c - -output_win32_la-win32.lo: win32.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -MT output_win32_la-win32.lo -MD -MP -MF $(DEPDIR)/output_win32_la-win32.Tpo -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c - $(am__mv) $(DEPDIR)/output_win32_la-win32.Tpo $(DEPDIR)/output_win32_la-win32.Plo -# source='win32.c' object='output_win32_la-win32.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -#install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES - - -all: dummy.$(OBJEXT) - -# No installation happening from here -install: all - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/jni/mpg123-1.13.4/src/output/Makefile.in b/jni/mpg123-1.13.4/src/output/Makefile.in deleted file mode 100644 index b6b86ec6..00000000 --- a/jni/mpg123-1.13.4/src/output/Makefile.in +++ /dev/null @@ -1,1187 +0,0 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ - -# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint - -# Use that sh/perl script to generate the module entries: -#for i in alsa coreaudio esd jack nas oss portaudio pulse sdl sndio sun win32 aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | -#perl -ne 'chomp; $big = uc($_); print < - -/* #include */ -#include - -#include "mpg123app.h" -#include "debug.h" - - -/* Analog output constant */ -static const char analog_output_res_name[] = ".AnalogOut"; - - -static int set_rate(audio_output_t *ao, ALconfig config) -{ - int dev = alGetDevice(config); - ALpv params[1]; - - /* Make sure the device is OK */ - if (dev < 0) - { - error1("set_rate: %s",alGetErrorString(oserror())); - return 1; - } - - params[0].param = AL_OUTPUT_RATE; - params[0].value.ll = alDoubleToFixed(ao->rate); - - if (alSetParams(dev, params,1) < 0) - error1("set_rate: %s",alGetErrorString(oserror())); - - return 0; -} - - -static int set_channels(audio_output_t *ao, ALconfig config) -{ - int ret; - - if(ao->channels == 2) - ret = alSetChannels(config, AL_STEREO); - else - ret = alSetChannels(config, AL_MONO); - - if (ret < 0) - error1("set_channels : %s",alGetErrorString(oserror())); - - return 0; -} - -static int set_format(audio_output_t *ao, ALconfig config) -{ - if (alSetSampFmt(config,AL_SAMPFMT_TWOSCOMP) < 0) - error1("set_format : %s",alGetErrorString(oserror())); - - if (alSetWidth(config,AL_SAMPLE_16) < 0) - error1("set_format : %s",alGetErrorString(oserror())); - - return 0; -} - - -static int open_sgi(audio_output_t *ao) -{ - int dev = AL_DEFAULT_OUTPUT; - ALconfig config = alNewConfig(); - ALport port = NULL; - - /* Test for correct completion */ - if (config == 0) { - error1("open_sgi: %s",alGetErrorString(oserror())); - return -1; - } - - /* Set port parameters */ - if(ao->channels == 2) - alSetChannels(config, AL_STEREO); - else - alSetChannels(config, AL_MONO); - - alSetWidth(config, AL_SAMPLE_16); - alSetSampFmt(config,AL_SAMPFMT_TWOSCOMP); - alSetQueueSize(config, 131069); - - /* Setup output device to specified module. If there is no module - specified in ao structure, use the default four output */ - if ((ao->device) != NULL) { - char *dev_name; - - dev_name=malloc((strlen(ao->device) + strlen(analog_output_res_name) + 1) * - sizeof(char)); - - strcpy(dev_name,ao->device); - strcat(dev_name,analog_output_res_name); - - /* Find the asked device resource */ - dev=alGetResourceByName(AL_SYSTEM,dev_name,AL_DEVICE_TYPE); - - /* Free allocated space */ - free(dev_name); - - if (!dev) { - error2("Invalid audio resource: %s (%s)",dev_name, alGetErrorString(oserror())); - return -1; - } - } - - /* Set the device */ - if (alSetDevice(config,dev) < 0) - { - error1("open_sgi: %s",alGetErrorString(oserror())); - return -1; - } - - /* Open the audio port */ - port = alOpenPort("mpg123-VSC", "w", config); - if(port == NULL) { - error1("Unable to open audio channel: %s", alGetErrorString(oserror())); - return -1; - } - - ao->handle = (void*)port; - - - set_format(ao, config); - set_channels(ao, config); - set_rate(ao, config); - - - alFreeConfig(config); - - return 1; -} - - -static int get_formats_sgi(output_t *ao) -{ - return MPG123_ENC_SIGNED_16; -} - - -static int write_sgi(audio_output_t *ao,unsigned char *buf,int len) -{ - ALport port = (ALport)ao->handle; - - if(ao->format == MPG123_ENC_SIGNED_8) - alWriteFrames(port, buf, len>>1); - else - alWriteFrames(port, buf, len>>2); - - return len; -} - - -static int close_sgi(audio_output_t *ao) -{ - ALport port = (ALport)ao->handle; - - if (port) { - while(alGetFilled(port) > 0) sginap(1); - alClosePort(port); - ao->handle=NULL; - } - - return 0; -} - -static void flush_sgi(audio_output_t *ao) -{ -} - - -static int init_sgi(audio_output_t* ao) -{ - if (ao==NULL) return -1; - - /* Set callbacks */ - ao->open = open_sgi; - ao->flush = flush_sgi; - ao->write = write_sgi; - ao->get_formats = get_formats_sgi; - ao->close = close_sgi; - - /* Success */ - return 0; -} - - - - - -/* - Module information data structure -*/ -mpg123_module_t mpg123_output_module_info = { - /* api_version */ MPG123_MODULE_API_VERSION, - /* name */ "sgi", - /* description */ "Audio output for SGI.", - /* revision */ "$Rev:$", - /* handle */ NULL, - - /* init_output */ init_sgi, -}; - - diff --git a/jni/mpg123-1.13.4/src/output/win32.c b/jni/mpg123-1.13.4/src/output/win32.c deleted file mode 100644 index 249f222b..00000000 --- a/jni/mpg123-1.13.4/src/output/win32.c +++ /dev/null @@ -1,229 +0,0 @@ -/* - win32: audio output for Windows 32bit - - copyright ?-2007 by the mpg123 project - free software under the terms of the LGPL 2.1 - see COPYING and AUTHORS files in distribution or http://mpg123.org - - initially written (as it seems) by Tony Million - rewrite of basic functionality for callback-less and properly ringbuffered operation by ravenexp -*/ - -#include "mpg123app.h" -#include -#include "debug.h" - -/* - Buffer size and number of buffers in the playback ring - NOTE: This particular num/size combination performs best under heavy - loads for my system, however this may not be true for any hardware/OS out there. - Generally, BUFFER_SIZE < 8k || NUM_BUFFERS > 16 || NUM_BUFFERS < 4 are not recommended. -*/ -#define BUFFER_SIZE 0x10000 -#define NUM_BUFFERS 8 /* total 512k roughly 2.5 sec of CD quality sound */ - -/* Buffer ring queue state */ -struct queue_state -{ - WAVEHDR buffer_headers[NUM_BUFFERS]; - /* The next buffer to be filled and put in playback */ - int next_buffer; - /* Buffer playback completion event */ - HANDLE play_done_event; - HWAVEOUT waveout; -}; - -static int open_win32(struct audio_output_struct *ao) -{ - struct queue_state* state; - int i; - MMRESULT res; - WAVEFORMATEX out_fmt; - UINT dev_id; - - if(!ao) return -1; - if(ao->rate == -1) return 0; - - /* Allocate queue state struct for this device */ - state = calloc(1, sizeof(struct queue_state)); - if(!state) return -1; - - ao->userptr = state; - /* Allocate playback buffers */ - for(i = 0; i < NUM_BUFFERS; i++) - if(!(state->buffer_headers[i].lpData = malloc(BUFFER_SIZE))) - ereturn(-1, "Out of memory for playback buffers."); - - state->play_done_event = CreateEvent(0,FALSE,FALSE,0); - if(state->play_done_event == INVALID_HANDLE_VALUE) return -1; - - /* FIXME: real device enumeration by capabilities? */ - dev_id = WAVE_MAPPER; /* probably does the same thing */ - ao->device = "WaveMapper"; - /* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */ - out_fmt.wFormatTag = WAVE_FORMAT_PCM; - out_fmt.wBitsPerSample = 16; - out_fmt.nChannels = ao->channels; - out_fmt.nSamplesPerSec = ao->rate; - out_fmt.nBlockAlign = out_fmt.nChannels*out_fmt.wBitsPerSample/8; - out_fmt.nAvgBytesPerSec = out_fmt.nBlockAlign*out_fmt.nSamplesPerSec; - out_fmt.cbSize = 0; - - res = waveOutOpen(&state->waveout, dev_id, &out_fmt, - (DWORD_PTR)state->play_done_event, 0, CALLBACK_EVENT); - - switch(res) - { - case MMSYSERR_NOERROR: - break; - case MMSYSERR_ALLOCATED: - ereturn(-1, "Audio output device is already allocated."); - case MMSYSERR_NODRIVER: - ereturn(-1, "No device driver is present."); - case MMSYSERR_NOMEM: - ereturn(-1, "Unable to allocate or lock memory."); - case WAVERR_BADFORMAT: - ereturn(-1, "Unsupported waveform-audio format."); - default: - ereturn(-1, "Unable to open wave output device."); - } - - /* Reset event from the "device open" message */ - ResetEvent(state->play_done_event); - return 0; -} - -static int get_formats_win32(struct audio_output_struct *ao) -{ - /* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */ - return MPG123_ENC_SIGNED_16; -} - -/* Stores audio data to the fixed size buffers and pushes them into the playback queue. - I have one grief with that: The last piece of a track may not reach the output, - only full buffers sent... But we don't get smooth audio otherwise. */ -static int write_win32(struct audio_output_struct *ao, unsigned char *buf, int len) -{ - struct queue_state* state; - MMRESULT res; - WAVEHDR* hdr; - - int rest_len; /* Input data bytes left for next recursion. */ - int bufill; /* Bytes we stuff into buffer now. */ - - if(!ao || !ao->userptr) return -1; - if(!buf || len <= 0) return 0; - - state = (struct queue_state*)ao->userptr; - hdr = &state->buffer_headers[state->next_buffer]; - - /* Check buffer header and wait if it's being played. - Skip waiting if the buffer is not full yet */ - while(hdr->dwBufferLength == BUFFER_SIZE && !(hdr->dwFlags & WHDR_DONE)) - { - /* debug1("waiting for buffer %i...", state->next_buffer); */ - WaitForSingleObject(state->play_done_event, INFINITE); - } - - /* If it was a full buffer being played, clean up. */ - if(hdr->dwFlags & WHDR_DONE) - { - waveOutUnprepareHeader(state->waveout, hdr, sizeof(WAVEHDR)); - hdr->dwFlags = 0; - hdr->dwBufferLength = 0; - } - - /* Now see how much we want to stuff in and then stuff it in. */ - bufill = BUFFER_SIZE - hdr->dwBufferLength; - if(len < bufill) bufill = len; - - rest_len = len - bufill; - memcpy(hdr->lpData + hdr->dwBufferLength, buf, bufill); - hdr->dwBufferLength += bufill; - if(hdr->dwBufferLength == BUFFER_SIZE) - { /* Send the buffer out when it's full. */ - res = waveOutPrepareHeader(state->waveout, hdr, sizeof(WAVEHDR)); - if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device (prepare)."); - - res = waveOutWrite(state->waveout, hdr, sizeof(WAVEHDR)); - if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device."); - - /* Cycle to the next buffer in the ring queue */ - state->next_buffer = (state->next_buffer + 1) % NUM_BUFFERS; - } - /* I'd like to propagate error codes or something... but there are no catchable surprises left. - Anyhow: Here is the recursion that makes ravenexp happy;-) */ - if(rest_len && write_win32(ao, buf + bufill, rest_len) < 0) /* Write the rest. */ - return -1; - else - return len; -} - -static void flush_win32(struct audio_output_struct *ao) -{ - int i, z; - struct queue_state* state; - - if(!ao || !ao->userptr) return; - state = (struct queue_state*)ao->userptr; - - /* FIXME: The very last output buffer is not played. This could be a problem on the feeding side. */ - i = 0; - z = state->next_buffer - 1; - for(i = 0; i < NUM_BUFFERS; i++) - { - if(!state->buffer_headers[i].dwFlags & WHDR_DONE) - WaitForSingleObject(state->play_done_event, INFINITE); - - waveOutUnprepareHeader(state->waveout, &state->buffer_headers[i], sizeof(WAVEHDR)); - state->buffer_headers[i].dwFlags = 0; - state->buffer_headers[i].dwBufferLength = 0; - z = (z + 1) % NUM_BUFFERS; - } -} - -static int close_win32(struct audio_output_struct *ao) -{ - int i; - struct queue_state* state; - - if(!ao || !ao->userptr) return -1; - state = (struct queue_state*)ao->userptr; - - flush_win32(ao); - waveOutClose(state->waveout); - CloseHandle(state->play_done_event); - - for(i = 0; i < NUM_BUFFERS; i++) free(state->buffer_headers[i].lpData); - - free(ao->userptr); - ao->userptr = 0; - return 0; -} - -static int init_win32(audio_output_t* ao) -{ - if(!ao) return -1; - - /* Set callbacks */ - ao->open = open_win32; - ao->flush = flush_win32; - ao->write = write_win32; - ao->get_formats = get_formats_win32; - ao->close = close_win32; - - /* Success */ - return 0; -} - -/* - Module information data structure -*/ -mpg123_module_t mpg123_output_module_info = { - /* api_version */ MPG123_MODULE_API_VERSION, - /* name */ "win32", - /* description */ "Audio output for Windows (winmm).", - /* revision */ "$Rev:$", - /* handle */ NULL, - - /* init_output */ init_win32, -}; diff --git a/jni/mpg123-1.13.4/src/tests/seek_accuracy.c b/jni/mpg123-1.13.4/src/tests/seek_accuracy.c deleted file mode 100644 index 73cbd702..00000000 --- a/jni/mpg123-1.13.4/src/tests/seek_accuracy.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - seek-accuracy: Take some given mpeg file and validate that seeks are indeed accurate. - - copyright 2009 by the mpg123 project - free software under the terms of the LGPL 2.1 - see COPYING and AUTHORS files in distribution or http://mpg123.org - initially written by Thomas Orgis - - arguments: decoder testfile.mpeg -*/ - -#include -#include - -#define SAMPLES 1000 -/* Cannot use the const value as fixed array size:-( */ -const size_t samples = SAMPLES; - -/* Use getlopt.c in future? But heck, don't bloat. */ -enum theargs -{ - arg_binname = 0 - ,arg_decoder - ,arg_preframes - ,arg_file - ,arg_total -}; - -const char* filename; -int channels; -mpg123_handle *m; -size_t first_sample_errs = 0; - - -int check_seeking(size_t *errs); - -int main(int argc, char **argv) -{ - int ret = 0; - size_t errs[2] = {0, 0}; - size_t errs_ntom[2] = {0, 0}; - - if(argc < arg_total) - { - fprintf(stderr, "\nUsage: %s \n\n", argv[0]); - return -1; - } - mpg123_init(); - m = mpg123_new(argv[arg_decoder], NULL); - mpg123_param(m, MPG123_RESYNC_LIMIT, -1, 0); - - if(mpg123_param(m, MPG123_PREFRAMES, atol(argv[arg_preframes]), 0) == MPG123_OK) - printf("Testing library with preframes set to %li\n", atol(argv[arg_preframes])); - - filename = argv[arg_file]; - ret = check_seeking(errs); - - if(ret == 0) - { - printf("Now with NtoM resampling to 33333 Hz!"); - mpg123_param(m, MPG123_FORCE_RATE, 33333, 0); - ret = check_seeking(errs_ntom); - } - else fprintf(stderr, "Some failure occured! Unable to test properly!"); - - printf("\n"); - printf("1to1 indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs[0],(size_p)samples); - printf("1to1 non-indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs[1],(size_p)samples); - printf("NtoM indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs_ntom[0],(size_p)samples); - printf("NtoM non-indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs_ntom[1],(size_p)samples); - printf("Errors in getting first sample again: %"SIZE_P"\n", first_sample_errs); - printf("\n"); - - if(ret == 0) - { - - if(first_sample_errs == 0 && errs[0] == 0 && errs[1] == 0 && errs_ntom[0] == 0 && errs_ntom[1] == 0) - { - printf("Congratulations, all seeks were accurate!\n"); - printf("But be warned: Not _all_ sample offsets have been tested. This result just means that the basic mechanism of sample-accurate seeking seems to work.\n"); - } - else - { - printf("There have been some errors. For layer 3 files, this may be due to too low MPG123_PREFRAMES.\n"); - ret = -1; - } - - } - else fprintf(stderr, "Some bad failure during checking!\n"); - - mpg123_delete(m); - mpg123_exit(); - - return ret; -} - -int open_file() -{ - if( mpg123_open(m, filename) == MPG123_OK - && - mpg123_getformat(m, NULL, &channels, NULL) == MPG123_OK ) - { - printf("Channels: %i\n", channels); - return 0; - } - else - { - printf("Opening file failed: %s\n", mpg123_strerror(m)); - return -1; - } -} - -/* Operation: - Read through the whole file and remember selected samples and their position. - Then, seek to the positions selectively and compare. - Second mode: Check if this is identical to fresh decoding and seek (without frame index table)... less important now, focusing on the first one. -*/ - -struct seeko -{ - off_t position[SAMPLES]; - short left[SAMPLES]; - short right[SAMPLES]; -}; - -/* select some positions to check seek accuracy on */ -void fix_positions(struct seeko *so, off_t length) -{ - off_t step = (length-1)/(samples-1); - size_t i; - /* simple fixed stepping, in order (one could shuffle this) */ - for(i=0; iposition[i] = i*step; - - /* plus the last one! */ - so->position[samples-1] = length-1; -} - -int collect(struct seeko *so) -{ - off_t pos_count = 0; - off_t length; - int err = MPG123_OK; - size_t posi = 0; - mpg123_scan(m); - length = mpg123_length(m); - printf("Estimated length: %"OFF_P"\n", (off_p)length); - /* Compute the interesting positions */ - fix_positions(so, length); - /* - Default format is always 16bit int, rate does not matter. - Let's just get the channel count and not bother. - */ - while(err == MPG123_OK) - { - short buff[1024]; /* choosing a non-divider of mpeg frame size on purpose */ - size_t got = 0; - off_t buffsamples; - err = mpg123_read(m, (unsigned char*)buff, 1024*sizeof(short), &got); - buffsamples = got/(channels*sizeof(short)); - while(so->position[posi] < pos_count+buffsamples) - { - size_t i = (so->position[posi]-pos_count)*channels; - printf("got sample %"SIZE_P" (%"OFF_P")\n", (size_p)posi, (off_p)so->position[posi]); - so->left[posi] = buff[i]; - if(channels == 2) - so->right[posi] = buff[i+1]; - - if(++posi >= samples) break; - } - if(posi >= samples) break; - - pos_count += buffsamples; - } - if(err != MPG123_DONE && err != MPG123_OK) - { - printf("An error occured (not done)?: %s\n", mpg123_strerror(m)); - return -1; - } - return 0; -} - -int check_sample(struct seeko *so, size_t i) -{ - short buf[2]; /* at max one left and right sample */ - size_t got = 0; - - if(mpg123_seek(m, so->position[i], SEEK_SET) != so->position[i]) - { - printf("Error seeking to %"OFF_P": %s\n", (off_p)so->position[i], mpg123_strerror(m)); - return -1; - } - - if( mpg123_read(m, (unsigned char*)buf, channels*sizeof(short), &got) != MPG123_OK - || - got/sizeof(short) != channels ) - { - printf("Error occured on reading sample %"SIZE_P"! (%s)\n", (size_p)i, mpg123_strerror(m)); - return -1; - } - if(buf[0] == so->left[i] && (channels == 1 || buf[1] == so->right[i])) - { - printf("sample %"SIZE_P" PASS\n", (size_p)i); - } - else - { - if(channels == 1) printf("sample %"SIZE_P" FAIL (%i != %i)\n", (size_p)i, buf[0], so->left[i]); - else printf("sample %"SIZE_P" FAIL (%i != %i || %i != %i)\n", (size_p)i, buf[0], so->left[i], buf[1], so->right[i]); - return -1; - } - return 0; -} - -size_t check_positions(struct seeko *so) -{ - size_t i; - size_t errs = 0; - printf("Seeking and comparing...\n"); - for(i=0; i + Patrick Dehne + Jonathan Yong <10walls@gmail.com> + +Co-initiator of the revived mpg123 project, but not that involved anymore: Nicholas J Humfrey Generic address pointing to the current maintainer (hopefully still works in future in case maintainership will change again): @@ -13,13 +17,18 @@ The creator: Michael Hipp (email: hippm@informatik.uni-tuebingen.de - please bot Contributions/ideas Thomas Orgis era (includes backports from mhipp trunk): -Jonathan Yong (jon_y) <10walls@gmail.com>: win32 hacking +Jarno Lehtinen : tinyalsa output +Anthony Wells : initial version of ID3v2 APIC patch +David Wohlferd : Win32 WaveOut buffer destructor fix. +Mike Gorchak : QNX native audio output (QSA) +Dan McGee : various patches (also for test suite) +Jonathan Yong (jon_y) <10walls@gmail.com>: win32 hacking, win32 wasapi audio. Malcolm Boczek : Common language runtime wrapper Elbert Pol (TeLLie) : OS/2 port fixup Jeroen Valkonet : motivate pitch control, suggestive patch for pitch command in generic control interface Andy Hefner : patch for that second UTF16 issue Taihei Monma : A whole lot of new/improved assembler code, including Altivec! -Christian Weisgerber : sndio output +Christian Weisgerber , Brad Smith: sndio output Patrick Dehne (P4tr3ck) : more MSVC++ porting, patch to handle missing bit reservoirs Thorsten Glaser : icy2utf8, suggest utf8 locale stuff Dan Smith : ABI fixes for ensuring stack alignment (esp. for MinGW-built DLL with MSVC) diff --git a/jni/mpg123-1.13.4/Android.mk b/jni/mpg123-1.17.0/Android.mk similarity index 88% rename from jni/mpg123-1.13.4/Android.mk rename to jni/mpg123-1.17.0/Android.mk index 270b68bf..045388a1 100644 --- a/jni/mpg123-1.13.4/Android.mk +++ b/jni/mpg123-1.17.0/Android.mk @@ -9,12 +9,15 @@ LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} LOCAL_C_INCLUDES := \ ${LOCAL_PATH}/src - + LOCAL_SRC_FILES := \ $(filter-out \ src/libmpg123/dct64_altivec.c \ src/libmpg123/dct64_i386.c src/libmpg123/dct64_i486.c \ src/libmpg123/synth_altivec.c src/libmpg123/synth_i486.c \ + src/libmpg123/synth_real.c \ + src/libmpg123/synth_s32.c \ + src/libmpg123/lfs_wrap.c \ src/libmpg123/testcpu.c \ , $(subst $(LOCAL_PATH)/,,\ $(wildcard ${LOCAL_PATH}/src/libmpg123/*.c) )) diff --git a/jni/mpg123-1.13.4/COPYING b/jni/mpg123-1.17.0/COPYING similarity index 95% rename from jni/mpg123-1.13.4/COPYING rename to jni/mpg123-1.17.0/COPYING index cf361b2a..d7bb85fc 100644 --- a/jni/mpg123-1.13.4/COPYING +++ b/jni/mpg123-1.17.0/COPYING @@ -1,25 +1,24 @@ This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package. -Main message: +Main message, to include in "About ..." boxes, etc: - Code is copyrighted by Michael Hipp, who made it free software under the terms of the LGPL 2.1. + Copyright (c) 1995-2013 by Michael Hipp and others, + free software under the terms of the LGPL v2.1 -But that is not all of it. -mpg123 is licensed under the GNU General Lesser Public License, version 2.1, and in parts under the GNU General Public License, version 2. -That means that _all_ of mpg123 is licensed under GPL and the major part also under the LGPL. +There is an attempt to cover the actual list of authors in the AUTHORS file. +Project maintainer since 2006 is Thomas Orgis and many people have contributed +since the Michael Hipp era, but he stays the initial source and it would +be impractical to count them all individually, so it's "and others". +Source files contain the phrase "the mpg123 project" to the same effect +in their license boilerplate; especially those that were added after +maintainership changed. The person mainly responsible for the first version +is usually named in the phrase "initially written by ...". -Actually, the "major part" currently is the whole distributed package of mpg123. There are some files (old alsa output, libao output) that you get from our svn repository and that do not fall under LGPL. - -When the copyright marker in a source file says "the mpg123 project" that means that the file contains code copyrighted by contributors to mpg123, the "initially written by" naming the person(s) that created the file and thus may have the largest part of copyrights on it. -I am explaining this here to emphasize that the copyright always actually lies by the individual member (i.e. contributor to) of the mpg123 project who wrote a specific section of code. -Usage of a source code management system like Subversion should provide keeping track of individual copyright traces... - -Please consider that any code that is contributed to the mpg123 project shall be licensed under LGPL 2.1 . -If you want to contribute, but don't agree to that (i.e. you want to have your code GPL only) please say so - then, we either you convince is to include your code under GPL, we convince you to make it LGPL instead or, as a last resort, you'll have to do you own GPLed fork. -But we should try to avoid the last option... - -All files in the distribution that don't carry a license note on their own are licensed under the terms of the LGPL 2.1; all files that do carry either a LGPL or GPL note are licensed respectively under the LGPL or GPL as follows: +All files in the distribution that don't carry a license note on their own are +licensed under the terms of the LGPL 2.1; exceptions may apply, especially to +files not in the official distribution but in the revision control repository. +The formal license text follows. ======================= 1. The LGPL version 2.1 diff --git a/jni/mpg123-1.13.4/ChangeLog b/jni/mpg123-1.17.0/ChangeLog similarity index 100% rename from jni/mpg123-1.13.4/ChangeLog rename to jni/mpg123-1.17.0/ChangeLog diff --git a/jni/mpg123-1.17.0/INSTALL b/jni/mpg123-1.17.0/INSTALL new file mode 100644 index 00000000..c618eff1 --- /dev/null +++ b/jni/mpg123-1.17.0/INSTALL @@ -0,0 +1,111 @@ +mpg123 install hints +-------------------- + +(This file has very long lines - die-hard terminal nostalgists can be satisfied by `fmt -s -w 75 < INSTALL | less`. I think it's better to let the reader's preference rule than to preformat the stuff to some arbitrary width.) + + +0. Prerequesites + +You really need: + +- a C compiler; we try to keep the code ANSI C89/ISO C90 compatible + gcc from 2.95 on should work, others, too - please report any issues + Actually, we have a confirmed working build (svn trunk leading to release 0.67) on SunOS 4.1.4 with gcc-2.7.0 . + +- an (UNIX-like) operating system with standard tools; MinGW32 and Cygwin are working for Microsoft Windows, too. We also have users happily on OS/2. +- For the library only, you may get lucky with MSVC++ using the project files under ports/ +- For other exotic platforms, also see ports/ +- If building from direct SCM checkout, you need GNU autotools installed (see below). + +You want: + +- working assembler (recent GNU binutils) if using certain CPU optimizations +- headers and lib for certain audio output drivers (libasound for alsa, sdl for sdl...) +- libtool's libltdl for runtime output modules (this used to be included, but now we rely on an existing install) + + +1. Build + +There is one main supported way to get your mpg123 installation consisting of + + a) the mpg123 binary file + - with libmpg123 as shared library or statically linked + - with audio output plugins, or one statically linked + b) a man page + +(you may want to copy some of the documentation - README, etc - to /usr/share/doc/mpg123 or the like, too) + +This way is the usual GNU 3-step procedure: + + ./configure + make + make install + +Run + + ./configure --help + +for a list of possible parameters you can specify in the configuration step. The obvious are --prefix and the normal GNU autotool bunch, but others include what audio subsystem to use and what CPU optimizations to build in. +For the optimizations (decoder choice), the default is a build that combines all usable optimizations for the platform and chooses one at runtime (see --cpu, --list-cpu and --test-cpu parameters). + +There are various parameters you can tune, but of course the defaults are what is mainly tested. + +Also, various library features can be left out via --disable options (like output formats, resampling modes). That way, you can strive for a minimal build that only does what you really need. Not every combination of library features is tested regularily, so you might hit some speed bumps, but usually stuff that is easily worked out (at least for the mpg123 team when you report it). + +An example (working on mpg123 trunk r3062): + + CFLAGS="-Os -s" ./configure --with-cpu=generic --disable-id3v2 --disable-lfs-alias --disable-feature-report --with-seektable=0 --disable-16bit --disable-32bit --disable-8bit --disable-messages --disable-feeder --disable-ntom --disable-downsample --disable-icy && make + +That, and further application of `strip --strip-unneeded`, yields a lean 93 KiB shared library for MPEG layer I/II/III decoding to floating point on my x86-64 system (it should be a bit smaller on 32 bit systems). When disabling layers I and II, too, that goes down to 81 KiB. + +The shared library of a full build weighs 170 KiB after stripping. + + +2. Developer build + +This project uses GNU autotools (no specific version, but they should be fairly recent), also libtool. You need to have those installed, as it is usually the case for build environments based on the GNU toolchain. + +One a fresh SCM checkout, or after changing things in configure.ac, you need to run + + autoreconf -iv + +to prepare the configure script. Then you can build as per point 1. + + +3. Library-only build + +If you do not want to build the whole thing, but only the library, run + + ./configure + cd src/libmpg123 + make + +You can then find the library itself under src/libmpg123/.libs (libtool likes to hide things there). + + +4. Exotic platforms + +See the ports/ directory for some help for building at least libmpg123 without the UNIX shell / autotools. The main strategy is to write a config.h to replace what configure would generate and then have a correct listing of all source files involved in that configuration (there are optional files for different decoder choices, for example). + +Then compile objects, link. + + +4a. Preparing Win32 binary packages. + +Caution: You should make sure to use some gcc >= 4.2.0, even if it's still the experimental package for MinGW32. +This helps preventing incompatibilities between generated DLL files and other compilers (it's about stack alignment). + +Get MinGW/MSYS installed, run the MSYS shell. +Enter the mpg123 source directory. +Execute sh ./windows-builds.sh . + +After some time, you should have some relevant files under releases/ (or releases\, for Windows people;-). +You don't just get one build -- there are several variants, corresponding to what usually is to be found under http://mpg123.org/download/win32 . + + +5. Note on large file support + +The libmpg123 API includes the generic off_t type for file offsets and thus is subject to shape-shifting on systems that change off_t depending on build flags. +To deal with the incompatibilities that can cause, the library needs to separate code paths for small and large off_t. +Since version 1.12.0, a large-file-enabled libmpg123 (the default set by configure) provides a dual-mode ABI. Depending on _FILE_OFFSET_BITS, the mpg123.h header file selects different library symbols to use for your app. +In both large-file and normal mode, the library should just work for your app. diff --git a/jni/mpg123-1.13.4/Makefile b/jni/mpg123-1.17.0/Makefile similarity index 63% rename from jni/mpg123-1.13.4/Makefile rename to jni/mpg123-1.17.0/Makefile index 3fff2600..e239b6c0 100644 --- a/jni/mpg123-1.13.4/Makefile +++ b/jni/mpg123-1.17.0/Makefile @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/mpg123 pkgincludedir = $(includedir)/mpg123 pkglibdir = $(libdir)/mpg123 @@ -32,15 +76,19 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu +build_triplet = 86_64-unknown-linux-gnu +host_triplet = arm-unknown-linux-androideabi subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/libmpg123.pc.in $(srcdir)/mpg123.spec.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO build/config.guess build/config.sub build/depcomp \ - build/install-sh build/ltmain.sh build/missing + $(dist_man_MANS) COPYING TODO build/compile build/config.guess \ + build/config.sub build/depcomp build/install-sh build/missing \ + build/ltmain.sh $(top_srcdir)/build/compile \ + $(top_srcdir)/build/config.guess \ + $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \ + $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -54,15 +102,33 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = libmpg123.pc mpg123.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -84,6 +150,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" NROFF = nroff @@ -91,18 +163,42 @@ MANS = $(dist_man_MANS) DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -130,9 +226,12 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11 +ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14 AIX_CFLAGS = AIX_LDFLAGS = AIX_LIBS = @@ -141,32 +240,33 @@ ALIB_LDFLAGS = ALIB_LIBS = ALSA_CFLAGS = ALSA_LDFLAGS = -ALSA_LIBS = -AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar -API_VERSION = 29 -AR = ar +ALSA_LIBS = -lasound +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +API_VERSION = 38 +AR = arm-linux-androideabi-ar ARTS_CFLAGS = ARTS_LDFLAGS = ARTS_LIBS = AS = as -AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11 -AWK = gawk -CC = gcc -CCAS = gcc +AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf +AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader +AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14 +AWK = mawk +CC = arm-linux-androideabi-gcc +CCAS = arm-linux-androideabi-gcc CCASDEPMODE = depmode=gcc3 CCASFLAGS = -g -O2 CCDEPMODE = depmode=gcc3 CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 COREAUDIO_CFLAGS = COREAUDIO_LDFLAGS = -COREAUDIO_LIBS = -CPP = gcc -E -CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT +COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices +CPP = arm-linux-androideabi-gcc -E +CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED CYGPATH_W = echo -DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo -DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT) +DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo +DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT) DEFS = -DHAVE_CONFIG_H DEPDIR = .deps DLLTOOL = dlltool @@ -200,10 +300,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s JACK_CFLAGS = JACK_LDFLAGS = JACK_LIBS = -LD = /usr/bin/ld +LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld LDFLAGS = -LFS_LOBJ = lfs_wrap.lo lfs_alias.lo -LIBMPG123_VERSION = 29:6:29 +LFS_LOBJ = lfs_alias.lo +LIBMPG123_VERSION = 38:4:38 LIBOBJS = LIBS = -lm LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -211,7 +311,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_LDFLAGS = -export-dynamic -MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo +MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo MANIFEST_TOOL = : MINT_CFLAGS = MINT_LDFLAGS = @@ -220,8 +320,8 @@ MKDIR_P = /bin/mkdir -p MODULE_OBJ = legacy_module.$(OBJEXT) NAS_CFLAGS = NAS_LDFLAGS = -NAS_LIBS = -NM = /usr/bin/nm -B +NAS_LIBS = -laudio +NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o @@ -230,7 +330,7 @@ OPENAL_LDFLAGS = OPENAL_LIBS = OS2_CFLAGS = OS2_LDFLAGS = -OS2_LIBS = +OS2_LIBS = -los2me -lmmpm2 -lsocket OSS_CFLAGS = OSS_LDFLAGS = OSS_LIBS = @@ -239,27 +339,30 @@ OTOOL64 = OUTPUT_CFLAGS = OUTPUT_LDFLAGS = OUTPUT_LIBS = -OUTPUT_MOD = dummy -OUTPUT_OBJ = output/dummy.$(OBJEXT) +OUTPUT_MOD = oss +OUTPUT_OBJ = output/oss.$(OBJEXT) PACKAGE = mpg123 PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net PACKAGE_NAME = mpg123 -PACKAGE_STRING = mpg123 1.13.4 +PACKAGE_STRING = mpg123 1.17.0 PACKAGE_TARNAME = mpg123 PACKAGE_URL = -PACKAGE_VERSION = 1.13.4 +PACKAGE_VERSION = 1.17.0 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PORTAUDIO_CFLAGS = PORTAUDIO_LDFLAGS = -PORTAUDIO_LIBS = -PULSE_CFLAGS = +PORTAUDIO_LIBS = -lportaudio +PULSE_CFLAGS = -D_REENTRANT PULSE_LDFLAGS = -PULSE_LIBS = -RANLIB = ranlib -SDL_CFLAGS = +PULSE_LIBS = -lpulse-simple -lpulse +QSA_CFLAGS = +QSA_LDFLAGS = +QSA_LIBS = +RANLIB = arm-linux-androideabi-ranlib +SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL SDL_LDFLAGS = -SDL_LIBS = +SDL_LIBS = -lSDL SED = /bin/sed SET_MAKE = SGI_CFLAGS = @@ -268,54 +371,63 @@ SGI_LIBS = SHELL = /bin/bash SNDIO_CFLAGS = SNDIO_LDFLAGS = -SNDIO_LIBS = -STRIP = strip +SNDIO_LIBS = -lsndio +STRIP = arm-linux-androideabi-strip SUN_CFLAGS = SUN_LDFLAGS = SUN_LIBS = -VERSION = 1.13.4 +TINYALSA_CFLAGS = +TINYALSA_LDFLAGS = +TINYALSA_LIBS = -ltinyalsa +VERSION = 1.17.0 WIN32_CFLAGS = WIN32_LDFLAGS = -WIN32_LIBS = -abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -ac_ct_AR = ar -ac_ct_CC = gcc +WIN32_LIBS = -lwinmm +WIN32_WASAPI_CFLAGS = +WIN32_WASAPI_LDFLAGS = +WIN32_WASAPI_LIBS = -lole32 -lavrt +YASM = yasm +YASMFLAGS = -pgas -rgas -mamd64 +YASM_FORMAT = +abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +ac_ct_AR = +ac_ct_CC = ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 +build = 86_64-unknown-linux-gnu +build_alias = 86_64-unknown-linux-gnu +build_cpu = 86_64 build_os = linux-gnu -build_vendor = pc +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc +host = arm-unknown-linux-androideabi +host_alias = arm-linux-androideabi +host_cpu = arm +host_os = linux-androideabi +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh +install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -325,7 +437,7 @@ sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . sysconfdir = ${prefix}/etc -target_alias = +target_alias = arm-linux-androideabi top_build_prefix = top_builddir = . top_srcdir = . @@ -391,6 +503,14 @@ EXTRA_DIST = \ ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \ ports/MSVC++/2008clr/examples/scanclr/Program.cs \ ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \ + ports/MSVC++/2010/mpg123.sln \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \ + ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj.filters \ ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \ ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \ ports/MSVC++/CMP3Stream/README \ @@ -408,12 +528,18 @@ EXTRA_DIST = \ ports/Sony_PSP/Makefile.psp \ ports/Sony_PSP/readers.c.patch \ ports/mpg123_.pas \ - scripts/benchmark-cpu.pl + ports/Xcode/config.h \ + ports/Xcode/mpg123.h \ + ports/Xcode/mpg123.xcodeproj/project.pbxproj \ + scripts/benchmark-cpu.pl \ + scripts/tag_lyrics.py \ + scripts/conplay \ + scripts/mpg123info all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -462,11 +588,18 @@ distclean-libtool: -rm -f libtool config.lt install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -495,13 +628,14 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -515,27 +649,28 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -550,57 +685,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -616,12 +706,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -633,15 +718,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -650,24 +731,33 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -701,13 +791,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -728,43 +815,50 @@ distdir: $(DISTFILES) fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -772,23 +866,23 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -796,6 +890,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -819,13 +914,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -859,10 +962,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -946,25 +1054,24 @@ uninstall-am: uninstall-man uninstall-pkgconfigDATA uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-man uninstall-man1 \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-pkgconfigDATA diff --git a/jni/mpg123-1.13.4/Makefile.am b/jni/mpg123-1.17.0/Makefile.am similarity index 85% rename from jni/mpg123-1.13.4/Makefile.am rename to jni/mpg123-1.17.0/Makefile.am index f3963c03..a59ee61e 100644 --- a/jni/mpg123-1.13.4/Makefile.am +++ b/jni/mpg123-1.17.0/Makefile.am @@ -66,6 +66,14 @@ EXTRA_DIST = \ ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \ ports/MSVC++/2008clr/examples/scanclr/Program.cs \ ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \ + ports/MSVC++/2010/mpg123.sln \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \ + ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj.filters \ ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \ ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \ ports/MSVC++/CMP3Stream/README \ @@ -83,4 +91,10 @@ EXTRA_DIST = \ ports/Sony_PSP/Makefile.psp \ ports/Sony_PSP/readers.c.patch \ ports/mpg123_.pas \ - scripts/benchmark-cpu.pl + ports/Xcode/config.h \ + ports/Xcode/mpg123.h \ + ports/Xcode/mpg123.xcodeproj/project.pbxproj \ + scripts/benchmark-cpu.pl \ + scripts/tag_lyrics.py \ + scripts/conplay \ + scripts/mpg123info diff --git a/jni/mpg123-1.13.4/Makefile.in b/jni/mpg123-1.17.0/Makefile.in similarity index 69% rename from jni/mpg123-1.13.4/Makefile.in rename to jni/mpg123-1.17.0/Makefile.in index 0465b8ac..1aca4bac 100644 --- a/jni/mpg123-1.13.4/Makefile.in +++ b/jni/mpg123-1.17.0/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +79,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/libmpg123.pc.in $(srcdir)/mpg123.spec.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO build/config.guess build/config.sub build/depcomp \ - build/install-sh build/ltmain.sh build/missing + $(dist_man_MANS) COPYING TODO build/compile build/config.guess \ + build/config.sub build/depcomp build/install-sh build/missing \ + build/ltmain.sh $(top_srcdir)/build/compile \ + $(top_srcdir)/build/config.guess \ + $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \ + $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -54,15 +102,33 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = libmpg123.pc mpg123.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -84,6 +150,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" NROFF = nroff @@ -91,18 +163,42 @@ MANS = $(dist_man_MANS) DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -130,7 +226,10 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AIX_CFLAGS = @AIX_CFLAGS@ @@ -143,6 +242,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LDFLAGS = @ALSA_LDFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ AR = @AR@ ARTS_CFLAGS = @ARTS_CFLAGS@ @@ -256,6 +356,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PULSE_CFLAGS = @PULSE_CFLAGS@ PULSE_LDFLAGS = @PULSE_LDFLAGS@ PULSE_LIBS = @PULSE_LIBS@ +QSA_CFLAGS = @QSA_CFLAGS@ +QSA_LDFLAGS = @QSA_LDFLAGS@ +QSA_LIBS = @QSA_LIBS@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LDFLAGS = @SDL_LDFLAGS@ @@ -273,10 +376,19 @@ STRIP = @STRIP@ SUN_CFLAGS = @SUN_CFLAGS@ SUN_LDFLAGS = @SUN_LDFLAGS@ SUN_LIBS = @SUN_LIBS@ +TINYALSA_CFLAGS = @TINYALSA_CFLAGS@ +TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@ +TINYALSA_LIBS = @TINYALSA_LIBS@ VERSION = @VERSION@ WIN32_CFLAGS = @WIN32_CFLAGS@ WIN32_LDFLAGS = @WIN32_LDFLAGS@ WIN32_LIBS = @WIN32_LIBS@ +WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@ +WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@ +WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@ +YASM = @YASM@ +YASMFLAGS = @YASMFLAGS@ +YASM_FORMAT = @YASM_FORMAT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -391,6 +503,14 @@ EXTRA_DIST = \ ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \ ports/MSVC++/2008clr/examples/scanclr/Program.cs \ ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \ + ports/MSVC++/2010/mpg123.sln \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \ + ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj \ + ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \ + ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj \ + ports/MSVC++/2010/scan/scan.vcxproj.filters \ ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \ ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \ ports/MSVC++/CMP3Stream/README \ @@ -408,12 +528,18 @@ EXTRA_DIST = \ ports/Sony_PSP/Makefile.psp \ ports/Sony_PSP/readers.c.patch \ ports/mpg123_.pas \ - scripts/benchmark-cpu.pl + ports/Xcode/config.h \ + ports/Xcode/mpg123.h \ + ports/Xcode/mpg123.xcodeproj/project.pbxproj \ + scripts/benchmark-cpu.pl \ + scripts/tag_lyrics.py \ + scripts/conplay \ + scripts/mpg123info all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -462,11 +588,18 @@ distclean-libtool: -rm -f libtool config.lt install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -495,13 +628,14 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -515,27 +649,28 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -550,57 +685,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -616,12 +706,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -633,15 +718,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -650,24 +731,33 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -701,13 +791,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -728,43 +815,50 @@ distdir: $(DISTFILES) fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -772,23 +866,23 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -796,6 +890,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -819,13 +914,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -859,10 +962,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -946,25 +1054,24 @@ uninstall-am: uninstall-man uninstall-pkgconfigDATA uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-man uninstall-man1 \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-man uninstall-man1 \ uninstall-pkgconfigDATA diff --git a/jni/mpg123-1.13.4/NEWS b/jni/mpg123-1.17.0/NEWS similarity index 86% rename from jni/mpg123-1.13.4/NEWS rename to jni/mpg123-1.17.0/NEWS index d00f075c..88abf994 100644 --- a/jni/mpg123-1.13.4/NEWS +++ b/jni/mpg123-1.17.0/NEWS @@ -1,3 +1,150 @@ +1.17.0 +--- +- mpg123-id3dump --no-scan; for speedup +- hide -C parameter from mpg123 --help when it is not supported +- added tinyalsa Output (by Jarno Lehtinen) +- build system tweaking +- some care for fixing Cygwin builds + +1.16.0 +--- +- Taihei strikes again: + - New Huffman decoding scheme (configurable, on by default) brings nice boost to mpg123 to make it the fastest decoder on modern CPUs again. + - new AVX decoder + - assembly-optimized DCT36 for SSE and AVX +- added configs for vintage 3DNow(ext) CPUs (AMD K6) utilizing assembly DCT36 +- added configs for vintage SSE CPUs (Pentium M), utilizing C DCT36 +- added FORMAT command to generic control +- added support for ID3v2 APIC frames +- added mpg123-id3dump as official companion to extract meta data + (including writing of album art from APIC to files) +- added mpg123-strip as official companion to strip dirt out of MPEG streams + (including meta data) +- not deleting ID3 data right after printing in generic control +- module loader a bit more flexible with relative MPG123_MODDIR +- Fix chopped-off playback with pulseaudio output: draining the output now on closing. +- SDL output fixup, a) not chopping off end and b) non-fatal underrun +- Fix obvious errors in win32 output ... does it now play the end of tracks? Need someone to test this. +- added support for screen and iris-ansi terminals with --title (as prompted by patch from sf.net user canavan) +- fixes/enhancements for sgi audio output +- libmpg123: proper largefile aliases for proper systems (FreeBSD with one one-and-only off_t + This enables client software that insists on defining pointless _FILE_OFFSET_BITS. +- wrapper script src/mpg123-with-modules to ease the pain of running mpg123 with modules without installation (setting MPG123_MODDIR) +- removed ALSA 0.5 code (unused for longtime, last GPL-only bit) + +1.15.4 +--- +- Writing CDDA data via --cdr works again; had also been broken by attempts to catch failing writes because of full disk. +- Also, the return values of WAV/CDR writing routines now properly indicate error to avoid stupid endless loop of "smart" audio writing code that wants to handle interruptions. Really, --cdr could just go and nobody would miss it ... +- Fix stupid bug in mpg123_chomp_string() (introduced in 1.15.1), empty lines were badly treated. Only usage in mpg123 is for parsing HTTP redirect headers; malicious HTTP servers might exploit that (possibility to zero bytes in memory). +- some cleanup for nagging mode +- more resync strictness to really catch (all) cases with changing decoder structure; in practice badly needed when disabling seekbuffer (so it's your fault, somehow ...) for non-seekable streams, otherwise not really an issue because of readahead checking + I repeat: This fixes possibly fatal behaviour in the parser when readahead checking is explicitly disabled (p.ex. via mpg123 --no-seekbuffer on http streams). By default, readahead checking is _always_ active! +- build system fixed for automake 1.13 (thanks to Nix) + +1.15.3 +--- +- Fix WAV writing. AGAIN. People love to decode WAV to stdout in various ways that started to get broken with me starting to care for people who like to write to full disks. I frikkin' HATE this rat race! I'm even starting to SHOUT. Now, the code prefers to write no header at all (when there is no actual output) instead of possibly writing too many misleading ones. Getting the blame for breaking dir2ogg repeatedly while trying to cope with one fatal situation that you cannot really cope with sucks. Big time. I hope that's it now! + +1.15.2 +--- +- build fix with older shells (== in configure) + +1.15.1 +--- +- libmpg123 API version 37 +- Fix corner case in HTTP communication with missing path in Location header (bug 187). +- Prevent nasty alignment issues by not guessing about assembler alignment when .balign is available (bug 188). + +1.15.0 +--- +- Added --continue (also see scripts/conplay). +- Added number row to terminal control keys for 10% jump points (for navigating long tracks). +- Set xterm title always if asked, disregarding the -q switch (if you want fully quiet, don't specify --title). +- Enable terminal mode in OS/2 by explicitly checking for and using os2term library. +- Getting WAV/AU/CDR writing back to a sane state while still catching out-of-disk when writing headers (none in case of CDR) but removing that initial test that prevented writing on any non-seekable file (like, /dev/stdout to a pipe). +- Added native audio output for QNX (thanks to Mike Gorchak), also improving portability of configure script while at that. +- more robust recovery from ALSA issues (device suspend) +- Fix crash in module loader on *BSD. +- Extend time display to switch to hours above 60 minutes (hh:mm:ss, ditching the sub-second precision) +- really include dithering in default x86-64 build. +- Fix mpg123_scan() not properly seeking back for all types of files (bug 3582628 ... it got a different number on sf.net now ... brilliant, folks!). +- Prevent false positives for "Frankenstein!" when using mpg123_scan(). +- Fix printing of negative positions with buffer (bug 186). +- Accept application/x-scpls as additional MIME type. +- Try to handle certain Windows toolchains that miss EOVERFLOW. + +1.14.4 +--- + +Who reworks a parsing and data mangling without really making sure that things still work like before? I hope I won't do so in future. Not again. + +- Fix resync logic to properly work again (used to prematurely end stream on bad headers). A regression again, this sucks, but at least we got a regression test for that now. +- Fix aeon-old regression (since 1.11.0) about short seeks: Bit reservoir was reset also for short seeks that did not break continuity. +- Another damned regression got fixed: Sample-accurate seek for files without full gapless info. + +1.14.3 +--- +- Fix regression from 1.14.1 in parsing of bad free format streams, avoiding apparently endless loops (just very slow reading, in fact). + +1.14.2 +--- +- Fix writing of WAV to stdout. + It is still not the best of ideas to do so, though. At least make sure to fix rate and channels. + +1.14.1 +--- +- Fix subtle bug that could trigger failure to detect a format change on resync when using libmpg123's feeder API. + That bug has been there since ages but was neutralized by other (buggy) behaviour of the parser before the little overhaul. The Law of an Even Number of Bugs. + +1.14.0 +--- +- libmpg123 API version 36 (see NEWS.libmpg123) +- Add --ignore-streamlength. +- But also deal with concatenated (Frankenstein) streams: Not applying gapless cutting once we're over the announced number of frames. +- Also, gapless cutting is only applied if relevant information is present. Previously, at least the decoder delay has been cut. +- Add --lyrics for printout of lyrics (from USLT in ID3v2). +- Added handling of SIGUSR1 and SIGUSER2 to terminal control code, configurable via --ctrlusr1 and --ctrlusr2. +- Some low-level API added (mpg123_framedata(), mpg123_framepos(), buffering and resampling control). +- Added info about input buffer fill to mpg123_getstate(). +- ReplayGain: Try to detect LAME below 3.95 for the different reference level of 83 dB (adding preamp of 6 dB). Version 3.95 itself (not 3.95.1) I cannot detect. User-set gain values are not touched. +- Keep silent about missing bit reservoir when ignoring frames. That is the whole point (mostly;-). +- Add the new/old WRITE_SAMPLE variant from MPlayer that makes the generic decoder faster on older CPUs (x86 at least). Not on x86-64, though (it's not enabled per default there). +- disable 3DNow and 3DNowExt DCT36, which is slow on modern CPUs +- Handle out-of-disk in the file writers (a bit, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=67259) +- Added Xcode project files to build libmpg123 on Mac OS and iOS +- 32 bit output for sndio output (patch by Brad Smith). +- Remote control interface knows LOADLIST command now. +- Now freeing meta data memory after printout. +- Some documentation cleanup, including manpage fixes by quadrispro. +- Re-enabled wildcard expansion on Windows (been broken by unicode file name support). +- Fix MMX tabinit syntax (thanks to Marcel Müller for pointing that out). +- Fix SGI audio output (been broken since change to modules). +- Fix some fringe behaviour (mpg123_getformat() triggering needless reading of next frame, possibly hitting bogus MPG123_NEED_MORE). +- Resync limit now also serves to increase amount of skipped junk on beginning. +- Better separation of stream end and read error (in case there is no stream opened, even). +- Don't always complain about failed free format header search (only with verbosity level 3). + +1.13.8 +--- +- Fix build for ARM Thumb (incompatible assembly in some macros). + +1.13.7 +--- +- Fix endless loop in module loader when starting mpg123 in a directory that does not exist. + +1.13.6 +--- +- Fix output of one random character in -vvv mode for ID3v2.2 frames (no buffer overflow, move along, folks;-). + +1.13.5 +--- +- Fix reading of ReplayGain values from Lame tag (nobody seen this before?!) + (both actual values and the distinction between audiophile / radio). +- Accept application/octet-stream as input from HTTP. +- Update man page with encodings. +- Build fixes. + 1.13.4 --- - Fix bogus error on resync with big offsets (hits systems that have bigger off_t than int), bug 3393801. diff --git a/jni/mpg123-1.13.4/NEWS.libmpg123 b/jni/mpg123-1.17.0/NEWS.libmpg123 similarity index 83% rename from jni/mpg123-1.13.4/NEWS.libmpg123 rename to jni/mpg123-1.17.0/NEWS.libmpg123 index c1b600aa..19651c4a 100644 --- a/jni/mpg123-1.13.4/NEWS.libmpg123 +++ b/jni/mpg123-1.17.0/NEWS.libmpg123 @@ -1,5 +1,34 @@ Changes in libmpg123 libtool interface versions... +38.0.38 + - Added MPG123_PICTURE and associated addition to mpg123_id3v2 struct. + +37.0.37 + - Added mpg123_chomp_string. + +36.0.36 + - Extended MPG123_RESYNC_LIMIT to initial header search. + - Not cutting decoder delay unconditionally anymore (only in combination with known encoder delay / padding). + +35.0.35 + - Added mpg123_meta_free(). + +34.0.34 + - Added flag MPG123_AUTO_RESAMPLE. + - Changed (improved;-) outbuffer behaviour. + +33.0.33 + - Added MPG123_BUFFERFILL. + +32.0.32 + - Added mpg123_framepos() + +31.0.31 + - Added mpg123_framedata() and MPG123_IGNORE_INFOFRAME. + +30.0.30 + - Added MPG123_FEEDPOOL and MPG123_FEEDBUFFER. + 29.0.29 - New decoder: ARM neon. - Added support for 24 bit output (dumb byte-chopping of 32 bit output). diff --git a/jni/mpg123-1.13.4/README b/jni/mpg123-1.17.0/README similarity index 100% rename from jni/mpg123-1.13.4/README rename to jni/mpg123-1.17.0/README diff --git a/jni/mpg123-1.13.4/TODO b/jni/mpg123-1.17.0/TODO similarity index 98% rename from jni/mpg123-1.13.4/TODO rename to jni/mpg123-1.17.0/TODO index ee2c2926..ec4de61f 100644 --- a/jni/mpg123-1.13.4/TODO +++ b/jni/mpg123-1.17.0/TODO @@ -1,5 +1,7 @@ Things that need to be done... +... as always, mostly outdated. + 0. Fix that ugly crash that happens sometimes when Ctrl+C-ing with jack output active: Program terminated with signal 11, Segmentation fault. diff --git a/jni/mpg123-1.13.4/aclocal.m4 b/jni/mpg123-1.17.0/aclocal.m4 similarity index 65% rename from jni/mpg123-1.13.4/aclocal.m4 rename to jni/mpg123-1.17.0/aclocal.m4 index 4b47e71e..851f6dc5 100644 --- a/jni/mpg123-1.13.4/aclocal.m4 +++ b/jni/mpg123-1.17.0/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -175,7 +176,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,10 +188,10 @@ fi[]dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -206,21 +207,19 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_PROG_AS # ---------- AC_DEFUN([AM_PROG_AS], @@ -235,15 +234,15 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -262,7 +261,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -288,22 +287,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -322,16 +318,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -341,7 +335,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -354,12 +348,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -367,8 +362,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -407,16 +403,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -425,16 +421,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -482,7 +478,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -492,34 +488,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -532,7 +533,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -544,21 +545,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -576,7 +575,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -584,32 +583,23 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -622,7 +612,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -651,31 +641,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -686,34 +685,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# 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: + +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: . + +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 + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -735,7 +778,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -754,16 +797,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -779,14 +820,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -804,7 +843,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -831,15 +870,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -847,11 +883,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -864,63 +899,35 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -931,24 +938,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # 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 AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && 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]) +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_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -959,32 +1024,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -994,9 +1067,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1004,34 +1153,32 @@ AC_MSG_RESULT(yes)]) # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1039,24 +1186,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1066,75 +1211,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/jni/mpg123-1.17.0/build/compile b/jni/mpg123-1.17.0/build/compile new file mode 100755 index 00000000..531136b0 --- /dev/null +++ b/jni/mpg123-1.17.0/build/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/jni/mpg123-1.13.4/build/config.guess b/jni/mpg123-1.17.0/build/config.guess similarity index 80% rename from jni/mpg123-1.13.4/build/config.guess rename to jni/mpg123-1.17.0/build/config.guess index da833146..b79252d6 100755 --- a/jni/mpg123-1.13.4/build/config.guess +++ b/jni/mpg123-1.17.0/build/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2009-04-27' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -170,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -333,6 +354,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -391,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -477,8 +501,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -491,7 +515,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -548,7 +572,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -591,52 +615,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -656,7 +680,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -727,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -766,14 +790,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -785,34 +809,39 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in + *:Interix*:*) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -822,6 +851,9 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -842,100 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -946,106 +899,132 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1053,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1074,7 +1053,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1089,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1117,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1158,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1182,7 +1161,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1202,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1231,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1248,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1274,9 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1290,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1335,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1359,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/jni/mpg123-1.13.4/build/config.sub b/jni/mpg123-1.17.0/build/config.sub similarity index 86% rename from jni/mpg123-1.13.4/build/config.sub rename to jni/mpg123-1.17.0/build/config.sub index a39437d0..8b612ab8 100755 --- a/jni/mpg123-1.13.4/build/config.sub +++ b/jni/mpg123-1.17.0/build/config.sub @@ -1,44 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2013-04-24' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -120,13 +115,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -149,10 +149,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -167,10 +170,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -215,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -239,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -270,32 +286,45 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -305,6 +334,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -319,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -355,28 +404,34 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -401,7 +456,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -467,11 +522,24 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -503,7 +571,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -661,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -719,6 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -755,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -823,6 +905,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -905,9 +993,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -932,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1001,6 +1094,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1057,20 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1140,6 +1224,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1237,9 +1324,12 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1260,22 +1350,23 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1283,7 +1374,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1322,7 +1413,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1371,7 +1462,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1407,15 +1498,14 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1438,10 +1528,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1453,8 +1543,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1474,14 +1576,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1490,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1508,7 +1610,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1613,7 +1715,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff --git a/jni/mpg123-1.13.4/build/depcomp b/jni/mpg123-1.17.0/build/depcomp similarity index 50% rename from jni/mpg123-1.13.4/build/depcomp rename to jni/mpg123-1.17.0/build/depcomp index df8eea7e..4ebd5b3a 100755 --- a/jni/mpg123-1.13.4/build/depcomp +++ b/jni/mpg123-1.17.0/build/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/jni/mpg123-1.13.4/build/install-sh b/jni/mpg123-1.17.0/build/install-sh similarity index 94% rename from jni/mpg123-1.13.4/build/install-sh rename to jni/mpg123-1.17.0/build/install-sh index 6781b987..377bb868 100755 --- a/jni/mpg123-1.13.4/build/install-sh +++ b/jni/mpg123-1.17.0/build/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/jni/mpg123-1.13.4/build/ltmain.sh b/jni/mpg123-1.17.0/build/ltmain.sh old mode 100755 new mode 100644 similarity index 99% rename from jni/mpg123-1.13.4/build/ltmain.sh rename to jni/mpg123-1.17.0/build/ltmain.sh index 3061e3c5..63ae69dc --- a/jni/mpg123-1.13.4/build/ltmain.sh +++ b/jni/mpg123-1.17.0/build/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1118,6 +1115,10 @@ esac ;; --no-silent|--no-quiet) opt_silent=false +func_append preserve_args " $opt" + ;; + --no-warning|--no-warn) + opt_warning=false func_append preserve_args " $opt" ;; --no-verbose) @@ -2059,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff --git a/jni/mpg123-1.17.0/build/missing b/jni/mpg123-1.17.0/build/missing new file mode 100755 index 00000000..cdea5149 --- /dev/null +++ b/jni/mpg123-1.17.0/build/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2012-06-26.16; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/jni/mpg123-1.17.0/config.log b/jni/mpg123-1.17.0/config.log new file mode 100644 index 00000000..caf0ca9b --- /dev/null +++ b/jni/mpg123-1.17.0/config.log @@ -0,0 +1,8735 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by mpg123 configure 1.17.0, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ ./configure --build=86_64-unknown-linux-gnu --host=arm-linux-androideabi --target=arm-linux-androideabi --disable-32bit + +## --------- ## +## Platform. ## +## --------- ## + +hostname = ilium +uname -m = x86_64 +uname -r = 3.2.0-41-generic +uname -s = Linux +uname -v = #66-Ubuntu SMP Thu Apr 25 03:27:11 UTC 2013 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = unknown +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /opt/ros/hydro/bin +PATH: /home/mfelis/local/bin +PATH: /home/mfelis/local/bin +PATH: /home/mfelis/local/bin +PATH: /usr/lib/lightdm/lightdm +PATH: /usr/local/sbin +PATH: /usr/local/bin +PATH: /usr/sbin +PATH: /usr/bin +PATH: /sbin +PATH: /bin +PATH: /usr/games +PATH: /home/mfelis/muscod/Packages/PGPLOT +PATH: /home/mfelis/muscod/MC2/Release/bin/ +PATH: /home/mfelis/muscod/Packages/PGPLOT +PATH: /home/mfelis/muscod/MC2/Release/bin/ +PATH: /home/mfelis/muscod/Packages/PGPLOT +PATH: /home/mfelis/muscod/MC2/Release/bin/ +PATH: /home/mfelis/.luarocks/bin/ +PATH: /opt/android-sdk-linux/tools +PATH: /opt/android-sdk-linux/platform-tools +PATH: /opt/android-ndk-r8e +PATH: /opt/android-ndk-r8e/ndk-standalone/bin + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:2796: checking build system type +configure:2810: result: 86_64-unknown-linux-gnu +configure:2830: checking host system type +configure:2843: result: arm-unknown-linux-androideabi +configure:2880: checking for a BSD-compatible install +configure:2948: result: /usr/bin/install -c +configure:2959: checking whether build environment is sane +configure:3014: result: yes +configure:3073: checking for arm-linux-androideabi-strip +configure:3089: found /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-strip +configure:3100: result: arm-linux-androideabi-strip +configure:3165: checking for a thread-safe mkdir -p +configure:3204: result: /bin/mkdir -p +configure:3211: checking for gawk +configure:3241: result: no +configure:3211: checking for mawk +configure:3227: found /usr/bin/mawk +configure:3238: result: mawk +configure:3249: checking whether make sets $(MAKE) +configure:3271: result: yes +configure:3300: checking whether make supports nested variables +configure:3317: result: yes +configure:3449: checking for -Werror in CFLAGS (It breaks tests) +configure:3465: result: no +configure:3476: checking if you are up to something totally static with LDFLAGS/CFLAGS +configure:3496: result: no +configure:3516: checking for style of include used by make +configure:3544: result: GNU +configure:3575: checking for arm-linux-androideabi-gcc +configure:3602: result: arm-linux-androideabi-gcc +configure:3871: checking for C compiler version +configure:3880: arm-linux-androideabi-gcc --version >&5 +arm-linux-androideabi-gcc (GCC) 4.6 20120106 (prerelease) +Copyright (C) 2011 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +configure:3891: $? = 0 +configure:3880: arm-linux-androideabi-gcc -v >&5 +Using built-in specs. +COLLECT_GCC=arm-linux-androideabi-gcc +COLLECT_LTO_WRAPPER=/opt/android-ndk-r8e/ndk-standalone/bin/../libexec/gcc/arm-linux-androideabi/4.6/lto-wrapper +Target: arm-linux-androideabi +Configured with: /s/ndk-toolchain/src/build/../gcc/gcc-4.6/configure --prefix=/tmp/ndk-andrewhsieh/build/toolchain/prefix --target=arm-linux-androideabi --host=x86_64-linux-gnu --build=x86_64-linux-gnu --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-mpfr=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-mpc=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-cloog=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-ppl=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --disable-ppl-version-check --disable-cloog-version-check --enable-cloog-backend=isl --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --enable-initfini-array --disable-nls --prefix=/tmp/ndk-andrewhsieh/build/toolchain/prefix --with-sysroot=/tmp/ndk-andrewhsieh/build/toolchain/prefix/sysroot --with-binutils-version=2.21 --with-mpfr-version=3.1.1 --with-mpc-version=1.0.1 --with-gmp-version=5.0.5 --with-gcc-version=4.6 --with-gdb-version=7.3.x --with-gxx-include-dir=/tmp/ndk-andrewhsieh/build/toolchain/prefix/include/c++/4.6 --with-bugurl=http://source.android.com/source/report-bugs.html --disable-bootstrap --disable-libquadmath --enable-plugins --enable-libgomp --enable-gold --enable-graphite=yes --with-cloog-version=0.17.0 --with-ppl-version=1.0 --with-arch=armv5te --program-transform-name='s&^&arm-linux-androideabi-&' --enable-gold=default +Thread model: posix +gcc version 4.6 20120106 (prerelease) (GCC) +configure:3891: $? = 0 +configure:3880: arm-linux-androideabi-gcc -V >&5 +arm-linux-androideabi-gcc: error: unrecognized option '-V' +arm-linux-androideabi-gcc: fatal error: no input files +compilation terminated. +configure:3891: $? = 1 +configure:3880: arm-linux-androideabi-gcc -qversion >&5 +arm-linux-androideabi-gcc: error: unrecognized option '-qversion' +arm-linux-androideabi-gcc: fatal error: no input files +compilation terminated. +configure:3891: $? = 1 +configure:3911: checking whether the C compiler works +configure:3933: arm-linux-androideabi-gcc conftest.c >&5 +configure:3937: $? = 0 +configure:3985: result: yes +configure:3988: checking for C compiler default output file name +configure:3990: result: a.out +configure:3996: checking for suffix of executables +configure:4003: arm-linux-androideabi-gcc -o conftest conftest.c >&5 +configure:4007: $? = 0 +configure:4029: result: +configure:4051: checking whether we are cross compiling +configure:4089: result: yes +configure:4094: checking for suffix of object files +configure:4116: arm-linux-androideabi-gcc -c conftest.c >&5 +configure:4120: $? = 0 +configure:4141: result: o +configure:4145: checking whether we are using the GNU C compiler +configure:4164: arm-linux-androideabi-gcc -c conftest.c >&5 +configure:4164: $? = 0 +configure:4173: result: yes +configure:4182: checking whether arm-linux-androideabi-gcc accepts -g +configure:4202: arm-linux-androideabi-gcc -c -g conftest.c >&5 +configure:4202: $? = 0 +configure:4243: result: yes +configure:4260: checking for arm-linux-androideabi-gcc option to accept ISO C89 +configure:4323: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:4323: $? = 0 +configure:4336: result: none needed +configure:4361: checking whether arm-linux-androideabi-gcc understands -c and -o together +configure:4383: arm-linux-androideabi-gcc -c conftest.c -o conftest2.o +configure:4386: $? = 0 +configure:4383: arm-linux-androideabi-gcc -c conftest.c -o conftest2.o +configure:4386: $? = 0 +configure:4398: result: yes +configure:4417: checking dependency style of arm-linux-androideabi-gcc +configure:4528: result: gcc3 +configure:4552: checking dependency style of arm-linux-androideabi-gcc +configure:4661: result: gcc3 +configure:4684: checking for arm-linux-androideabi-gcc +configure:4711: result: arm-linux-androideabi-gcc +configure:4980: checking for C compiler version +configure:4989: arm-linux-androideabi-gcc --version >&5 +arm-linux-androideabi-gcc (GCC) 4.6 20120106 (prerelease) +Copyright (C) 2011 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +configure:5000: $? = 0 +configure:4989: arm-linux-androideabi-gcc -v >&5 +Using built-in specs. +COLLECT_GCC=arm-linux-androideabi-gcc +COLLECT_LTO_WRAPPER=/opt/android-ndk-r8e/ndk-standalone/bin/../libexec/gcc/arm-linux-androideabi/4.6/lto-wrapper +Target: arm-linux-androideabi +Configured with: /s/ndk-toolchain/src/build/../gcc/gcc-4.6/configure --prefix=/tmp/ndk-andrewhsieh/build/toolchain/prefix --target=arm-linux-androideabi --host=x86_64-linux-gnu --build=x86_64-linux-gnu --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-mpfr=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-mpc=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-cloog=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --with-ppl=/tmp/ndk-andrewhsieh/build/toolchain/temp-install --disable-ppl-version-check --disable-cloog-version-check --enable-cloog-backend=isl --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --enable-initfini-array --disable-nls --prefix=/tmp/ndk-andrewhsieh/build/toolchain/prefix --with-sysroot=/tmp/ndk-andrewhsieh/build/toolchain/prefix/sysroot --with-binutils-version=2.21 --with-mpfr-version=3.1.1 --with-mpc-version=1.0.1 --with-gmp-version=5.0.5 --with-gcc-version=4.6 --with-gdb-version=7.3.x --with-gxx-include-dir=/tmp/ndk-andrewhsieh/build/toolchain/prefix/include/c++/4.6 --with-bugurl=http://source.android.com/source/report-bugs.html --disable-bootstrap --disable-libquadmath --enable-plugins --enable-libgomp --enable-gold --enable-graphite=yes --with-cloog-version=0.17.0 --with-ppl-version=1.0 --with-arch=armv5te --program-transform-name='s&^&arm-linux-androideabi-&' --enable-gold=default +Thread model: posix +gcc version 4.6 20120106 (prerelease) (GCC) +configure:5000: $? = 0 +configure:4989: arm-linux-androideabi-gcc -V >&5 +arm-linux-androideabi-gcc: error: unrecognized option '-V' +arm-linux-androideabi-gcc: fatal error: no input files +compilation terminated. +configure:5000: $? = 1 +configure:4989: arm-linux-androideabi-gcc -qversion >&5 +arm-linux-androideabi-gcc: error: unrecognized option '-qversion' +arm-linux-androideabi-gcc: fatal error: no input files +compilation terminated. +configure:5000: $? = 1 +configure:5004: checking whether we are using the GNU C compiler +configure:5032: result: yes +configure:5041: checking whether arm-linux-androideabi-gcc accepts -g +configure:5102: result: yes +configure:5119: checking for arm-linux-androideabi-gcc option to accept ISO C89 +configure:5195: result: none needed +configure:5220: checking whether arm-linux-androideabi-gcc understands -c and -o together +configure:5257: result: yes +configure:5276: checking dependency style of arm-linux-androideabi-gcc +configure:5387: result: gcc3 +configure:5407: checking how to run the C preprocessor +configure:5438: arm-linux-androideabi-gcc -E conftest.c +configure:5438: $? = 0 +configure:5452: arm-linux-androideabi-gcc -E conftest.c +conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory +compilation terminated. +configure:5452: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| /* end confdefs.h. */ +| #include +configure:5477: result: arm-linux-androideabi-gcc -E +configure:5497: arm-linux-androideabi-gcc -E conftest.c +configure:5497: $? = 0 +configure:5511: arm-linux-androideabi-gcc -E conftest.c +conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory +compilation terminated. +configure:5511: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| /* end confdefs.h. */ +| #include +configure:5540: checking for grep that handles long lines and -e +configure:5598: result: /bin/grep +configure:5603: checking for egrep +configure:5665: result: /bin/grep -E +configure:5671: checking for an ANSI C-conforming const +configure:5737: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5737: $? = 0 +configure:5744: result: yes +configure:5752: checking for inline +configure:5768: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5768: $? = 0 +configure:5776: result: inline +configure:5795: checking for ANSI C header files +configure:5815: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5815: $? = 0 +configure:5899: result: yes +configure:5912: checking for sys/types.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for sys/stat.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for stdlib.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for string.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for memory.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for strings.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for inttypes.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for stdint.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5912: checking for unistd.h +configure:5912: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:5912: $? = 0 +configure:5912: result: yes +configure:5924: checking whether byte ordering is bigendian +configure:5939: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:22:9: error: unknown type name 'not' +conftest.c:22:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'universal' +conftest.c:22:15: error: unknown type name 'universal' +configure:5939: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| /* end confdefs.h. */ +| #ifndef __APPLE_CC__ +| not a universal capable compiler +| #endif +| typedef int dummy; +| +configure:5984: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:28:8: error: unknown type name 'bogus' +conftest.c:28:21: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'macros' +configure:5984: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| #include +| +| int +| main () +| { +| #if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) +| bogus endian macros +| #endif +| +| ; +| return 0; +| } +configure:6028: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:27:8: error: unknown type name 'bogus' +conftest.c:27:21: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'macros' +configure:6028: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| +| int +| main () +| { +| #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) +| bogus endian macros +| #endif +| +| ; +| return 0; +| } +configure:6084: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:6084: $? = 0 +configure:6130: result: no +configure:6250: checking for lt_dlinit in -lltdl +configure:6275: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lltdl >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lltdl +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccaIoM2J.o: in function main:conftest.c:33: error: undefined reference to 'lt_dlinit' +collect2: ld returned 1 exit status +configure:6275: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char lt_dlinit (); +| int +| main () +| { +| return lt_dlinit (); +| ; +| return 0; +| } +configure:6284: result: no +configure:6306: WARNING: ltdl library not found +configure:6686: checking how to print strings +configure:6713: result: printf +configure:6734: checking for a sed that does not truncate output +configure:6798: result: /bin/sed +configure:6816: checking for fgrep +configure:6878: result: /bin/grep -F +configure:6913: checking for ld used by arm-linux-androideabi-gcc +configure:6980: result: /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld +configure:6987: checking if the linker (/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld) is GNU ld +configure:7002: result: yes +configure:7014: checking for BSD- or MS-compatible name lister (nm) +configure:7063: result: /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B +configure:7193: checking the name lister (/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B) interface +configure:7200: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:7203: /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B "conftest.o" +configure:7206: output +00000000 B some_variable +configure:7213: result: BSD nm +configure:7216: checking whether ln -s works +configure:7220: result: yes +configure:7228: checking the maximum length of command line arguments +configure:7358: result: 1572864 +configure:7375: checking whether the shell understands some XSI constructs +configure:7385: result: yes +configure:7389: checking whether the shell understands "+=" +configure:7395: result: yes +configure:7430: checking how to convert 86_64-unknown-linux-gnu file names to arm-unknown-linux-androideabi format +configure:7470: result: func_convert_file_noop +configure:7477: checking how to convert 86_64-unknown-linux-gnu file names to toolchain format +configure:7497: result: func_convert_file_noop +configure:7504: checking for /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld option to reload object files +configure:7511: result: -r +configure:7545: checking for arm-linux-androideabi-objdump +configure:7572: result: objdump +configure:7641: checking how to recognize dependent libraries +configure:7843: result: pass_all +configure:7888: checking for arm-linux-androideabi-dlltool +configure:7915: result: dlltool +configure:7985: checking how to associate runtime and link libraries +configure:8012: result: printf %s\n +configure:8028: checking for arm-linux-androideabi-ar +configure:8044: found /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-ar +configure:8055: result: arm-linux-androideabi-ar +configure:8136: checking for archiver @FILE support +configure:8153: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:8153: $? = 0 +configure:8156: arm-linux-androideabi-ar cru libconftest.a @conftest.lst >&5 +configure:8159: $? = 0 +configure:8164: arm-linux-androideabi-ar cru libconftest.a @conftest.lst >&5 +arm-linux-androideabi-ar: conftest.o: No such file or directory +configure:8167: $? = 1 +configure:8179: result: @ +configure:8197: checking for arm-linux-androideabi-strip +configure:8224: result: arm-linux-androideabi-strip +configure:8296: checking for arm-linux-androideabi-ranlib +configure:8312: found /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-ranlib +configure:8323: result: arm-linux-androideabi-ranlib +configure:8465: checking command to parse /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B output from arm-linux-androideabi-gcc object +configure:8585: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:8588: $? = 0 +configure:8592: /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm +configure:8595: $? = 0 +configure:8661: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c conftstm.o >&5 +configure:8664: $? = 0 +configure:8702: result: ok +configure:8739: checking for sysroot +configure:8769: result: no +configure:8985: checking for arm-linux-androideabi-mt +configure:9015: result: no +configure:9025: checking for mt +configure:9041: found /bin/mt +configure:9052: result: mt +configure:9064: WARNING: using cross tools not prefixed with host triplet +configure:9075: checking if mt is a manifest tool +configure:9081: mt '-?' +configure:9089: result: no +configure:9728: checking for dlfcn.h +configure:9728: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:9728: $? = 0 +configure:9728: result: yes +configure:9872: checking for objdir +configure:9887: result: .libs +configure:10158: checking if arm-linux-androideabi-gcc supports -fno-rtti -fno-exceptions +configure:10176: arm-linux-androideabi-gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 +cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default] +configure:10180: $? = 0 +configure:10193: result: no +configure:10520: checking for arm-linux-androideabi-gcc option to produce PIC +configure:10527: result: -fPIC -DPIC +configure:10535: checking if arm-linux-androideabi-gcc PIC flag -fPIC -DPIC works +configure:10553: arm-linux-androideabi-gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 +configure:10557: $? = 0 +configure:10570: result: yes +configure:10599: checking if arm-linux-androideabi-gcc static flag -static works +configure:10627: result: yes +configure:10642: checking if arm-linux-androideabi-gcc supports -c -o file.o +configure:10663: arm-linux-androideabi-gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 +configure:10667: $? = 0 +configure:10689: result: yes +configure:10697: checking if arm-linux-androideabi-gcc supports -c -o file.o +configure:10744: result: yes +configure:10777: checking whether the arm-linux-androideabi-gcc linker (/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld) supports shared libraries +configure:11930: result: yes +configure:11967: checking whether -lc should be explicitly linked in +configure:11975: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:11978: $? = 0 +configure:11993: arm-linux-androideabi-gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 +configure:11996: $? = 0 +configure:12010: result: no +configure:12170: checking dynamic linker characteristics +configure:12681: arm-linux-androideabi-gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5 +configure:12681: $? = 0 +configure:12903: result: GNU/Linux ld.so +configure:13010: checking how to hardcode library paths into programs +configure:13035: result: immediate +configure:13575: checking whether stripping libraries is possible +configure:13580: result: yes +configure:13615: checking if libtool supports shared libraries +configure:13617: result: yes +configure:13620: checking whether to build shared libraries +configure:13641: result: yes +configure:13644: checking whether to build static libraries +configure:13648: result: no +configure:14465: checking if .balign is present +configure:14470: result: yes +configure:14512: checking __attribute__((aligned(16))) +configure:14518: result: yes +configure:14530: checking if assembler supports AVX instructions +configure:14540: result: no +configure:14551: checking for yasm +configure:14567: found /usr/bin/yasm +configure:14578: result: yasm +configure:14591: checking if yasm supports GAS syntax and AVX instructions +configure:14598: result: yes +configure:14620: checking for ANSI C header files +configure:14724: result: yes +configure:14735: checking stdio.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking stdio.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for stdio.h +configure:14735: result: yes +configure:14735: checking for stdlib.h +configure:14735: result: yes +configure:14735: checking for string.h +configure:14735: result: yes +configure:14735: checking for unistd.h +configure:14735: result: yes +configure:14735: checking sched.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking sched.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for sched.h +configure:14735: result: yes +configure:14735: checking sys/ioctl.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking sys/ioctl.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for sys/ioctl.h +configure:14735: result: yes +configure:14735: checking for sys/types.h +configure:14735: result: yes +configure:14735: checking for stdint.h +configure:14735: result: yes +configure:14735: checking limits.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking limits.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for limits.h +configure:14735: result: yes +configure:14735: checking for inttypes.h +configure:14735: result: yes +configure:14735: checking sys/time.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking sys/time.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for sys/time.h +configure:14735: result: yes +configure:14735: checking sys/wait.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking sys/wait.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for sys/wait.h +configure:14735: result: yes +configure:14735: checking sys/resource.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking sys/resource.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for sys/resource.h +configure:14735: result: yes +configure:14735: checking sys/signal.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:77:24: fatal error: sys/signal.h: No such file or directory +compilation terminated. +configure:14735: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:14735: result: no +configure:14735: checking sys/signal.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +conftest.c:44:24: fatal error: sys/signal.h: No such file or directory +compilation terminated. +configure:14735: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| /* end confdefs.h. */ +| #include +configure:14735: result: no +configure:14735: checking for sys/signal.h +configure:14735: result: no +configure:14735: checking signal.h usability +configure:14735: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking signal.h presence +configure:14735: arm-linux-androideabi-gcc -E conftest.c +configure:14735: $? = 0 +configure:14735: result: yes +configure:14735: checking for signal.h +configure:14735: result: yes +configure:14755: checking for special C compiler options needed for large files +configure:14800: result: no +configure:14806: checking for _FILE_OFFSET_BITS value needed for large files +configure:14831: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:51:3: warning: left shift count >= width of type [enabled by default] +conftest.c:51:3: warning: left shift count >= width of type [enabled by default] +conftest.c:52:10: warning: left shift count >= width of type [enabled by default] +conftest.c:52:10: warning: left shift count >= width of type [enabled by default] +conftest.c:51:7: error: size of array 'off_t_is_large' is negative +conftest.c:53:9: warning: variably modified 'off_t_is_large' at file scope [enabled by default] +configure:14831: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| /* Check that off_t can represent 2**63 - 1 correctly. +| We can't simply define LARGE_OFF_T to be 9223372036854775807, +| since some C++ compilers masquerading as C compilers +| incorrectly reject 9223372036854775807. */ +| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +| int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +| && LARGE_OFF_T % 2147483647 == 1) +| ? 1 : -1]; +| int +| main () +| { +| +| ; +| return 0; +| } +configure:14855: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:52:3: warning: left shift count >= width of type [enabled by default] +conftest.c:52:3: warning: left shift count >= width of type [enabled by default] +conftest.c:53:10: warning: left shift count >= width of type [enabled by default] +conftest.c:53:10: warning: left shift count >= width of type [enabled by default] +conftest.c:52:7: error: size of array 'off_t_is_large' is negative +conftest.c:54:9: warning: variably modified 'off_t_is_large' at file scope [enabled by default] +configure:14855: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #define _FILE_OFFSET_BITS 64 +| #include +| /* Check that off_t can represent 2**63 - 1 correctly. +| We can't simply define LARGE_OFF_T to be 9223372036854775807, +| since some C++ compilers masquerading as C compilers +| incorrectly reject 9223372036854775807. */ +| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +| int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +| && LARGE_OFF_T % 2147483647 == 1) +| ? 1 : -1]; +| int +| main () +| { +| +| ; +| return 0; +| } +configure:14863: result: unknown +configure:14875: checking for _LARGE_FILES value needed for large files +configure:14900: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:51:3: warning: left shift count >= width of type [enabled by default] +conftest.c:51:3: warning: left shift count >= width of type [enabled by default] +conftest.c:52:10: warning: left shift count >= width of type [enabled by default] +conftest.c:52:10: warning: left shift count >= width of type [enabled by default] +conftest.c:51:7: error: size of array 'off_t_is_large' is negative +conftest.c:53:9: warning: variably modified 'off_t_is_large' at file scope [enabled by default] +configure:14900: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| /* Check that off_t can represent 2**63 - 1 correctly. +| We can't simply define LARGE_OFF_T to be 9223372036854775807, +| since some C++ compilers masquerading as C compilers +| incorrectly reject 9223372036854775807. */ +| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +| int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +| && LARGE_OFF_T % 2147483647 == 1) +| ? 1 : -1]; +| int +| main () +| { +| +| ; +| return 0; +| } +configure:14924: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:52:3: warning: left shift count >= width of type [enabled by default] +conftest.c:52:3: warning: left shift count >= width of type [enabled by default] +conftest.c:53:10: warning: left shift count >= width of type [enabled by default] +conftest.c:53:10: warning: left shift count >= width of type [enabled by default] +conftest.c:52:7: error: size of array 'off_t_is_large' is negative +conftest.c:54:9: warning: variably modified 'off_t_is_large' at file scope [enabled by default] +configure:14924: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #define _LARGE_FILES 1 +| #include +| /* Check that off_t can represent 2**63 - 1 correctly. +| We can't simply define LARGE_OFF_T to be 9223372036854775807, +| since some C++ compilers masquerading as C compilers +| incorrectly reject 9223372036854775807. */ +| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +| int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +| && LARGE_OFF_T % 2147483647 == 1) +| ? 1 : -1]; +| int +| main () +| { +| +| ; +| return 0; +| } +configure:14932: result: unknown +configure:14958: checking for size_t +configure:14958: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14958: $? = 0 +configure:14958: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:21: error: expected expression before ')' token +configure:14958: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((size_t))) +| return 0; +| ; +| return 0; +| } +configure:14958: result: yes +configure:14969: checking for uintptr_t +configure:14969: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14969: $? = 0 +configure:14969: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:24: error: expected expression before ')' token +configure:14969: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((uintptr_t))) +| return 0; +| ; +| return 0; +| } +configure:14969: result: yes +configure:14980: checking for ssize_t +configure:14980: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14980: $? = 0 +configure:14980: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:22: error: expected expression before ')' token +configure:14980: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((ssize_t))) +| return 0; +| ; +| return 0; +| } +configure:14980: result: yes +configure:14991: checking for off_t +configure:14991: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:14991: $? = 0 +configure:14991: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:20: error: expected expression before ')' token +configure:14991: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((off_t))) +| return 0; +| ; +| return 0; +| } +configure:14991: result: yes +configure:15002: checking for int32_t +configure:15002: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15002: $? = 0 +configure:15002: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:22: error: expected expression before ')' token +configure:15002: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((int32_t))) +| return 0; +| ; +| return 0; +| } +configure:15002: result: yes +configure:15013: checking for uint32_t +configure:15013: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15013: $? = 0 +configure:15013: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:23: error: expected expression before ')' token +configure:15013: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((uint32_t))) +| return 0; +| ; +| return 0; +| } +configure:15013: result: yes +configure:15024: checking for int16_t +configure:15024: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15024: $? = 0 +configure:15024: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:22: error: expected expression before ')' token +configure:15024: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((int16_t))) +| return 0; +| ; +| return 0; +| } +configure:15024: result: yes +configure:15035: checking for uint16_t +configure:15035: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15035: $? = 0 +configure:15035: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:23: error: expected expression before ')' token +configure:15035: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| if (sizeof ((uint16_t))) +| return 0; +| ; +| return 0; +| } +configure:15035: result: yes +configure:15050: checking size of size_t +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15055: $? = 0 +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:12: error: size of array 'test_array' is negative +configure:15055: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 0)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:12: error: size of array 'test_array' is negative +configure:15055: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 1)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:81:12: error: size of array 'test_array' is negative +configure:15055: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 3)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15055: $? = 0 +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15055: $? = 0 +configure:15055: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15055: $? = 0 +configure:15069: result: 4 +configure:15083: checking size of ssize_t +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15088: $? = 0 +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:82:12: error: size of array 'test_array' is negative +configure:15088: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= 0)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:82:12: error: size of array 'test_array' is negative +configure:15088: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= 1)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:82:12: error: size of array 'test_array' is negative +configure:15088: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= 3)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15088: $? = 0 +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15088: $? = 0 +configure:15088: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15088: $? = 0 +configure:15102: result: 4 +configure:15116: checking size of off_t +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15121: $? = 0 +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:83:12: error: size of array 'test_array' is negative +configure:15121: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= 0)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:83:12: error: size of array 'test_array' is negative +configure:15121: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= 1)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:83:12: error: size of array 'test_array' is negative +configure:15121: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= 3)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15121: $? = 0 +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15121: $? = 0 +configure:15121: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15121: $? = 0 +configure:15135: result: 4 +configure:15149: checking size of int32_t +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15154: $? = 0 +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:84:12: error: size of array 'test_array' is negative +configure:15154: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= 0)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:84:12: error: size of array 'test_array' is negative +configure:15154: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= 1)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:84:12: error: size of array 'test_array' is negative +configure:15154: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= 3)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15154: $? = 0 +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15154: $? = 0 +configure:15154: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15154: $? = 0 +configure:15168: result: 4 +configure:15182: checking size of long +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15187: $? = 0 +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:85:12: error: size of array 'test_array' is negative +configure:15187: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 0)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:85:12: error: size of array 'test_array' is negative +configure:15187: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 1)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:85:12: error: size of array 'test_array' is negative +configure:15187: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| int +| main () +| { +| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 3)]; +| test_array [0] = 0; +| return test_array [0]; +| +| ; +| return 0; +| } +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15187: $? = 0 +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15187: $? = 0 +configure:15187: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15187: $? = 0 +configure:15201: result: 4 +configure:15258: checking if we want to enable alias wrappers for largefile +configure:15261: result: yes +configure:15279: checking for stdlib.h +configure:15279: result: yes +configure:15279: checking for unistd.h +configure:15279: result: yes +configure:15279: checking for sys/param.h +configure:15279: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15279: $? = 0 +configure:15279: result: yes +configure:15299: checking for getpagesize +configure:15299: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccWsuoQr.o: in function main:conftest.c:89: error: undefined reference to 'getpagesize' +collect2: ld returned 1 exit status +configure:15299: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| /* end confdefs.h. */ +| /* Define getpagesize to an innocuous variant, in case declares getpagesize. +| For example, HP-UX 11i declares gettimeofday. */ +| #define getpagesize innocuous_getpagesize +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char getpagesize (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef getpagesize +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char getpagesize (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_getpagesize || defined __stub___getpagesize +| choke me +| #endif +| +| int +| main () +| { +| return getpagesize (); +| ; +| return 0; +| } +configure:15299: result: no +configure:15308: checking for working mmap +configure:15465: result: no +configure:15476: checking POSIX termios +configure:15496: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15496: $? = 0 +configure:15504: result: yes +configure:15518: checking for random +configure:15518: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccMJcYzS.o: in function main:conftest.c:90: error: undefined reference to 'random' +collect2: ld returned 1 exit status +configure:15518: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| /* end confdefs.h. */ +| /* Define random to an innocuous variant, in case declares random. +| For example, HP-UX 11i declares gettimeofday. */ +| #define random innocuous_random +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char random (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef random +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char random (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_random || defined __stub___random +| choke me +| #endif +| +| int +| main () +| { +| return random (); +| ; +| return 0; +| } +configure:15518: result: no +configure:15532: checking for sched_setscheduler +configure:15532: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15532: $? = 0 +configure:15532: result: yes +configure:15532: checking for setuid +configure:15532: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15532: $? = 0 +configure:15532: result: yes +configure:15532: checking for getuid +configure:15532: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15532: $? = 0 +configure:15532: result: yes +configure:15546: checking for setpriority +configure:15546: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15546: $? = 0 +configure:15546: result: yes +configure:15559: checking for strerror +configure:15559: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15559: $? = 0 +configure:15559: result: yes +configure:15572: checking for setlocale +configure:15572: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15572: $? = 0 +configure:15572: result: yes +configure:15572: checking for nl_langinfo +configure:15572: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccuXtJjQ.o: in function main:conftest.c:96: error: undefined reference to 'nl_langinfo' +collect2: ld returned 1 exit status +configure:15572: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| /* end confdefs.h. */ +| /* Define nl_langinfo to an innocuous variant, in case declares nl_langinfo. +| For example, HP-UX 11i declares gettimeofday. */ +| #define nl_langinfo innocuous_nl_langinfo +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char nl_langinfo (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef nl_langinfo +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char nl_langinfo (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_nl_langinfo || defined __stub___nl_langinfo +| choke me +| #endif +| +| int +| main () +| { +| return nl_langinfo (); +| ; +| return 0; +| } +configure:15572: result: no +configure:15585: checking for strdup +configure:15585: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +conftest.c:85:6: warning: conflicting types for built-in function 'strdup' [enabled by default] +configure:15585: $? = 0 +configure:15585: result: yes +configure:15598: checking for atoll +configure:15598: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15598: $? = 0 +configure:15598: result: yes +configure:15610: checking for mkfifo +configure:15610: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/cceKGVAo.o: in function main:conftest.c:98: error: undefined reference to 'mkfifo' +collect2: ld returned 1 exit status +configure:15610: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| /* end confdefs.h. */ +| /* Define mkfifo to an innocuous variant, in case declares mkfifo. +| For example, HP-UX 11i declares gettimeofday. */ +| #define mkfifo innocuous_mkfifo +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char mkfifo (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef mkfifo +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char mkfifo (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_mkfifo || defined __stub___mkfifo +| choke me +| #endif +| +| int +| main () +| { +| return mkfifo (); +| ; +| return 0; +| } +configure:15610: result: no +configure:15627: checking locale.h usability +configure:15627: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15627: $? = 0 +configure:15627: result: yes +configure:15627: checking locale.h presence +configure:15627: arm-linux-androideabi-gcc -E conftest.c +configure:15627: $? = 0 +configure:15627: result: yes +configure:15627: checking for locale.h +configure:15627: result: yes +configure:15627: checking langinfo.h usability +configure:15627: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:98:22: fatal error: langinfo.h: No such file or directory +compilation terminated. +configure:15627: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:15627: result: no +configure:15627: checking langinfo.h presence +configure:15627: arm-linux-androideabi-gcc -E conftest.c +conftest.c:65:22: fatal error: langinfo.h: No such file or directory +compilation terminated. +configure:15627: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| /* end confdefs.h. */ +| #include +configure:15627: result: no +configure:15627: checking for langinfo.h +configure:15627: result: no +configure:15642: checking netdb.h usability +configure:15642: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking netdb.h presence +configure:15642: arm-linux-androideabi-gcc -E conftest.c +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking for netdb.h +configure:15642: result: yes +configure:15642: checking for sys/param.h +configure:15642: result: yes +configure:15642: checking sys/socket.h usability +configure:15642: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking sys/socket.h presence +configure:15642: arm-linux-androideabi-gcc -E conftest.c +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking for sys/socket.h +configure:15642: result: yes +configure:15642: checking netinet/in.h usability +configure:15642: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking netinet/in.h presence +configure:15642: arm-linux-androideabi-gcc -E conftest.c +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking for netinet/in.h +configure:15642: result: yes +configure:15642: checking arpa/inet.h usability +configure:15642: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking arpa/inet.h presence +configure:15642: arm-linux-androideabi-gcc -E conftest.c +configure:15642: $? = 0 +configure:15642: result: yes +configure:15642: checking for arpa/inet.h +configure:15642: result: yes +configure:15663: checking for library containing gethostbyname +configure:15694: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15694: $? = 0 +configure:15711: result: none required +configure:15719: checking for library containing socket +configure:15750: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15750: $? = 0 +configure:15767: result: none required +configure:15778: checking for getaddrinfo +configure:15778: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c >&5 +configure:15778: $? = 0 +configure:15778: result: yes +configure:15791: checking for working AI_ADDRCONFIG +configure:15836: result: no +configure:15870: checking for sqrt in -lm +configure:15895: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lm >&5 +conftest.c:78:6: warning: conflicting types for built-in function 'sqrt' [enabled by default] +configure:15895: $? = 0 +configure:15904: result: yes +configure:15915: checking for powf in -lmx +configure:15940: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lmx -lm >&5 +conftest.c:79:6: warning: conflicting types for built-in function 'powf' [enabled by default] +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lmx +collect2: ld returned 1 exit status +configure:15940: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char powf (); +| int +| main () +| { +| return powf (); +| ; +| return 0; +| } +configure:15949: result: no +configure:15979: checking os2.h usability +configure:15979: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:105:17: fatal error: os2.h: No such file or directory +compilation terminated. +configure:15979: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:15979: result: no +configure:15979: checking os2.h presence +configure:15979: arm-linux-androideabi-gcc -E conftest.c +conftest.c:72:17: fatal error: os2.h: No such file or directory +compilation terminated. +configure:15979: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +configure:15979: result: no +configure:15979: checking for os2.h +configure:15979: result: no +configure:15986: checking for tcsetattr in -los2term +configure:16011: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -los2term -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -los2term +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccesypax.o: in function main:conftest.c:83: error: undefined reference to 'tcsetattr' +collect2: ld returned 1 exit status +configure:16011: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char tcsetattr (); +| int +| main () +| { +| return tcsetattr (); +| ; +| return 0; +| } +configure:16020: result: no +configure:16286: checking if we want feature report function +configure:16302: result: yes +configure:16372: checking for arm-linux-androideabi-pkg-config +configure:16405: result: no +configure:16415: checking for pkg-config +configure:16433: found /usr/bin/pkg-config +configure:16445: result: /usr/bin/pkg-config +configure:16470: checking pkg-config is at least version 0.9.0 +configure:16473: result: yes +configure:16585: checking for snd_pcm_open in -lasound +configure:16610: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lasound -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lasound +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccEwCVEO.o: in function main:conftest.c:83: error: undefined reference to 'snd_pcm_open' +collect2: ld returned 1 exit status +configure:16610: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char snd_pcm_open (); +| int +| main () +| { +| return snd_pcm_open (); +| ; +| return 0; +| } +configure:16619: result: no +configure:16522: checking for pcm_open in -ltinyalsa +configure:16547: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -ltinyalsa -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -ltinyalsa +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccKD3zH1.o: in function main:conftest.c:83: error: undefined reference to 'pcm_open' +collect2: ld returned 1 exit status +configure:16547: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char pcm_open (); +| int +| main () +| { +| return pcm_open (); +| ; +| return 0; +| } +configure:16556: result: no +configure:16499: checking sys/soundcard.h usability +configure:16499: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:105:27: fatal error: sys/soundcard.h: No such file or directory +compilation terminated. +configure:16499: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:16499: result: no +configure:16499: checking sys/soundcard.h presence +configure:16499: arm-linux-androideabi-gcc -E conftest.c +conftest.c:72:27: fatal error: sys/soundcard.h: No such file or directory +compilation terminated. +configure:16499: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +configure:16499: result: no +configure:16499: checking for sys/soundcard.h +configure:16499: result: no +configure:16499: checking linux/soundcard.h usability +configure:16499: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +configure:16499: $? = 0 +configure:16499: result: yes +configure:16499: checking linux/soundcard.h presence +configure:16499: arm-linux-androideabi-gcc -E conftest.c +configure:16499: $? = 0 +configure:16499: result: yes +configure:16499: checking for linux/soundcard.h +configure:16499: result: yes +configure:16499: checking machine/soundcard.h usability +configure:16499: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:31: fatal error: machine/soundcard.h: No such file or directory +compilation terminated. +configure:16499: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:16499: result: no +configure:16499: checking machine/soundcard.h presence +configure:16499: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:31: fatal error: machine/soundcard.h: No such file or directory +compilation terminated. +configure:16499: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:16499: result: no +configure:16499: checking for machine/soundcard.h +configure:16499: result: no +configure:17356: checking AudioUnit/AudioUnit.h usability +configure:17356: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:33: fatal error: AudioUnit/AudioUnit.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17356: result: no +configure:17356: checking AudioUnit/AudioUnit.h presence +configure:17356: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:33: fatal error: AudioUnit/AudioUnit.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17356: result: no +configure:17356: checking for AudioUnit/AudioUnit.h +configure:17356: result: no +configure:17356: checking CoreServices/CoreServices.h usability +configure:17356: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:39: fatal error: CoreServices/CoreServices.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17356: result: no +configure:17356: checking CoreServices/CoreServices.h presence +configure:17356: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:39: fatal error: CoreServices/CoreServices.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17356: result: no +configure:17356: checking for CoreServices/CoreServices.h +configure:17356: result: no +configure:17356: checking AudioToolbox/AudioToolbox.h usability +configure:17356: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:39: fatal error: AudioToolbox/AudioToolbox.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17356: result: no +configure:17356: checking AudioToolbox/AudioToolbox.h presence +configure:17356: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:39: fatal error: AudioToolbox/AudioToolbox.h: No such file or directory +compilation terminated. +configure:17356: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17356: result: no +configure:17356: checking for AudioToolbox/AudioToolbox.h +configure:17356: result: no +configure:17270: checking for sio_open in -lsndio +configure:17295: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lsndio -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lsndio +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/cc0UZHe8.o: in function main:conftest.c:84: error: undefined reference to 'sio_open' +collect2: ld returned 1 exit status +configure:17295: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char sio_open (); +| int +| main () +| { +| return sio_open (); +| ; +| return 0; +| } +configure:17304: result: no +configure:17331: checking sun/audioio.h usability +configure:17331: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:25: fatal error: sun/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17331: result: no +configure:17331: checking sun/audioio.h presence +configure:17331: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:25: fatal error: sun/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17331: result: no +configure:17331: checking for sun/audioio.h +configure:17331: result: no +configure:17331: checking sys/audioio.h usability +configure:17331: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:25: fatal error: sys/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17331: result: no +configure:17331: checking sys/audioio.h presence +configure:17331: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:25: fatal error: sys/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17331: result: no +configure:17331: checking for sys/audioio.h +configure:17331: result: no +configure:17331: checking asm/audioio.h usability +configure:17331: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:25: fatal error: asm/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17331: result: no +configure:17331: checking asm/audioio.h presence +configure:17331: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:25: fatal error: asm/audioio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17331: result: no +configure:17331: checking for asm/audioio.h +configure:17331: result: no +configure:17331: checking sys/audio.h usability +configure:17331: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:23: fatal error: sys/audio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17331: result: no +configure:17331: checking sys/audio.h presence +configure:17331: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:23: fatal error: sys/audio.h: No such file or directory +compilation terminated. +configure:17331: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17331: result: no +configure:17331: checking for sys/audio.h +configure:17331: result: no +configure:17209: checking windows.h usability +configure:17209: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:21: fatal error: windows.h: No such file or directory +compilation terminated. +configure:17209: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17209: result: no +configure:17209: checking windows.h presence +configure:17209: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:21: fatal error: windows.h: No such file or directory +compilation terminated. +configure:17209: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17209: result: no +configure:17209: checking for windows.h +configure:17209: result: no +configure:17226: checking if we have wasapi headers +configure:17251: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lm -lole32 -lavrt >&5 +conftest.c:76:22: fatal error: initguid.h: No such file or directory +compilation terminated. +configure:17251: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| +| #define COBJMACROS 1 +| #define _WIN32_WINNT 0x601 +| #include +| #include +| #include +| #include +| int main(){ +| /* UUID Checks */ +| GUID *IDs = { +| &CLSID_MMDeviceEnumerator, +| &IID_IMMDeviceEnumerator, +| &IID_IAudioClient, +| &IID_IAudioRenderClient +| }; +| return 0; +| } +| +configure:17260: result: no +configure:17440: checking for os2.h +configure:17440: result: no +configure:16845: checking for ESD +configure:16852: $PKG_CONFIG --exists --print-errors "esound" +Package esound was not found in the pkg-config search path. +Perhaps you should add the directory containing `esound.pc' +to the PKG_CONFIG_PATH environment variable +No package 'esound' found +configure:16855: $? = 1 +configure:16868: $PKG_CONFIG --exists --print-errors "esound" +Package esound was not found in the pkg-config search path. +Perhaps you should add the directory containing `esound.pc' +to the PKG_CONFIG_PATH environment variable +No package 'esound' found +configure:16871: $? = 1 +No package 'esound' found +configure:16898: result: no +configure:16707: checking for JACK +configure:16714: $PKG_CONFIG --exists --print-errors "jack" +Package jack was not found in the pkg-config search path. +Perhaps you should add the directory containing `jack.pc' +to the PKG_CONFIG_PATH environment variable +No package 'jack' found +configure:16717: $? = 1 +configure:16730: $PKG_CONFIG --exists --print-errors "jack" +Package jack was not found in the pkg-config search path. +Perhaps you should add the directory containing `jack.pc' +to the PKG_CONFIG_PATH environment variable +No package 'jack' found +configure:16733: $? = 1 +No package 'jack' found +configure:16760: result: no +configure:16975: checking for Pa_Initialize in -lportaudio +configure:17000: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -lportaudio -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lportaudio +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccE8NUwi.o: in function main:conftest.c:84: error: undefined reference to 'Pa_Initialize' +collect2: ld returned 1 exit status +configure:17000: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char Pa_Initialize (); +| int +| main () +| { +| return Pa_Initialize (); +| ; +| return 0; +| } +configure:17009: result: no +configure:16776: checking for PULSE +configure:16783: $PKG_CONFIG --exists --print-errors "libpulse-simple" +configure:16786: $? = 0 +configure:16799: $PKG_CONFIG --exists --print-errors "libpulse-simple" +configure:16802: $? = 0 +configure:16837: result: yes +configure:17080: checking for SDL +configure:17087: $PKG_CONFIG --exists --print-errors "sdl" +configure:17090: $? = 0 +configure:17103: $PKG_CONFIG --exists --print-errors "sdl" +configure:17106: $? = 0 +configure:17141: result: yes +configure:17148: checking for AuOpenServer in -laudio +configure:17173: arm-linux-androideabi-gcc -o conftest -g -O2 conftest.c -laudio -lm >&5 +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: error: cannot find -laudio +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/../../../../arm-linux-androideabi/bin/ld: /tmp/ccoi6igD.o: in function main:conftest.c:84: error: undefined reference to 'AuOpenServer' +collect2: ld returned 1 exit status +configure:17173: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char AuOpenServer (); +| int +| main () +| { +| return AuOpenServer (); +| ; +| return 0; +| } +configure:17182: result: no +configure:17382: checking for artsc +configure:17392: result: no +configure:17401: checking OpenAL/al.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:23: fatal error: OpenAL/al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking OpenAL/al.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:23: fatal error: OpenAL/al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for OpenAL/al.h +configure:17401: result: no +configure:17401: checking OpenAL/alc.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:24: fatal error: OpenAL/alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking OpenAL/alc.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:24: fatal error: OpenAL/alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for OpenAL/alc.h +configure:17401: result: no +configure:17401: checking AL/al.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:19: fatal error: AL/al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking AL/al.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:19: fatal error: AL/al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for AL/al.h +configure:17401: result: no +configure:17401: checking AL/alc.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:20: fatal error: AL/alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking AL/alc.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:20: fatal error: AL/alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for AL/alc.h +configure:17401: result: no +configure:17401: checking al.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:16: fatal error: al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking al.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:16: fatal error: al.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for al.h +configure:17401: result: no +configure:17401: checking alc.h usability +configure:17401: arm-linux-androideabi-gcc -c -g -O2 conftest.c >&5 +conftest.c:106:17: fatal error: alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +| #ifdef HAVE_SYS_TYPES_H +| # include +| #endif +| #ifdef HAVE_SYS_STAT_H +| # include +| #endif +| #ifdef STDC_HEADERS +| # include +| # include +| #else +| # ifdef HAVE_STDLIB_H +| # include +| # endif +| #endif +| #ifdef HAVE_STRING_H +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #ifdef HAVE_STRINGS_H +| # include +| #endif +| #ifdef HAVE_INTTYPES_H +| # include +| #endif +| #ifdef HAVE_STDINT_H +| # include +| #endif +| #ifdef HAVE_UNISTD_H +| # include +| #endif +| #include +configure:17401: result: no +configure:17401: checking alc.h presence +configure:17401: arm-linux-androideabi-gcc -E conftest.c +conftest.c:73:17: fatal error: alc.h: No such file or directory +compilation terminated. +configure:17401: $? = 1 +configure: failed program was: +| /* confdefs.h */ +| #define PACKAGE_NAME "mpg123" +| #define PACKAGE_TARNAME "mpg123" +| #define PACKAGE_VERSION "1.17.0" +| #define PACKAGE_STRING "mpg123 1.17.0" +| #define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +| #define PACKAGE_URL "" +| #define PACKAGE "mpg123" +| #define VERSION "1.17.0" +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define DYNAMIC_BUILD 1 +| #define HAVE_DLFCN_H 1 +| #define LT_OBJDIR ".libs/" +| #define GAPLESS 1 +| #define USE_NEW_HUFFTABLE 1 +| #define NO_32BIT 1 +| #define NO_REAL 1 +| #define MODULE_FILE_SUFFIX ".la" +| #define ASMALIGN_BALIGN 1 +| #define STDC_HEADERS 1 +| #define HAVE_STDIO_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SCHED_H 1 +| #define HAVE_SYS_IOCTL_H 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_LIMITS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_SYS_TIME_H 1 +| #define HAVE_SYS_WAIT_H 1 +| #define HAVE_SYS_RESOURCE_H 1 +| #define HAVE_SIGNAL_H 1 +| #define SIZEOF_SIZE_T 4 +| #define SIZEOF_SSIZE_T 4 +| #define SIZEOF_OFF_T 4 +| #define SIZEOF_INT32_T 4 +| #define SIZEOF_LONG 4 +| #define lfs_alias_t off_t +| #define LFS_ALIAS_BITS 32 +| #define HAVE_STDLIB_H 1 +| #define HAVE_UNISTD_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_TERMIOS 1 +| #define HAVE_SCHED_SETSCHEDULER 1 +| #define HAVE_SETUID 1 +| #define HAVE_GETUID 1 +| #define HAVE_SETPRIORITY 1 +| #define HAVE_STRERROR 1 +| #define HAVE_SETLOCALE 1 +| #define HAVE_STRDUP 1 +| #define HAVE_ATOLL 1 +| #define HAVE_LOCALE_H 1 +| #define HAVE_NETDB_H 1 +| #define HAVE_SYS_PARAM_H 1 +| #define HAVE_SYS_SOCKET_H 1 +| #define HAVE_NETINET_IN_H 1 +| #define HAVE_ARPA_INET_H 1 +| #define HAVE_GETADDRINFO 1 +| #define HAVE_LIBM 1 +| #define HAVE_LINUX_SOUNDCARD_H 1 +| /* end confdefs.h. */ +| #include +configure:17401: result: no +configure:17401: checking for alc.h +configure:17401: result: no +configure:16488: checking if you are too dumbing dumb for the dummy +configure:16490: result: no +configure:18124: checking for windows.h +configure:18124: result: no +configure:18384: checking if we have EOVERFLOW macro +configure:18393: arm-linux-androideabi-gcc -c -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 -DOPT_ARM -DREAL_IS_FIXED conftest.c >&5 +configure:18393: $? = 0 +configure:18399: result: yes +configure:18591: checking that generated files are newer than configure +configure:18597: result: done +configure:18737: creating ./config.status + +## ---------------------- ## +## Running config.status. ## +## ---------------------- ## + +This file was extended by mpg123 config.status 1.17.0, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + +on ilium + +config.status:1296: creating Makefile +config.status:1296: creating libmpg123.pc +config.status:1296: creating mpg123.spec +config.status:1296: creating doc/Makefile +config.status:1296: creating src/Makefile +config.status:1296: creating src/output/Makefile +config.status:1296: creating src/libmpg123/Makefile +config.status:1296: creating src/libmpg123/mpg123.h +config.status:1296: creating src/config.h +config.status:1477: src/config.h is unchanged +config.status:1525: executing depfiles commands +config.status:1525: executing libtool commands + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_build=86_64-unknown-linux-gnu +ac_cv_c_bigendian=no +ac_cv_c_compiler_gnu=yes +ac_cv_c_const=yes +ac_cv_c_inline=inline +ac_cv_env_CCASFLAGS_set= +ac_cv_env_CCASFLAGS_value= +ac_cv_env_CCAS_set= +ac_cv_env_CCAS_value= +ac_cv_env_CC_set=set +ac_cv_env_CC_value=arm-linux-androideabi-gcc +ac_cv_env_CFLAGS_set= +ac_cv_env_CFLAGS_value= +ac_cv_env_CPPFLAGS_set= +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_ESD_CFLAGS_set= +ac_cv_env_ESD_CFLAGS_value= +ac_cv_env_ESD_LIBS_set= +ac_cv_env_ESD_LIBS_value= +ac_cv_env_JACK_CFLAGS_set= +ac_cv_env_JACK_CFLAGS_value= +ac_cv_env_JACK_LIBS_set= +ac_cv_env_JACK_LIBS_value= +ac_cv_env_LDFLAGS_set= +ac_cv_env_LDFLAGS_value= +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_PKG_CONFIG_set= +ac_cv_env_PKG_CONFIG_value= +ac_cv_env_PULSE_CFLAGS_set= +ac_cv_env_PULSE_CFLAGS_value= +ac_cv_env_PULSE_LIBS_set= +ac_cv_env_PULSE_LIBS_value= +ac_cv_env_SDL_CFLAGS_set= +ac_cv_env_SDL_CFLAGS_value= +ac_cv_env_SDL_LIBS_set= +ac_cv_env_SDL_LIBS_value= +ac_cv_env_build_alias_set=set +ac_cv_env_build_alias_value=86_64-unknown-linux-gnu +ac_cv_env_host_alias_set=set +ac_cv_env_host_alias_value=arm-linux-androideabi +ac_cv_env_target_alias_set=set +ac_cv_env_target_alias_value=arm-linux-androideabi +ac_cv_func_atoll=yes +ac_cv_func_getaddrinfo=yes +ac_cv_func_getpagesize=no +ac_cv_func_getuid=yes +ac_cv_func_mkfifo=no +ac_cv_func_mmap_fixed_mapped=no +ac_cv_func_nl_langinfo=no +ac_cv_func_random=no +ac_cv_func_sched_setscheduler=yes +ac_cv_func_setlocale=yes +ac_cv_func_setpriority=yes +ac_cv_func_setuid=yes +ac_cv_func_strdup=yes +ac_cv_func_strerror=yes +ac_cv_header_AL_al_h=no +ac_cv_header_AL_alc_h=no +ac_cv_header_AudioToolbox_AudioToolbox_h=no +ac_cv_header_AudioUnit_AudioUnit_h=no +ac_cv_header_CoreServices_CoreServices_h=no +ac_cv_header_OpenAL_al_h=no +ac_cv_header_OpenAL_alc_h=no +ac_cv_header_al_h=no +ac_cv_header_alc_h=no +ac_cv_header_arpa_inet_h=yes +ac_cv_header_asm_audioio_h=no +ac_cv_header_dlfcn_h=yes +ac_cv_header_inttypes_h=yes +ac_cv_header_langinfo_h=no +ac_cv_header_limits_h=yes +ac_cv_header_linux_soundcard_h=yes +ac_cv_header_locale_h=yes +ac_cv_header_machine_soundcard_h=no +ac_cv_header_memory_h=yes +ac_cv_header_netdb_h=yes +ac_cv_header_netinet_in_h=yes +ac_cv_header_os2_h=no +ac_cv_header_sched_h=yes +ac_cv_header_signal_h=yes +ac_cv_header_stdc=yes +ac_cv_header_stdint_h=yes +ac_cv_header_stdio_h=yes +ac_cv_header_stdlib_h=yes +ac_cv_header_string_h=yes +ac_cv_header_strings_h=yes +ac_cv_header_sun_audioio_h=no +ac_cv_header_sys_audio_h=no +ac_cv_header_sys_audioio_h=no +ac_cv_header_sys_ioctl_h=yes +ac_cv_header_sys_param_h=yes +ac_cv_header_sys_resource_h=yes +ac_cv_header_sys_signal_h=no +ac_cv_header_sys_socket_h=yes +ac_cv_header_sys_soundcard_h=no +ac_cv_header_sys_stat_h=yes +ac_cv_header_sys_time_h=yes +ac_cv_header_sys_types_h=yes +ac_cv_header_sys_wait_h=yes +ac_cv_header_unistd_h=yes +ac_cv_header_windows_h=no +ac_cv_host=arm-unknown-linux-androideabi +ac_cv_lib_asound_snd_pcm_open=no +ac_cv_lib_audio_AuOpenServer=no +ac_cv_lib_ltdl_lt_dlinit=no +ac_cv_lib_m_sqrt=yes +ac_cv_lib_mx_powf=no +ac_cv_lib_os2term_tcsetattr=no +ac_cv_lib_portaudio_Pa_Initialize=no +ac_cv_lib_sndio_sio_open=no +ac_cv_lib_tinyalsa_pcm_open=no +ac_cv_objext=o +ac_cv_path_EGREP='/bin/grep -E' +ac_cv_path_FGREP='/bin/grep -F' +ac_cv_path_GREP=/bin/grep +ac_cv_path_SED=/bin/sed +ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config +ac_cv_path_install='/usr/bin/install -c' +ac_cv_path_mkdir=/bin/mkdir +ac_cv_prog_AR=arm-linux-androideabi-ar +ac_cv_prog_AWK=mawk +ac_cv_prog_CC=arm-linux-androideabi-gcc +ac_cv_prog_CPP='arm-linux-androideabi-gcc -E' +ac_cv_prog_DLLTOOL=dlltool +ac_cv_prog_OBJDUMP=objdump +ac_cv_prog_RANLIB=arm-linux-androideabi-ranlib +ac_cv_prog_STRIP=arm-linux-androideabi-strip +ac_cv_prog_YASM=yasm +ac_cv_prog_ac_ct_MANIFEST_TOOL=mt +ac_cv_prog_cc_c89= +ac_cv_prog_cc_g=yes +ac_cv_prog_make_make_set=yes +ac_cv_search_gethostbyname='none required' +ac_cv_search_socket='none required' +ac_cv_sizeof_int32_t=4 +ac_cv_sizeof_long=4 +ac_cv_sizeof_off_t=4 +ac_cv_sizeof_size_t=4 +ac_cv_sizeof_ssize_t=4 +ac_cv_sys_file_offset_bits=unknown +ac_cv_sys_large_files=unknown +ac_cv_sys_largefile_CC=no +ac_cv_sys_posix_termios=yes +ac_cv_type_int16_t=yes +ac_cv_type_int32_t=yes +ac_cv_type_off_t=yes +ac_cv_type_size_t=yes +ac_cv_type_ssize_t=yes +ac_cv_type_uint16_t=yes +ac_cv_type_uint32_t=yes +ac_cv_type_uintptr_t=yes +am_cv_CCAS_dependencies_compiler_type=gcc3 +am_cv_CC_dependencies_compiler_type=gcc3 +am_cv_make_support_nested_variables=yes +am_cv_prog_cc_c_o=yes +apr_cv_gai_addrconfig=no +lt_cv_ar_at_file=@ +lt_cv_archive_cmds_need_lc=no +lt_cv_deplibs_check_method=pass_all +lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_ld_reload_flag=-r +lt_cv_nm_interface='BSD nm' +lt_cv_objdir=.libs +lt_cv_path_LD=/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld +lt_cv_path_NM='/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B' +lt_cv_path_mainfest_tool=no +lt_cv_prog_compiler_c_o=yes +lt_cv_prog_compiler_pic='-fPIC -DPIC' +lt_cv_prog_compiler_pic_works=yes +lt_cv_prog_compiler_rtti_exceptions=no +lt_cv_prog_compiler_static_works=yes +lt_cv_prog_gnu_ld=yes +lt_cv_sharedlib_from_linklib_cmd='printf %s\n' +lt_cv_shlibpath_overrides_runpath=no +lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' +lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\''' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\''' +lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' +lt_cv_sys_max_cmd_len=1572864 +lt_cv_to_host_file_cmd=func_convert_file_noop +lt_cv_to_tool_file_cmd=func_convert_file_noop +pkg_cv_PULSE_CFLAGS='-D_REENTRANT ' +pkg_cv_PULSE_LIBS='-lpulse-simple -lpulse ' +pkg_cv_SDL_CFLAGS='-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL ' +pkg_cv_SDL_LIBS='-lSDL ' + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +ACLOCAL='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14' +AIX_CFLAGS='' +AIX_LDFLAGS='' +AIX_LIBS='' +ALIB_CFLAGS='' +ALIB_LDFLAGS='' +ALIB_LIBS='' +ALSA_CFLAGS='' +ALSA_LDFLAGS='' +ALSA_LIBS='-lasound' +AMDEPBACKSLASH='\' +AMDEP_FALSE='#' +AMDEP_TRUE='' +AMTAR='$${TAR-tar}' +AM_BACKSLASH='\' +AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +AM_DEFAULT_VERBOSITY='1' +AM_V='$(V)' +API_VERSION='38' +AR='arm-linux-androideabi-ar' +ARTS_CFLAGS='' +ARTS_LDFLAGS='' +ARTS_LIBS='' +AS='as' +AUTOCONF='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf' +AUTOHEADER='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader' +AUTOMAKE='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14' +AWK='mawk' +CC='arm-linux-androideabi-gcc' +CCAS='arm-linux-androideabi-gcc' +CCASDEPMODE='depmode=gcc3' +CCASFLAGS='-g -O2' +CCDEPMODE='depmode=gcc3' +CFLAGS='-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2' +COREAUDIO_CFLAGS='' +COREAUDIO_LDFLAGS='' +COREAUDIO_LIBS='-framework AudioToolbox -framework AudioUnit -framework CoreServices' +CPP='arm-linux-androideabi-gcc -E' +CPPFLAGS=' -DOPT_ARM -DREAL_IS_FIXED ' +CYGPATH_W='echo' +DECODER_LOBJ=' stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo' +DECODER_OBJ=' stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT)' +DEFS='-DHAVE_CONFIG_H' +DEPDIR='.deps' +DLLTOOL='dlltool' +DSYMUTIL='' +DUMMY_CFLAGS='' +DUMMY_LDFLAGS='' +DUMMY_LIBS='' +DUMPBIN='' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EGREP='/bin/grep -E' +ESD_CFLAGS='' +ESD_LDFLAGS='' +ESD_LIBS='' +EXEC_LT_LDFLAGS='' +EXEEXT='' +FGREP='/bin/grep -F' +GREP='/bin/grep' +HAVE_AIX_FALSE='' +HAVE_AIX_TRUE='#' +HAVE_ALIB_FALSE='' +HAVE_ALIB_TRUE='#' +HAVE_ALSA_FALSE='' +HAVE_ALSA_TRUE='#' +HAVE_ARTS_FALSE='' +HAVE_ARTS_TRUE='#' +HAVE_COREAUDIO_FALSE='' +HAVE_COREAUDIO_TRUE='#' +HAVE_DUMMY_FALSE='#' +HAVE_DUMMY_TRUE='' +HAVE_ESD_FALSE='' +HAVE_ESD_TRUE='#' +HAVE_HP_FALSE='' +HAVE_HP_TRUE='#' +HAVE_JACK_FALSE='' +HAVE_JACK_TRUE='#' +HAVE_MINT_FALSE='' +HAVE_MINT_TRUE='#' +HAVE_MODULES_FALSE='' +HAVE_MODULES_TRUE='#' +HAVE_NAS_FALSE='' +HAVE_NAS_TRUE='#' +HAVE_OPENAL_FALSE='' +HAVE_OPENAL_TRUE='#' +HAVE_OS2_FALSE='' +HAVE_OS2_TRUE='#' +HAVE_OSS_FALSE='#' +HAVE_OSS_TRUE='' +HAVE_PORTAUDIO_FALSE='' +HAVE_PORTAUDIO_TRUE='#' +HAVE_PULSE_FALSE='#' +HAVE_PULSE_TRUE='' +HAVE_QSA_FALSE='' +HAVE_QSA_TRUE='#' +HAVE_SDL_FALSE='#' +HAVE_SDL_TRUE='' +HAVE_SGI_FALSE='' +HAVE_SGI_TRUE='#' +HAVE_SNDIO_FALSE='' +HAVE_SNDIO_TRUE='#' +HAVE_SUN_FALSE='' +HAVE_SUN_TRUE='#' +HAVE_TINYALSA_FALSE='' +HAVE_TINYALSA_TRUE='#' +HAVE_WIN32_FALSE='' +HAVE_WIN32_TRUE='#' +HAVE_WIN32_WASAPI_FALSE='' +HAVE_WIN32_WASAPI_TRUE='#' +HP_CFLAGS='' +HP_LDFLAGS='' +HP_LIBS='' +INCLUDE_STDIO_H='#include ' +INCLUDE_STDLIB_H='#include ' +INCLUDE_SYS_TYPE_H='#include ' +INSTALL_DATA='${INSTALL} -m 644' +INSTALL_PROGRAM='${INSTALL}' +INSTALL_SCRIPT='${INSTALL}' +INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' +JACK_CFLAGS='' +JACK_LDFLAGS='' +JACK_LIBS='' +LD='/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld' +LDFLAGS=' ' +LFS_LOBJ=' lfs_alias.lo' +LIBMPG123_VERSION='38:4:38' +LIBOBJS='' +LIBS='-lm ' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +LIPO='' +LN_S='ln -s' +LTLIBOBJS='' +LT_LDFLAGS='-export-dynamic' +MAKEINFO='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo' +MANIFEST_TOOL=':' +MINT_CFLAGS='' +MINT_LDFLAGS='' +MINT_LIBS='' +MKDIR_P='/bin/mkdir -p' +MODULE_OBJ='legacy_module.$(OBJEXT)' +NAS_CFLAGS='' +NAS_LDFLAGS='' +NAS_LIBS='-laudio' +NM='/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B' +NMEDIT='' +OBJDUMP='objdump' +OBJEXT='o' +OPENAL_CFLAGS='' +OPENAL_LDFLAGS='' +OPENAL_LIBS='' +OS2_CFLAGS='' +OS2_LDFLAGS='' +OS2_LIBS='-los2me -lmmpm2 -lsocket' +OSS_CFLAGS='' +OSS_LDFLAGS='' +OSS_LIBS='' +OTOOL64='' +OTOOL='' +OUTPUT_CFLAGS='' +OUTPUT_LDFLAGS='' +OUTPUT_LIBS='' +OUTPUT_MOD='oss' +OUTPUT_OBJ='output/oss.$(OBJEXT)' +PACKAGE='mpg123' +PACKAGE_BUGREPORT='mpg123-devel@lists.sourceforge.net' +PACKAGE_NAME='mpg123' +PACKAGE_STRING='mpg123 1.17.0' +PACKAGE_TARNAME='mpg123' +PACKAGE_URL='' +PACKAGE_VERSION='1.17.0' +PATH_SEPARATOR=':' +PKG_CONFIG='/usr/bin/pkg-config' +PORTAUDIO_CFLAGS='' +PORTAUDIO_LDFLAGS='' +PORTAUDIO_LIBS='-lportaudio' +PULSE_CFLAGS='-D_REENTRANT ' +PULSE_LDFLAGS='' +PULSE_LIBS='-lpulse-simple -lpulse ' +QSA_CFLAGS='' +QSA_LDFLAGS='' +QSA_LIBS='' +RANLIB='arm-linux-androideabi-ranlib' +SDL_CFLAGS='-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL ' +SDL_LDFLAGS='' +SDL_LIBS='-lSDL ' +SED='/bin/sed' +SET_MAKE='' +SGI_CFLAGS='' +SGI_LDFLAGS='' +SGI_LIBS='' +SHELL='/bin/bash' +SNDIO_CFLAGS='' +SNDIO_LDFLAGS='' +SNDIO_LIBS='-lsndio' +STRIP='arm-linux-androideabi-strip' +SUN_CFLAGS='' +SUN_LDFLAGS='' +SUN_LIBS='' +TINYALSA_CFLAGS='' +TINYALSA_LDFLAGS='' +TINYALSA_LIBS='-ltinyalsa' +USE_YASM_FOR_AVX_FALSE='' +USE_YASM_FOR_AVX_TRUE='#' +VERSION='1.17.0' +WIN32_CFLAGS='' +WIN32_CODES_FALSE='' +WIN32_CODES_TRUE='#' +WIN32_LDFLAGS='' +WIN32_LIBS='-lwinmm' +WIN32_WASAPI_CFLAGS='' +WIN32_WASAPI_LDFLAGS='' +WIN32_WASAPI_LIBS='-lole32 -lavrt' +YASM='yasm' +YASMFLAGS='-pgas -rgas -mamd64' +YASM_FORMAT='' +ac_ct_AR='' +ac_ct_CC='' +ac_ct_DUMPBIN='' +am__EXEEXT_FALSE='' +am__EXEEXT_TRUE='#' +am__fastdepCCAS_FALSE='#' +am__fastdepCCAS_TRUE='' +am__fastdepCC_FALSE='#' +am__fastdepCC_TRUE='' +am__include='include' +am__isrc='' +am__leading_dot='.' +am__nodep='_no' +am__quote='' +am__tar='$${TAR-tar} chof - "$$tardir"' +am__untar='$${TAR-tar} xf -' +bindir='${exec_prefix}/bin' +build='86_64-unknown-linux-gnu' +build_alias='86_64-unknown-linux-gnu' +build_cpu='86_64' +build_os='linux-gnu' +build_vendor='unknown' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='${prefix}' +host='arm-unknown-linux-androideabi' +host_alias='arm-linux-androideabi' +host_cpu='arm' +host_os='linux-androideabi' +host_vendor='unknown' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${datarootdir}/info' +install_sh='${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh' +libdir='${exec_prefix}/lib' +libexecdir='${exec_prefix}/libexec' +localedir='${datarootdir}/locale' +localstatedir='${prefix}/var' +mandir='${datarootdir}/man' +mkdir_p='$(MKDIR_P)' +oldincludedir='/usr/include' +pdfdir='${docdir}' +prefix='/usr/local' +program_transform_name='s,x,x,' +psdir='${docdir}' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='${prefix}/etc' +target_alias='arm-linux-androideabi' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +/* confdefs.h */ +#define PACKAGE_NAME "mpg123" +#define PACKAGE_TARNAME "mpg123" +#define PACKAGE_VERSION "1.17.0" +#define PACKAGE_STRING "mpg123 1.17.0" +#define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +#define PACKAGE_URL "" +#define PACKAGE "mpg123" +#define VERSION "1.17.0" +#define STDC_HEADERS 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_UNISTD_H 1 +#define DYNAMIC_BUILD 1 +#define HAVE_DLFCN_H 1 +#define LT_OBJDIR ".libs/" +#define GAPLESS 1 +#define USE_NEW_HUFFTABLE 1 +#define NO_32BIT 1 +#define NO_REAL 1 +#define MODULE_FILE_SUFFIX ".la" +#define ASMALIGN_BALIGN 1 +#define STDC_HEADERS 1 +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_SCHED_H 1 +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_WAIT_H 1 +#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SIGNAL_H 1 +#define SIZEOF_SIZE_T 4 +#define SIZEOF_SSIZE_T 4 +#define SIZEOF_OFF_T 4 +#define SIZEOF_INT32_T 4 +#define SIZEOF_LONG 4 +#define lfs_alias_t off_t +#define LFS_ALIAS_BITS 32 +#define HAVE_STDLIB_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_TERMIOS 1 +#define HAVE_SCHED_SETSCHEDULER 1 +#define HAVE_SETUID 1 +#define HAVE_GETUID 1 +#define HAVE_SETPRIORITY 1 +#define HAVE_STRERROR 1 +#define HAVE_SETLOCALE 1 +#define HAVE_STRDUP 1 +#define HAVE_ATOLL 1 +#define HAVE_LOCALE_H 1 +#define HAVE_NETDB_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_NETINET_IN_H 1 +#define HAVE_ARPA_INET_H 1 +#define HAVE_GETADDRINFO 1 +#define HAVE_LIBM 1 +#define HAVE_LINUX_SOUNDCARD_H 1 +#define DEFAULT_OUTPUT_MODULE "oss" +#define FRAME_INDEX 1 +#define INDEX_SIZE 1000 +#define NETWORK 1 +#define IPV6 1 + +configure: exit 0 diff --git a/jni/mpg123-1.13.4/config.status b/jni/mpg123-1.17.0/config.status similarity index 88% rename from jni/mpg123-1.13.4/config.status rename to jni/mpg123-1.17.0/config.status index b5a83fec..8f067a35 100755 --- a/jni/mpg123-1.13.4/config.status +++ b/jni/mpg123-1.17.0/config.status @@ -285,16 +285,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -354,28 +354,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -392,8 +380,8 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mpg123 $as_me 1.13.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by mpg123 $as_me 1.17.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -439,21 +427,21 @@ $config_commands Report bugs to ." -ac_cs_config="'--with-default-audio=dummy' '--enable-network=no' '--with-cpu=generic_fpu' '--with-audio=dummy'" +ac_cs_config="'--build=86_64-unknown-linux-gnu' '--host=arm-linux-androideabi' '--target=arm-linux-androideabi' '--disable-32bit' 'build_alias=86_64-unknown-linux-gnu' 'host_alias=arm-linux-androideabi' 'target_alias=arm-linux-androideabi' 'CC=arm-linux-androideabi-gcc'" ac_cs_version="\ -mpg123 config.status 1.13.4 -configured by ./configure, generated by GNU Autoconf 2.68, +mpg123 config.status 1.17.0 +configured by ./configure, generated by GNU Autoconf 2.69, with options \"$ac_cs_config\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4' +ac_pwd='/home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0' srcdir='.' INSTALL='/usr/bin/install -c' MKDIR_P='/bin/mkdir -p' -AWK='gawk' +AWK='mawk' test -n "$AWK" || AWK=awk # The default lists apply if the user does not specify any file. ac_need_defaults=: @@ -531,7 +519,7 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X '/bin/bash' './configure' '--with-default-audio=dummy' '--enable-network=no' '--with-cpu=generic_fpu' '--with-audio=dummy' $ac_configure_extra_args --no-create --no-recursion + set X /bin/bash './configure' '--build=86_64-unknown-linux-gnu' '--host=arm-linux-androideabi' '--target=arm-linux-androideabi' '--disable-32bit' 'build_alias=86_64-unknown-linux-gnu' 'host_alias=arm-linux-androideabi' 'target_alias=arm-linux-androideabi' 'CC=arm-linux-androideabi-gcc' $ac_configure_extra_args --no-create --no-recursion shift $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6 CONFIG_SHELL='/bin/bash' @@ -566,25 +554,26 @@ enable_shared='yes' AS='as' DLLTOOL='dlltool' OBJDUMP='objdump' -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' pic_mode='default' enable_fast_install='yes' SHELL='/bin/bash' ECHO='printf %s\n' -host_alias='' -host='i686-pc-linux-gnu' -host_os='linux-gnu' -build_alias='' -build='i686-pc-linux-gnu' +PATH_SEPARATOR=':' +host_alias='arm-linux-androideabi' +host='arm-unknown-linux-androideabi' +host_os='linux-androideabi' +build_alias='86_64-unknown-linux-gnu' +build='86_64-unknown-linux-gnu' build_os='linux-gnu' SED='/bin/sed' Xsed='/bin/sed -e 1s/^X//' GREP='/bin/grep' EGREP='/bin/grep -E' FGREP='/bin/grep -F' -LD='/usr/bin/ld' -NM='/usr/bin/nm -B' +LD='/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld' +NM='/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B' LN_S='ln -s' max_cmd_len='1572864' ac_objext='o' @@ -601,18 +590,18 @@ file_magic_cmd='$MAGIC_CMD' file_magic_glob='' want_nocaseglob='no' sharedlib_from_linklib_cmd='printf %s\n' -AR='ar' +AR='arm-linux-androideabi-ar' AR_FLAGS='cru' archiver_list_spec='@' -STRIP='strip' -RANLIB='ranlib' -old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $oldlib' +STRIP='arm-linux-androideabi-strip' +RANLIB='arm-linux-androideabi-ranlib' +old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib' old_postuninstall_cmds='' -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $oldlib' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib' lock_old_archive_extraction='no' -CC='gcc' +CC='arm-linux-androideabi-gcc' CFLAGS='-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2' -compiler='gcc' +compiler='arm-linux-androideabi-gcc' GCC='yes' lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\''' lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' @@ -655,7 +644,6 @@ with_gnu_ld='yes' allow_undefined_flag='' no_undefined_flag='' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -hardcode_libdir_flag_spec_ld='' hardcode_libdir_separator='' hardcode_direct='no' hardcode_direct_absolute='no' @@ -687,18 +675,18 @@ postuninstall_cmds='' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' finish_eval='' hardcode_into_libs='yes' -sys_lib_search_path_spec='/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2 /usr/lib/i386-linux-gnu /lib /usr/lib ' -sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/lib/alsa-lib /usr/local/lib ' +sys_lib_search_path_spec='/opt/android-ndk-r8e/ndk-standalone/lib/gcc/arm-linux-androideabi/4.6 /opt/android-ndk-r8e/ndk-standalone/lib/gcc /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/lib /opt/android-ndk-r8e/ndk-standalone/sysroot/usr/lib ' +sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 ' hardcode_action='immediate' enable_dlopen='unknown' enable_dlopen_self='unknown' enable_dlopen_self_static='unknown' -old_striplib='strip --strip-debug' -striplib='strip --strip-unneeded' +old_striplib='arm-linux-androideabi-strip --strip-debug' +striplib='arm-linux-androideabi-strip --strip-unneeded' -LTCC='gcc' +LTCC='arm-linux-androideabi-gcc' LTCFLAGS='-g -O2' -compiler='gcc' +compiler='arm-linux-androideabi-gcc' # A function that is used when there is no print builtin or printf. func_fallback_echo () @@ -709,7 +697,7 @@ _LTECHO_EOF' } # Quote evaled strings. -for var in AS DLLTOOL OBJDUMP SHELL ECHO SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_flag_spec_ld hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib; do +for var in AS DLLTOOL OBJDUMP SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib; do case `eval \\$ECHO \\""\\$$var"\\"` in *[\\\`\"\$]*) eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\"" @@ -744,7 +732,7 @@ fi PACKAGE='mpg123' - VERSION='1.13.4' + VERSION='1.17.0' TIMESTAMP='' RM='rm -f' ofile='libtool' @@ -842,8 +830,8 @@ S["WIN32_CODES_TRUE"]="#" S["OUTPUT_LDFLAGS"]="" S["OUTPUT_LIBS"]="" S["OUTPUT_CFLAGS"]="" -S["OUTPUT_MOD"]="dummy" -S["OUTPUT_OBJ"]="output/dummy.$(OBJEXT)" +S["OUTPUT_MOD"]="oss" +S["OUTPUT_OBJ"]="output/oss.$(OBJEXT)" S["HAVE_DUMMY_FALSE"]="#" S["HAVE_DUMMY_TRUE"]="" S["DUMMY_CFLAGS"]="" @@ -868,7 +856,7 @@ S["HAVE_OS2_FALSE"]="" S["HAVE_OS2_TRUE"]="#" S["OS2_CFLAGS"]="" S["OS2_LDFLAGS"]="" -S["OS2_LIBS"]="" +S["OS2_LIBS"]="-los2me -lmmpm2 -lsocket" S["HAVE_HP_FALSE"]="" S["HAVE_HP_TRUE"]="#" S["HP_CFLAGS"]="" @@ -893,29 +881,34 @@ S["HAVE_NAS_FALSE"]="" S["HAVE_NAS_TRUE"]="#" S["NAS_CFLAGS"]="" S["NAS_LDFLAGS"]="" -S["NAS_LIBS"]="" -S["HAVE_SDL_FALSE"]="" -S["HAVE_SDL_TRUE"]="#" +S["NAS_LIBS"]="-laudio" +S["HAVE_SDL_FALSE"]="#" +S["HAVE_SDL_TRUE"]="" S["SDL_LDFLAGS"]="" -S["HAVE_PULSE_FALSE"]="" -S["HAVE_PULSE_TRUE"]="#" +S["HAVE_PULSE_FALSE"]="#" +S["HAVE_PULSE_TRUE"]="" S["PULSE_LDFLAGS"]="" S["HAVE_PORTAUDIO_FALSE"]="" S["HAVE_PORTAUDIO_TRUE"]="#" S["PORTAUDIO_CFLAGS"]="" S["PORTAUDIO_LDFLAGS"]="" -S["PORTAUDIO_LIBS"]="" +S["PORTAUDIO_LIBS"]="-lportaudio" S["HAVE_JACK_FALSE"]="" S["HAVE_JACK_TRUE"]="#" S["JACK_LDFLAGS"]="" S["HAVE_ESD_FALSE"]="" S["HAVE_ESD_TRUE"]="#" S["ESD_LDFLAGS"]="" +S["HAVE_WIN32_WASAPI_FALSE"]="" +S["HAVE_WIN32_WASAPI_TRUE"]="#" +S["WIN32_WASAPI_CFLAGS"]="" +S["WIN32_WASAPI_LDFLAGS"]="" +S["WIN32_WASAPI_LIBS"]="-lole32 -lavrt" S["HAVE_WIN32_FALSE"]="" S["HAVE_WIN32_TRUE"]="#" S["WIN32_CFLAGS"]="" S["WIN32_LDFLAGS"]="" -S["WIN32_LIBS"]="" +S["WIN32_LIBS"]="-lwinmm" S["HAVE_SUN_FALSE"]="" S["HAVE_SUN_TRUE"]="#" S["SUN_CFLAGS"]="" @@ -925,38 +918,53 @@ S["HAVE_SNDIO_FALSE"]="" S["HAVE_SNDIO_TRUE"]="#" S["SNDIO_CFLAGS"]="" S["SNDIO_LDFLAGS"]="" -S["SNDIO_LIBS"]="" +S["SNDIO_LIBS"]="-lsndio" S["HAVE_COREAUDIO_FALSE"]="" S["HAVE_COREAUDIO_TRUE"]="#" S["COREAUDIO_CFLAGS"]="" S["COREAUDIO_LDFLAGS"]="" -S["COREAUDIO_LIBS"]="" -S["HAVE_OSS_FALSE"]="" -S["HAVE_OSS_TRUE"]="#" +S["COREAUDIO_LIBS"]="-framework AudioToolbox -framework AudioUnit -framework CoreServices" +S["HAVE_OSS_FALSE"]="#" +S["HAVE_OSS_TRUE"]="" S["OSS_CFLAGS"]="" S["OSS_LDFLAGS"]="" S["OSS_LIBS"]="" +S["HAVE_QSA_FALSE"]="" +S["HAVE_QSA_TRUE"]="#" +S["QSA_CFLAGS"]="" +S["QSA_LDFLAGS"]="" +S["QSA_LIBS"]="" S["HAVE_ALSA_FALSE"]="" S["HAVE_ALSA_TRUE"]="#" S["ALSA_CFLAGS"]="" S["ALSA_LDFLAGS"]="" -S["ALSA_LIBS"]="" -S["SDL_LIBS"]="" -S["SDL_CFLAGS"]="" +S["ALSA_LIBS"]="-lasound" +S["HAVE_TINYALSA_FALSE"]="" +S["HAVE_TINYALSA_TRUE"]="#" +S["TINYALSA_CFLAGS"]="" +S["TINYALSA_LDFLAGS"]="" +S["TINYALSA_LIBS"]="-ltinyalsa" +S["SDL_LIBS"]="-lSDL " +S["SDL_CFLAGS"]="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL " S["ESD_LIBS"]="" S["ESD_CFLAGS"]="" -S["PULSE_LIBS"]="" -S["PULSE_CFLAGS"]="" +S["PULSE_LIBS"]="-lpulse-simple -lpulse " +S["PULSE_CFLAGS"]="-D_REENTRANT " S["JACK_LIBS"]="" S["JACK_CFLAGS"]="" S["PKG_CONFIG"]="/usr/bin/pkg-config" -S["DECODER_LOBJ"]=" stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo" +S["DECODER_LOBJ"]=" stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo" S["DECODER_OBJ"]=" stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$"\ -"(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT)" +"(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT)" +S["YASM_FORMAT"]="" +S["USE_YASM_FOR_AVX_FALSE"]="" +S["USE_YASM_FOR_AVX_TRUE"]="#" S["INCLUDE_SYS_TYPE_H"]="#include " S["INCLUDE_STDLIB_H"]="#include " S["INCLUDE_STDIO_H"]="#include " -S["LFS_LOBJ"]="lfs_wrap.lo lfs_alias.lo" +S["LFS_LOBJ"]=" lfs_alias.lo" +S["YASMFLAGS"]="-pgas -rgas -mamd64" +S["YASM"]="yasm" S["EXEC_LT_LDFLAGS"]="" S["LT_LDFLAGS"]="-export-dynamic" S["MODULE_OBJ"]="legacy_module.$(OBJEXT)" @@ -968,14 +976,14 @@ S["LIPO"]="" S["NMEDIT"]="" S["DSYMUTIL"]="" S["MANIFEST_TOOL"]=":" -S["RANLIB"]="ranlib" -S["ac_ct_AR"]="ar" -S["AR"]="ar" +S["RANLIB"]="arm-linux-androideabi-ranlib" +S["ac_ct_AR"]="" +S["AR"]="arm-linux-androideabi-ar" S["LN_S"]="ln -s" -S["NM"]="/usr/bin/nm -B" +S["NM"]="/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B" S["ac_ct_DUMPBIN"]="" S["DUMPBIN"]="" -S["LD"]="/usr/bin/ld" +S["LD"]="/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld" S["FGREP"]="/bin/grep -F" S["SED"]="/bin/sed" S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool" @@ -984,15 +992,16 @@ S["DLLTOOL"]="dlltool" S["AS"]="as" S["EGREP"]="/bin/grep -E" S["GREP"]="/bin/grep" -S["CPP"]="gcc -E" +S["CPP"]="arm-linux-androideabi-gcc -E" S["am__fastdepCCAS_FALSE"]="#" S["am__fastdepCCAS_TRUE"]="" S["CCASDEPMODE"]="depmode=gcc3" S["CCASFLAGS"]="-g -O2" -S["CCAS"]="gcc" +S["CCAS"]="arm-linux-androideabi-gcc" S["am__fastdepCC_FALSE"]="#" S["am__fastdepCC_TRUE"]="" S["CCDEPMODE"]="depmode=gcc3" +S["am__nodep"]="_no" S["AMDEPBACKSLASH"]="\\" S["AMDEP_FALSE"]="#" S["AMDEP_TRUE"]="" @@ -1001,47 +1010,51 @@ S["am__include"]="include" S["DEPDIR"]=".deps" S["OBJEXT"]="o" S["EXEEXT"]="" -S["ac_ct_CC"]="gcc" -S["CPPFLAGS"]=" -DOPT_GENERIC -DREAL_IS_FLOAT " +S["ac_ct_CC"]="" +S["CPPFLAGS"]=" -DOPT_ARM -DREAL_IS_FIXED " S["LDFLAGS"]=" " S["CFLAGS"]="-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2" -S["CC"]="gcc" -S["am__untar"]="${AMTAR} xf -" -S["am__tar"]="${AMTAR} chof - \"$$tardir\"" -S["AMTAR"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar" +S["CC"]="arm-linux-androideabi-gcc" +S["AM_BACKSLASH"]="\\" +S["AM_DEFAULT_VERBOSITY"]="1" +S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)" +S["AM_V"]="$(V)" +S["am__untar"]="$${TAR-tar} xf -" +S["am__tar"]="$${TAR-tar} chof - \"$$tardir\"" +S["AMTAR"]="$${TAR-tar}" S["am__leading_dot"]="." S["SET_MAKE"]="" -S["AWK"]="gawk" -S["mkdir_p"]="/bin/mkdir -p" +S["AWK"]="mawk" +S["mkdir_p"]="$(MKDIR_P)" S["MKDIR_P"]="/bin/mkdir -p" S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s" -S["STRIP"]="strip" -S["install_sh"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh" -S["MAKEINFO"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo" -S["AUTOHEADER"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader" -S["AUTOMAKE"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11" -S["AUTOCONF"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf" -S["ACLOCAL"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11" -S["VERSION"]="1.13.4" +S["STRIP"]="arm-linux-androideabi-strip" +S["install_sh"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh" +S["MAKEINFO"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo" +S["AUTOHEADER"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader" +S["AUTOMAKE"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14" +S["AUTOCONF"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf" +S["ACLOCAL"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14" +S["VERSION"]="1.17.0" S["PACKAGE"]="mpg123" S["CYGPATH_W"]="echo" S["am__isrc"]="" S["INSTALL_DATA"]="${INSTALL} -m 644" S["INSTALL_SCRIPT"]="${INSTALL}" S["INSTALL_PROGRAM"]="${INSTALL}" -S["host_os"]="linux-gnu" -S["host_vendor"]="pc" -S["host_cpu"]="i686" -S["host"]="i686-pc-linux-gnu" +S["host_os"]="linux-androideabi" +S["host_vendor"]="unknown" +S["host_cpu"]="arm" +S["host"]="arm-unknown-linux-androideabi" S["build_os"]="linux-gnu" -S["build_vendor"]="pc" -S["build_cpu"]="i686" -S["build"]="i686-pc-linux-gnu" -S["API_VERSION"]="29" -S["LIBMPG123_VERSION"]="29:6:29" -S["target_alias"]="" -S["host_alias"]="" -S["build_alias"]="" +S["build_vendor"]="unknown" +S["build_cpu"]="86_64" +S["build"]="86_64-unknown-linux-gnu" +S["API_VERSION"]="38" +S["LIBMPG123_VERSION"]="38:4:38" +S["target_alias"]="arm-linux-androideabi" +S["host_alias"]="arm-linux-androideabi" +S["build_alias"]="86_64-unknown-linux-gnu" S["LIBS"]="-lm " S["ECHO_T"]="" S["ECHO_N"]="-n" @@ -1071,8 +1084,8 @@ S["prefix"]="/usr/local" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="" S["PACKAGE_BUGREPORT"]="mpg123-devel@lists.sourceforge.net" -S["PACKAGE_STRING"]="mpg123 1.13.4" -S["PACKAGE_VERSION"]="1.13.4" +S["PACKAGE_STRING"]="mpg123 1.17.0" +S["PACKAGE_VERSION"]="1.17.0" S["PACKAGE_TARNAME"]="mpg123" S["PACKAGE_NAME"]="mpg123" S["PATH_SEPARATOR"]=":" @@ -1120,12 +1133,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { D["PACKAGE_NAME"]=" \"mpg123\"" D["PACKAGE_TARNAME"]=" \"mpg123\"" -D["PACKAGE_VERSION"]=" \"1.13.4\"" -D["PACKAGE_STRING"]=" \"mpg123 1.13.4\"" +D["PACKAGE_VERSION"]=" \"1.17.0\"" +D["PACKAGE_STRING"]=" \"mpg123 1.17.0\"" D["PACKAGE_BUGREPORT"]=" \"mpg123-devel@lists.sourceforge.net\"" D["PACKAGE_URL"]=" \"\"" D["PACKAGE"]=" \"mpg123\"" -D["VERSION"]=" \"1.13.4\"" +D["VERSION"]=" \"1.17.0\"" D["STDC_HEADERS"]=" 1" D["HAVE_SYS_TYPES_H"]=" 1" D["HAVE_SYS_STAT_H"]=" 1" @@ -1140,8 +1153,11 @@ D["DYNAMIC_BUILD"]=" 1" D["HAVE_DLFCN_H"]=" 1" D["LT_OBJDIR"]=" \".libs/\"" D["GAPLESS"]=" 1" -D["IEEE_FLOAT"]=" 1" +D["USE_NEW_HUFFTABLE"]=" 1" +D["NO_32BIT"]=" 1" +D["NO_REAL"]=" 1" D["MODULE_FILE_SUFFIX"]=" \".la\"" +D["ASMALIGN_BALIGN"]=" 1" D["STDC_HEADERS"]=" 1" D["HAVE_STDIO_H"]=" 1" D["HAVE_STDLIB_H"]=" 1" @@ -1156,47 +1172,39 @@ D["HAVE_INTTYPES_H"]=" 1" D["HAVE_SYS_TIME_H"]=" 1" D["HAVE_SYS_WAIT_H"]=" 1" D["HAVE_SYS_RESOURCE_H"]=" 1" -D["HAVE_SYS_SIGNAL_H"]=" 1" D["HAVE_SIGNAL_H"]=" 1" -D["_FILE_OFFSET_BITS"]=" 64" D["SIZEOF_SIZE_T"]=" 4" D["SIZEOF_SSIZE_T"]=" 4" -D["SIZEOF_OFF_T"]=" 8" +D["SIZEOF_OFF_T"]=" 4" D["SIZEOF_INT32_T"]=" 4" D["SIZEOF_LONG"]=" 4" +D["lfs_alias_t"]=" off_t" D["LFS_ALIAS_BITS"]=" 32" D["HAVE_STDLIB_H"]=" 1" D["HAVE_UNISTD_H"]=" 1" D["HAVE_SYS_PARAM_H"]=" 1" -D["HAVE_GETPAGESIZE"]=" 1" -D["HAVE_MMAP"]=" 1" D["HAVE_TERMIOS"]=" 1" -D["HAVE_RANDOM"]=" 1" D["HAVE_SCHED_SETSCHEDULER"]=" 1" D["HAVE_SETUID"]=" 1" D["HAVE_GETUID"]=" 1" D["HAVE_SETPRIORITY"]=" 1" D["HAVE_STRERROR"]=" 1" D["HAVE_SETLOCALE"]=" 1" -D["HAVE_NL_LANGINFO"]=" 1" D["HAVE_STRDUP"]=" 1" D["HAVE_ATOLL"]=" 1" -D["HAVE_MKFIFO"]=" 1" -D["FIFO"]=" 1" D["HAVE_LOCALE_H"]=" 1" -D["HAVE_LANGINFO_H"]=" 1" D["HAVE_NETDB_H"]=" 1" D["HAVE_SYS_PARAM_H"]=" 1" D["HAVE_SYS_SOCKET_H"]=" 1" D["HAVE_NETINET_IN_H"]=" 1" D["HAVE_ARPA_INET_H"]=" 1" D["HAVE_GETADDRINFO"]=" 1" -D["HAVE_GAI_ADDRCONFIG"]=" 1" D["HAVE_LIBM"]=" 1" -D["ABI_ALIGN_FUN"]=" 1" -D["DEFAULT_OUTPUT_MODULE"]=" \"dummy\"" +D["HAVE_LINUX_SOUNDCARD_H"]=" 1" +D["DEFAULT_OUTPUT_MODULE"]=" \"oss\"" D["FRAME_INDEX"]=" 1" D["INDEX_SIZE"]=" 1000" +D["NETWORK"]=" 1" D["IPV6"]=" 1" for (key in D) D_is_set[key] = 1 FS = "" @@ -1522,7 +1530,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -1535,7 +1543,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -1569,21 +1577,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -1637,8 +1643,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -1701,6 +1707,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -1996,10 +2005,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator diff --git a/jni/mpg123-1.13.4/configure b/jni/mpg123-1.17.0/configure similarity index 92% rename from jni/mpg123-1.13.4/configure rename to jni/mpg123-1.17.0/configure index 0184f7ed..4ac50496 100755 --- a/jni/mpg123-1.13.4/configure +++ b/jni/mpg123-1.17.0/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for mpg123 1.13.4. +# Generated by GNU Autoconf 2.69 for mpg123 1.17.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mpg123' PACKAGE_TARNAME='mpg123' -PACKAGE_VERSION='1.13.4' -PACKAGE_STRING='mpg123 1.13.4' +PACKAGE_VERSION='1.17.0' +PACKAGE_STRING='mpg123 1.17.0' PACKAGE_BUGREPORT='mpg123-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -692,6 +712,11 @@ JACK_LDFLAGS HAVE_ESD_FALSE HAVE_ESD_TRUE ESD_LDFLAGS +HAVE_WIN32_WASAPI_FALSE +HAVE_WIN32_WASAPI_TRUE +WIN32_WASAPI_CFLAGS +WIN32_WASAPI_LDFLAGS +WIN32_WASAPI_LIBS HAVE_WIN32_FALSE HAVE_WIN32_TRUE WIN32_CFLAGS @@ -717,11 +742,21 @@ HAVE_OSS_TRUE OSS_CFLAGS OSS_LDFLAGS OSS_LIBS +HAVE_QSA_FALSE +HAVE_QSA_TRUE +QSA_CFLAGS +QSA_LDFLAGS +QSA_LIBS HAVE_ALSA_FALSE HAVE_ALSA_TRUE ALSA_CFLAGS ALSA_LDFLAGS ALSA_LIBS +HAVE_TINYALSA_FALSE +HAVE_TINYALSA_TRUE +TINYALSA_CFLAGS +TINYALSA_LDFLAGS +TINYALSA_LIBS SDL_LIBS SDL_CFLAGS ESD_LIBS @@ -733,10 +768,15 @@ JACK_CFLAGS PKG_CONFIG DECODER_LOBJ DECODER_OBJ +YASM_FORMAT +USE_YASM_FOR_AVX_FALSE +USE_YASM_FOR_AVX_TRUE INCLUDE_SYS_TYPE_H INCLUDE_STDLIB_H INCLUDE_STDIO_H LFS_LOBJ +YASMFLAGS +YASM EXEC_LT_LDFLAGS LT_LDFLAGS MODULE_OBJ @@ -773,6 +813,7 @@ CCAS am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -786,6 +827,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -860,6 +905,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_modules enable_static @@ -882,6 +928,7 @@ enable_ntom enable_downsample enable_feeder enable_messages +enable_new_huffman enable_int_quality enable_16bit enable_8bit @@ -889,6 +936,7 @@ enable_32bit enable_real with_cpu enable_buffer +enable_newoldwritesample enable_layer1 enable_layer2 enable_layer3 @@ -1376,8 +1424,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1463,7 +1509,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mpg123 1.13.4 to adapt to many kinds of systems. +\`configure' configures mpg123 1.17.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1533,7 +1579,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mpg123 1.13.4:";; + short | recursive ) echo "Configuration of mpg123 1.17.0:";; esac cat <<\_ACEOF @@ -1541,8 +1587,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-modules=no/yes dynamically loadable output modules --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1562,23 +1612,25 @@ Optional Features: --disable-downsample=no/yes no downsampled decoding --disable-feeder=no/yes no feeder decoding, no buffered readers --disable-messages=no/yes no error/warning messages on the console + --enable-new-huffman=yes/no use new huffman decoding scheme by Taihei (faster on modern CPUs at least, so on by default) --enable-int-quality=yes/no use rounding instead of fast truncation for integer output, where possible --disable-16bit=no/yes no 16 bit integer output --disable-8bit=no/yes no 8 bit integer output --disable-32bit=no/yes no 32 bit integer output (also 24 bit) --disable-real=no/yes no real (floating point) output --enable-buffer=yes/no disable audio buffer code (default uses system whitelist... proper checks later) + --enable-newoldwritesample=no/yes enable new/old WRITE_SAMPLE macro for non-accurate 16 bit output, faster on certain CPUs (default on on x86-32) --disable-layer1=no/yes no layer I decoding --disable-layer2=no/yes no layer II decoding --disable-layer3=no/yes no layer III decoding --disable-largefile omit support for large files - --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 in addition to mpg123_seek, mpg123_seek_64 as alias on x86-64) + --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 or mpg123_seek_64 in addition to mpg123_seek, or the other way around; It is a mess, do not play with this!) --disable-feature_report Disable feature report function Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1593,15 +1645,19 @@ Optional Packages: --with-cpu=i486 Use code optimized for i486 processors (only usable alone!) --with-cpu=i586 Use code optimized for i586 processors --with-cpu=i586_dither Use code optimized for i586 processors with dithering (noise shaping), adds 256K to binary size - --with-cpu=3dnow Use code optimized for 3DNow processors - --with-cpu=3dnowext Use code optimized for 3DNowExt processors (K6-3+, Athlon) + --with-cpu=3dnow Use code optimized for 3DNow processors + --with-cpu=3dnow_vintage Use code optimized for older 3DNow processors (K6 family) + --with-cpu=3dnowext Use code optimized for 3DNowExt processors (K6-3+, Athlon) --with-cpu=3dnowext_alone Really only 3DNowExt decoder, without 3DNow fallback for flexible rate + --with-cpu=3dnow_vintage Use code optimized for older extended 3DNow processors (like K6-III+) --with-cpu=mmx Use code optimized for MMX processors --with-cpu=mmx_alone Really only MMX decoder, without i586 fallback for flexible rate --with-cpu=sse Use code optimized for SSE processors + --with-cpu=sse_vintage Use code optimized for older SSE processors (plain C DCT36) --with-cpu=sse_alone Really only SSE decoder, without i586 fallback for flexible rate + --with-cpu=avx Use code optimized for x86-64 with AVX processors --with-cpu=x86 Pack all x86 opts into one binary (excluding i486, including dither) - --with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including dithered generic) + --with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including AVX and dithered generic) --with-cpu=altivec Use code optimized for Altivec processors (PowerPC G4 and G5) --with-cpu=ppc_nofpu Use code optimized for PowerPC processors with fixed point arithmetic (experimental) --with-cpu=neon Use code optimized for ARM NEON SIMD engine (Cortex-A series) @@ -1611,26 +1667,29 @@ Optional Packages: --with-audio= Select a list (or only one) of audio output modules (comma or space separated list). - --with-default-audio=aix Use AIX as default audio output sub-system - --with-default-audio=alib Use Alib as default audio output sub-system (for HPUX) - --with-default-audio=alsa Use ALSA as default audio output sub-system - --with-default-audio=arts Use aRts as default audio output sub-system (KDE sound server) - --with-default-audio=dummy Use dummy as default audio (when no sound card is available) - --with-default-audio=esd Use ESoundD as default audio output sub-system - --with-default-audio=hp Use HP as default audio output sub-system - --with-default-audio=jack Use JACK as default low-latency audio server - --with-default-audio=coreaudio Use Mac OS X as default audio output sub-system (CoreAudio) - --with-default-audio=mint Use MinT as default audio output sub-system (Atari) - --with-default-audio=nas Use NAS as default audio output (Network Audio System) - --with-default-audio=os2 Use OS2 as default audio output sub-system - --with-default-audio=oss Use OSS as default audio output sub-system (/dev/dsp) - --with-default-audio=portaudio Use PortAudio as default audio output sub-system - --with-default-audio=pulse Use Pulse audio server as default audio output sub-system - --with-default-audio=sdl Use SDL as default audio output sub-system (Simple DirectMedia Layer) - --with-default-audio=sgi Use SGI as default audio output sub-system (IRIX) - --with-default-audio=sndio Use OpenBSD's sndio as default audio output sub-system - --with-default-audio=sun Use Sun as default audio output sub-system (/dev/audio) - --with-default-audio=win32 Use Win32 audio as default audio output sub-system + --with-default-audio=aix Use AIX as default audio output sub-system + --with-default-audio=alib Use Alib as default audio output sub-system (for HPUX) + --with-default-audio=alsa Use ALSA as default audio output sub-system (libasound) + --with-default-audio=tinyalsa Use ALSA as default audio output sub-system (tinyalsa) + --with-default-audio=arts Use aRts as default audio output sub-system (KDE sound server) + --with-default-audio=dummy Use dummy as default audio (when no sound card is available) + --with-default-audio=esd Use ESoundD as default audio output sub-system + --with-default-audio=hp Use HP as default audio output sub-system + --with-default-audio=jack Use JACK as default low-latency audio server + --with-default-audio=coreaudio Use Mac OS X as default audio output sub-system (CoreAudio) + --with-default-audio=mint Use MinT as default audio output sub-system (Atari) + --with-default-audio=nas Use NAS as default audio output (Network Audio System) + --with-default-audio=os2 Use OS2 as default audio output sub-system + --with-default-audio=oss Use OSS as default audio output sub-system (/dev/dsp) + --with-default-audio=portaudio Use PortAudio as default audio output sub-system + --with-default-audio=pulse Use Pulse audio server as default audio output sub-system + --with-default-audio=qsa Use QSA as default audio output sub-system + --with-default-audio=sdl Use SDL as default audio output sub-system (Simple DirectMedia Layer) + --with-default-audio=sgi Use SGI as default audio output sub-system (IRIX) + --with-default-audio=sndio Use OpenBSD's sndio as default audio output sub-system + --with-default-audio=sun Use Sun as default audio output sub-system (/dev/audio) + --with-default-audio=win32 Use Win32 audio as default audio output sub-system + --with-default-audio=win32_wasapi Use Win32 wasapi audio as default audio output sub-system --with-optimization=0 No Optimization @@ -1735,10 +1794,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mpg123 configure 1.13.4 -generated by GNU Autoconf 2.68 +mpg123 configure 1.17.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1924,7 +1983,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2172,7 +2231,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2188,7 +2248,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2214,7 +2275,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2230,7 +2292,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2264,7 +2327,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2336,8 +2400,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mpg123 $as_me 1.13.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by mpg123 $as_me 1.17.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2687,8 +2751,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -API_VERSION=29 -LIB_PATCHLEVEL=6 +API_VERSION=38 +LIB_PATCHLEVEL=4 LIBMPG123_VERSION=$API_VERSION:$LIB_PATCHLEVEL:$API_VERSION @@ -2797,7 +2861,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -am__api_version='1.11' +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 @@ -2836,7 +2900,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2894,9 +2958,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2907,32 +2968,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2944,6 +3013,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2966,12 +3045,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2983,10 +3062,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3005,7 +3084,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3045,7 +3124,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3096,7 +3175,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3125,12 +3204,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3149,7 +3222,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3213,6 +3286,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3235,7 +3347,7 @@ fi # Define the identity of the package. PACKAGE='mpg123' - VERSION='1.13.4' + VERSION='1.17.0' cat >>confdefs.h <<_ACEOF @@ -3263,18 +3375,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + +# 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: + +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: . + +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 ac_config_headers="$ac_config_headers src/config.h" @@ -3287,10 +3451,16 @@ $as_echo_n "checking for -Werror in CFLAGS (It breaks tests)... " >&6; } if echo "$CFLAGS" | grep Werror; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - as_fn_error $? "I refuse to run with -Werror in CFLAGS. That breaks tests and makes this configure bogus. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have -Werror in CFLAGS. That may break some tests and make this configure bogus. If you want paranoid compilation, use --enable-nagging option, which adds -Werror for gcc. Also note that you shall not run make distcheck after configuring with --enable-nagging. -distcheck uses the generated CFLAGS..." "$LINENO" 5 +distcheck uses the generated CFLAGS... +Anyhow, continuing at your own risk." >&5 +$as_echo "$as_me: WARNING: You have -Werror in CFLAGS. That may break some tests and make this configure bogus. +If you want paranoid compilation, use --enable-nagging option, which adds -Werror for gcc. +Also note that you shall not run make distcheck after configuring with --enable-nagging. +distcheck uses the generated CFLAGS... +Anyhow, continuing at your own risk." >&2;} else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -3350,7 +3520,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3383,6 +3553,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3415,7 +3586,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3455,7 +3626,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3508,7 +3679,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3549,7 +3720,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3607,7 +3778,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3651,7 +3822,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4097,8 +4268,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4183,6 +4353,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 @@ -4194,8 +4423,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4229,16 +4459,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4247,16 +4477,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4328,8 +4558,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4361,16 +4592,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4379,16 +4610,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4464,7 +4695,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4504,7 +4735,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4557,7 +4788,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4598,7 +4829,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4656,7 +4887,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4700,7 +4931,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4896,8 +5127,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4982,6 +5212,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 @@ -4993,8 +5282,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5028,16 +5318,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5046,16 +5336,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5263,7 +5553,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5329,7 +5619,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5389,11 +5679,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -5410,8 +5700,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -5427,10 +5718,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -6064,7 +6355,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6104,7 +6395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6156,7 +6447,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6196,7 +6487,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6248,7 +6539,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6288,7 +6579,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6354,8 +6645,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -6462,7 +6753,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6541,7 +6832,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6797,7 +7088,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6841,7 +7132,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6999,6 +7290,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -7038,7 +7334,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -7260,7 +7556,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7300,7 +7596,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7464,7 +7760,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7603,7 +7899,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7643,7 +7939,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7743,7 +8039,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7787,7 +8083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7912,7 +8208,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7952,7 +8248,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8011,7 +8307,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8051,7 +8347,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8101,13 +8397,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -8254,6 +8550,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -8642,7 +8939,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -8653,7 +8950,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -8686,7 +8996,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8726,7 +9036,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8806,7 +9116,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8846,7 +9156,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8898,7 +9208,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8938,7 +9248,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8990,7 +9300,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9030,7 +9340,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9082,7 +9392,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9122,7 +9432,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9174,7 +9484,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9214,7 +9524,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9293,7 +9603,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9304,6 +9620,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -9336,6 +9653,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -9357,7 +9675,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9433,7 +9753,22 @@ done # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -9506,6 +9841,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + @@ -9970,7 +10309,9 @@ lt_prog_compiler_static= case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -10061,18 +10402,33 @@ lt_prog_compiler_static= ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -10434,7 +10790,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -10684,8 +11039,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -11064,6 +11418,7 @@ fi # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -11109,6 +11464,7 @@ fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -11137,10 +11493,6 @@ fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -11153,7 +11505,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11192,7 +11544,6 @@ fi fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -11810,11 +12161,6 @@ esac - - - - - @@ -11910,7 +12256,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11919,7 +12265,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11984,7 +12330,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12123,7 +12469,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -12131,10 +12477,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12142,7 +12484,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12160,7 +12502,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12180,17 +12522,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -12251,7 +12594,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -12267,7 +12610,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -12304,9 +12647,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12388,7 +12731,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12457,7 +12800,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12482,7 +12825,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12506,7 +12849,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -12537,7 +12880,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12547,7 +12890,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13329,6 +13672,8 @@ CC="$lt_save_CC" + + ac_config_commands="$ac_config_commands libtool" @@ -13613,13 +13958,31 @@ if test "x$messages" = "xdisabled"; then $as_echo "#define NO_WARNING 1" >>confdefs.h -$as_echo "#define NO_ERROR 1" >>confdefs.h +$as_echo "#define NO_ERRORMSG 1" >>confdefs.h $as_echo "#define NO_ERETURN 1" >>confdefs.h fi +newhuff=enabled +# Check whether --enable-new-huffman was given. +if test "${enable_new_huffman+set}" = set; then : + enableval=$enable_new_huffman; + if test "x$enableval" = xno; then + newhuff=disabled + fi + + +fi + + +if test "x$newhuff" = "xenabled"; then + +$as_echo "#define USE_NEW_HUFFTABLE 1" >>confdefs.h + +fi + integers=fast # Check whether --enable-int-quality was given. if test "${enable_int_quality+set}" = set; then : @@ -13702,7 +14065,7 @@ $as_echo "#define IEEE_FLOAT 1" >>confdefs.h fi - +newoldwritesample=disabled case $host in arm*-*-linux*) # check that... perhaps we are better off on arm with kernel math emulation @@ -13710,18 +14073,22 @@ case $host in ;; i386-*-linux*|i386-*-kfreebsd*-gnu) cpu_type="i386_fpu" + newoldwritesample=enabled ;; i486-*-linux*|i486-*-kfreebsd*-gnu) cpu_type="i486" + newoldwritesample=enabled ;; i586-*-linux*|i586-*-kfreebsd*-gnu) cpu_type="x86" + newoldwritesample=enabled ;; i686-*-linux*|i686-*-kfreebsd*-gnu) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-linux*|x86_64-*-kfreebsd*-gnu) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-*-linux*|*-*-kfreebsd*-gnu) cpu_type="generic_fpu" @@ -13733,20 +14100,22 @@ $as_echo_n "checking if CPU type supports x86-64... " >&6; } 1) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } cpu_type="x86" + newoldwritesample=enabled ;; esac ;; i386-apple-darwin*) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-apple-darwin*) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-apple-darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CPU type supports AltiVec" >&5 @@ -13766,18 +14135,20 @@ $as_echo "no" >&6; } ;; i?86-*-dragonfly* | i?86-*-freebsd* | i?86-*-midnightbsd* | i?86-*-mirbsd* | i?86-*-netbsd* | i?86-*-openbsd*) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-dragonfly* | x86_64-*-freebsd* | x86_64-*-midnightbsd* | x86_64-*-mirbsd* | x86_64-*-netbsd* | x86_64-*-openbsd*) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-*-dragonfly* | *-*-freebsd* | *-*-midnightbsd* | *-*-mirbsd* | *-*-netbsd* | *-*-openbsd*) cpu_type="generic_fpu" ;; i386-*-solaris*) cpu_type=x86 + newoldwritesample=enabled ;; x86_64-*-solaris*) - cpu_type=x86-64_all + cpu_type=x86-64 ;; *-*-solaris*) cpu_type="generic_fpu" @@ -13786,6 +14157,7 @@ $as_echo "no" >&6; } # Till we sorted out the assembler troubles, generic CPU is default. i386-pc-os2-emx) cpu_type=generic_fpu + newoldwritesample=enabled ;; x86_64-pc-os2-emx) # We are optimistic hat the future knows OS/2 on x86-64;-) @@ -13797,33 +14169,42 @@ $as_echo "no" >&6; } *-dec-osf*) cpu_type="generic_fpu" ;; - x86_64-pc-cygwin*) - cpu_type="x86-64_all" + x86_64-*-cygwin*) + cpu_type="x86-64" ;; - i686-pc-cygwin*) + i686-*-cygwin*) cpu_type="x86" + newoldwritesample=enabled ;; - i586-pc-cygwin*) + i586-*-cygwin*) cpu_type="x86" + newoldwritesample=enabled ;; - i486-pc-cygwin*) + i486-*-cygwin*) cpu_type="i486" + newoldwritesample=enabled ;; - i386-pc-cygwin*) + i386-*-cygwin*) cpu_type="i386" + newoldwritesample=enabled ;; - *-pc-cygwin*) + *-cygwin*) cpu_type="generic_fpu" ;; i[3-7]86-*-mingw32*) LIBS="$LIBS" buffer=disabled cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-mingw32*) LIBS="$LIBS" buffer=disabled cpu_type="x86-64" + ;; + i386-*-nto-qnx*) + cpu_type="x86" + newoldwritesample=enabled ;; i386-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown host operating system" >&5 @@ -13831,6 +14212,7 @@ $as_echo "$as_me: WARNING: Unknown host operating system" >&2;} cpu_type="i386" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i486-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown host operating system" >&5 @@ -13838,6 +14220,7 @@ $as_echo "$as_me: WARNING: Unknown host operating system" >&2;} cpu_type="i486" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i586-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown host operating system" >&5 @@ -13845,6 +14228,7 @@ $as_echo "$as_me: WARNING: Unknown host operating system" >&2;} cpu_type="x86" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i686-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown host operating system" >&5 @@ -13852,11 +14236,12 @@ $as_echo "$as_me: WARNING: Unknown host operating system" >&2;} cpu_type="x86" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; x86_64-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown host operating system" >&5 $as_echo "$as_me: WARNING: Unknown host operating system" >&2;} - cpu_type="x86-64_all" + cpu_type="x86-64" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" ;; @@ -13885,6 +14270,19 @@ if test "${enable_buffer+set}" = set; then : fi +# Check whether --enable-newoldwritesample was given. +if test "${enable_newoldwritesample+set}" = set; then : + enableval=$enable_newoldwritesample; + if test "x$enableval" = xyes + then + newoldwritesample=enabled + else + newoldwritesample=disabled + fi + +fi + + if test "x$with_cpu" != "x"; then cpu_type=$with_cpu fi @@ -14063,6 +14461,23 @@ _ACEOF # based on posting from John Dalgliesh on ffmpeg (LGPL) mailing list +# extended to use balign if present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if .balign is present" >&5 +$as_echo_n "checking if .balign is present... " >&6; } +echo '.balign 4' > conftest.s +if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define ASMALIGN_BALIGN 1" >>confdefs.h + + +else + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + # find if .align arg is power-of-two or not asmalign_exp="unknown" if test x"$asmalign_exp" = xunknown; then @@ -14084,6 +14499,12 @@ if test x"$asmalign_exp" = xyes; then $as_echo "#define ASMALIGN_EXP 1" >>confdefs.h +else + +$as_echo "#define ASMALIGN_BYTE 1" >>confdefs.h + +fi + fi ccalign="unknown" @@ -14104,6 +14525,97 @@ $as_echo "no" >&6; } fi +avx_support="unknown" +if test x"$avx_support" = xunknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if assembler supports AVX instructions" >&5 +$as_echo_n "checking if assembler supports AVX instructions... " >&6; } + avx_support="no" + echo '.text' > conftest.s + echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s + if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then + avx_support="yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + rm -f conftest.o conftest.s +fi + +if test x"$avx_support" = xno; then + for ac_prog in yasm +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_YASM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$YASM"; then + ac_cv_prog_YASM="$YASM" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YASM="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +YASM=$ac_cv_prog_YASM +if test -n "$YASM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YASM" >&5 +$as_echo "$YASM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$YASM" && break +done +test -n "$YASM" || YASM="no" + + if test x"$YASM" != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $YASM supports GAS syntax and AVX instructions" >&5 +$as_echo_n "checking if $YASM supports GAS syntax and AVX instructions... " >&6; } + echo '.text' > conftest.s + echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s + if $YASM -pgas -rcpp -o conftest.o conftest.s 1>/dev/null 2>&1; then + avx_support="yes" + YASMFLAGS="-pgas -rgas -mamd64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + rm -f conftest.o conftest.s + fi +else + YASM="no" +fi + +if test "x$cpu_type" = "xavx"; then + if test "x$avx_support" != "xyes"; then + as_fn_error $? "Assembler doesn't understand AVX instructions." "$LINENO" 5 + fi +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -14429,13 +14941,17 @@ _ACEOF esac rm -rf conftest* fi + + fi if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '[^0-9]' > /dev/null; then LFS_LOBJ= + largefile_sensitive=no else # Add dual-mode wrapper code. LFS_LOBJ=lfs_wrap.lo + largefile_sensitive=yes fi # Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf. @@ -14693,12 +15209,23 @@ _ACEOF -# The alias functions want to know the native off_t bits. -# "Native" also means large file offsets, if enabled, it's what is native to the mpg123 library. -if test "x$ac_cv_sizeof_long" = "x"; then - as_fn_error $? "Cannot determine sizeof(long)?" "$LINENO" 5 +if test "x$largefile_sensitive" = xyes; then + lfs_alias_type=long + lfs_alias_size=$ac_cv_sizeof_long else - LFS_ALIAS_BITS=`expr "$ac_cv_sizeof_long" "*" "8"` + lfs_alias_type=off_t + lfs_alias_size=$ac_cv_sizeof_off_t +fi + +if test "x$lfs_alias_size" = "x"; then + as_fn_error $? "Cannot determine sizeof(lfs_alias_t)?" "$LINENO" 5 +else + LFS_ALIAS_BITS=`expr "$lfs_alias_size" "*" "8"` + +cat >>confdefs.h <<_ACEOF +#define lfs_alias_t $lfs_alias_type +_ACEOF + cat >>confdefs.h <<_ACEOF #define LFS_ALIAS_BITS $LFS_ALIAS_BITS @@ -15092,23 +15619,6 @@ fi done -if test x"$fifo" = xauto; then - if test x"$have_mkfifo" = xyes; then - fifo=enabled - else - fifo=disabled - fi -fi -if test x"$fifo" = xenabled; then - -$as_echo "#define FIFO 1" >>confdefs.h - - if test x"$have_mkfifo" = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You forced FIFO code while I think there is no mkfifo() available! " >&5 -$as_echo "$as_me: WARNING: You forced FIFO code while I think there is no mkfifo() available! " >&2;} - fi -fi - # locale headers for ac_header in locale.h langinfo.h @@ -15465,12 +15975,54 @@ ADD_CPPFLAGS="" ADD_LDFLAGS="" LIBS="$LIBS" +# Consider moving that stuff. ac_fn_c_check_header_mongrel "$LINENO" "os2.h" "ac_cv_header_os2_h" "$ac_includes_default" if test "x$ac_cv_header_os2_h" = xyes; then : ADD_CPPFLAGS="$ADD_CPPFLAGS -DOS2" fi +# On OS/2, we need to link to os2term to make terminal control actually work. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcsetattr in -los2term" >&5 +$as_echo_n "checking for tcsetattr in -los2term... " >&6; } +if ${ac_cv_lib_os2term_tcsetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-los2term $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tcsetattr (); +int +main () +{ +return tcsetattr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_os2term_tcsetattr=yes +else + ac_cv_lib_os2term_tcsetattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_os2term_tcsetattr" >&5 +$as_echo "$ac_cv_lib_os2term_tcsetattr" >&6; } +if test "x$ac_cv_lib_os2term_tcsetattr" = xyes; then : + ADD_LDFLAGS="$ADD_LDFLAGS -los2term" +fi + # If debugging is enabled then make warnings errors if test x"$debugging" = xenabled; then @@ -15499,14 +16051,20 @@ s_i586="$s_i386 synth_i586" s_i586d="$s_i386 synth_i586_dither" s_3dnow="$s_i386 synth_3dnow dct64_3dnow equalizer_3dnow" s_3dnowext="$s_i386 dct64_3dnowext tabinit_mmx synth_3dnowext" +s_3dnow_vintage=$s_3dnow +s_3dnowext_vintage=$s_3dnowext if test "x$layer3" = "xenabled"; then - s_3dnow="$s_3dnow dct36_3dnow" - s_3dnowext="$s_3dnowext dct36_3dnowext" + s_3dnow_vintage="$s_3dnow_vintage dct36_3dnow" + s_3dnowext_vintage="$s_3dnowext_vintage dct36_3dnowext" fi s_mmx="$s_i386 dct64_mmx tabinit_mmx synth_mmx" -s_sse="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 " -s_x86_64="dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32" +s_sse_vintage="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 " +s_sse="$s_sse_vintage dct36_sse" +s_x86_64="dct36_x86_64 dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32" +s_x86_64_mono_synths="synth_x86_64_float synth_x86_64_s32" +s_x86_64_avx="dct36_avx dct64_avx dct64_avx_float synth_stereo_avx_float synth_stereo_avx_s32" s_x86multi="getcpuflags" +s_x86_64_multi="getcpuflags_x86_64" s_dither="dither" s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo_neon_float synth_stereo_neon_s32" @@ -15514,12 +16072,18 @@ s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo # note: supporting deactivation of output formats for these decoders would need more logic here if test "x$integers" = "xquality"; then s_sse="$s_sse synth_sse_accurate synth_stereo_sse_accurate" + s_sse_vintage="$s_sse_vintage synth_sse_accurate synth_stereo_sse_accurate" s_x86_64="$s_x86_64 synth_x86_64_accurate synth_stereo_x86_64_accurate" + s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64_accurate" + s_x86_64_avx="$s_x86_64_avx synth_stereo_avx_accurate" s_arm="synth_arm_accurate" s_neon="$s_neon synth_neon_accurate synth_stereo_neon_accurate" else s_sse="$s_sse synth_sse" # no stereo + s_sse_vintage="$s_sse_vintage synth_sse" # no stereo s_x86_64="$s_x86_64 synth_x86_64 synth_stereo_x86_64" + s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64" + s_x86_64_avx="$s_x86_64_avx synth_stereo_avx" s_arm="synth_arm" s_neon="$s_neon synth_neon synth_stereo_neon" fi @@ -15546,7 +16110,7 @@ case $cpu_type in ccalign=no ;; ppc_nofpu) - ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_GENERIC -DOPT_PPC -DREAL_IS_FIXED" + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_PPC -DREAL_IS_FIXED" more_sources= ccalign=no ;; @@ -15609,6 +16173,10 @@ $as_echo "no" >&6; } ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW -DREAL_IS_FLOAT" more_sources="$s_fpu $s_i586 $s_3dnow $s_x86multi " ;; + 3dnow_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_i586 $s_3dnow_vintage $s_x86multi " + ;; 3dnow_alone) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOW -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnow" @@ -15617,6 +16185,10 @@ $as_echo "no" >&6; } ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOWEXT -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnowext" ;; + 3dnowext_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_3dnowext_vintage $s_3dnow $s_x86multi" + ;; 3dnowext) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnowext $s_3dnow $s_x86multi" @@ -15629,17 +16201,39 @@ $as_echo "no" >&6; } ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE -DREAL_IS_FLOAT" more_sources="$s_fpu $s_sse" ;; - x86|x86_dither) - ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOWEXT -DOPT_SSE -DREAL_IS_FLOAT" - more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow $s_3dnowext $s_sse $s_x86multi $s_dither" + sse_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_sse_vintage" ;; - x86-64) + avx) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_x86_64_avx $s_x86_64_mono_synths" + if test "x$YASM" != "xno"; then + use_yasm_for_avx="yes" + fi + ;; + x86|x86_dither) + # plain C dct36 always there, for vintage/non-vintage + # Selection of non-/vintage sources implies that + # $s_3dnow_vintage contains $s_3dnow, + # $s_sse contains $s_sse_vintage. + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow_vintage $s_3dnowext_vintage $s_sse $s_x86multi $s_dither" + ;; + x86-64_alone) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_X86_64 -DREAL_IS_FLOAT" more_sources="$s_fpu $s_x86_64" ;; - x86-64_all|x86-64_dither) + x86-64|x86-64_all|x86-64_dither) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_X86_64 -DOPT_GENERIC -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT" - more_sources="$s_fpu $s_x86_64 $s_dither" + more_sources="$s_fpu $s_x86_64 $s_dither $s_x86_64_multi" + if test "x$avx_support" = "xyes"; then + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX" + more_sources="$more_sources $s_x86_64_avx" + if test "x$YASM" != "xno"; then + use_yasm_for_avx="yes" + fi + fi ;; *) as_fn_error $? "Unknown CPU type '$cpu_type'" "$LINENO" 5 @@ -15648,7 +16242,7 @@ esac # Mac OS X specific linker flags case $cpu_type in - 3dnow|3dnow_alone|3dnowext|3dnowext_alone|mmx|mmx_alone|sse|sse_alone|x86|x86_dither) + 3dnow|3dnow_vintage|3dnow_alone|3dnowext|3dnowext_vintage|3dnowext_alone|mmx|mmx_alone|sse|sse_vintage|sse_alone|x86|x86_dither) case $host in i386-apple-darwin8*|*-apple-darwin10*) ADD_LDFLAGS="$ADD_LDFLAGS -Wl,-read_only_relocs,suppress" @@ -15661,6 +16255,33 @@ case $cpu_type in ;; esac +# Use yasm instead of the default assembler for AVX sources +if test "x$use_yasm_for_avx" = "xyes"; then + case $host_os in + *cygwin*|*mingw*) + YASM_FORMAT="-f win64" + ;; + *darwin*) + YASM_FORMAT="-f macho" + ;; + *) + YASM_FORMAT="-f elf" + ;; + esac + +$as_echo "#define USE_YASM_FOR_AVX 1" >>confdefs.h + +fi + if test "x$use_yasm_for_avx" = xyes ; then + USE_YASM_FOR_AVX_TRUE= + USE_YASM_FOR_AVX_FALSE='#' +else + USE_YASM_FOR_AVX_TRUE='#' + USE_YASM_FOR_AVX_FALSE= +fi + + + # Check if we want feature report function. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want feature report function" >&5 $as_echo_n "checking if we want feature report function... " >&6; } @@ -15687,11 +16308,27 @@ if test "x$feature_report" = xenabled; then more_sources="$more_sources feature" fi +# Return 0 if first arg appears in list of following arguments. +# Return 1 otherwise. +word_in_list() { + word=$1 + shift + # Avoid naming conflict with the outside! + # Is local not POSIX sh? + for given_word in "$@" + do + if test "x$word" = "x$given_word"; then + return 0 + fi + done + return 1 +} + for i in $more_sources do - # Echo make sure every file is only once in the list. - echo "$DECODER_OBJ" | $GREP -v -w "$i\.\$(OBJEXT)" > /dev/null && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" - echo "$DECODER_LOBJ" | $GREP -v -w "$i\.lo" > /dev/null && DECODER_LOBJ="$DECODER_LOBJ $i.lo" + # Make sure every file is only once in the list. + word_in_list "$i.\$(OBJEXT)" $DECODER_OBJ || DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" + word_in_list "$i.lo" $DECODER_LOBJ || DECODER_LOBJ="$DECODER_LOBJ $i.lo" done @@ -15706,7 +16343,15 @@ fi # The full list of supported modules to check, first come, first serve. -check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy" +check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy" +# Only check qsa before all else on QNX. +# It would mask ALSA otherwise. +case $host in + *-nto-qnx*) + check_modules="qsa $check_modules" + ;; +esac + # The final list. output_modules= @@ -15740,7 +16385,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15783,7 +16428,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15871,7 +16516,70 @@ done check_failed=yes fi ;; + tinyalsa) + TINYALSA_LIBS="-ltinyalsa" + # Check for ALSA + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcm_open in -ltinyalsa" >&5 +$as_echo_n "checking for pcm_open in -ltinyalsa... " >&6; } +if ${ac_cv_lib_tinyalsa_pcm_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinyalsa $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pcm_open (); +int +main () +{ +return pcm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinyalsa_pcm_open=yes +else + ac_cv_lib_tinyalsa_pcm_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinyalsa_pcm_open" >&5 +$as_echo "$ac_cv_lib_tinyalsa_pcm_open" >&6; } +if test "x$ac_cv_lib_tinyalsa_pcm_open" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "tinyalsa/asoundlib.h" "ac_cv_header_tinyalsa_asoundlib_h" "$ac_includes_default" +if test "x$ac_cv_header_tinyalsa_asoundlib_h" = xyes; then : + output_modules="$output_modules tinyalsa" HAVE_TINYALSA="yes" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found TINYALSA library but NOT header files on your system" >&5 +$as_echo "$as_me: WARNING: Found TINYALSA library but NOT header files on your system" >&2;} +fi + + + + +fi + + if test "x$HAVE_TINYALSA" != xyes; then + check_failed=yes + fi + ;; + # QSA and ALSA are not distinguishable in these tests, need to block + # each other and play with test order depending on platform. alsa) + if test "x$HAVE_QSA" = xyes; then + HAVE_ALSA=no + else + ALSA_LIBS="-lasound" # Check for ALSA { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5 @@ -15927,6 +16635,71 @@ fi if test "x$HAVE_ALSA" != xyes; then check_failed=yes fi + + fi # HAVE_QSA + ;; + qsa) + if test "x$HAVE_ALSA" = xyes; then + HAVE_QSA=no + else + + QSA_LIBS="-lasound" + # Check for QSA + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5 +$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; } +if ${ac_cv_lib_asound_snd_pcm_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snd_pcm_open (); +int +main () +{ +return snd_pcm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_asound_snd_pcm_open=yes +else + ac_cv_lib_asound_snd_pcm_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5 +$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; } +if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "sys/asoundlib.h" "ac_cv_header_sys_asoundlib_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_asoundlib_h" = xyes; then : + output_modules="$output_modules qsa" HAVE_QSA="yes" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found QSA library but NOT header files on your system" >&5 +$as_echo "$as_me: WARNING: Found QSA library but NOT header files on your system" >&2;} +fi + + + + +fi + + if test "x$HAVE_QSA" != xyes; then + check_failed=yes + fi + + fi # HAVE_ALSA ;; jack) @@ -16446,6 +17219,52 @@ fi done ;; + win32_wasapi) + # Check for windows ... and win32 wasapi audio + # Does not work... instead just check for header + # AC_CHECK_LIB( [avrt], [] ) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have wasapi headers" >&5 +$as_echo_n "checking if we have wasapi headers... " >&6; } + OLD_LIBS=$LIBS + LIBS="$LIBS -lole32 -lavrt" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define COBJMACROS 1 +#define _WIN32_WINNT 0x601 +#include +#include +#include +#include +int main(){ + /* UUID Checks */ + GUID *IDs = { + &CLSID_MMDeviceEnumerator, + &IID_IMMDeviceEnumerator, + &IID_IAudioClient, + &IID_IAudioRenderClient + }; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + HAVE_WIN32_WASAPI=yes +else + HAVE_WIN32_WASAPI=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$OLD_LIBS + WIN32_WASAPI_LIBS="-lole32 -lavrt" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_WIN32_WASAPI" >&5 +$as_echo "$HAVE_WIN32_WASAPI" >&6; } + if test "x$HAVE_WIN32_WASAPI" = xyes; then + output_modules="$output_modules win32_wasapi" + else + check_failed=yes + fi + ;; sndio) SNDIO_LIBS=-lsndio { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sio_open in -lsndio" >&5 @@ -16767,7 +17586,8 @@ if test "x$check_forced" = xyes -a "x$check_failed" = "xyes"; then fi # When you extend check_modules, you should extend this: -#for i in alsa oss coreaudio sndio sun win32 esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | +#for i in alsa qsa oss coreaudio sndio sun win32 win32_wasapi esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy +#do echo $i; done | #perl -ne 'chomp; $big = uc($_); print < { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + +#### Check for Win32 Named Pipe functions +win32_fifo_working=no +if test x$win32_specific_codes = xenabled; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have Named Pipes" >&5 +$as_echo_n "checking if we have Named Pipes... " >&6; } + if test "x$fifo" != "xdisabled"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int main(){ + CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + return 0; + } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + win32_fifo_working=yes +else + win32_winver_bump=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "x$win32_fifo_working" != "xyes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define WINVER 0x501 + #define _WIN32_WINNT 0x501 + #include + int main(){ + CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + return 0; + } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + win32_fifo_working=yes +else + win32_fifo_working=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + fi + have_mkfifo=$win32_fifo_working + if test "x$win32_fifo_working" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define WANT_WIN32_FIFO 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + +#### WINVER Bump +if test x$win32_specific_codes = xenabled; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WINVER and _WIN32_WINNT needs version bumps" >&5 $as_echo_n "checking if WINVER and _WIN32_WINNT needs version bumps... " >&6; } if test "x$win32_winver_bump" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CFLAGS="$CFLAGS -DWINVER=0x0501 -D_WIN32_WINNT=0x0501" + +$as_echo "#define WINVER 0x0501" >>confdefs.h + + +$as_echo "#define _WIN32_WINNT 0x0501" >>confdefs.h + # getaddrinfo and freeaddrinfo are available for Win2K and above # Bug: MinGW.org w32api ws2tcpip.h incorrectly wants (_WIN32_WINNT >= 0x0501) for getaddrinfo and freeaddrinfo # MultiByteToWideChar and WideCharToMultiByte are available for Win2K and above @@ -17440,6 +18378,34 @@ $as_echo "no" >&6; } fi fi +fi #END OF WIN32 CHECKS + +#### Check mingw.org for EOVERFLOW +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have EOVERFLOW macro" >&5 +$as_echo_n "checking if we have EOVERFLOW macro... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +int i = (EOVERFLOW) + 0; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eoverflow_present=yes +else + eoverflow_present=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $eoverflow_present" >&5 +$as_echo "$eoverflow_present" >&6; } +if test "x$eoverflow_present" = "xyes"; then : + +else + +$as_echo "#define EOVERFLOW EFBIG" >>confdefs.h + +fi + #### Use Win32 support codes if test "x$win32_specific_codes" = xenabled ; then WIN32_CODES_TRUE= @@ -17465,6 +18431,25 @@ if test x"$ipv6" = xauto; then fi fi + +if test x"$fifo" = xauto; then + if test x"$have_mkfifo" = xyes; then + fifo=enabled + else + fifo=disabled + fi +fi + +if test x"$fifo" = xenabled; then + +$as_echo "#define FIFO 1" >>confdefs.h + + if test x"$have_mkfifo" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You forced FIFO code while I think there is no mkfifo() available! " >&5 +$as_echo "$as_me: WARNING: You forced FIFO code while I think there is no mkfifo() available! " >&2;} + fi +fi + if test x"$network" = xenabled; then $as_echo "#define NETWORK 1" >>confdefs.h @@ -17603,6 +18588,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -17632,10 +18625,22 @@ if test -z "${HAVE_MODULES_TRUE}" && test -z "${HAVE_MODULES_FALSE}"; then as_fn_error $? "conditional \"HAVE_MODULES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_YASM_FOR_AVX_TRUE}" && test -z "${USE_YASM_FOR_AVX_FALSE}"; then + as_fn_error $? "conditional \"USE_YASM_FOR_AVX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_TINYALSA_TRUE}" && test -z "${HAVE_TINYALSA_FALSE}"; then + as_fn_error $? "conditional \"HAVE_TINYALSA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then as_fn_error $? "conditional \"HAVE_ALSA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_QSA_TRUE}" && test -z "${HAVE_QSA_FALSE}"; then + as_fn_error $? "conditional \"HAVE_QSA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then as_fn_error $? "conditional \"HAVE_OSS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17656,6 +18661,10 @@ if test -z "${HAVE_WIN32_TRUE}" && test -z "${HAVE_WIN32_FALSE}"; then as_fn_error $? "conditional \"HAVE_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_WIN32_WASAPI_TRUE}" && test -z "${HAVE_WIN32_WASAPI_FALSE}"; then + as_fn_error $? "conditional \"HAVE_WIN32_WASAPI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_ESD_TRUE}" && test -z "${HAVE_ESD_FALSE}"; then as_fn_error $? "conditional \"HAVE_ESD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18018,16 +19027,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -18087,28 +19096,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18129,8 +19126,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mpg123 $as_me 1.13.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by mpg123 $as_me 1.17.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18195,11 +19192,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mpg123 config.status 1.13.4 -configured by $0, generated by GNU Autoconf 2.68, +mpg123 config.status 1.17.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18290,7 +19287,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -18335,6 +19332,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -18415,7 +19413,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -18474,6 +19471,7 @@ DLLTOOL \ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -18522,7 +19520,6 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -19210,7 +20207,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19223,7 +20220,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -19257,21 +20254,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -19325,8 +20320,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -19389,6 +20384,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -19684,10 +20682,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -20001,19 +20995,10 @@ else echo " The lib will (try to) support default offset size, too." fi echo " LFS alias symbols ....... $lfs_alias ($LFS_ALIAS_BITS)" +echo " LFS alias type .......... $lfs_alias_type" -echo " Alignment checks ........ $aligncheck" -if test x"$aligncheck" = xenabled; then - if test x"$ccalign" != xyes; then - echo " (without effect since special alignment is not employed)" - fi - if test x"$GCC" = xyes; then - echo " (note that newer gcc 4.x versions do not use/need the align check)" - fi -fi echo -n " Core libmpg123 features: - Integer conversion ...... $integers Layer I ................. $layer1 Layer II ................ $layer2 Layer III ............... $layer3 @@ -20031,6 +21016,12 @@ echo -n " 16 bit integer .......... $int16 32/24 bit integer ....... $int32 real (32 bit float) ..... $real + Optimization detail: + Integer conversion ...... $integers + New/old WRITE_SAMPLE .... $newoldwritesample + new Huffman scheme ...... $newhuff + +Note: Disabling core features is not commonly done and some combinations might not build/work. If you encounter such a case, help yourself (and provide a patch) or just poke the maintainers. " # just an empty line echo diff --git a/jni/mpg123-1.13.4/configure.ac b/jni/mpg123-1.17.0/configure.ac similarity index 77% rename from jni/mpg123-1.13.4/configure.ac rename to jni/mpg123-1.17.0/configure.ac index 88ffbe74..c60e8f9c 100644 --- a/jni/mpg123-1.13.4/configure.ac +++ b/jni/mpg123-1.17.0/configure.ac @@ -7,12 +7,11 @@ dnl initially written by Nicholas J. Humfrey dnl Require autoconf version >= 2.57 AC_PREREQ(2.57) - dnl ############# Initialisation -AC_INIT([mpg123], [1.13.4], [mpg123-devel@lists.sourceforge.net]) +AC_INIT([mpg123], [1.17.0], [mpg123-devel@lists.sourceforge.net]) dnl Increment API_VERSION when the API gets changes (new functions). -API_VERSION=29 -LIB_PATCHLEVEL=6 +API_VERSION=38 +LIB_PATCHLEVEL=4 dnl Since we want to be backwards compatible, both sides get set to API_VERSION. LIBMPG123_VERSION=$API_VERSION:$LIB_PATCHLEVEL:$API_VERSION AC_SUBST(LIBMPG123_VERSION) @@ -26,7 +25,7 @@ AC_CANONICAL_HOST dnl Version 1.7 of automake is recommended AM_INIT_AUTOMAKE(1.7) -AM_CONFIG_HEADER(src/config.h) +AC_CONFIG_HEADERS([src/config.h]) # You get strange symptoms like jack module build failing because the AC_C_CONST failed to detect the working const support. @@ -35,10 +34,11 @@ AM_CONFIG_HEADER(src/config.h) AC_MSG_CHECKING([for -Werror in CFLAGS (It breaks tests)]) if echo "$CFLAGS" | grep Werror; then AC_MSG_RESULT([yes]) - AC_MSG_ERROR([I refuse to run with -Werror in CFLAGS. That breaks tests and makes this configure bogus. + AC_MSG_WARN([You have -Werror in CFLAGS. That may break some tests and make this configure bogus. If you want paranoid compilation, use --enable-nagging option, which adds -Werror for gcc. Also note that you shall not run make distcheck after configuring with --enable-nagging. -distcheck uses the generated CFLAGS...]) +distcheck uses the generated CFLAGS... +Anyhow, continuing at your own risk.]) else AC_MSG_RESULT([no]) fi @@ -382,10 +382,24 @@ AC_ARG_ENABLE(messages, if test "x$messages" = "xdisabled"; then AC_DEFINE(NO_WARNING, 1, [ Define to disable warning messages. ]) - AC_DEFINE(NO_ERROR, 1, [ Define to disable error messages. ]) + AC_DEFINE(NO_ERRORMSG, 1, [ Define to disable error messages. ]) AC_DEFINE(NO_ERETURN, 1, [ Define to disable error messages in combination with a return value (the return is left intact). ]) fi +newhuff=enabled +AC_ARG_ENABLE(new-huffman, +[ --enable-new-huffman=[yes/no] use new huffman decoding scheme by Taihei (faster on modern CPUs at least, so on by default) ], +[ + if test "x$enableval" = xno; then + newhuff=disabled + fi +] +, []) + +if test "x$newhuff" = "xenabled"; then + AC_DEFINE(USE_NEW_HUFFTABLE, 1, [ Define for new Huffman decoding scheme. ]) +fi + integers=fast AC_ARG_ENABLE(int-quality, [ --enable-int-quality=[yes/no] use rounding instead of fast truncation for integer output, where possible ], @@ -442,15 +456,19 @@ AC_ARG_WITH([cpu], [ --with-cpu=i486 Use code optimized for i486 processors (only usable alone!) --with-cpu=i586 Use code optimized for i586 processors --with-cpu=i586_dither Use code optimized for i586 processors with dithering (noise shaping), adds 256K to binary size - --with-cpu=3dnow Use code optimized for 3DNow processors - --with-cpu=3dnowext Use code optimized for 3DNowExt processors (K6-3+, Athlon) + --with-cpu=3dnow Use code optimized for 3DNow processors + --with-cpu=3dnow_vintage Use code optimized for older 3DNow processors (K6 family) + --with-cpu=3dnowext Use code optimized for 3DNowExt processors (K6-3+, Athlon) --with-cpu=3dnowext_alone Really only 3DNowExt decoder, without 3DNow fallback for flexible rate + --with-cpu=3dnow_vintage Use code optimized for older extended 3DNow processors (like K6-III+) --with-cpu=mmx Use code optimized for MMX processors --with-cpu=mmx_alone Really only MMX decoder, without i586 fallback for flexible rate --with-cpu=sse Use code optimized for SSE processors + --with-cpu=sse_vintage Use code optimized for older SSE processors (plain C DCT36) --with-cpu=sse_alone Really only SSE decoder, without i586 fallback for flexible rate + --with-cpu=avx Use code optimized for x86-64 with AVX processors --with-cpu=x86 Pack all x86 opts into one binary (excluding i486, including dither) - --with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including dithered generic) + --with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including AVX and dithered generic) --with-cpu=altivec Use code optimized for Altivec processors (PowerPC G4 and G5) --with-cpu=ppc_nofpu Use code optimized for PowerPC processors with fixed point arithmetic (experimental) --with-cpu=neon Use code optimized for ARM NEON SIMD engine (Cortex-A series) @@ -472,7 +490,7 @@ if test "x$ieee" = xyes; then AC_DEFINE(IEEE_FLOAT, 1, [ Define to indicate that float storage follows IEEE754. ]) fi - +newoldwritesample=disabled case $host in arm*-*-linux*) # check that... perhaps we are better off on arm with kernel math emulation @@ -480,18 +498,22 @@ case $host in ;; i386-*-linux*|i386-*-kfreebsd*-gnu) cpu_type="i386_fpu" + newoldwritesample=enabled ;; i486-*-linux*|i486-*-kfreebsd*-gnu) cpu_type="i486" + newoldwritesample=enabled ;; i586-*-linux*|i586-*-kfreebsd*-gnu) cpu_type="x86" + newoldwritesample=enabled ;; i686-*-linux*|i686-*-kfreebsd*-gnu) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-linux*|x86_64-*-kfreebsd*-gnu) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-*-linux*|*-*-kfreebsd*-gnu) cpu_type="generic_fpu" @@ -501,19 +523,21 @@ case $host in case `sysctl -n hw.optional.x86_64` in 1) AC_MSG_RESULT([yes]) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *) AC_MSG_RESULT([no]) cpu_type="x86" + newoldwritesample=enabled ;; esac ;; i386-apple-darwin*) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-apple-darwin*) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-apple-darwin*) AC_MSG_CHECKING([if CPU type supports AltiVec]) @@ -530,18 +554,20 @@ case $host in ;; i?86-*-dragonfly* | i?86-*-freebsd* | i?86-*-midnightbsd* | i?86-*-mirbsd* | i?86-*-netbsd* | i?86-*-openbsd*) cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-dragonfly* | x86_64-*-freebsd* | x86_64-*-midnightbsd* | x86_64-*-mirbsd* | x86_64-*-netbsd* | x86_64-*-openbsd*) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-*-dragonfly* | *-*-freebsd* | *-*-midnightbsd* | *-*-mirbsd* | *-*-netbsd* | *-*-openbsd*) cpu_type="generic_fpu" ;; i386-*-solaris*) cpu_type=x86 + newoldwritesample=enabled ;; x86_64-*-solaris*) - cpu_type=x86-64_all + cpu_type=x86-64 ;; *-*-solaris*) cpu_type="generic_fpu" @@ -550,6 +576,7 @@ case $host in # Till we sorted out the assembler troubles, generic CPU is default. i386-pc-os2-emx) cpu_type=generic_fpu + newoldwritesample=enabled ;; x86_64-pc-os2-emx) # We are optimistic hat the future knows OS/2 on x86-64;-) @@ -561,61 +588,74 @@ case $host in *-dec-osf*) cpu_type="generic_fpu" ;; - x86_64-pc-cygwin*) - cpu_type="x86-64_all" + x86_64-*-cygwin*) + cpu_type="x86-64" ;; - i686-pc-cygwin*) + i686-*-cygwin*) cpu_type="x86" + newoldwritesample=enabled ;; - i586-pc-cygwin*) + i586-*-cygwin*) cpu_type="x86" + newoldwritesample=enabled ;; - i486-pc-cygwin*) + i486-*-cygwin*) cpu_type="i486" + newoldwritesample=enabled ;; - i386-pc-cygwin*) + i386-*-cygwin*) cpu_type="i386" + newoldwritesample=enabled ;; - *-pc-cygwin*) + *-cygwin*) cpu_type="generic_fpu" ;; i@<:@3-7@:>@86-*-mingw32*) LIBS="$LIBS" buffer=disabled cpu_type="x86" + newoldwritesample=enabled ;; x86_64-*-mingw32*) LIBS="$LIBS" buffer=disabled cpu_type="x86-64" + ;; + i386-*-nto-qnx*) + cpu_type="x86" + newoldwritesample=enabled ;; i386-*) AC_MSG_WARN([Unknown host operating system]) cpu_type="i386" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i486-*) AC_MSG_WARN([Unknown host operating system]) cpu_type="i486" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i586-*) AC_MSG_WARN([Unknown host operating system]) cpu_type="x86" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; i686-*) AC_MSG_WARN([Unknown host operating system]) cpu_type="x86" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" + newoldwritesample=enabled ;; x86_64-*) AC_MSG_WARN([Unknown host operating system]) - cpu_type="x86-64_all" + cpu_type="x86-64" buffer=disabled ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS" ;; @@ -641,6 +681,17 @@ AC_ARG_ENABLE(buffer, ] ) +AC_ARG_ENABLE(newoldwritesample, +[ --enable-newoldwritesample=[no/yes] enable new/old WRITE_SAMPLE macro for non-accurate 16 bit output, faster on certain CPUs (default on on x86-32)], +[ + if test "x$enableval" = xyes + then + newoldwritesample=enabled + else + newoldwritesample=disabled + fi +]) + dnl Did user choose other CPU type ? if test "x$with_cpu" != "x"; then cpu_type=$with_cpu @@ -754,26 +805,29 @@ AC_ARG_WITH([audio], [ --with-audio= Select a list (or only one) of audio output modules (comma or space separated list). ]) AC_ARG_WITH([default-audio], [ - --with-default-audio=aix Use AIX as default audio output sub-system - --with-default-audio=alib Use Alib as default audio output sub-system (for HPUX) - --with-default-audio=alsa Use ALSA as default audio output sub-system - --with-default-audio=arts Use aRts as default audio output sub-system (KDE sound server) - --with-default-audio=dummy Use dummy as default audio (when no sound card is available) - --with-default-audio=esd Use ESoundD as default audio output sub-system - --with-default-audio=hp Use HP as default audio output sub-system - --with-default-audio=jack Use JACK as default low-latency audio server - --with-default-audio=coreaudio Use Mac OS X as default audio output sub-system (CoreAudio) - --with-default-audio=mint Use MinT as default audio output sub-system (Atari) - --with-default-audio=nas Use NAS as default audio output (Network Audio System) - --with-default-audio=os2 Use OS2 as default audio output sub-system - --with-default-audio=oss Use OSS as default audio output sub-system (/dev/dsp) - --with-default-audio=portaudio Use PortAudio as default audio output sub-system - --with-default-audio=pulse Use Pulse audio server as default audio output sub-system - --with-default-audio=sdl Use SDL as default audio output sub-system (Simple DirectMedia Layer) - --with-default-audio=sgi Use SGI as default audio output sub-system (IRIX) - --with-default-audio=sndio Use OpenBSD's sndio as default audio output sub-system - --with-default-audio=sun Use Sun as default audio output sub-system (/dev/audio) - --with-default-audio=win32 Use Win32 audio as default audio output sub-system + --with-default-audio=aix Use AIX as default audio output sub-system + --with-default-audio=alib Use Alib as default audio output sub-system (for HPUX) + --with-default-audio=alsa Use ALSA as default audio output sub-system (libasound) + --with-default-audio=tinyalsa Use ALSA as default audio output sub-system (tinyalsa) + --with-default-audio=arts Use aRts as default audio output sub-system (KDE sound server) + --with-default-audio=dummy Use dummy as default audio (when no sound card is available) + --with-default-audio=esd Use ESoundD as default audio output sub-system + --with-default-audio=hp Use HP as default audio output sub-system + --with-default-audio=jack Use JACK as default low-latency audio server + --with-default-audio=coreaudio Use Mac OS X as default audio output sub-system (CoreAudio) + --with-default-audio=mint Use MinT as default audio output sub-system (Atari) + --with-default-audio=nas Use NAS as default audio output (Network Audio System) + --with-default-audio=os2 Use OS2 as default audio output sub-system + --with-default-audio=oss Use OSS as default audio output sub-system (/dev/dsp) + --with-default-audio=portaudio Use PortAudio as default audio output sub-system + --with-default-audio=pulse Use Pulse audio server as default audio output sub-system + --with-default-audio=qsa Use QSA as default audio output sub-system + --with-default-audio=sdl Use SDL as default audio output sub-system (Simple DirectMedia Layer) + --with-default-audio=sgi Use SGI as default audio output sub-system (IRIX) + --with-default-audio=sndio Use OpenBSD's sndio as default audio output sub-system + --with-default-audio=sun Use Sun as default audio output sub-system (/dev/audio) + --with-default-audio=win32 Use Win32 audio as default audio output sub-system + --with-default-audio=win32_wasapi Use Win32 wasapi audio as default audio output sub-system ]) AC_ARG_WITH([optimization], [ @@ -807,6 +861,18 @@ AC_DEFINE_UNQUOTED( MODULE_FILE_SUFFIX, "$with_module_suffix", [The suffix for m dnl ############## Assembler, compiler properties # based on posting from John Dalgliesh on ffmpeg (LGPL) mailing list +# extended to use balign if present +AC_MSG_CHECKING([if .balign is present]) +echo '.balign 4' > conftest.s +if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then + + AC_MSG_RESULT([yes]) + AC_DEFINE(ASMALIGN_BALIGN, 1, [ Define if .balign is present. ]) + +else + +AC_MSG_RESULT([no]) + # find if .align arg is power-of-two or not asmalign_exp="unknown" if test x"$asmalign_exp" = xunknown; then @@ -823,6 +889,10 @@ if test x"$asmalign_exp" = xunknown; then fi if test x"$asmalign_exp" = xyes; then AC_DEFINE(ASMALIGN_EXP, 1, [ Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. ]) +else + AC_DEFINE(ASMALIGN_BYTE, 1, [ Define if .align just takes byte count. ]) +fi + fi ccalign="unknown" @@ -842,6 +912,49 @@ fi dnl We apply alignment hints only to cpus that need it. dnl See further below for the definition of CCALIGN +avx_support="unknown" +if test x"$avx_support" = xunknown; then + AC_MSG_CHECKING([if assembler supports AVX instructions]) + avx_support="no" + echo '.text' > conftest.s + echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s + if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then + avx_support="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + rm -f conftest.o conftest.s +fi + +if test x"$avx_support" = xno; then + AC_CHECK_PROGS(YASM,[yasm],no) + if test x"$YASM" != xno; then + AC_MSG_CHECKING([if $YASM supports GAS syntax and AVX instructions]) + echo '.text' > conftest.s + echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s + if $YASM -pgas -rcpp -o conftest.o conftest.s 1>/dev/null 2>&1; then + avx_support="yes" + YASMFLAGS="-pgas -rgas -mamd64" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + rm -f conftest.o conftest.s + fi +else + YASM="no" +fi + +if test "x$cpu_type" = "xavx"; then + if test "x$avx_support" != "xyes"; then + AC_MSG_ERROR([Assembler doesn't understand AVX instructions.]) + fi +fi + +AC_SUBST(YASM) +AC_SUBST(YASMFLAGS) + dnl ############## Really basic headers, needed for other checks. AC_HEADER_STDC @@ -859,12 +972,16 @@ dnl Using the file_offset_bits variable here is fine for linux (possibly Solaris dnl Others... we'll have to see. dnl Note: I started writing this with with multiline replacements. dnl Does not work. Automake insists on putting these into Makefiles where they break things. +dnl It is also assumed that a system that does not set file offset bits is not +dnl sensitive to largefile changes, i.e. FreeBSD always using 64 bit off_t. if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '@<:@^0-9@:>@' > /dev/null; then dnl if it has non-numeric chars or is empty... ignore... LFS_LOBJ= + largefile_sensitive=no else # Add dual-mode wrapper code. LFS_LOBJ=lfs_wrap.lo + largefile_sensitive=yes fi # Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf. @@ -882,19 +999,30 @@ AC_CHECK_SIZEOF(off_t,4) AC_CHECK_SIZEOF(int32_t) AC_CHECK_SIZEOF(long,4) -# The alias functions want to know the native off_t bits. -# "Native" also means large file offsets, if enabled, it's what is native to the mpg123 library. -if test "x$ac_cv_sizeof_long" = "x"; then - AC_MSG_ERROR([Cannot determine sizeof(long)?]) +dnl The native type used for aliases is what off_t maps to without any largefile- +dnl enabling switches. So, it's long int if the system is largefile-senstive, +dnl but it is actual plain off_t if the system does not have such switches. +if test "x$largefile_sensitive" = xyes; then + lfs_alias_type=long + lfs_alias_size=$ac_cv_sizeof_long else - LFS_ALIAS_BITS=`expr "$ac_cv_sizeof_long" "*" "8"` + lfs_alias_type=off_t + lfs_alias_size=$ac_cv_sizeof_off_t +fi + +if test "x$lfs_alias_size" = "x"; then + AC_MSG_ERROR([Cannot determine sizeof(lfs_alias_t)?]) +else + LFS_ALIAS_BITS=`expr "$lfs_alias_size" "*" "8"` + AC_DEFINE_UNQUOTED([lfs_alias_t], $lfs_alias_type, + [Define to the native offset type (long or actually off_t).]) AC_DEFINE_UNQUOTED([LFS_ALIAS_BITS], $LFS_ALIAS_BITS, - [Define this to the size of long type in bits, used for LFS small/native alias functions.]) + [Define this to the size of native offset type in bits, used for LFS alias functions.]) fi lfs_alias=enabled AC_ARG_ENABLE(lfs-alias, - [ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 in addition to mpg123_seek, mpg123_seek_64 as alias on x86-64) ], + [ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 or mpg123_seek_64 in addition to mpg123_seek, or the other way around; It is a mess, do not play with this!) ], [ if test "x$enableval" = xno; then lfs_alias="disabled" @@ -950,20 +1078,6 @@ AC_CHECK_FUNCS( atoll ) AC_CHECK_FUNCS( mkfifo, [ have_mkfifo=yes ], [ have_mkfifo=no ] ) -if test x"$fifo" = xauto; then - if test x"$have_mkfifo" = xyes; then - fifo=enabled - else - fifo=disabled - fi -fi -if test x"$fifo" = xenabled; then - AC_DEFINE(FIFO, 1, [ Define if FIFO support is enabled. ]) - if test x"$have_mkfifo" = xno; then - AC_MSG_WARN( [ You forced FIFO code while I think there is no mkfifo() available! ] ) - fi -fi - dnl ############## Header and Library Checks # locale headers @@ -1036,7 +1150,10 @@ ADD_CPPFLAGS="" ADD_LDFLAGS="" LIBS="$LIBS" +# Consider moving that stuff. AC_CHECK_HEADER([os2.h], [ADD_CPPFLAGS="$ADD_CPPFLAGS -DOS2"]) +# On OS/2, we need to link to os2term to make terminal control actually work. +AC_CHECK_LIB([os2term], [tcsetattr], [ADD_LDFLAGS="$ADD_LDFLAGS -los2term"]) # If debugging is enabled then make warnings errors if test x"$debugging" = xenabled; then @@ -1054,7 +1171,7 @@ dnl Only try the attribute_align_arg mumbo-jumbo on x86, x86-64 warns/errors out dnl ...dunno even what about other architectures. case $host in i?86-*) - AC_DEFINE(ABI_ALIGN_FUN, 1, [ Define if your architecture wants/needs/can use attribute_align_arg and alignment checks. It's for 32bit x86... ]) + AC_DEFINE(ABI_ALIGN_FUN, 1, [ Define if your architecture wants/needs/can use attribute_align_arg and alignment checks. It is for 32bit x86... ]) ;; esac @@ -1065,14 +1182,20 @@ s_i586="$s_i386 synth_i586" s_i586d="$s_i386 synth_i586_dither" s_3dnow="$s_i386 synth_3dnow dct64_3dnow equalizer_3dnow" s_3dnowext="$s_i386 dct64_3dnowext tabinit_mmx synth_3dnowext" +s_3dnow_vintage=$s_3dnow +s_3dnowext_vintage=$s_3dnowext if test "x$layer3" = "xenabled"; then - s_3dnow="$s_3dnow dct36_3dnow" - s_3dnowext="$s_3dnowext dct36_3dnowext" + s_3dnow_vintage="$s_3dnow_vintage dct36_3dnow" + s_3dnowext_vintage="$s_3dnowext_vintage dct36_3dnowext" fi s_mmx="$s_i386 dct64_mmx tabinit_mmx synth_mmx" -s_sse="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 " -s_x86_64="dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32" +s_sse_vintage="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 " +s_sse="$s_sse_vintage dct36_sse" +s_x86_64="dct36_x86_64 dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32" +s_x86_64_mono_synths="synth_x86_64_float synth_x86_64_s32" +s_x86_64_avx="dct36_avx dct64_avx dct64_avx_float synth_stereo_avx_float synth_stereo_avx_s32" s_x86multi="getcpuflags" +s_x86_64_multi="getcpuflags_x86_64" s_dither="dither" s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo_neon_float synth_stereo_neon_s32" @@ -1080,12 +1203,18 @@ s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo # note: supporting deactivation of output formats for these decoders would need more logic here if test "x$integers" = "xquality"; then s_sse="$s_sse synth_sse_accurate synth_stereo_sse_accurate" + s_sse_vintage="$s_sse_vintage synth_sse_accurate synth_stereo_sse_accurate" s_x86_64="$s_x86_64 synth_x86_64_accurate synth_stereo_x86_64_accurate" + s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64_accurate" + s_x86_64_avx="$s_x86_64_avx synth_stereo_avx_accurate" s_arm="synth_arm_accurate" s_neon="$s_neon synth_neon_accurate synth_stereo_neon_accurate" else s_sse="$s_sse synth_sse" # no stereo + s_sse_vintage="$s_sse_vintage synth_sse" # no stereo s_x86_64="$s_x86_64 synth_x86_64 synth_stereo_x86_64" + s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64" + s_x86_64_avx="$s_x86_64_avx synth_stereo_avx" s_arm="synth_arm" s_neon="$s_neon synth_neon synth_stereo_neon" fi @@ -1114,7 +1243,7 @@ dnl Not disabling buffer for float mode... check that this is OK now! ccalign=no ;; ppc_nofpu) - ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_GENERIC -DOPT_PPC -DREAL_IS_FIXED" + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_PPC -DREAL_IS_FIXED" more_sources= ccalign=no ;; @@ -1174,6 +1303,10 @@ dnl Not disabling buffer for float mode... check that this is OK now! ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW -DREAL_IS_FLOAT" more_sources="$s_fpu $s_i586 $s_3dnow $s_x86multi " ;; + 3dnow_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_i586 $s_3dnow_vintage $s_x86multi " + ;; 3dnow_alone) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOW -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnow" @@ -1182,6 +1315,10 @@ dnl Not disabling buffer for float mode... check that this is OK now! ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOWEXT -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnowext" ;; + 3dnowext_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_3dnowext_vintage $s_3dnow $s_x86multi" + ;; 3dnowext) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT -DREAL_IS_FLOAT" more_sources="$s_fpu $s_3dnowext $s_3dnow $s_x86multi" @@ -1194,17 +1331,39 @@ dnl Not disabling buffer for float mode... check that this is OK now! ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE -DREAL_IS_FLOAT" more_sources="$s_fpu $s_sse" ;; - x86|x86_dither) - ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOWEXT -DOPT_SSE -DREAL_IS_FLOAT" - more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow $s_3dnowext $s_sse $s_x86multi $s_dither" + sse_vintage) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_sse_vintage" ;; - x86-64) + avx) + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_x86_64_avx $s_x86_64_mono_synths" + if test "x$YASM" != "xno"; then + use_yasm_for_avx="yes" + fi + ;; + x86|x86_dither) + # plain C dct36 always there, for vintage/non-vintage + # Selection of non-/vintage sources implies that + # $s_3dnow_vintage contains $s_3dnow, + # $s_sse contains $s_sse_vintage. + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT" + more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow_vintage $s_3dnowext_vintage $s_sse $s_x86multi $s_dither" + ;; + x86-64_alone) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_X86_64 -DREAL_IS_FLOAT" more_sources="$s_fpu $s_x86_64" ;; - x86-64_all|x86-64_dither) + x86-64|x86-64_all|x86-64_dither) ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_X86_64 -DOPT_GENERIC -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT" - more_sources="$s_fpu $s_x86_64 $s_dither" + more_sources="$s_fpu $s_x86_64 $s_dither $s_x86_64_multi" + if test "x$avx_support" = "xyes"; then + ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX" + more_sources="$more_sources $s_x86_64_avx" + if test "x$YASM" != "xno"; then + use_yasm_for_avx="yes" + fi + fi ;; *) AC_MSG_ERROR([Unknown CPU type '$cpu_type']) @@ -1213,7 +1372,7 @@ esac # Mac OS X specific linker flags case $cpu_type in - 3dnow|3dnow_alone|3dnowext|3dnowext_alone|mmx|mmx_alone|sse|sse_alone|x86|x86_dither) + 3dnow|3dnow_vintage|3dnow_alone|3dnowext|3dnowext_vintage|3dnowext_alone|mmx|mmx_alone|sse|sse_vintage|sse_alone|x86|x86_dither) case $host in i386-apple-darwin8*|*-apple-darwin10*) ADD_LDFLAGS="$ADD_LDFLAGS -Wl,-read_only_relocs,suppress" @@ -1226,6 +1385,24 @@ case $cpu_type in ;; esac +# Use yasm instead of the default assembler for AVX sources +if test "x$use_yasm_for_avx" = "xyes"; then + case $host_os in + *cygwin*|*mingw*) + YASM_FORMAT="-f win64" + ;; + *darwin*) + YASM_FORMAT="-f macho" + ;; + *) + YASM_FORMAT="-f elf" + ;; + esac + AC_DEFINE(USE_YASM_FOR_AVX, 1, [Define to use yasm for assemble AVX sources.]) +fi +AM_CONDITIONAL( [USE_YASM_FOR_AVX], [test "x$use_yasm_for_avx" = xyes] ) +AC_SUBST(YASM_FORMAT) + # Check if we want feature report function. AC_MSG_CHECKING([if we want feature report function]) feature_report=enabled @@ -1245,11 +1422,27 @@ if test "x$feature_report" = xenabled; then more_sources="$more_sources feature" fi +# Return 0 if first arg appears in list of following arguments. +# Return 1 otherwise. +word_in_list() { + word=$1 + shift + # Avoid naming conflict with the outside! + # Is local not POSIX sh? + for given_word in "$@" + do + if test "x$word" = "x$given_word"; then + return 0 + fi + done + return 1 +} + for i in $more_sources do - # Echo make sure every file is only once in the list. - echo "$DECODER_OBJ" | $GREP -v -w "$i\.\$(OBJEXT)" > /dev/null && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" - echo "$DECODER_LOBJ" | $GREP -v -w "$i\.lo" > /dev/null && DECODER_LOBJ="$DECODER_LOBJ $i.lo" + # Make sure every file is only once in the list. + word_in_list "$i.\$(OBJEXT)" $DECODER_OBJ || DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" + word_in_list "$i.lo" $DECODER_LOBJ || DECODER_LOBJ="$DECODER_LOBJ $i.lo" done AC_SUBST(DECODER_OBJ) @@ -1264,7 +1457,15 @@ fi dnl ############## Output module choice # The full list of supported modules to check, first come, first serve. -check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy" +check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy" +# Only check qsa before all else on QNX. +# It would mask ALSA otherwise. +case $host in + *-nto-qnx*) + check_modules="qsa $check_modules" + ;; +esac + # The final list. output_modules= @@ -1300,7 +1501,26 @@ do check_failed=yes fi ;; + tinyalsa) + TINYALSA_LIBS="-ltinyalsa" + # Check for ALSA + AC_CHECK_LIB( [tinyalsa], [pcm_open], + [ AC_CHECK_HEADER( [tinyalsa/asoundlib.h], + [ output_modules="$output_modules tinyalsa" HAVE_TINYALSA="yes"], + [ AC_MSG_WARN([Found TINYALSA library but NOT header files on your system]) ] ) + ] + ) + if test "x$HAVE_TINYALSA" != xyes; then + check_failed=yes + fi + ;; + # QSA and ALSA are not distinguishable in these tests, need to block + # each other and play with test order depending on platform. alsa) + if test "x$HAVE_QSA" = xyes; then + HAVE_ALSA=no + else + ALSA_LIBS="-lasound" # Check for ALSA AC_CHECK_LIB( [asound], [snd_pcm_open], @@ -1312,6 +1532,27 @@ do if test "x$HAVE_ALSA" != xyes; then check_failed=yes fi + + fi # HAVE_QSA + ;; + qsa) + if test "x$HAVE_ALSA" = xyes; then + HAVE_QSA=no + else + + QSA_LIBS="-lasound" + # Check for QSA + AC_CHECK_LIB( [asound], [snd_pcm_open], + [ AC_CHECK_HEADER( [sys/asoundlib.h], + [ output_modules="$output_modules qsa" HAVE_QSA="yes"], + [ AC_MSG_WARN([Found QSA library but NOT header files on your system]) ] ) + ] + ) + if test "x$HAVE_QSA" != xyes; then + check_failed=yes + fi + + fi # HAVE_ALSA ;; jack) PKG_CHECK_MODULES(JACK, jack, output_modules="$output_modules jack" HAVE_JACK="yes", HAVE_JACK="no" check_failed=yes) @@ -1379,6 +1620,40 @@ do WIN32_LIBS=-lwinmm AC_CHECK_HEADERS([windows.h], output_modules="$output_modules win32" HAVE_WIN32=yes, HAVE_WIN32=no check_failed=yes) ;; + win32_wasapi) + # Check for windows ... and win32 wasapi audio + # Does not work... instead just check for header + # AC_CHECK_LIB( [avrt], [] ) + AC_MSG_CHECKING([if we have wasapi headers]) + OLD_LIBS=$LIBS + LIBS="$LIBS -lole32 -lavrt" + AC_LINK_IFELSE([AC_LANG_SOURCE([ +#define COBJMACROS 1 +#define _WIN32_WINNT 0x601 +#include +#include +#include +#include +int main(){ + /* UUID Checks */ + GUID *IDs[] = { + &CLSID_MMDeviceEnumerator, + &IID_IMMDeviceEnumerator, + &IID_IAudioClient, + &IID_IAudioRenderClient + }; + return 0; +} + ])], [HAVE_WIN32_WASAPI=yes], [HAVE_WIN32_WASAPI=no]) + LIBS=$OLD_LIBS + WIN32_WASAPI_LIBS="-lole32 -lavrt" + AC_MSG_RESULT([$HAVE_WIN32_WASAPI]) + if test "x$HAVE_WIN32_WASAPI" = xyes; then + output_modules="$output_modules win32_wasapi" + else + check_failed=yes + fi + ;; sndio) SNDIO_LIBS=-lsndio AC_CHECK_LIB([sndio], [sio_open], @@ -1536,7 +1811,8 @@ if test "x$check_forced" = xyes -a "x$check_failed" = "xyes"; then fi # When you extend check_modules, you should extend this: -#for i in alsa oss coreaudio sndio sun win32 esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | +#for i in alsa qsa oss coreaudio sndio sun win32 win32_wasapi esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy +#do echo $i; done | #perl -ne 'chomp; $big = uc($_); print < + int main(){ + CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + return 0; + }])],[win32_fifo_working=yes],[win32_winver_bump=yes]) + if test "x$win32_fifo_working" != "xyes"; then + AC_LINK_IFELSE([AC_LANG_SOURCE([ + #define WINVER 0x501 + #define _WIN32_WINNT 0x501 + #include + int main(){ + CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + return 0; + }])],[win32_fifo_working=yes],[win32_fifo_working=no]) + fi + fi + have_mkfifo=$win32_fifo_working + if test "x$win32_fifo_working" = "xyes"; then + AC_MSG_RESULT([yes]) + AC_DEFINE([WANT_WIN32_FIFO], [1], [ Define to use Win32 named pipes ]) + else + AC_MSG_RESULT([no]) + fi +fi + +#### WINVER Bump +if test x$win32_specific_codes = xenabled; then AC_MSG_CHECKING([if WINVER and _WIN32_WINNT needs version bumps]) if test "x$win32_winver_bump" = "xyes"; then AC_MSG_RESULT([yes]) - CFLAGS="$CFLAGS -DWINVER=0x0501 -D_WIN32_WINNT=0x0501" + AC_DEFINE([WINVER], [0x0501], [ WinXP and above for ipv6 ]) + AC_DEFINE([_WIN32_WINNT], [0x0501], [ WinXP and above for ipv6 ]) # getaddrinfo and freeaddrinfo are available for Win2K and above # Bug: MinGW.org w32api ws2tcpip.h incorrectly wants (_WIN32_WINNT >= 0x0501) for getaddrinfo and freeaddrinfo # MultiByteToWideChar and WideCharToMultiByte are available for Win2K and above @@ -1964,6 +2308,17 @@ if test "x$win32_specific_codes" = xenabled && test "x$host_os" != "xcygwin"; th fi fi +fi #END OF WIN32 CHECKS + +#### Check mingw.org for EOVERFLOW +AC_MSG_CHECKING([if we have EOVERFLOW macro]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +#include +int i = (EOVERFLOW) + 0; +])],[eoverflow_present=yes],[eoverflow_present=no]) +AC_MSG_RESULT([$eoverflow_present]) +AS_IF([test "x$eoverflow_present" = "xyes"],[],[AC_DEFINE([EOVERFLOW],[EFBIG],[Use EFBIG as substitude for EOVERFLOW, mingw.org may lack the latter])]) + #### Use Win32 support codes AM_CONDITIONAL([WIN32_CODES], [ test "x$win32_specific_codes" = xenabled ]) @@ -1982,6 +2337,23 @@ if test x"$ipv6" = xauto; then fi fi +dnl ############## FIFO enable + +if test x"$fifo" = xauto; then + if test x"$have_mkfifo" = xyes; then + fifo=enabled + else + fifo=disabled + fi +fi + +if test x"$fifo" = xenabled; then + AC_DEFINE(FIFO, 1, [ Define if FIFO support is enabled. ]) + if test x"$have_mkfifo" = xno; then + AC_MSG_WARN( [ You forced FIFO code while I think there is no mkfifo() available! ] ) + fi +fi + dnl ############## Network enable if test x"$network" = xenabled; then AC_DEFINE(NETWORK, 1, [ Define if network support is enabled. ]) @@ -2042,19 +2414,10 @@ else echo " The lib will (try to) support default offset size, too." fi echo " LFS alias symbols ....... $lfs_alias ($LFS_ALIAS_BITS)" +echo " LFS alias type .......... $lfs_alias_type" -echo " Alignment checks ........ $aligncheck" -if test x"$aligncheck" = xenabled; then - if test x"$ccalign" != xyes; then - echo " (without effect since special alignment is not employed)" - fi - if test x"$GCC" = xyes; then - echo " (note that newer gcc 4.x versions do not use/need the align check)" - fi -fi echo -n " Core libmpg123 features: - Integer conversion ...... $integers Layer I ................. $layer1 Layer II ................ $layer2 Layer III ............... $layer3 @@ -2072,6 +2435,12 @@ echo -n " 16 bit integer .......... $int16 32/24 bit integer ....... $int32 real (32 bit float) ..... $real + Optimization detail: + Integer conversion ...... $integers + New/old WRITE_SAMPLE .... $newoldwritesample + new Huffman scheme ...... $newhuff + +Note: Disabling core features is not commonly done and some combinations might not build/work. If you encounter such a case, help yourself (and provide a patch) or just poke the maintainers. " # just an empty line echo diff --git a/jni/mpg123-1.13.4/doc/ACCURACY b/jni/mpg123-1.17.0/doc/ACCURACY similarity index 100% rename from jni/mpg123-1.13.4/doc/ACCURACY rename to jni/mpg123-1.17.0/doc/ACCURACY diff --git a/jni/mpg123-1.13.4/doc/BENCHMARKING b/jni/mpg123-1.17.0/doc/BENCHMARKING similarity index 100% rename from jni/mpg123-1.13.4/doc/BENCHMARKING rename to jni/mpg123-1.17.0/doc/BENCHMARKING diff --git a/jni/mpg123-1.13.4/doc/BUGS b/jni/mpg123-1.17.0/doc/BUGS similarity index 100% rename from jni/mpg123-1.13.4/doc/BUGS rename to jni/mpg123-1.17.0/doc/BUGS diff --git a/jni/mpg123-1.13.4/doc/CONTACT b/jni/mpg123-1.17.0/doc/CONTACT similarity index 100% rename from jni/mpg123-1.13.4/doc/CONTACT rename to jni/mpg123-1.17.0/doc/CONTACT diff --git a/jni/mpg123-1.17.0/doc/LARGEFILE b/jni/mpg123-1.17.0/doc/LARGEFILE new file mode 100644 index 00000000..01f77dc6 --- /dev/null +++ b/jni/mpg123-1.17.0/doc/LARGEFILE @@ -0,0 +1,82 @@ +Regarding largefile setup, client apps can be built three ways: + +1. _FILE_OFFSET_BITS == 64 (header maps to mpg123_open_64) +2. _FILE_OFFSET_BITS == 32 (header maps to mpg123_open_32) +3. _FILE_OFFSET_BITS == (header maps to mpg123_open) + +The libmpg123 build needs to be prepared for everything. Also, it needs to keep +in mind the days before introducing large file support --- binaries should still +work with updated libmpg123. So, mpg123_open should always match what is the +default build on a platform without added settings. Those are the platform +variants: + +1. 64 bit native system, long == off_t +libmpg123: mpg123_open +lfs_alias: mpg123_open_64 -> mpg123_open +lfs_wrap: + +2. largefile-sensitive, long = 32, off_t = 64 (if enabled) +libmpg123: mpg123_open_64 +lfs_alias: mpg123_open_32 -> mpg123_open +lfs_wrap: mpg123_open -> mpg123_open_64 + +3. largefile, long = 32, off_t = 64 (FreeBSD) +libmpg123: mpg123_open +lfs_alias: mpg123_open_64 -> mpg123_open +lfs_wrap: + +This is what mpg123 does in version 1.15.4 and it works. Well, for cases 1 +(Linux/Solaris x86-64) and 2 (Linux/Solaris x86). Case 3 needs to be added +properly. Actually, let's have a second look at case 2: When mpg123 is built +with --disable-largefile: + +2a. largefile-sensitive, mpg123 built with off_t = 32 == long +libmpg123: mpg123_open +lfs_alias: mpg123_open_32 -> mpg123_open +lfs_wrap: + +So, this is still correct. Now, what about case 3? What does mpg123 do +currently, as of 1.15.4? + +3a. largefile, long = 32, off_t = 64 (... and mpg123 not really aware of that) +libmpg123: mpg123_open +lfs_alias: mpg123_open_32(long) -> mpg123_open(off_t) +lfs_wrap: + +This is _wrong_. Luckily, this does not cause binary compatibility issues, as +mpg123_open_32 won't be called by anyone unless that someone tries to define +_FILE_OFFSET_BITS=32, which is nonsense. Perhaps old FreeBSD binaries before +LFS times? Well, back then, there was no libmpg123. So let's ignore that case. +The issue at hand is that the alias should be from mpg123_open_64 to +mpg123_open, for clients that insist on defining _FILE_OFFSET_BITS=64. + +The change needed now is to fix the naming and also change the type the +alias functions use: It is not long int anymore! + +Let's revisit case 1 for a moment: My old lfs_alias.c provides for the case +lfs_alias: mpg123_open -> mpg123_open_64. Is that actually possible? +What means enforcing _FILE_OFFSET_BITS=64 from the outside, which _could_ +happen when libmpg123 is included someplace and folks are on the wrong side +of paranoid regarding this. So, there is + +1a. 64 bit native system, long == off_t = 64 and _FILE_OFFSET_BITS=64 +libmpg123: mpg123_open_64 +lfs_alias: mpg123_open -> mpg123_open_64 +lfs_wrap: + +(Works also for any system with long == off_t in any width) +Likewise, there is largefile-sensitive system with enforced 32 bits: + +2b. largefile-sensitive, mpg123 with enforced _FILE_OFFSET_BITS=32 +libmpg123: mpg123_open_32 +lfs_alias: mpg123_open -> mpg123_open_32 +lfs_wrap: + +All cases are supported with this significant change from 1.15.4: +Make the aliases use a defined lfs_alias_t, which can be long or off_t, +depending on what is the default type for offsets on the platform. +Folks who try _FILE_OFFSET_BITS=32 on a system that only supports +64 bit get a linking error during mpg123 build (from the _64 aliases), +which I consider to be a feature. + +I salute anyone who is not confused after reading this. diff --git a/jni/mpg123-1.13.4/doc/LICENSE b/jni/mpg123-1.17.0/doc/LICENSE similarity index 100% rename from jni/mpg123-1.13.4/doc/LICENSE rename to jni/mpg123-1.17.0/doc/LICENSE diff --git a/jni/mpg123-1.13.4/doc/Makefile b/jni/mpg123-1.17.0/doc/Makefile similarity index 60% rename from jni/mpg123-1.13.4/doc/Makefile rename to jni/mpg123-1.17.0/doc/Makefile index 46d4fdf5..cb46a38b 100644 --- a/jni/mpg123-1.13.4/doc/Makefile +++ b/jni/mpg123-1.17.0/doc/Makefile @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # doc/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/mpg123 pkgincludedir = $(includedir)/mpg123 pkglibdir = $(libdir)/mpg123 @@ -31,10 +75,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu +build_triplet = 86_64-unknown-linux-gnu +host_triplet = arm-unknown-linux-androideabi subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in THANKS TODO +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am THANKS TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -46,10 +90,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11 +ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14 AIX_CFLAGS = AIX_LDFLAGS = AIX_LIBS = @@ -58,32 +120,33 @@ ALIB_LDFLAGS = ALIB_LIBS = ALSA_CFLAGS = ALSA_LDFLAGS = -ALSA_LIBS = -AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar -API_VERSION = 29 -AR = ar +ALSA_LIBS = -lasound +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +API_VERSION = 38 +AR = arm-linux-androideabi-ar ARTS_CFLAGS = ARTS_LDFLAGS = ARTS_LIBS = AS = as -AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11 -AWK = gawk -CC = gcc -CCAS = gcc +AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf +AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader +AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14 +AWK = mawk +CC = arm-linux-androideabi-gcc +CCAS = arm-linux-androideabi-gcc CCASDEPMODE = depmode=gcc3 CCASFLAGS = -g -O2 CCDEPMODE = depmode=gcc3 CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 COREAUDIO_CFLAGS = COREAUDIO_LDFLAGS = -COREAUDIO_LIBS = -CPP = gcc -E -CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT +COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices +CPP = arm-linux-androideabi-gcc -E +CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED CYGPATH_W = echo -DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo -DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT) +DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo +DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT) DEFS = -DHAVE_CONFIG_H DEPDIR = .deps DLLTOOL = dlltool @@ -117,10 +180,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s JACK_CFLAGS = JACK_LDFLAGS = JACK_LIBS = -LD = /usr/bin/ld +LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld LDFLAGS = -LFS_LOBJ = lfs_wrap.lo lfs_alias.lo -LIBMPG123_VERSION = 29:6:29 +LFS_LOBJ = lfs_alias.lo +LIBMPG123_VERSION = 38:4:38 LIBOBJS = LIBS = -lm LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -128,7 +191,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_LDFLAGS = -export-dynamic -MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo +MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo MANIFEST_TOOL = : MINT_CFLAGS = MINT_LDFLAGS = @@ -137,8 +200,8 @@ MKDIR_P = /bin/mkdir -p MODULE_OBJ = legacy_module.$(OBJEXT) NAS_CFLAGS = NAS_LDFLAGS = -NAS_LIBS = -NM = /usr/bin/nm -B +NAS_LIBS = -laudio +NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o @@ -147,7 +210,7 @@ OPENAL_LDFLAGS = OPENAL_LIBS = OS2_CFLAGS = OS2_LDFLAGS = -OS2_LIBS = +OS2_LIBS = -los2me -lmmpm2 -lsocket OSS_CFLAGS = OSS_LDFLAGS = OSS_LIBS = @@ -156,27 +219,30 @@ OTOOL64 = OUTPUT_CFLAGS = OUTPUT_LDFLAGS = OUTPUT_LIBS = -OUTPUT_MOD = dummy -OUTPUT_OBJ = output/dummy.$(OBJEXT) +OUTPUT_MOD = oss +OUTPUT_OBJ = output/oss.$(OBJEXT) PACKAGE = mpg123 PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net PACKAGE_NAME = mpg123 -PACKAGE_STRING = mpg123 1.13.4 +PACKAGE_STRING = mpg123 1.17.0 PACKAGE_TARNAME = mpg123 PACKAGE_URL = -PACKAGE_VERSION = 1.13.4 +PACKAGE_VERSION = 1.17.0 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PORTAUDIO_CFLAGS = PORTAUDIO_LDFLAGS = -PORTAUDIO_LIBS = -PULSE_CFLAGS = +PORTAUDIO_LIBS = -lportaudio +PULSE_CFLAGS = -D_REENTRANT PULSE_LDFLAGS = -PULSE_LIBS = -RANLIB = ranlib -SDL_CFLAGS = +PULSE_LIBS = -lpulse-simple -lpulse +QSA_CFLAGS = +QSA_LDFLAGS = +QSA_LIBS = +RANLIB = arm-linux-androideabi-ranlib +SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL SDL_LDFLAGS = -SDL_LIBS = +SDL_LIBS = -lSDL SED = /bin/sed SET_MAKE = SGI_CFLAGS = @@ -185,54 +251,63 @@ SGI_LIBS = SHELL = /bin/bash SNDIO_CFLAGS = SNDIO_LDFLAGS = -SNDIO_LIBS = -STRIP = strip +SNDIO_LIBS = -lsndio +STRIP = arm-linux-androideabi-strip SUN_CFLAGS = SUN_LDFLAGS = SUN_LIBS = -VERSION = 1.13.4 +TINYALSA_CFLAGS = +TINYALSA_LDFLAGS = +TINYALSA_LIBS = -ltinyalsa +VERSION = 1.17.0 WIN32_CFLAGS = WIN32_LDFLAGS = -WIN32_LIBS = -abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/doc -abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/doc -abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -ac_ct_AR = ar -ac_ct_CC = gcc +WIN32_LIBS = -lwinmm +WIN32_WASAPI_CFLAGS = +WIN32_WASAPI_LDFLAGS = +WIN32_WASAPI_LIBS = -lole32 -lavrt +YASM = yasm +YASMFLAGS = -pgas -rgas -mamd64 +YASM_FORMAT = +abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/doc +abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/doc +abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +ac_ct_AR = +ac_ct_CC = ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 +build = 86_64-unknown-linux-gnu +build_alias = 86_64-unknown-linux-gnu +build_cpu = 86_64 build_os = linux-gnu -build_vendor = pc +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc +host = arm-unknown-linux-androideabi +host_alias = arm-linux-androideabi +host_cpu = arm +host_os = linux-androideabi +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh +install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -242,7 +317,7 @@ sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . sysconfdir = ${prefix}/etc -target_alias = +target_alias = arm-linux-androideabi top_build_prefix = ../ top_builddir = .. top_srcdir = .. @@ -259,6 +334,7 @@ EXTRA_DIST = \ LICENSE \ THANKS \ ACCURACY \ + LARGEFILE \ libmpg123_speed.txt \ doxyhead.xhtml \ doxy_examples.c \ @@ -269,6 +345,7 @@ EXTRA_DIST = \ examples/id3dump.c \ examples/feedseek.c \ examples/dump_seekindex.c \ + examples/extract_frames.c \ examples/Makefile all: all-am @@ -310,11 +387,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -361,10 +438,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -445,15 +527,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/jni/mpg123-1.13.4/doc/Makefile.am b/jni/mpg123-1.17.0/doc/Makefile.am similarity index 93% rename from jni/mpg123-1.13.4/doc/Makefile.am rename to jni/mpg123-1.17.0/doc/Makefile.am index 6dfd0e90..551172f0 100644 --- a/jni/mpg123-1.13.4/doc/Makefile.am +++ b/jni/mpg123-1.17.0/doc/Makefile.am @@ -18,6 +18,7 @@ EXTRA_DIST = \ LICENSE \ THANKS \ ACCURACY \ + LARGEFILE \ libmpg123_speed.txt \ doxyhead.xhtml \ doxy_examples.c \ @@ -28,4 +29,5 @@ EXTRA_DIST = \ examples/id3dump.c \ examples/feedseek.c \ examples/dump_seekindex.c \ + examples/extract_frames.c \ examples/Makefile diff --git a/jni/mpg123-1.13.4/doc/Makefile.in b/jni/mpg123-1.17.0/doc/Makefile.in similarity index 75% rename from jni/mpg123-1.13.4/doc/Makefile.in rename to jni/mpg123-1.17.0/doc/Makefile.in index 66482718..9dadfd4e 100644 --- a/jni/mpg123-1.13.4/doc/Makefile.in +++ b/jni/mpg123-1.17.0/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in THANKS TODO +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am THANKS TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -46,8 +90,26 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AIX_CFLAGS = @AIX_CFLAGS@ @@ -60,6 +122,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LDFLAGS = @ALSA_LDFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ AR = @AR@ ARTS_CFLAGS = @ARTS_CFLAGS@ @@ -173,6 +236,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PULSE_CFLAGS = @PULSE_CFLAGS@ PULSE_LDFLAGS = @PULSE_LDFLAGS@ PULSE_LIBS = @PULSE_LIBS@ +QSA_CFLAGS = @QSA_CFLAGS@ +QSA_LDFLAGS = @QSA_LDFLAGS@ +QSA_LIBS = @QSA_LIBS@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LDFLAGS = @SDL_LDFLAGS@ @@ -190,10 +256,19 @@ STRIP = @STRIP@ SUN_CFLAGS = @SUN_CFLAGS@ SUN_LDFLAGS = @SUN_LDFLAGS@ SUN_LIBS = @SUN_LIBS@ +TINYALSA_CFLAGS = @TINYALSA_CFLAGS@ +TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@ +TINYALSA_LIBS = @TINYALSA_LIBS@ VERSION = @VERSION@ WIN32_CFLAGS = @WIN32_CFLAGS@ WIN32_LDFLAGS = @WIN32_LDFLAGS@ WIN32_LIBS = @WIN32_LIBS@ +WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@ +WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@ +WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@ +YASM = @YASM@ +YASMFLAGS = @YASMFLAGS@ +YASM_FORMAT = @YASM_FORMAT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -259,6 +334,7 @@ EXTRA_DIST = \ LICENSE \ THANKS \ ACCURACY \ + LARGEFILE \ libmpg123_speed.txt \ doxyhead.xhtml \ doxy_examples.c \ @@ -269,6 +345,7 @@ EXTRA_DIST = \ examples/id3dump.c \ examples/feedseek.c \ examples/dump_seekindex.c \ + examples/extract_frames.c \ examples/Makefile all: all-am @@ -310,11 +387,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -361,10 +438,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -445,15 +527,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/jni/mpg123-1.13.4/doc/PATENTS b/jni/mpg123-1.17.0/doc/PATENTS similarity index 100% rename from jni/mpg123-1.13.4/doc/PATENTS rename to jni/mpg123-1.17.0/doc/PATENTS diff --git a/jni/mpg123-1.13.4/doc/README.3DNOW b/jni/mpg123-1.17.0/doc/README.3DNOW similarity index 100% rename from jni/mpg123-1.13.4/doc/README.3DNOW rename to jni/mpg123-1.17.0/doc/README.3DNOW diff --git a/jni/mpg123-1.13.4/doc/README.gain b/jni/mpg123-1.17.0/doc/README.gain similarity index 100% rename from jni/mpg123-1.13.4/doc/README.gain rename to jni/mpg123-1.17.0/doc/README.gain diff --git a/jni/mpg123-1.13.4/doc/README.remote b/jni/mpg123-1.17.0/doc/README.remote similarity index 96% rename from jni/mpg123-1.13.4/doc/README.remote rename to jni/mpg123-1.17.0/doc/README.remote index a13795ad..f16932af 100644 --- a/jni/mpg123-1.13.4/doc/README.remote +++ b/jni/mpg123-1.17.0/doc/README.remote @@ -28,6 +28,8 @@ LOAD/L : load and start playing resource LOADPAUSED/LP : load but do not start playing resource +LOADLIST : load a playlist from given , and display its entries, optionally load and play one of these specificed by the integer (<0: just list, 0: play last track, >0:play track with that position in list) + PAUSE/P: pause playback STOP/S: stop playback (closes file) @@ -84,7 +86,7 @@ Note: mpg123 returns errors on stderr, so your frontend should look not only at stdout but also at stderr for responses. It is a good idea to use --remote-err and just look at stderr. -@R MPG123 (ThOr) v6 +@R MPG123 (ThOr) v7 Startup version message. Everything after MPG123 is auxilliary information about behaviour and command support, ID3v2 tag support is new in v3. @I ID3: @@ -107,6 +109,9 @@ Note: mpg123 returns errors on stderr, so your frontend should Status message after loading a song (no ID3 song info) a = filename without path and extension +@I LISTENTRY : + printout of playlists loaded with LOADLIST + @S ... Stream info at beginning of playback, meaning S diff --git a/jni/mpg123-1.13.4/doc/ROAD_TO_LGPL b/jni/mpg123-1.17.0/doc/ROAD_TO_LGPL similarity index 100% rename from jni/mpg123-1.13.4/doc/ROAD_TO_LGPL rename to jni/mpg123-1.17.0/doc/ROAD_TO_LGPL diff --git a/jni/mpg123-1.13.4/doc/THANKS b/jni/mpg123-1.17.0/doc/THANKS similarity index 100% rename from jni/mpg123-1.13.4/doc/THANKS rename to jni/mpg123-1.17.0/doc/THANKS diff --git a/jni/mpg123-1.13.4/doc/TODO b/jni/mpg123-1.17.0/doc/TODO similarity index 100% rename from jni/mpg123-1.13.4/doc/TODO rename to jni/mpg123-1.17.0/doc/TODO diff --git a/jni/mpg123-1.13.4/doc/doxy_examples.c b/jni/mpg123-1.17.0/doc/doxy_examples.c similarity index 73% rename from jni/mpg123-1.13.4/doc/doxy_examples.c rename to jni/mpg123-1.17.0/doc/doxy_examples.c index b7c16a13..6fc851be 100644 --- a/jni/mpg123-1.13.4/doc/doxy_examples.c +++ b/jni/mpg123-1.17.0/doc/doxy_examples.c @@ -6,7 +6,7 @@ /** \file mpglib.c Example program mimicking the old mpglib test program. It takes an MPEG bitstream from standard input and writes raw audio to standard output. - This is an use case of the mpg123_decode() in and out function in the feeder mode. + This is an use case of the mpg123_decode() in and out function in the feeder mode, quite close to classic mpglib usage and thus a template to convert from that to libmpg123. */ /** \file scan.c Example program that examines the exact length of an MPEG file. @@ -14,4 +14,8 @@ /** \file id3dump.c Parse ID3 info and print to standard output. */ +/** \file extract_frames.c Parse stream and extract only the valid MPEG frames to standard output. */ + +/** \file feedseek.c Fuzzy feeder seeking. */ + /* @} */ diff --git a/jni/mpg123-1.13.4/doc/doxygen.conf b/jni/mpg123-1.17.0/doc/doxygen.conf similarity index 90% rename from jni/mpg123-1.13.4/doc/doxygen.conf rename to jni/mpg123-1.17.0/doc/doxygen.conf index 6972b9c4..74616c74 100644 --- a/jni/mpg123-1.13.4/doc/doxygen.conf +++ b/jni/mpg123-1.17.0/doc/doxygen.conf @@ -9,7 +9,7 @@ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English FULL_PATH_NAMES = NO -INPUT = doxy_examples.c examples/mpg123_to_wav.c examples/mpglib.c examples/scan.c examples/id3dump.c ../src/libmpg123/mpg123.h +INPUT = doxy_examples.c examples/mpg123_to_wav.c examples/mpglib.c examples/scan.c examples/feedseek.c examples/id3dump.c ../src/libmpg123/mpg123.h OPTIMIZE_OUTPUT_FOR_C = YES EXTRACT_ALL = NO HIDE_UNDOC_MEMBERS = NO diff --git a/jni/mpg123-1.13.4/doc/doxyhead.xhtml b/jni/mpg123-1.17.0/doc/doxyhead.xhtml similarity index 100% rename from jni/mpg123-1.13.4/doc/doxyhead.xhtml rename to jni/mpg123-1.17.0/doc/doxyhead.xhtml diff --git a/jni/mpg123-1.13.4/doc/examples/Makefile b/jni/mpg123-1.17.0/doc/examples/Makefile similarity index 72% rename from jni/mpg123-1.13.4/doc/examples/Makefile rename to jni/mpg123-1.17.0/doc/examples/Makefile index 93d1f0cb..52f1b07a 100644 --- a/jni/mpg123-1.13.4/doc/examples/Makefile +++ b/jni/mpg123-1.17.0/doc/examples/Makefile @@ -1,4 +1,4 @@ -targets = feedseek mpg123_to_wav mpg123_to_wav_replaced_io scan id3dump mpglib dump_seekindex +targets = feedseek mpg123_to_wav mpg123_to_wav_replaced_io scan id3dump mpglib dump_seekindex extract_frames all: $(targets) @@ -6,8 +6,13 @@ all: $(targets) #MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123_64) #MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123_64) # This works on sane setups where off_t is off_t, and just that. -MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123) -MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123) +ifeq ($(MPG123_PREFIX),) + MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123) + MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123) +else # Yeah, that's with GNU/Linux in mind, at least GNU ld ... + MPG123_CFLAGS := -I$(MPG123_PREFIX)/include + MPG123_LDFLAGS := -L$(MPG123_PREFIX)/lib -Wl,-rpath $(MPG123_PREFIX)/lib -lmpg123 +endif SND_CFLAGS := $(shell pkg-config --cflags sndfile) SND_LDFLAGS := $(shell pkg-config --libs sndfile) @@ -36,5 +41,8 @@ dump_seekindex: dump_seekindex.c mpglib: mpglib.c $(compile) -o mpglib mpglib.c $(linkflags) +extract_frames: extract_frames.c + $(compile) -o $@ $< $(linkflags) + clean: rm -vf $(targets) diff --git a/jni/mpg123-1.13.4/doc/examples/dump_seekindex.c b/jni/mpg123-1.17.0/doc/examples/dump_seekindex.c similarity index 100% rename from jni/mpg123-1.13.4/doc/examples/dump_seekindex.c rename to jni/mpg123-1.17.0/doc/examples/dump_seekindex.c diff --git a/jni/mpg123-1.17.0/doc/examples/extract_frames.c b/jni/mpg123-1.17.0/doc/examples/extract_frames.c new file mode 100644 index 00000000..f5ee58c9 --- /dev/null +++ b/jni/mpg123-1.17.0/doc/examples/extract_frames.c @@ -0,0 +1,92 @@ +/* + extract_frams: utlize the framebyframe API and mpg123_framedata to extract the MPEG frames out of a stream (strip off anything else). + + copyright 2011 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Thomas Orgis +*/ + +#include + +/* unistd.h is not available under MSVC, + io.h defines the read and write functions */ +#ifndef _MSC_VER +#include +#else +#include +#endif + +#include + +int do_work(mpg123_handle *m); + +int main(int argc, char **argv) +{ + int ret = 0; + mpg123_handle *m; + + mpg123_init(); + m = mpg123_new(NULL, &ret); + + if(m == NULL) + { + fprintf(stderr, "Cannot create handle: %s", mpg123_plain_strerror(ret)); + } + else + { + fprintf(stderr, "I'll take your dirty MPEG audio from standard input and will write the extracted pure MPEG data to standard output.\n"); + if(argc > 1 && strcmp(argv[1], "--noinfo") == 0) + { + fprintf(stderr, "Enabling parsing/consuming of the Info frame so that it will not appear in output.\n"); + ret = mpg123_param(m, MPG123_REMOVE_FLAGS, MPG123_IGNORE_INFOFRAME, 0.); + } + else + { + fprintf(stderr, "If you'd have given --noinfo as argument, I would omit a LAME/Xing info frame.\n"); + ret = mpg123_param(m, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0.); + } + if(ret == 0) ret = do_work(m); + + if(ret != 0) fprintf(stderr, "Some error occured: %s\n", mpg123_strerror(m)); + + + mpg123_delete(m); /* Closes, too. */ + } + mpg123_exit(); + + return ret; +} + +int do_work(mpg123_handle *m) +{ + int ret; + size_t count = 0; + ret = mpg123_open_fd(m, STDIN_FILENO); + if(ret != MPG123_OK) return ret; + + while( (ret = mpg123_framebyframe_next(m)) == MPG123_OK || ret == MPG123_NEW_FORMAT ) + { + unsigned long header; + unsigned char *bodydata; + size_t bodybytes; + if(mpg123_framedata(m, &header, &bodydata, &bodybytes) == MPG123_OK) + { + /* Need to extract the 4 header bytes from the native storage in the correct order. */ + unsigned char hbuf[4]; + int i; + for(i=0; i<4; ++i) hbuf[i] = (unsigned char) ((header >> ((3-i)*8)) & 0xff); + + /* Now write out both header and data, fire and forget. */ + write(STDOUT_FILENO, hbuf, 4); + write(STDOUT_FILENO, bodydata, bodybytes); + fprintf(stderr, "%zu: header 0x%08x, %zu body bytes\n", ++count, header, bodybytes); + } + } + + if(ret != MPG123_DONE) + fprintf(stderr, "Some error occured (non-fatal?): %s\n", mpg123_strerror(m)); + + fprintf(stderr, "Done with %zu MPEG frames.\n", count); + + return 0; +} diff --git a/jni/mpg123-1.13.4/doc/examples/feedseek.c b/jni/mpg123-1.17.0/doc/examples/feedseek.c similarity index 100% rename from jni/mpg123-1.13.4/doc/examples/feedseek.c rename to jni/mpg123-1.17.0/doc/examples/feedseek.c diff --git a/jni/mpg123-1.13.4/doc/examples/id3dump.c b/jni/mpg123-1.17.0/doc/examples/id3dump.c similarity index 94% rename from jni/mpg123-1.13.4/doc/examples/id3dump.c rename to jni/mpg123-1.17.0/doc/examples/id3dump.c index 29534916..649e3314 100644 --- a/jni/mpg123-1.13.4/doc/examples/id3dump.c +++ b/jni/mpg123-1.17.0/doc/examples/id3dump.c @@ -94,9 +94,15 @@ void print_raw_v2(mpg123_id3v2 *v2) for(i=0; itexts; ++i) { char id[5]; + char lang[4]; memcpy(id, v2->text[i].id, 4); id[4] = 0; - printf("%s\n", id); + memcpy(lang, v2->text[i].lang, 3); + lang[3] = 0; + if(v2->text[i].description.fill) + printf("%s language(%s) description(%s)\n", id, lang, v2->text[i].description.p); + else printf("%s language(%s)\n", id, lang); + print_lines(" ", &v2->text[i].text); } for(i=0; iextras; ++i) diff --git a/jni/mpg123-1.13.4/doc/examples/mpg123_to_wav.c b/jni/mpg123-1.17.0/doc/examples/mpg123_to_wav.c similarity index 65% rename from jni/mpg123-1.13.4/doc/examples/mpg123_to_wav.c rename to jni/mpg123-1.17.0/doc/examples/mpg123_to_wav.c index 0dd0ab39..91938750 100644 --- a/jni/mpg123-1.13.4/doc/examples/mpg123_to_wav.c +++ b/jni/mpg123-1.17.0/doc/examples/mpg123_to_wav.c @@ -14,7 +14,7 @@ void usage() { - printf("Usage: mpg123_to_wav \n"); + printf("Usage: mpg123_to_wav [s16|f32 [ ]]\n"); exit(99); } @@ -39,24 +39,32 @@ int main(int argc, char *argv[]) int err = MPG123_OK; off_t samples = 0; - if (argc!=3) usage(); + if (argc<3) usage(); printf( "Input file: %s\n", argv[1]); printf( "Output file: %s\n", argv[2]); err = mpg123_init(); - if( err != MPG123_OK || (mh = mpg123_new(NULL, &err)) == NULL - /* Let mpg123 work with the file, that excludes MPG123_NEED_MORE messages. */ - || mpg123_open(mh, argv[1]) != MPG123_OK - /* Peek into track and get first output format. */ - || mpg123_getformat(mh, &rate, &channels, &encoding) != MPG123_OK ) + if(err != MPG123_OK || (mh = mpg123_new(NULL, &err)) == NULL) { - fprintf( stderr, "Trouble with mpg123: %s\n", - mh==NULL ? mpg123_plain_strerror(err) : mpg123_strerror(mh) ); + fprintf(stderr, "Basic setup goes wrong: %s", mpg123_plain_strerror(err)); cleanup(mh); return -1; } - if(encoding != MPG123_ENC_SIGNED_16) + /* Simple hack to enable floating point output. */ + if(argc >= 4 && !strcmp(argv[3], "f32")) mpg123_param(mh, MPG123_ADD_FLAGS, MPG123_FORCE_FLOAT, 0.); + + /* Let mpg123 work with the file, that excludes MPG123_NEED_MORE messages. */ + if( mpg123_open(mh, argv[1]) != MPG123_OK + /* Peek into track and get first output format. */ + || mpg123_getformat(mh, &rate, &channels, &encoding) != MPG123_OK ) + { + fprintf( stderr, "Trouble with mpg123: %s\n", mpg123_strerror(mh) ); + cleanup(mh); + return -1; + } + + if(encoding != MPG123_ENC_SIGNED_16 && encoding != MPG123_ENC_FLOAT_32) { /* Signed 16 is the default output format anyways; it would actually by only different if we forced it. So this check is here just for this explanation. */ cleanup(mh); @@ -70,22 +78,29 @@ int main(int argc, char *argv[]) bzero(&sfinfo, sizeof(sfinfo) ); sfinfo.samplerate = rate; sfinfo.channels = channels; - sfinfo.format = SF_FORMAT_WAV|SF_FORMAT_PCM_16; - printf("Creating 16bit WAV with %i channels and %liHz.\n", channels, rate); + sfinfo.format = SF_FORMAT_WAV|(encoding == MPG123_ENC_SIGNED_16 ? SF_FORMAT_PCM_16 : SF_FORMAT_FLOAT); + printf("Creating WAV with %i channels and %liHz.\n", channels, rate); sndfile = sf_open(argv[2], SFM_WRITE, &sfinfo); if(sndfile == NULL){ fprintf(stderr, "Cannot open output file!\n"); cleanup(mh); return -2; } /* Buffer could be almost any size here, mpg123_outblock() is just some recommendation. Important, especially for sndfile writing, is that the size is a multiple of sample size. */ - buffer_size = mpg123_outblock( mh ); + buffer_size = argc >= 5 ? atol(argv[4]) : mpg123_outblock(mh); buffer = malloc( buffer_size ); do { + sf_count_t more_samples; err = mpg123_read( mh, buffer, buffer_size, &done ); - sf_write_short( sndfile, (short*)buffer, done/sizeof(short) ); - samples += done/sizeof(short); + more_samples = encoding == MPG123_ENC_SIGNED_16 + ? sf_write_short(sndfile, (short*)buffer, done/sizeof(short)) + : sf_write_float(sndfile, (float*)buffer, done/sizeof(float)); + if(more_samples < 0 || more_samples*mpg123_encsize(encoding) != done) + { + fprintf(stderr, "Warning: Written number of samples does not match the byte count we got from libmpg123: %li != %li\n", (long)(more_samples*mpg123_encsize(encoding)), (long)done); + } + samples += more_samples; /* We are not in feeder mode, so MPG123_OK, MPG123_ERR and MPG123_NEW_FORMAT are the only possibilities. We do not handle a new format, MPG123_DONE is the end... so abort on anything not MPG123_OK. */ } while (err==MPG123_OK); diff --git a/jni/mpg123-1.13.4/doc/examples/mpglib.c b/jni/mpg123-1.17.0/doc/examples/mpglib.c similarity index 94% rename from jni/mpg123-1.13.4/doc/examples/mpglib.c rename to jni/mpg123-1.17.0/doc/examples/mpglib.c index bf3a30ec..4ee1a1d7 100644 --- a/jni/mpg123-1.13.4/doc/examples/mpglib.c +++ b/jni/mpg123-1.17.0/doc/examples/mpglib.c @@ -16,6 +16,10 @@ #include #endif +#ifdef _WIN32 +#include +#endif + #include #define INBUFF 16384 @@ -31,6 +35,11 @@ int main(int argc, char **argv) size_t in = 0, outc = 0; mpg123_handle *m; +#ifdef _WIN32 +_setmode(_fileno(stdin),_O_BINARY); +_setmode(_fileno(stdout),_O_BINARY); +#endif + mpg123_init(); m = mpg123_new(argc > 1 ? argv[1] : NULL, &ret); if(m == NULL) diff --git a/jni/mpg123-1.13.4/doc/examples/scan.c b/jni/mpg123-1.17.0/doc/examples/scan.c similarity index 100% rename from jni/mpg123-1.13.4/doc/examples/scan.c rename to jni/mpg123-1.17.0/doc/examples/scan.c diff --git a/jni/mpg123-1.13.4/doc/libmpg123_speed.txt b/jni/mpg123-1.17.0/doc/libmpg123_speed.txt similarity index 100% rename from jni/mpg123-1.13.4/doc/libmpg123_speed.txt rename to jni/mpg123-1.17.0/doc/libmpg123_speed.txt diff --git a/jni/mpg123-1.13.4/equalize.dat b/jni/mpg123-1.17.0/equalize.dat similarity index 100% rename from jni/mpg123-1.13.4/equalize.dat rename to jni/mpg123-1.17.0/equalize.dat diff --git a/jni/mpg123-1.13.4/libmpg123.pc b/jni/mpg123-1.17.0/libmpg123.pc similarity index 93% rename from jni/mpg123-1.13.4/libmpg123.pc rename to jni/mpg123-1.17.0/libmpg123.pc index d33fe8f8..e5118f63 100644 --- a/jni/mpg123-1.13.4/libmpg123.pc +++ b/jni/mpg123-1.17.0/libmpg123.pc @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: libmpg123 Description: An optimised MPEG Audio decoder Requires: -Version: 1.13.4 +Version: 1.17.0 Libs: -L${libdir} -lmpg123 Cflags: -I${includedir} diff --git a/jni/mpg123-1.13.4/libmpg123.pc.in b/jni/mpg123-1.17.0/libmpg123.pc.in similarity index 100% rename from jni/mpg123-1.13.4/libmpg123.pc.in rename to jni/mpg123-1.17.0/libmpg123.pc.in diff --git a/jni/mpg123-1.13.4/libtool b/jni/mpg123-1.17.0/libtool similarity index 98% rename from jni/mpg123-1.13.4/libtool rename to jni/mpg123-1.17.0/libtool index 4ee545b2..cdc144e6 100755 --- a/jni/mpg123-1.13.4/libtool +++ b/jni/mpg123-1.17.0/libtool @@ -1,13 +1,13 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (mpg123) 1.13.4 -# Libtool was configured on host dormouse: +# Generated automatically by config.status (mpg123) 1.17.0 +# Libtool was configured on host ilium: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -55,8 +55,8 @@ DLLTOOL="dlltool" OBJDUMP="objdump" # Which release of libtool.m4 was used? -macro_version=2.4 -macro_revision=1.3293 +macro_version=2.4.2 +macro_revision=1.3337 # What type of objects to build. pic_mode=default @@ -70,14 +70,17 @@ SHELL="/bin/bash" # An echo program that protects backslashes. ECHO="printf %s\\n" +# The PATH separator for the build system. +PATH_SEPARATOR=":" + # The host system. -host_alias= -host=i686-pc-linux-gnu -host_os=linux-gnu +host_alias=arm-linux-androideabi +host=arm-unknown-linux-androideabi +host_os=linux-androideabi # The build system. -build_alias= -build=i686-pc-linux-gnu +build_alias=86_64-unknown-linux-gnu +build=86_64-unknown-linux-gnu build_os=linux-gnu # A sed program that does not truncate output. @@ -96,7 +99,7 @@ EGREP="/bin/grep -E" FGREP="/bin/grep -F" # A BSD- or MS-compatible name lister. -NM="/usr/bin/nm -B" +NM="/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B" # Whether we need soft or hard links. LN_S="ln -s" @@ -141,7 +144,7 @@ want_nocaseglob="no" sharedlib_from_linklib_cmd="printf %s\\n" # The archiver. -AR="ar" +AR="arm-linux-androideabi-ar" # Flags to create an archive. AR_FLAGS="cru" @@ -150,18 +153,18 @@ AR_FLAGS="cru" archiver_list_spec="@" # A symbol stripping program. -STRIP="strip" +STRIP="arm-linux-androideabi-strip" # Commands used to install an old-style archive. -RANLIB="ranlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" +RANLIB="arm-linux-androideabi-ranlib" +old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib" old_postuninstall_cmds="" # Whether to use a lock for old archive extraction. lock_old_archive_extraction=no # A C compiler. -LTCC="gcc" +LTCC="arm-linux-androideabi-gcc" # LTCC compiler flags. LTCFLAGS="-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2" @@ -272,10 +275,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2 /usr/lib/i386-linux-gnu /lib /usr/lib " +sys_lib_search_path_spec="/opt/android-ndk-r8e/ndk-standalone/lib/gcc/arm-linux-androideabi/4.6 /opt/android-ndk-r8e/ndk-standalone/lib/gcc /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/lib /opt/android-ndk-r8e/ndk-standalone/sysroot/usr/lib " # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/lib/alsa-lib /usr/local/lib " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 " # Whether dlopen is supported. dlopen_support=unknown @@ -287,22 +290,22 @@ dlopen_self=unknown dlopen_self_static=unknown # Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" +old_striplib="arm-linux-androideabi-strip --strip-debug" +striplib="arm-linux-androideabi-strip --strip-unneeded" # The linker used to build libraries. -LD="/usr/bin/ld" +LD="/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld" # How to create reloadable object files. reload_flag=" -r" reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" # Commands used to build an old-style archive. -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" +old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" # A language specific compiler. -CC="gcc" +CC="arm-linux-androideabi-gcc" # Is the compiler the GNU compiler? with_gcc=yes @@ -368,10 +371,6 @@ no_undefined_flag="" # This must work even if $libdir does not exist hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" -# If ld is used when linking, flag to hardcode $libdir into a binary -# during linking. This must work even if $libdir does not exist. -hardcode_libdir_flag_spec_ld="" - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator="" @@ -432,11 +431,11 @@ hardcode_action=immediate # ### END LIBTOOL CONFIG -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -474,6 +473,7 @@ hardcode_action=immediate # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -502,7 +502,7 @@ hardcode_action=immediate # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -512,9 +512,9 @@ hardcode_action=immediate PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -569,15 +569,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -816,7 +811,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -1200,8 +1195,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1478,6 +1473,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1544,6 +1540,10 @@ esac ;; --no-silent|--no-quiet) opt_silent=false +preserve_args+=" $opt" + ;; + --no-warning|--no-warn) + opt_warning=false preserve_args+=" $opt" ;; --no-verbose) @@ -2485,7 +2485,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3627,11 +3627,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3896,7 +3898,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -4408,14 +4410,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5483,9 +5488,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -6069,7 +6080,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) compiler_flags+=" $arg" compile_command+=" $arg" finalize_command+=" $arg" @@ -6573,7 +6585,8 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -7257,7 +7270,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7742,6 +7755,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7858,7 +7872,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8446,6 +8460,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8476,7 +8495,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) perm_rpath+=" $libdir" ;; esac fi done @@ -8484,11 +8503,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9578,6 +9593,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9687,7 +9704,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" newdependency_libs+=" ${lt_sysroot:+=}$libdir/$name" diff --git a/jni/mpg123-1.13.4/m4/addrconfig.m4 b/jni/mpg123-1.17.0/m4/addrconfig.m4 similarity index 100% rename from jni/mpg123-1.13.4/m4/addrconfig.m4 rename to jni/mpg123-1.17.0/m4/addrconfig.m4 diff --git a/jni/mpg123-1.13.4/m4/libtool.m4 b/jni/mpg123-1.17.0/m4/libtool.m4 similarity index 97% rename from jni/mpg123-1.13.4/m4/libtool.m4 rename to jni/mpg123-1.17.0/m4/libtool.m4 index d8125842..44e0ecff 100644 --- a/jni/mpg123-1.13.4/m4/libtool.m4 +++ b/jni/mpg123-1.17.0/m4/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2644,7 +2703,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2713,7 +2772,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2738,7 +2797,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2762,7 +2821,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2793,7 +2852,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2803,7 +2862,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3225,7 +3284,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3645,6 +3704,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4229,7 +4289,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4321,18 +4383,33 @@ m4_if([$1], [CXX], [ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4492,7 +4569,9 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4517,7 +4596,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4768,8 +4846,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5064,6 +5141,7 @@ _LT_EOF # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5110,10 +5188,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5126,7 +5200,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5165,7 +5239,6 @@ _LT_EOF fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5607,9 +5680,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5767,7 +5837,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6137,7 +6206,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6898,12 +6967,18 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7100,7 +7175,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7233,7 +7307,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7420,6 +7493,77 @@ CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7489,6 +7633,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff --git a/jni/mpg123-1.13.4/m4/ltoptions.m4 b/jni/mpg123-1.17.0/m4/ltoptions.m4 similarity index 96% rename from jni/mpg123-1.13.4/m4/ltoptions.m4 rename to jni/mpg123-1.17.0/m4/ltoptions.m4 index 17cfd51c..5d9acd8e 100644 --- a/jni/mpg123-1.13.4/m4/ltoptions.m4 +++ b/jni/mpg123-1.17.0/m4/ltoptions.m4 @@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/jni/mpg123-1.13.4/m4/ltsugar.m4 b/jni/mpg123-1.17.0/m4/ltsugar.m4 similarity index 100% rename from jni/mpg123-1.13.4/m4/ltsugar.m4 rename to jni/mpg123-1.17.0/m4/ltsugar.m4 diff --git a/jni/mpg123-1.13.4/m4/ltversion.m4 b/jni/mpg123-1.17.0/m4/ltversion.m4 similarity index 77% rename from jni/mpg123-1.13.4/m4/ltversion.m4 rename to jni/mpg123-1.17.0/m4/ltversion.m4 index 9c7b5d41..07a8602d 100644 --- a/jni/mpg123-1.13.4/m4/ltversion.m4 +++ b/jni/mpg123-1.17.0/m4/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/jni/mpg123-1.13.4/m4/lt~obsolete.m4 b/jni/mpg123-1.17.0/m4/lt~obsolete.m4 similarity index 100% rename from jni/mpg123-1.13.4/m4/lt~obsolete.m4 rename to jni/mpg123-1.17.0/m4/lt~obsolete.m4 diff --git a/jni/mpg123-1.13.4/makedll.sh b/jni/mpg123-1.17.0/makedll.sh similarity index 100% rename from jni/mpg123-1.13.4/makedll.sh rename to jni/mpg123-1.17.0/makedll.sh diff --git a/jni/mpg123-1.13.4/man1/mpg123.1 b/jni/mpg123-1.17.0/man1/mpg123.1 similarity index 87% rename from jni/mpg123-1.13.4/man1/mpg123.1 rename to jni/mpg123-1.17.0/man1/mpg123.1 index f5a88c90..2b90c3b1 100644 --- a/jni/mpg123-1.13.4/man1/mpg123.1 +++ b/jni/mpg123-1.17.0/man1/mpg123.1 @@ -1,4 +1,4 @@ -.TH mpg123 1 "31 Jan 2008" +.TH mpg123 1 "22 Apr 2012" .SH NAME mpg123 \- play audio MPEG 1.0/2.0/2.5 stream (layers 1, 2 and 3) .SH SYNOPSIS @@ -63,8 +63,9 @@ With this switch you can make it bail out on data errors The old name still works, but is not advertised or recommened to use (subject to removal in future). .TP \fB\-\^-resync\-limit \fIbytes\fR -Set number of bytes to search for valid MPEG data; <0 means search whole stream. +Set number of bytes to search for valid MPEG data once lost in stream; <0 means search whole stream. If you know there are huge chunks of invalid data in your files... here is your hammer. +Note: Only since version 1.14 this also increases the amount of junk skipped on beginning. .TP \fB\-p \fIURL \fR| \fBnone\fR, \fB\-\^\-proxy \fIURL \fR| \fBnone The specified @@ -82,6 +83,14 @@ from the respective servers. See also the HTTP authentication to use when recieving files via HTTP. The format used is user:password. .TP +\fB\-\^\-ignore\-mime +Ignore MIME types given by HTTP server. If you know better and want mpg123 +to decode something the server thinks is image/png, then just do it. +.TP +\fB\-\^\-no\-seekbuffer +Disable the default micro-buffering of non-seekable streams that gives the +parser a safer footing. +.TP \fB\-@ \fIfile\fR, \fB\-\^\-list \fIfile Read filenames and/or URLs of MPEG audio streams from the specified .I file @@ -101,8 +110,13 @@ Of the playlist, play specified entry only. .I n is the number of entry starting at 1. A value of 0 is the default and means playling the whole list, a negative value means showing of the list of titles with their numbers... .TP +\fB\-\^\-continue +Enable playlist continuation mode. This changes frame skipping to apply only to the first track and also continues to play following tracks in playlist after the selected one. Also, the option to play a number of frames only applies to the whole playlist. Basically, this tries to treat the playlist more like one big stream (like, an audio book). +The current track number in list (1-based) and frame number (0-based) are printed at exit (useful if you interrupted playback and want to continue later). +Note that the continuation info is printed to standard output unless the switch for piping audio data to standard out is used. Also, it really makes sense to work with actual playlist files instead of lists of file names as arguments, to keep track positions consistent. +.TP \fB\-\-loop \fItimes\fR -for looping track(s) a certain number of times, < 0 means infinite loop (not with --random!). +for looping track(s) a certain number of times, < 0 means infinite loop (not with \-\-random!). .TP .BR \-\-keep\-open For remote control mode: Keep loaded file open after reaching end. @@ -170,13 +184,13 @@ is used as file name. You can also use .I --au and .I --cdr -for AU and CDR format, respectively. +for AU and CDR format, respectively. Note that WAV/AU writing to non-seekable files, or redirected stdout, needs some thought. Since 1.16.0, the logic changed to writing the header with the first actual data. This avoids spurious WAV headers in a pipe, for example. The result of decoding nothing to WAV/AU is a file consisting just of the header when it is seekable and really nothing when not (not even a header). Correctly writing data with prophetic headers to stdout is no easy business. .TP \fB\-\^\-au \fIfile Does not play the MPEG file but writes it to .I file in SUN audio format. If \- is used as the filename, the AU file is -written to stdout. +written to stdout. See paragraph about WAV writing for header fun with non-seekable streams. .TP \fB\-\^\-cdr \fIfile Does not play the MPEG file but writes it to @@ -227,7 +241,7 @@ Force stereo output .TP \fB\-r \fIrate\fR, \fB\-\^\-rate \fIrate Set sample rate (default: automatic). You may want to -change this if you need a constant bitrate independed of +change this if you need a constant bitrate independent of the mpeg stream rate. mpg123 automagically converts the rate. You should then combine this with \-\-stereo or \-\-mono. .TP @@ -242,6 +256,13 @@ Set hardware pitch (speedup/down, 0 is neutral; 0.05 is 5%). This changes the ou .BR \-\-8bit Forces 8bit output .TP +\fB\-\^\-float +Forces f32 encoding +.TP +\fp\-e \fIenc\fR, \fB\-\^\-encoding \fIenc +Choose output sample encoding. Possible values look like f32 (32-bit floating point), s32 (32-bit signed integer), u32 (32-bit unsigned integer) and the variants with different numbers of bits (s24, u24, s16, u16, s8, u8) and also special variants like ulaw and alaw 8-bit. +See the output of mpg123's longhelp for actually available encodings. +.TP \fB\-d \fIn\fR, \fB\-\^\-doublespeed \fIn Only play every .IR n 'th @@ -340,7 +361,7 @@ beginning of the song, ',' to rewind, '.' to fast forward, and 'q' to quit. Type 'h' for a full list of available controls. .TP \fB\-\^\-title -In an xterm, or rxvt (compatible, TERM environment variable is examined), change the window's title to the name of song currently +In an xterm, rxvt, screen, iris-ansi (compatible, TERM environment variable is examined), change the window's title to the name of song currently playing. .TP \fB\-\^\-long\-tag diff --git a/jni/mpg123-1.13.4/mpg123.spec b/jni/mpg123-1.17.0/mpg123.spec similarity index 99% rename from jni/mpg123-1.13.4/mpg123.spec rename to jni/mpg123-1.17.0/mpg123.spec index 5125b7b6..3b42ba35 100644 --- a/jni/mpg123-1.13.4/mpg123.spec +++ b/jni/mpg123-1.17.0/mpg123.spec @@ -4,7 +4,7 @@ # - devel packages for alsa, sdl, etc... to build the respective output modules. Summary: The fast console mpeg audio decoder/player. Name: mpg123 -Version: 1.13.4 +Version: 1.17.0 Release: 1 URL: http://www.mpg123.org/ License: GPL diff --git a/jni/mpg123-1.13.4/mpg123.spec.in b/jni/mpg123-1.17.0/mpg123.spec.in similarity index 100% rename from jni/mpg123-1.13.4/mpg123.spec.in rename to jni/mpg123-1.17.0/mpg123.spec.in diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2005/libmpg123/libmpg123.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2005/libmpg123/libmpg123.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2005/libmpg123/libmpg123.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2005/libmpg123/libmpg123.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/dump_seekindex/dump_seekindex.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008/dump_seekindex/dump_seekindex.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/dump_seekindex/dump_seekindex.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008/dump_seekindex/dump_seekindex.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/feedseek/feedseek.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008/feedseek/feedseek.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/feedseek/feedseek.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008/feedseek/feedseek.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/libmpg123/libmpg123.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008/libmpg123/libmpg123.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/libmpg123/libmpg123.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008/libmpg123/libmpg123.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/mpg123.sln b/jni/mpg123-1.17.0/ports/MSVC++/2008/mpg123.sln similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/mpg123.sln rename to jni/mpg123-1.17.0/ports/MSVC++/2008/mpg123.sln diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/mpglib/mpglib.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008/mpglib/mpglib.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/mpglib/mpglib.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008/mpglib/mpglib.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008/scan/scan.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008/scan/scan.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008/scan/scan.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008/scan/scan.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/2008clr.sln b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/2008clr.sln similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/2008clr.sln rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/2008clr.sln diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Program.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Program.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Program.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Program.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Properties/AssemblyInfo.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Properties/AssemblyInfo.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Properties/AssemblyInfo.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/Properties/AssemblyInfo.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/ReplaceReaderclr.csproj b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/ReplaceReaderclr.csproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/ReplaceReaderclr/ReplaceReaderclr.csproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/ReplaceReaderclr/ReplaceReaderclr.csproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/Program.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/Program.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/Program.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/Program.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/Properties/AssemblyInfo.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/Properties/AssemblyInfo.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/Properties/AssemblyInfo.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/Properties/AssemblyInfo.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/feedseekclr.csproj b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/feedseekclr.csproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/feedseekclr/feedseekclr.csproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/feedseekclr/feedseekclr.csproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/Program.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/Program.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/Program.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/Program.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/AssemblyInfo.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/AssemblyInfo.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/AssemblyInfo.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/AssemblyInfo.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/ReadMe.txt b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/ReadMe.txt similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/ReadMe.txt rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/ReadMe.txt diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/advanced.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/advanced.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/advanced.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/advanced.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/advanced.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/advanced.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/advanced.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/advanced.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/dllmain.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/dllmain.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/dllmain.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/dllmain.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/enum.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/enum.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/enum.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/enum.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/error.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/error.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/error.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/error.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/error.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/error.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/error.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/error.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v1.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v1.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v1.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v1.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v1.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v1.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v1.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v1.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v2.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v2.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v2.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v2.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v2.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v2.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/id3v2.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/id3v2.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.rc b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.rc similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.rc rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.rc diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/mpg123clr.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/mpg123clr.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/resource.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/resource.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/resource.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/resource.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/stdafx.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/stdafx.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/stdafx.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/stdafx.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/stdafx.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/stdafx.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/stdafx.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/stdafx.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/string.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/string.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/string.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/string.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/string.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/string.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/string.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/string.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/targetver.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/targetver.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/targetver.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/targetver.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/text.cpp b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/text.cpp similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/text.cpp rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/text.cpp diff --git a/jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/text.h b/jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/text.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/2008clr/mpg123clr/text.h rename to jni/mpg123-1.17.0/ports/MSVC++/2008clr/mpg123clr/text.h diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj b/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj new file mode 100644 index 00000000..6e4a0369 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {3C75D302-5DA2-49DD-A27A-5EB199D6933B} + Win32Proj + dump_seekindex + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + $(ProjectDir)$(Configuration)\ + ..\..\..\MSVC++;..\..\..\..\src\libmpg123;$(IncludePath) + + + false + $(ProjectDir)$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + {67caa87b-7cf1-4f93-bb67-21c513f40803} + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters b/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters new file mode 100644 index 00000000..72e22ea5 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj b/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj new file mode 100644 index 00000000..60f0fb21 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj @@ -0,0 +1,95 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + {67caa87b-7cf1-4f93-bb67-21c513f40803} + + + + {AE56D9D0-ECBA-44CD-943A-E530F6C46E15} + Win32Proj + feedseek + + + + Application + Unicode + + + Application + true + Unicode + + + + + + + + + + + + + true + ..\..\..\MSVC++;..\..\..\..\src\libmpg123;$(IncludePath) + $(ProjectDir)$(Configuration)\ + + + false + ..\..\..\MSVC++;..\..\..\..\src\libmpg123;$(IncludePath) + $(ProjectDir)$(Configuration)\ + + + + + + Level3 + true + EditAndContinue + Disabled + EnableFastChecks + MultiThreadedDebugDLL + WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + + + ProgramDatabase + MaxSpeed + MultiThreadedDLL + true + true + WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters b/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters new file mode 100644 index 00000000..569f2556 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/libmpg123/libmpg123.vcxproj b/jni/mpg123-1.17.0/ports/MSVC++/2010/libmpg123/libmpg123.vcxproj new file mode 100644 index 00000000..f42b38dc --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/libmpg123/libmpg123.vcxproj @@ -0,0 +1,960 @@ + + + + + Debug_Generic_Dll + Win32 + + + Debug_Generic + Win32 + + + Debug_x86_Dll_Minimal + Win32 + + + Debug_x86_Dll + Win32 + + + Debug_x86 + Win32 + + + Release_Generic_Dll + Win32 + + + Release_Generic + Win32 + + + Release_x86_Dll_Minimal + Win32 + + + Release_x86_Dll + Win32 + + + Release_x86 + Win32 + + + + {67CAA87B-7CF1-4F93-BB67-21C513F40803} + libmpg123 + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(ProjectDir)Debug\ + Debug\ + $(ProjectDir)Release\ + Release\ + $(ProjectDir)Debug\ + Debug\ + $(ProjectDir)Release\ + Release\ + $(ProjectDir)Debug\ + Debug\ + $(ProjectDir)Release\ + Release\ + $(ProjectDir)Debug\ + Debug\ + $(ProjectDir)Release\ + Release\ + false + $(ProjectDir)Debug\ + Debug\ + $(ProjectDir)Release\ + Release\ + false + + + + Disabled + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebugDLL + false + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + $(ProjectDir)Debug\$(ProjectName).lib + + + + + MaxSpeed + AnySuitable + true + Speed + true + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;%(PreprocessorDefinitions) + + + MultiThreadedDLL + false + false + StreamingSIMDExtensions + Precise + false + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + $(ProjectDir)Release\$(ProjectName).lib + + + + + Disabled + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;_DEBUG;BUILD_MPG123_DLL;ACCURATE_ROUNDING;IEEE_FLOAT;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebugDLL + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + $(ProjectDir)Debug\$(ProjectName).dll + $(ProjectDir)\Debug;%(AdditionalLibraryDirectories) + true + true + 0x63000000 + false + true + + + + + MaxSpeed + AnySuitable + true + Speed + true + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;OPT_GENERIC;BUILD_MPG123_DLL;%(PreprocessorDefinitions) + + + MultiThreadedDLL + false + false + StreamingSIMDExtensions + Precise + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + $(ProjectDir)Release\$(ProjectName).dll + true + 0x63000000 + false + true + + + + + Disabled + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebugDLL + false + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\getcpuflags.o" "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_i586.o" "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_mmx.o" "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Debug\$(ProjectName).lib + $(ProjectDir)\Debug;%(AdditionalLibraryDirectories) + + + + + MaxSpeed + AnySuitable + true + Speed + true + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;%(PreprocessorDefinitions) + + + MultiThreadedDLL + false + false + StreamingSIMDExtensions + Precise + false + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\getcpuflags.o" "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_i586.o" "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_mmx.o" "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse.o" "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Release\$(ProjectName).lib + $(ProjectDir)\Release;%(AdditionalLibraryDirectories) + + + + + Disabled + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebugDLL + Precise + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\getcpuflags.o" "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_i586.o" "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_mmx.o" "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Debug\$(ProjectName).dll + $(ProjectDir)\Debug;%(AdditionalLibraryDirectories) + true + true + 0x63000000 + true + false + + + + + + + + + MaxSpeed + AnySuitable + true + Speed + true + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;%(PreprocessorDefinitions) + + + MultiThreadedDLL + false + false + StreamingSIMDExtensions + Precise + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\getcpuflags.o" "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_i586.o" "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_mmx.o" "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse.o" "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Release\$(ProjectName).dll + $(ProjectDir)\Release;%(AdditionalLibraryDirectories) + true + 0x63000000 + false + true + + + + + + + + + Disabled + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;NO_STRING;NO_ID3V2;NO_ICY;NO_DOWNSAMPLE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;%(PreprocessorDefinitions) + false + + + EnableFastChecks + MultiThreadedDebugDLL + Precise + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Debug\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\getcpuflags.o" "$(ProjectDir)..\libmpg123\Debug\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Debug\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_i586.o" "$(ProjectDir)..\libmpg123\Debug\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_mmx.o" "$(ProjectDir)..\libmpg123\Debug\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Debug\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Debug\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Debug\$(ProjectName).dll + $(ProjectDir)\Debug;%(AdditionalLibraryDirectories) + true + true + 0x63000000 + true + false + + + + + + + + + MaxSpeed + AnySuitable + true + Speed + true + ../..;../../../../src/libmpg123;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_WARNINGS;BUILD_MPG123_DLL;OPT_MULTI;OPT_GENERIC;OPT_I386;OPT_I586;OPT_MMX;OPT_3DNOW;OPT_3DNOWEXT;OPT_SSE;NO_STRING;NO_ID3V2;NO_ICY;NO_DOWNSAMPLE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;%(PreprocessorDefinitions) + + + MultiThreadedDLL + false + false + StreamingSIMDExtensions + Precise + false + Level3 + false + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct36_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct36_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\dct64_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_mmx.o" "$(ProjectDir)..\libmpg123\Release\dct64_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\dct64_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.o" "$(ProjectDir)..\libmpg123\Release\dct64_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\equalizer_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.o" "$(ProjectDir)..\libmpg123\Release\equalizer_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\getcpuflags.S" /nologo > "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\getcpuflags.o" "$(ProjectDir)..\libmpg123\Release\getcpuflags.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnow.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnow.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_3dnowext.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.o" "$(ProjectDir)..\libmpg123\Release\synth_3dnowext.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_i586.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_i586.o" "$(ProjectDir)..\libmpg123\Release\synth_i586.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_mmx.o" "$(ProjectDir)..\libmpg123\Release\synth_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse.o" "$(ProjectDir)..\libmpg123\Release\synth_sse.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_float.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_float.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\tabinit_mmx.S" /nologo > "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.o" "$(ProjectDir)..\libmpg123\Release\tabinit_mmx.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_sse_s32.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_accurate.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_accurate.asm" + +cl /I "..\.." /EP /TC "$(ProjectDir)..\..\..\..\src\libmpg123\synth_stereo_sse_s32.S" /nologo > "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" +yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.o" "$(ProjectDir)..\libmpg123\Release\synth_stereo_sse_s32.asm" + + + + dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) + $(ProjectDir)Release\$(ProjectName).dll + $(ProjectDir)\Release;%(AdditionalLibraryDirectories) + true + 0x63000000 + false + true + + + + + + + + + + + true + true + true + true + + + true + true + true + true + true + true + true + true + true + true + + + + + + + true + true + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/mpg123.sln b/jni/mpg123-1.17.0/ports/MSVC++/2010/mpg123.sln new file mode 100644 index 00000000..cce053f0 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/mpg123.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "feedseek", "feedseek\feedseek.vcxproj", "{AE56D9D0-ECBA-44CD-943A-E530F6C46E15}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpg123", "libmpg123\libmpg123.vcxproj", "{67CAA87B-7CF1-4F93-BB67-21C513F40803}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan", "scan\scan.vcxproj", "{1B03F4FD-A10A-4F99-A476-BE7FFD1CB508}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dump_seekindex", "dump_seekindex\dump_seekindex.vcxproj", "{3C75D302-5DA2-49DD-A27A-5EB199D6933B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AE56D9D0-ECBA-44CD-943A-E530F6C46E15}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE56D9D0-ECBA-44CD-943A-E530F6C46E15}.Debug|Win32.Build.0 = Debug|Win32 + {AE56D9D0-ECBA-44CD-943A-E530F6C46E15}.Release|Win32.ActiveCfg = Release|Win32 + {AE56D9D0-ECBA-44CD-943A-E530F6C46E15}.Release|Win32.Build.0 = Release|Win32 + {67CAA87B-7CF1-4F93-BB67-21C513F40803}.Debug|Win32.ActiveCfg = Debug_x86|Win32 + {67CAA87B-7CF1-4F93-BB67-21C513F40803}.Debug|Win32.Build.0 = Debug_x86|Win32 + {67CAA87B-7CF1-4F93-BB67-21C513F40803}.Release|Win32.ActiveCfg = Release_x86|Win32 + {67CAA87B-7CF1-4F93-BB67-21C513F40803}.Release|Win32.Build.0 = Release_x86|Win32 + {1B03F4FD-A10A-4F99-A476-BE7FFD1CB508}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B03F4FD-A10A-4F99-A476-BE7FFD1CB508}.Debug|Win32.Build.0 = Debug|Win32 + {1B03F4FD-A10A-4F99-A476-BE7FFD1CB508}.Release|Win32.ActiveCfg = Release|Win32 + {1B03F4FD-A10A-4F99-A476-BE7FFD1CB508}.Release|Win32.Build.0 = Release|Win32 + {3C75D302-5DA2-49DD-A27A-5EB199D6933B}.Debug|Win32.ActiveCfg = Debug|Win32 + {3C75D302-5DA2-49DD-A27A-5EB199D6933B}.Debug|Win32.Build.0 = Debug|Win32 + {3C75D302-5DA2-49DD-A27A-5EB199D6933B}.Release|Win32.ActiveCfg = Release|Win32 + {3C75D302-5DA2-49DD-A27A-5EB199D6933B}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj b/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj new file mode 100644 index 00000000..6fc5f91b --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj @@ -0,0 +1,93 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + {67caa87b-7cf1-4f93-bb67-21c513f40803} + + + + {1B03F4FD-A10A-4F99-A476-BE7FFD1CB508} + Win32Proj + scan + + + + Application + Unicode + + + Application + true + Unicode + + + + + + + + + + + + + true + $(ProjectDir)$(Configuration)\ + ..\..\..\MSVC++;..\..\..\..\src\libmpg123;$(IncludePath) + + + false + $(ProjectDir)$(Configuration)\ + + + + NotUsing + Level3 + true + EditAndContinue + Disabled + EnableFastChecks + MultiThreadedDebugDLL + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir) + + + Console + true + + + + + Level3 + NotUsing + ProgramDatabase + MaxSpeed + MultiThreadedDLL + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj.filters b/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj.filters new file mode 100644 index 00000000..aa03bdf9 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/MSVC++/2010/scan/scan.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/CORE/CORE_FileIn.H b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/CORE/CORE_FileIn.H similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/CORE/CORE_FileIn.H rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/CORE/CORE_FileIn.H diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/CORE/SourceFilter_MP3.H b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/CORE/SourceFilter_MP3.H similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/CORE/SourceFilter_MP3.H rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/CORE/SourceFilter_MP3.H diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_Def.H b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_Def.H similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_Def.H rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_Def.H diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_FileIn.H b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_FileIn.H similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_FileIn.H rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/INCLUDE/IIEP_FileIn.H diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/README b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/README similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/README rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/README diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_FileIn.CPP b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_FileIn.CPP similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_FileIn.CPP rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_FileIn.CPP diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_Log.CPP b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_Log.CPP similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_Log.CPP rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_Log.CPP diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_Mutex.CPP b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_Mutex.CPP similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/CORE_Mutex.CPP rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/CORE_Mutex.CPP diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/SourceFilter_MP3Stream.CPP b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/SourceFilter_MP3Stream.CPP similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/SOURCE/SourceFilter_MP3Stream.CPP rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/SOURCE/SourceFilter_MP3Stream.CPP diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE diff --git a/jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj b/jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj rename to jni/mpg123-1.17.0/ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj diff --git a/jni/mpg123-1.13.4/ports/MSVC++/config.h b/jni/mpg123-1.17.0/ports/MSVC++/config.h similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/config.h rename to jni/mpg123-1.17.0/ports/MSVC++/config.h diff --git a/jni/mpg123-1.13.4/ports/MSVC++/examples/feedseek.c b/jni/mpg123-1.17.0/ports/MSVC++/examples/feedseek.c similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/examples/feedseek.c rename to jni/mpg123-1.17.0/ports/MSVC++/examples/feedseek.c diff --git a/jni/mpg123-1.13.4/ports/MSVC++/examples/scan.c b/jni/mpg123-1.17.0/ports/MSVC++/examples/scan.c similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/examples/scan.c rename to jni/mpg123-1.17.0/ports/MSVC++/examples/scan.c diff --git a/jni/mpg123-1.13.4/ports/MSVC++/mpg123.h b/jni/mpg123-1.17.0/ports/MSVC++/mpg123.h similarity index 89% rename from jni/mpg123-1.13.4/ports/MSVC++/mpg123.h rename to jni/mpg123-1.17.0/ports/MSVC++/mpg123.h index 04f4db2e..6b8ead35 100644 --- a/jni/mpg123-1.13.4/ports/MSVC++/mpg123.h +++ b/jni/mpg123-1.17.0/ports/MSVC++/mpg123.h @@ -12,8 +12,14 @@ #include typedef long ssize_t; + +// Needed for Visual Studio versions before VS 2010. +#if (_MSC_VER < 1600) typedef __int32 int32_t; typedef unsigned __int32 uint32_t; +#else +#include +#endif #define PRIiMAX "I64i" typedef __int64 intmax_t; diff --git a/jni/mpg123-1.13.4/ports/MSVC++/msvc.c b/jni/mpg123-1.17.0/ports/MSVC++/msvc.c similarity index 100% rename from jni/mpg123-1.13.4/ports/MSVC++/msvc.c rename to jni/mpg123-1.17.0/ports/MSVC++/msvc.c diff --git a/jni/mpg123-1.13.4/ports/README b/jni/mpg123-1.17.0/ports/README similarity index 78% rename from jni/mpg123-1.13.4/ports/README rename to jni/mpg123-1.17.0/ports/README index 7aa5c18b..f83b0cb4 100644 --- a/jni/mpg123-1.13.4/ports/README +++ b/jni/mpg123-1.17.0/ports/README @@ -18,3 +18,9 @@ Note that those may be a bit outdated (especially when a file is added/removed i If you want to use the asm build you will need yasm (http://www.tortall.net/projects/yasm/). Please put yasm.exe into a directory where MSVC++ can find it. Finally switch the libmpg123 project to the Release_MMX_Dll build using the Visual Studio Configuration Manager. + - Xcode contains the project file for building and using libmpg123 with + Xcode for Mac and iOS (arm and simulator builds). Please add the + ports/Xcode folder to the header search path of your project so that + Xcode can find the right mpg123.h and config.h. Then drag the mpg123 + Xcode project into your own project. Finally in your build target, build + phases, add mpg123-ios or mpg123-mac to the libraries to link. diff --git a/jni/mpg123-1.13.4/ports/Sony_PSP/Makefile.psp b/jni/mpg123-1.17.0/ports/Sony_PSP/Makefile.psp similarity index 100% rename from jni/mpg123-1.13.4/ports/Sony_PSP/Makefile.psp rename to jni/mpg123-1.17.0/ports/Sony_PSP/Makefile.psp diff --git a/jni/mpg123-1.13.4/ports/Sony_PSP/README b/jni/mpg123-1.17.0/ports/Sony_PSP/README similarity index 100% rename from jni/mpg123-1.13.4/ports/Sony_PSP/README rename to jni/mpg123-1.17.0/ports/Sony_PSP/README diff --git a/jni/mpg123-1.13.4/ports/Sony_PSP/config.h b/jni/mpg123-1.17.0/ports/Sony_PSP/config.h similarity index 99% rename from jni/mpg123-1.13.4/ports/Sony_PSP/config.h rename to jni/mpg123-1.17.0/ports/Sony_PSP/config.h index 2a6c600a..957c5e9d 100644 --- a/jni/mpg123-1.13.4/ports/Sony_PSP/config.h +++ b/jni/mpg123-1.17.0/ports/Sony_PSP/config.h @@ -254,7 +254,7 @@ /* #undef NO_ERETURN */ /* Define to disable error messages. */ -/* #undef NO_ERROR */ +/* #undef NO_ERRORMSG */ /* Define to disable feeder and buffered readers. */ /* #undef NO_FEEDER */ diff --git a/jni/mpg123-1.13.4/ports/Sony_PSP/readers.c.patch b/jni/mpg123-1.17.0/ports/Sony_PSP/readers.c.patch similarity index 100% rename from jni/mpg123-1.13.4/ports/Sony_PSP/readers.c.patch rename to jni/mpg123-1.17.0/ports/Sony_PSP/readers.c.patch diff --git a/jni/mpg123-1.17.0/ports/Xcode/config.h b/jni/mpg123-1.17.0/ports/Xcode/config.h new file mode 100644 index 00000000..651b521f --- /dev/null +++ b/jni/mpg123-1.17.0/ports/Xcode/config.h @@ -0,0 +1,197 @@ +#include "TargetConditionals.h" + +#if TARGET_IPHONE_SIMULATOR + #define DEFAULT_OUTPUT_MODULE "dummy" + /* #undef HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H */ + /* #undef HAVE_AUDIOUNIT_AUDIOUNIT_H */ + /* #undef HAVE_CORESERVICES_CORESERVICES_H */ + /* #undef HAVE_OPENAL_ALC_H */ + /* #undef HAVE_OPENAL_AL_H */ + #define ABI_ALIGN_FUN 1 + #define HAVE_GAI_ADDRCONFIG 1 + #define LFS_ALIAS_BITS 32 + /* #undef HAVE_LIBMX */ + #define HAVE_MMAP 1 + #define IEEE_FLOAT 1 + #define SIZEOF_INT32_T 4 + #define SIZEOF_LONG 4 + #define SIZEOF_OFF_T 8 + #define SIZEOF_SIZE_T 4 + #define SIZEOF_SSIZE_T 4 + #define OPT_GENERIC +#elif TARGET_OS_IPHONE + #define DEFAULT_OUTPUT_MODULE "dummy" + /* #undef HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H */ + /* #undef HAVE_AUDIOUNIT_AUDIOUNIT_H */ + /* #undef HAVE_CORESERVICES_CORESERVICES_H */ + /* #undef HAVE_OPENAL_ALC_H */ + /* #undef HAVE_OPENAL_AL_H */ + /* #undef ABI_ALIGN_FUN */ + /* #undef HAVE_GAI_ADDRCONFIG */ + #define LFS_ALIAS_BITS 32 + /* #undef HAVE_LIBMX */ + /* #undef HAVE_MMAP */ + /* #undef IEEE_FLOAT */ + #define SIZEOF_INT32_T 4 + #define SIZEOF_LONG 4 + #define SIZEOF_OFF_T 8 + #define SIZEOF_SIZE_T 4 + #define SIZEOF_SSIZE_T 4 + #define OPT_NEON +#elif TARGET_OS_MAC + #define DEFAULT_OUTPUT_MODULE "coreaudio" + #define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1 + #define HAVE_AUDIOUNIT_AUDIOUNIT_H 1 + #define HAVE_CORESERVICES_CORESERVICES_H 1 + #define HAVE_OPENAL_ALC_H 1 + #define HAVE_OPENAL_AL_H 1 + /* #undef ABI_ALIGN_FUN */ + #define HAVE_GAI_ADDRCONFIG 1 + #define LFS_ALIAS_BITS 64 + #define HAVE_LIBMX 1 + #define HAVE_MMAP 1 + #define IEEE_FLOAT 1 + #define SIZEOF_INT32_T 4 + #define SIZEOF_LONG 8 + #define SIZEOF_OFF_T 8 + #define SIZEOF_SIZE_T 8 + #define SIZEOF_SIZE_T 8 + #define SIZEOF_SSIZE_T 8 + #define OPT_GENERIC +#else + #error "Unknown target." +#endif + +/* #undef ACCURATE_ROUNDING */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ +#define ASMALIGN_EXP 1 +#define CCALIGN 1 +/* #undef DEBUG */ +/* #undef DYNAMIC_BUILD */ +#define FIFO 1 +#define FRAME_INDEX 1 +#define GAPLESS 1 +/* #undef HAVE_ALC_H */ +/* #undef HAVE_ALIB_H */ +/* #undef HAVE_AL_ALC_H */ +/* #undef HAVE_AL_AL_H */ +/* #undef HAVE_AL_H */ +#define HAVE_ARPA_INET_H 1 +/* #undef HAVE_ASM_AUDIOIO_H */ +#define HAVE_ATOLL 1 +/* #undef HAVE_AUDIOS_H */ +/* #undef HAVE_CULIB_H */ +#define HAVE_DLFCN_H 1 +#define HAVE_GETADDRINFO 1 +#define HAVE_GETPAGESIZE 1 +#define HAVE_GETUID 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_LANGINFO_H 1 +#define HAVE_LIBM 1 +#define HAVE_LIMITS_H 1 +/* #undef HAVE_LINUX_SOUNDCARD_H */ +#define HAVE_LOCALE_H 1 +/* #undef HAVE_LTDL */ +/* #undef HAVE_MACHINE_SOUNDCARD_H */ +#define HAVE_MEMORY_H 1 +#define HAVE_MKFIFO 1 +#define HAVE_NETDB_H 1 +#define HAVE_NETINET_IN_H 1 +/* #undef HAVE_NETINET_TCP_H */ +#define HAVE_NL_LANGINFO 1 +/* #undef HAVE_OS2ME_H */ +/* #undef HAVE_OS2_H */ +#define HAVE_RANDOM 1 +#define HAVE_SCHED_H 1 +/* #undef HAVE_SCHED_SETSCHEDULER */ +#define HAVE_SETLOCALE 1 +#define HAVE_SETPRIORITY 1 +#define HAVE_SETUID 1 +#define HAVE_SIGNAL_H 1 +/* #undef HAVE_SNDIO_H */ +#define HAVE_STDINT_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRDUP 1 +#define HAVE_STRERROR 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +/* #undef HAVE_SUN_AUDIOIO_H */ +/* #undef HAVE_SYS_AUDIOIO_H */ +/* #undef HAVE_SYS_AUDIO_H */ +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SYS_SIGNAL_H 1 +#define HAVE_SYS_SOCKET_H 1 +/* #undef HAVE_SYS_SOUNDCARD_H */ +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_WAIT_H 1 +#define HAVE_TERMIOS 1 +#define HAVE_UNISTD_H 1 +/* #undef HAVE_WINDOWS_H */ +/* #undef HAVE_WS2TCPIP_H */ +#define INDEX_SIZE 1000 +#define IPV6 1 +#define LT_OBJDIR ".libs/" +#define MODULE_FILE_SUFFIX ".la" +#define NETWORK 1 +/* #undef NO_16BIT */ +/* #undef NO_32BIT */ +/* #undef NO_8BIT */ +/* #undef NO_DOWNSAMPLE */ +/* #undef NO_ERETURN */ +/* #undef NO_ERRORMSG */ +/* #undef NO_FEEDER */ +/* #undef NO_ICY */ +/* #undef NO_ID3V2 */ +/* #undef NO_LAYER1 */ +/* #undef NO_LAYER2 */ +/* #undef NO_LAYER3 */ +/* #undef NO_NTOM */ +/* #undef NO_REAL */ +/* #undef NO_STRING */ +/* #undef NO_WARNING */ +#define PACKAGE "mpg123" +#define PACKAGE_BUGREPORT "mpg123-devel@lists.sourceforge.net" +#define PACKAGE_NAME "mpg123" +#define PACKAGE_STRING "mpg123 1.14.0" +#define PACKAGE_TARNAME "mpg123" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "1.14.0" +/* #undef PORTAUDIO18 */ +#define STDC_HEADERS 1 +/* #undef USE_MODULES */ +#define VERSION "1.14.0" +/* #undef WANT_WIN32_FIFO */ +/* #undef WANT_WIN32_SOCKETS */ +/* #undef WANT_WIN32_UNICODE */ +/* #undef WINVER */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif +/* #undef _FILE_OFFSET_BITS */ +/* #undef _LARGE_FILES */ +/* #undef _WIN32_WINNT */ +/* #undef const */ +#ifndef __cplusplus +/* #undef inline */ +#endif +/* #undef int16_t */ +/* #undef int32_t */ +/* #undef off_t */ +/* #undef size_t */ +/* #undef ssize_t */ +/* #undef uint16_t */ +/* #undef uint32_t */ +/* #undef uintptr_t */ + +#define REAL_IS_FLOAT diff --git a/jni/mpg123-1.17.0/ports/Xcode/mpg123.h b/jni/mpg123-1.17.0/ports/Xcode/mpg123.h new file mode 100644 index 00000000..97711805 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/Xcode/mpg123.h @@ -0,0 +1,17 @@ +/* + mpg123.h: MPEG Audio Decoder library wrapper header for Xcode + + copyright 2012 by the mpg123 project - free software under the terms of the LGPL 2.1 + initially written by Patrick Dehne. +*/ + +#ifndef MPG123_XCODE_H +#define MPG123_XCODE_H + +#include +#include + +#define MPG123_NO_CONFIGURE +#include "../../src/libmpg123/mpg123.h.in" /* Yes, .h.in; we include the configure template! */ + +#endif diff --git a/jni/mpg123-1.17.0/ports/Xcode/mpg123.xcodeproj/project.pbxproj b/jni/mpg123-1.17.0/ports/Xcode/mpg123.xcodeproj/project.pbxproj new file mode 100644 index 00000000..30cb5c29 --- /dev/null +++ b/jni/mpg123-1.17.0/ports/Xcode/mpg123.xcodeproj/project.pbxproj @@ -0,0 +1,670 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + CD132C23152A4B8000B4F5A8 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C21152A4B8000B4F5A8 /* config.h */; }; + CD132C24152A4B8000B4F5A8 /* mpg123.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C22152A4B8000B4F5A8 /* mpg123.h */; }; + CD132C7E152A4D7E00B4F5A8 /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C62152A4D7E00B4F5A8 /* compat.h */; }; + CD132C7F152A4D7E00B4F5A8 /* decode.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C63152A4D7E00B4F5A8 /* decode.h */; }; + CD132C80152A4D7E00B4F5A8 /* dither.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C64152A4D7E00B4F5A8 /* dither.h */; }; + CD132C81152A4D7E00B4F5A8 /* frame.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C65152A4D7E00B4F5A8 /* frame.h */; }; + CD132C82152A4D7E00B4F5A8 /* getbits.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C66152A4D7E00B4F5A8 /* getbits.h */; }; + CD132C83152A4D7E00B4F5A8 /* getcpuflags.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C67152A4D7E00B4F5A8 /* getcpuflags.h */; }; + CD132C84152A4D7E00B4F5A8 /* huffman.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C68152A4D7E00B4F5A8 /* huffman.h */; }; + CD132C85152A4D7E00B4F5A8 /* icy.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C69152A4D7E00B4F5A8 /* icy.h */; }; + CD132C86152A4D7E00B4F5A8 /* icy2utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6A152A4D7E00B4F5A8 /* icy2utf8.h */; }; + CD132C87152A4D7E00B4F5A8 /* id3.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6B152A4D7E00B4F5A8 /* id3.h */; }; + CD132C88152A4D7E00B4F5A8 /* index.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6C152A4D7E00B4F5A8 /* index.h */; }; + CD132C89152A4D7E00B4F5A8 /* intsym.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6D152A4D7E00B4F5A8 /* intsym.h */; }; + CD132C8A152A4D7E00B4F5A8 /* l2tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6E152A4D7E00B4F5A8 /* l2tables.h */; }; + CD132C8B152A4D7E00B4F5A8 /* l3_integer_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6F152A4D7E00B4F5A8 /* l3_integer_tables.h */; }; + CD132C8C152A4D7E00B4F5A8 /* l12_integer_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C70152A4D7E00B4F5A8 /* l12_integer_tables.h */; }; + CD132C8D152A4D7E00B4F5A8 /* mangle.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C71152A4D7E00B4F5A8 /* mangle.h */; }; + CD132C8E152A4D7E00B4F5A8 /* mpg123lib_intern.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C73152A4D7E00B4F5A8 /* mpg123lib_intern.h */; }; + CD132C8F152A4D7E00B4F5A8 /* optimize.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C74152A4D7E00B4F5A8 /* optimize.h */; }; + CD132C90152A4D7E00B4F5A8 /* parse.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C75152A4D7E00B4F5A8 /* parse.h */; }; + CD132C91152A4D7E00B4F5A8 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C76152A4D7E00B4F5A8 /* reader.h */; }; + CD132C92152A4D7E00B4F5A8 /* sample.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C77152A4D7E00B4F5A8 /* sample.h */; }; + CD132C93152A4D7E00B4F5A8 /* synth_8bit.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C78152A4D7E00B4F5A8 /* synth_8bit.h */; }; + CD132C94152A4D7E00B4F5A8 /* synth_mono.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C79152A4D7E00B4F5A8 /* synth_mono.h */; }; + CD132C95152A4D7E00B4F5A8 /* synth_ntom.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7A152A4D7E00B4F5A8 /* synth_ntom.h */; }; + CD132C96152A4D7E00B4F5A8 /* synth.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7B152A4D7E00B4F5A8 /* synth.h */; }; + CD132C97152A4D7E00B4F5A8 /* synths.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7C152A4D7E00B4F5A8 /* synths.h */; }; + CD132C98152A4D7E00B4F5A8 /* true.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7D152A4D7E00B4F5A8 /* true.h */; }; + CD132CB3152A4E7000B4F5A8 /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C99152A4E7000B4F5A8 /* compat.c */; }; + CD132CB4152A4E7000B4F5A8 /* dct64.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9A152A4E7000B4F5A8 /* dct64.c */; }; + CD132CB5152A4E7000B4F5A8 /* dither.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9B152A4E7000B4F5A8 /* dither.c */; }; + CD132CB6152A4E7000B4F5A8 /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9C152A4E7000B4F5A8 /* equalizer.c */; }; + CD132CB7152A4E7000B4F5A8 /* feature.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9D152A4E7000B4F5A8 /* feature.c */; }; + CD132CB8152A4E7000B4F5A8 /* format.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9E152A4E7000B4F5A8 /* format.c */; }; + CD132CB9152A4E7000B4F5A8 /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9F152A4E7000B4F5A8 /* frame.c */; }; + CD132CBA152A4E7000B4F5A8 /* icy.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA0152A4E7000B4F5A8 /* icy.c */; }; + CD132CBB152A4E7000B4F5A8 /* icy2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA1152A4E7000B4F5A8 /* icy2utf8.c */; }; + CD132CBC152A4E7000B4F5A8 /* id3.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA2152A4E7000B4F5A8 /* id3.c */; }; + CD132CBD152A4E7000B4F5A8 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA3152A4E7000B4F5A8 /* index.c */; }; + CD132CBE152A4E7000B4F5A8 /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA4152A4E7000B4F5A8 /* layer1.c */; }; + CD132CBF152A4E7000B4F5A8 /* layer2.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA5152A4E7000B4F5A8 /* layer2.c */; }; + CD132CC0152A4E7000B4F5A8 /* layer3.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA6152A4E7000B4F5A8 /* layer3.c */; }; + CD132CC1152A4E7000B4F5A8 /* lfs_alias.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA7152A4E7000B4F5A8 /* lfs_alias.c */; }; + CD132CC2152A4E7000B4F5A8 /* libmpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA8152A4E7000B4F5A8 /* libmpg123.c */; }; + CD132CC3152A4E7000B4F5A8 /* ntom.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA9152A4E7000B4F5A8 /* ntom.c */; }; + CD132CC4152A4E7000B4F5A8 /* optimize.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAA152A4E7000B4F5A8 /* optimize.c */; }; + CD132CC5152A4E7000B4F5A8 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAB152A4E7000B4F5A8 /* parse.c */; }; + CD132CC6152A4E7000B4F5A8 /* readers.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAC152A4E7000B4F5A8 /* readers.c */; }; + CD132CC7152A4E7000B4F5A8 /* stringbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAD152A4E7000B4F5A8 /* stringbuf.c */; }; + CD132CC8152A4E7000B4F5A8 /* synth_8bit.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAE152A4E7000B4F5A8 /* synth_8bit.c */; }; + CD132CC9152A4E7000B4F5A8 /* synth_real.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAF152A4E7000B4F5A8 /* synth_real.c */; }; + CD132CCA152A4E7000B4F5A8 /* synth_s32.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB0152A4E7000B4F5A8 /* synth_s32.c */; }; + CD132CCB152A4E7000B4F5A8 /* synth.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB1152A4E7000B4F5A8 /* synth.c */; }; + CD132CCC152A4E7000B4F5A8 /* tabinit.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB2152A4E7000B4F5A8 /* tabinit.c */; }; + CD132CD6152A511C00B4F5A8 /* dct64_neon_float.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CCD152A511800B4F5A8 /* dct64_neon_float.S */; }; + CD132CD7152A511C00B4F5A8 /* dct64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CCE152A511900B4F5A8 /* dct64_neon.S */; }; + CD132CD9152A511C00B4F5A8 /* synth_neon_float.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD0152A511A00B4F5A8 /* synth_neon_float.S */; }; + CD132CDA152A511C00B4F5A8 /* synth_neon_s32.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD1152A511A00B4F5A8 /* synth_neon_s32.S */; }; + CD132CDB152A511C00B4F5A8 /* synth_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD2152A511A00B4F5A8 /* synth_neon.S */; }; + CD132CDC152A511C00B4F5A8 /* synth_stereo_neon_float.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD3152A511B00B4F5A8 /* synth_stereo_neon_float.S */; }; + CD132CDD152A511C00B4F5A8 /* synth_stereo_neon_s32.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD4152A511B00B4F5A8 /* synth_stereo_neon_s32.S */; }; + CD132CDE152A511C00B4F5A8 /* synth_stereo_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = CD132CD5152A511C00B4F5A8 /* synth_stereo_neon.S */; }; + CDB0288C152B760700B01410 /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C99152A4E7000B4F5A8 /* compat.c */; }; + CDB0288D152B760700B01410 /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C62152A4D7E00B4F5A8 /* compat.h */; }; + CDB0288E152B760700B01410 /* dct64.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9A152A4E7000B4F5A8 /* dct64.c */; }; + CDB02890152B760D00B01410 /* decode.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C63152A4D7E00B4F5A8 /* decode.h */; }; + CDB02891152B760D00B01410 /* dither.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C64152A4D7E00B4F5A8 /* dither.h */; }; + CDB02892152B760D00B01410 /* dither.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9B152A4E7000B4F5A8 /* dither.c */; }; + CDB02893152B760D00B01410 /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9C152A4E7000B4F5A8 /* equalizer.c */; }; + CDB02894152B760D00B01410 /* feature.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9D152A4E7000B4F5A8 /* feature.c */; }; + CDB02895152B760D00B01410 /* format.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9E152A4E7000B4F5A8 /* format.c */; }; + CDB02896152B761300B01410 /* frame.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C65152A4D7E00B4F5A8 /* frame.h */; }; + CDB02897152B761300B01410 /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132C9F152A4E7000B4F5A8 /* frame.c */; }; + CDB02898152B761300B01410 /* getbits.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C66152A4D7E00B4F5A8 /* getbits.h */; }; + CDB02899152B761300B01410 /* getcpuflags.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C67152A4D7E00B4F5A8 /* getcpuflags.h */; }; + CDB0289A152B761300B01410 /* huffman.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C68152A4D7E00B4F5A8 /* huffman.h */; }; + CDB0289B152B761300B01410 /* icy.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C69152A4D7E00B4F5A8 /* icy.h */; }; + CDB0289C152B761300B01410 /* icy.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA0152A4E7000B4F5A8 /* icy.c */; }; + CDB0289D152B761300B01410 /* icy2utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6A152A4D7E00B4F5A8 /* icy2utf8.h */; }; + CDB0289E152B761300B01410 /* icy2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA1152A4E7000B4F5A8 /* icy2utf8.c */; }; + CDB0289F152B761C00B01410 /* id3.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6B152A4D7E00B4F5A8 /* id3.h */; }; + CDB028A0152B761C00B01410 /* id3.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA2152A4E7000B4F5A8 /* id3.c */; }; + CDB028A1152B761C00B01410 /* index.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6C152A4D7E00B4F5A8 /* index.h */; }; + CDB028A2152B761C00B01410 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA3152A4E7000B4F5A8 /* index.c */; }; + CDB028A3152B761C00B01410 /* intsym.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6D152A4D7E00B4F5A8 /* intsym.h */; }; + CDB028A4152B761C00B01410 /* l2tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6E152A4D7E00B4F5A8 /* l2tables.h */; }; + CDB028A5152B761C00B01410 /* l3_integer_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C6F152A4D7E00B4F5A8 /* l3_integer_tables.h */; }; + CDB028A6152B761C00B01410 /* l12_integer_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C70152A4D7E00B4F5A8 /* l12_integer_tables.h */; }; + CDB028A7152B761C00B01410 /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA4152A4E7000B4F5A8 /* layer1.c */; }; + CDB028A8152B762E00B01410 /* layer2.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA5152A4E7000B4F5A8 /* layer2.c */; }; + CDB028A9152B763500B01410 /* layer3.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA6152A4E7000B4F5A8 /* layer3.c */; }; + CDB028AA152B763500B01410 /* lfs_alias.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA7152A4E7000B4F5A8 /* lfs_alias.c */; }; + CDB028AB152B763500B01410 /* libmpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA8152A4E7000B4F5A8 /* libmpg123.c */; }; + CDB028AC152B763500B01410 /* mangle.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C71152A4D7E00B4F5A8 /* mangle.h */; }; + CDB028AD152B764100B01410 /* mpg123lib_intern.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C73152A4D7E00B4F5A8 /* mpg123lib_intern.h */; }; + CDB028AE152B764100B01410 /* ntom.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CA9152A4E7000B4F5A8 /* ntom.c */; }; + CDB028AF152B764100B01410 /* optimize.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C74152A4D7E00B4F5A8 /* optimize.h */; }; + CDB028B0152B764100B01410 /* optimize.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAA152A4E7000B4F5A8 /* optimize.c */; }; + CDB028B1152B764100B01410 /* parse.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C75152A4D7E00B4F5A8 /* parse.h */; }; + CDB028B2152B764100B01410 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAB152A4E7000B4F5A8 /* parse.c */; }; + CDB028B3152B764100B01410 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C76152A4D7E00B4F5A8 /* reader.h */; }; + CDB028B4152B764100B01410 /* readers.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAC152A4E7000B4F5A8 /* readers.c */; }; + CDB028B5152B764900B01410 /* sample.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C77152A4D7E00B4F5A8 /* sample.h */; }; + CDB028B6152B764900B01410 /* stringbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAD152A4E7000B4F5A8 /* stringbuf.c */; }; + CDB028B7152B764900B01410 /* synth.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB1152A4E7000B4F5A8 /* synth.c */; }; + CDB028B8152B764900B01410 /* synth_8bit.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C78152A4D7E00B4F5A8 /* synth_8bit.h */; }; + CDB028B9152B764900B01410 /* synth_8bit.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAE152A4E7000B4F5A8 /* synth_8bit.c */; }; + CDB028BA152B764900B01410 /* synth_mono.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C79152A4D7E00B4F5A8 /* synth_mono.h */; }; + CDB028BB152B764900B01410 /* synth_ntom.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7A152A4D7E00B4F5A8 /* synth_ntom.h */; }; + CDB028BC152B764900B01410 /* synth_real.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CAF152A4E7000B4F5A8 /* synth_real.c */; }; + CDB028BD152B764900B01410 /* synth_s32.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB0152A4E7000B4F5A8 /* synth_s32.c */; }; + CDB028BE152B765000B01410 /* synth.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7B152A4D7E00B4F5A8 /* synth.h */; }; + CDB028BF152B765000B01410 /* synths.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7C152A4D7E00B4F5A8 /* synths.h */; }; + CDB028C0152B765000B01410 /* tabinit.c in Sources */ = {isa = PBXBuildFile; fileRef = CD132CB2152A4E7000B4F5A8 /* tabinit.c */; }; + CDB028C1152B765000B01410 /* true.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C7D152A4D7E00B4F5A8 /* true.h */; }; + CDB028C2152B765900B01410 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C21152A4B8000B4F5A8 /* config.h */; }; + CDB028C3152B765900B01410 /* mpg123.h in Headers */ = {isa = PBXBuildFile; fileRef = CD132C22152A4B8000B4F5A8 /* mpg123.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + CD132C0E152A48C200B4F5A8 /* libmpg123-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmpg123-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CD132C21152A4B8000B4F5A8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; + CD132C22152A4B8000B4F5A8 /* mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123.h; sourceTree = SOURCE_ROOT; }; + CD132C62152A4D7E00B4F5A8 /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compat.h; sourceTree = ""; }; + CD132C63152A4D7E00B4F5A8 /* decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode.h; sourceTree = ""; }; + CD132C64152A4D7E00B4F5A8 /* dither.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dither.h; sourceTree = ""; }; + CD132C65152A4D7E00B4F5A8 /* frame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = ""; }; + CD132C66152A4D7E00B4F5A8 /* getbits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getbits.h; sourceTree = ""; }; + CD132C67152A4D7E00B4F5A8 /* getcpuflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getcpuflags.h; sourceTree = ""; }; + CD132C68152A4D7E00B4F5A8 /* huffman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = huffman.h; sourceTree = ""; }; + CD132C69152A4D7E00B4F5A8 /* icy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy.h; sourceTree = ""; }; + CD132C6A152A4D7E00B4F5A8 /* icy2utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = icy2utf8.h; sourceTree = ""; }; + CD132C6B152A4D7E00B4F5A8 /* id3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3.h; sourceTree = ""; }; + CD132C6C152A4D7E00B4F5A8 /* index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = ""; }; + CD132C6D152A4D7E00B4F5A8 /* intsym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intsym.h; sourceTree = ""; }; + CD132C6E152A4D7E00B4F5A8 /* l2tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l2tables.h; sourceTree = ""; }; + CD132C6F152A4D7E00B4F5A8 /* l3_integer_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l3_integer_tables.h; sourceTree = ""; }; + CD132C70152A4D7E00B4F5A8 /* l12_integer_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l12_integer_tables.h; sourceTree = ""; }; + CD132C71152A4D7E00B4F5A8 /* mangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mangle.h; sourceTree = ""; }; + CD132C72152A4D7E00B4F5A8 /* mpg123.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpg123.h.in; sourceTree = ""; }; + CD132C73152A4D7E00B4F5A8 /* mpg123lib_intern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpg123lib_intern.h; sourceTree = ""; }; + CD132C74152A4D7E00B4F5A8 /* optimize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = optimize.h; sourceTree = ""; }; + CD132C75152A4D7E00B4F5A8 /* parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parse.h; sourceTree = ""; }; + CD132C76152A4D7E00B4F5A8 /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = ""; }; + CD132C77152A4D7E00B4F5A8 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = ""; }; + CD132C78152A4D7E00B4F5A8 /* synth_8bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_8bit.h; sourceTree = ""; }; + CD132C79152A4D7E00B4F5A8 /* synth_mono.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_mono.h; sourceTree = ""; }; + CD132C7A152A4D7E00B4F5A8 /* synth_ntom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth_ntom.h; sourceTree = ""; }; + CD132C7B152A4D7E00B4F5A8 /* synth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synth.h; sourceTree = ""; }; + CD132C7C152A4D7E00B4F5A8 /* synths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = synths.h; sourceTree = ""; }; + CD132C7D152A4D7E00B4F5A8 /* true.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = true.h; sourceTree = ""; }; + CD132C99152A4E7000B4F5A8 /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compat.c; sourceTree = ""; }; + CD132C9A152A4E7000B4F5A8 /* dct64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dct64.c; sourceTree = ""; }; + CD132C9B152A4E7000B4F5A8 /* dither.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dither.c; sourceTree = ""; }; + CD132C9C152A4E7000B4F5A8 /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = ""; }; + CD132C9D152A4E7000B4F5A8 /* feature.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feature.c; sourceTree = ""; }; + CD132C9E152A4E7000B4F5A8 /* format.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = format.c; sourceTree = ""; }; + CD132C9F152A4E7000B4F5A8 /* frame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = frame.c; sourceTree = ""; }; + CD132CA0152A4E7000B4F5A8 /* icy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = icy.c; sourceTree = ""; }; + CD132CA1152A4E7000B4F5A8 /* icy2utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = icy2utf8.c; sourceTree = ""; }; + CD132CA2152A4E7000B4F5A8 /* id3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = id3.c; sourceTree = ""; }; + CD132CA3152A4E7000B4F5A8 /* index.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = index.c; sourceTree = ""; }; + CD132CA4152A4E7000B4F5A8 /* layer1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layer1.c; sourceTree = ""; }; + CD132CA5152A4E7000B4F5A8 /* layer2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layer2.c; sourceTree = ""; }; + CD132CA6152A4E7000B4F5A8 /* layer3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layer3.c; sourceTree = ""; }; + CD132CA7152A4E7000B4F5A8 /* lfs_alias.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lfs_alias.c; sourceTree = ""; }; + CD132CA8152A4E7000B4F5A8 /* libmpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libmpg123.c; sourceTree = ""; }; + CD132CA9152A4E7000B4F5A8 /* ntom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ntom.c; sourceTree = ""; }; + CD132CAA152A4E7000B4F5A8 /* optimize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = optimize.c; sourceTree = ""; }; + CD132CAB152A4E7000B4F5A8 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parse.c; sourceTree = ""; }; + CD132CAC152A4E7000B4F5A8 /* readers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = readers.c; sourceTree = ""; }; + CD132CAD152A4E7000B4F5A8 /* stringbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stringbuf.c; sourceTree = ""; }; + CD132CAE152A4E7000B4F5A8 /* synth_8bit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = synth_8bit.c; sourceTree = ""; }; + CD132CAF152A4E7000B4F5A8 /* synth_real.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = synth_real.c; sourceTree = ""; }; + CD132CB0152A4E7000B4F5A8 /* synth_s32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = synth_s32.c; sourceTree = ""; }; + CD132CB1152A4E7000B4F5A8 /* synth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = synth.c; sourceTree = ""; }; + CD132CB2152A4E7000B4F5A8 /* tabinit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tabinit.c; sourceTree = ""; }; + CD132CCD152A511800B4F5A8 /* dct64_neon_float.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = dct64_neon_float.S; sourceTree = ""; }; + CD132CCE152A511900B4F5A8 /* dct64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = dct64_neon.S; sourceTree = ""; }; + CD132CD0152A511A00B4F5A8 /* synth_neon_float.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_neon_float.S; sourceTree = ""; }; + CD132CD1152A511A00B4F5A8 /* synth_neon_s32.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_neon_s32.S; sourceTree = ""; }; + CD132CD2152A511A00B4F5A8 /* synth_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_neon.S; sourceTree = ""; }; + CD132CD3152A511B00B4F5A8 /* synth_stereo_neon_float.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_stereo_neon_float.S; sourceTree = ""; }; + CD132CD4152A511B00B4F5A8 /* synth_stereo_neon_s32.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_stereo_neon_s32.S; sourceTree = ""; }; + CD132CD5152A511C00B4F5A8 /* synth_stereo_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = synth_stereo_neon.S; sourceTree = ""; }; + CD6D72D1152B748200CF4285 /* libmpg123-mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmpg123-mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + CD132C0B152A48C200B4F5A8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD6D72CE152B748200CF4285 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + CD132C03152A48C100B4F5A8 = { + isa = PBXGroup; + children = ( + CD132C60152A4C9A00B4F5A8 /* src */, + CD132C13152A48C200B4F5A8 /* Xcode */, + CD132C0F152A48C200B4F5A8 /* Products */, + ); + sourceTree = ""; + }; + CD132C0F152A48C200B4F5A8 /* Products */ = { + isa = PBXGroup; + children = ( + CD132C0E152A48C200B4F5A8 /* libmpg123-ios.a */, + CD6D72D1152B748200CF4285 /* libmpg123-mac.a */, + ); + name = Products; + sourceTree = ""; + }; + CD132C13152A48C200B4F5A8 /* Xcode */ = { + isa = PBXGroup; + children = ( + CD132C21152A4B8000B4F5A8 /* config.h */, + CD132C22152A4B8000B4F5A8 /* mpg123.h */, + ); + name = Xcode; + sourceTree = ""; + }; + CD132C60152A4C9A00B4F5A8 /* src */ = { + isa = PBXGroup; + children = ( + CD132C61152A4CA400B4F5A8 /* libmpg123 */, + ); + name = src; + path = ../../src; + sourceTree = SOURCE_ROOT; + }; + CD132C61152A4CA400B4F5A8 /* libmpg123 */ = { + isa = PBXGroup; + children = ( + CD132C99152A4E7000B4F5A8 /* compat.c */, + CD132C62152A4D7E00B4F5A8 /* compat.h */, + CD132C9A152A4E7000B4F5A8 /* dct64.c */, + CD132CCD152A511800B4F5A8 /* dct64_neon_float.S */, + CD132CCE152A511900B4F5A8 /* dct64_neon.S */, + CD132C63152A4D7E00B4F5A8 /* decode.h */, + CD132C64152A4D7E00B4F5A8 /* dither.h */, + CD132C9B152A4E7000B4F5A8 /* dither.c */, + CD132C9C152A4E7000B4F5A8 /* equalizer.c */, + CD132C9D152A4E7000B4F5A8 /* feature.c */, + CD132C9E152A4E7000B4F5A8 /* format.c */, + CD132C65152A4D7E00B4F5A8 /* frame.h */, + CD132C9F152A4E7000B4F5A8 /* frame.c */, + CD132C66152A4D7E00B4F5A8 /* getbits.h */, + CD132C67152A4D7E00B4F5A8 /* getcpuflags.h */, + CD132C68152A4D7E00B4F5A8 /* huffman.h */, + CD132C69152A4D7E00B4F5A8 /* icy.h */, + CD132CA0152A4E7000B4F5A8 /* icy.c */, + CD132C6A152A4D7E00B4F5A8 /* icy2utf8.h */, + CD132CA1152A4E7000B4F5A8 /* icy2utf8.c */, + CD132C6B152A4D7E00B4F5A8 /* id3.h */, + CD132CA2152A4E7000B4F5A8 /* id3.c */, + CD132C6C152A4D7E00B4F5A8 /* index.h */, + CD132CA3152A4E7000B4F5A8 /* index.c */, + CD132C6D152A4D7E00B4F5A8 /* intsym.h */, + CD132C6E152A4D7E00B4F5A8 /* l2tables.h */, + CD132C6F152A4D7E00B4F5A8 /* l3_integer_tables.h */, + CD132C70152A4D7E00B4F5A8 /* l12_integer_tables.h */, + CD132CA4152A4E7000B4F5A8 /* layer1.c */, + CD132CA5152A4E7000B4F5A8 /* layer2.c */, + CD132CA6152A4E7000B4F5A8 /* layer3.c */, + CD132CA7152A4E7000B4F5A8 /* lfs_alias.c */, + CD132CA8152A4E7000B4F5A8 /* libmpg123.c */, + CD132C71152A4D7E00B4F5A8 /* mangle.h */, + CD132C72152A4D7E00B4F5A8 /* mpg123.h.in */, + CD132C73152A4D7E00B4F5A8 /* mpg123lib_intern.h */, + CD132CA9152A4E7000B4F5A8 /* ntom.c */, + CD132C74152A4D7E00B4F5A8 /* optimize.h */, + CD132CAA152A4E7000B4F5A8 /* optimize.c */, + CD132C75152A4D7E00B4F5A8 /* parse.h */, + CD132CAB152A4E7000B4F5A8 /* parse.c */, + CD132C76152A4D7E00B4F5A8 /* reader.h */, + CD132CAC152A4E7000B4F5A8 /* readers.c */, + CD132C77152A4D7E00B4F5A8 /* sample.h */, + CD132CAD152A4E7000B4F5A8 /* stringbuf.c */, + CD132CB1152A4E7000B4F5A8 /* synth.c */, + CD132C78152A4D7E00B4F5A8 /* synth_8bit.h */, + CD132CAE152A4E7000B4F5A8 /* synth_8bit.c */, + CD132C79152A4D7E00B4F5A8 /* synth_mono.h */, + CD132C7A152A4D7E00B4F5A8 /* synth_ntom.h */, + CD132CAF152A4E7000B4F5A8 /* synth_real.c */, + CD132CB0152A4E7000B4F5A8 /* synth_s32.c */, + CD132CD0152A511A00B4F5A8 /* synth_neon_float.S */, + CD132CD1152A511A00B4F5A8 /* synth_neon_s32.S */, + CD132CD2152A511A00B4F5A8 /* synth_neon.S */, + CD132CD3152A511B00B4F5A8 /* synth_stereo_neon_float.S */, + CD132CD4152A511B00B4F5A8 /* synth_stereo_neon_s32.S */, + CD132CD5152A511C00B4F5A8 /* synth_stereo_neon.S */, + CD132C7B152A4D7E00B4F5A8 /* synth.h */, + CD132C7C152A4D7E00B4F5A8 /* synths.h */, + CD132CB2152A4E7000B4F5A8 /* tabinit.c */, + CD132C7D152A4D7E00B4F5A8 /* true.h */, + ); + path = libmpg123; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + CD132C0C152A48C200B4F5A8 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + CD132C23152A4B8000B4F5A8 /* config.h in Headers */, + CD132C24152A4B8000B4F5A8 /* mpg123.h in Headers */, + CD132C7E152A4D7E00B4F5A8 /* compat.h in Headers */, + CD132C7F152A4D7E00B4F5A8 /* decode.h in Headers */, + CD132C80152A4D7E00B4F5A8 /* dither.h in Headers */, + CD132C81152A4D7E00B4F5A8 /* frame.h in Headers */, + CD132C82152A4D7E00B4F5A8 /* getbits.h in Headers */, + CD132C83152A4D7E00B4F5A8 /* getcpuflags.h in Headers */, + CD132C84152A4D7E00B4F5A8 /* huffman.h in Headers */, + CD132C85152A4D7E00B4F5A8 /* icy.h in Headers */, + CD132C86152A4D7E00B4F5A8 /* icy2utf8.h in Headers */, + CD132C87152A4D7E00B4F5A8 /* id3.h in Headers */, + CD132C88152A4D7E00B4F5A8 /* index.h in Headers */, + CD132C89152A4D7E00B4F5A8 /* intsym.h in Headers */, + CD132C8A152A4D7E00B4F5A8 /* l2tables.h in Headers */, + CD132C8B152A4D7E00B4F5A8 /* l3_integer_tables.h in Headers */, + CD132C8C152A4D7E00B4F5A8 /* l12_integer_tables.h in Headers */, + CD132C8D152A4D7E00B4F5A8 /* mangle.h in Headers */, + CD132C8E152A4D7E00B4F5A8 /* mpg123lib_intern.h in Headers */, + CD132C8F152A4D7E00B4F5A8 /* optimize.h in Headers */, + CD132C90152A4D7E00B4F5A8 /* parse.h in Headers */, + CD132C91152A4D7E00B4F5A8 /* reader.h in Headers */, + CD132C92152A4D7E00B4F5A8 /* sample.h in Headers */, + CD132C93152A4D7E00B4F5A8 /* synth_8bit.h in Headers */, + CD132C94152A4D7E00B4F5A8 /* synth_mono.h in Headers */, + CD132C95152A4D7E00B4F5A8 /* synth_ntom.h in Headers */, + CD132C96152A4D7E00B4F5A8 /* synth.h in Headers */, + CD132C97152A4D7E00B4F5A8 /* synths.h in Headers */, + CD132C98152A4D7E00B4F5A8 /* true.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD6D72CF152B748200CF4285 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + CDB0288D152B760700B01410 /* compat.h in Headers */, + CDB02890152B760D00B01410 /* decode.h in Headers */, + CDB02891152B760D00B01410 /* dither.h in Headers */, + CDB02896152B761300B01410 /* frame.h in Headers */, + CDB02898152B761300B01410 /* getbits.h in Headers */, + CDB02899152B761300B01410 /* getcpuflags.h in Headers */, + CDB0289A152B761300B01410 /* huffman.h in Headers */, + CDB0289B152B761300B01410 /* icy.h in Headers */, + CDB0289D152B761300B01410 /* icy2utf8.h in Headers */, + CDB0289F152B761C00B01410 /* id3.h in Headers */, + CDB028A1152B761C00B01410 /* index.h in Headers */, + CDB028A3152B761C00B01410 /* intsym.h in Headers */, + CDB028A4152B761C00B01410 /* l2tables.h in Headers */, + CDB028A5152B761C00B01410 /* l3_integer_tables.h in Headers */, + CDB028A6152B761C00B01410 /* l12_integer_tables.h in Headers */, + CDB028AC152B763500B01410 /* mangle.h in Headers */, + CDB028AD152B764100B01410 /* mpg123lib_intern.h in Headers */, + CDB028AF152B764100B01410 /* optimize.h in Headers */, + CDB028B1152B764100B01410 /* parse.h in Headers */, + CDB028B3152B764100B01410 /* reader.h in Headers */, + CDB028B5152B764900B01410 /* sample.h in Headers */, + CDB028B8152B764900B01410 /* synth_8bit.h in Headers */, + CDB028BA152B764900B01410 /* synth_mono.h in Headers */, + CDB028BB152B764900B01410 /* synth_ntom.h in Headers */, + CDB028BE152B765000B01410 /* synth.h in Headers */, + CDB028BF152B765000B01410 /* synths.h in Headers */, + CDB028C1152B765000B01410 /* true.h in Headers */, + CDB028C2152B765900B01410 /* config.h in Headers */, + CDB028C3152B765900B01410 /* mpg123.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + CD132C0D152A48C200B4F5A8 /* mpg123-ios */ = { + isa = PBXNativeTarget; + buildConfigurationList = CD132C1B152A48C200B4F5A8 /* Build configuration list for PBXNativeTarget "mpg123-ios" */; + buildPhases = ( + CD132C0A152A48C200B4F5A8 /* Sources */, + CD132C0B152A48C200B4F5A8 /* Frameworks */, + CD132C0C152A48C200B4F5A8 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "mpg123-ios"; + productName = libmpg123; + productReference = CD132C0E152A48C200B4F5A8 /* libmpg123-ios.a */; + productType = "com.apple.product-type.library.static"; + }; + CD6D72D0152B748200CF4285 /* mpg123-mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = CD6D72D4152B748200CF4285 /* Build configuration list for PBXNativeTarget "mpg123-mac" */; + buildPhases = ( + CD6D72CD152B748200CF4285 /* Sources */, + CD6D72CE152B748200CF4285 /* Frameworks */, + CD6D72CF152B748200CF4285 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "mpg123-mac"; + productName = "mpg123-mac"; + productReference = CD6D72D1152B748200CF4285 /* libmpg123-mac.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + CD132C05152A48C100B4F5A8 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; + buildConfigurationList = CD132C08152A48C100B4F5A8 /* Build configuration list for PBXProject "mpg123" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = CD132C03152A48C100B4F5A8; + productRefGroup = CD132C0F152A48C200B4F5A8 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + CD132C0D152A48C200B4F5A8 /* mpg123-ios */, + CD6D72D0152B748200CF4285 /* mpg123-mac */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + CD132C0A152A48C200B4F5A8 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CD132CB3152A4E7000B4F5A8 /* compat.c in Sources */, + CD132CB4152A4E7000B4F5A8 /* dct64.c in Sources */, + CD132CB5152A4E7000B4F5A8 /* dither.c in Sources */, + CD132CB6152A4E7000B4F5A8 /* equalizer.c in Sources */, + CD132CB7152A4E7000B4F5A8 /* feature.c in Sources */, + CD132CB8152A4E7000B4F5A8 /* format.c in Sources */, + CD132CB9152A4E7000B4F5A8 /* frame.c in Sources */, + CD132CBA152A4E7000B4F5A8 /* icy.c in Sources */, + CD132CBB152A4E7000B4F5A8 /* icy2utf8.c in Sources */, + CD132CBC152A4E7000B4F5A8 /* id3.c in Sources */, + CD132CBD152A4E7000B4F5A8 /* index.c in Sources */, + CD132CBE152A4E7000B4F5A8 /* layer1.c in Sources */, + CD132CBF152A4E7000B4F5A8 /* layer2.c in Sources */, + CD132CC0152A4E7000B4F5A8 /* layer3.c in Sources */, + CD132CC1152A4E7000B4F5A8 /* lfs_alias.c in Sources */, + CD132CC2152A4E7000B4F5A8 /* libmpg123.c in Sources */, + CD132CC3152A4E7000B4F5A8 /* ntom.c in Sources */, + CD132CC4152A4E7000B4F5A8 /* optimize.c in Sources */, + CD132CC5152A4E7000B4F5A8 /* parse.c in Sources */, + CD132CC6152A4E7000B4F5A8 /* readers.c in Sources */, + CD132CC7152A4E7000B4F5A8 /* stringbuf.c in Sources */, + CD132CC8152A4E7000B4F5A8 /* synth_8bit.c in Sources */, + CD132CC9152A4E7000B4F5A8 /* synth_real.c in Sources */, + CD132CCA152A4E7000B4F5A8 /* synth_s32.c in Sources */, + CD132CCB152A4E7000B4F5A8 /* synth.c in Sources */, + CD132CCC152A4E7000B4F5A8 /* tabinit.c in Sources */, + CD132CD6152A511C00B4F5A8 /* dct64_neon_float.S in Sources */, + CD132CD7152A511C00B4F5A8 /* dct64_neon.S in Sources */, + CD132CD9152A511C00B4F5A8 /* synth_neon_float.S in Sources */, + CD132CDA152A511C00B4F5A8 /* synth_neon_s32.S in Sources */, + CD132CDB152A511C00B4F5A8 /* synth_neon.S in Sources */, + CD132CDC152A511C00B4F5A8 /* synth_stereo_neon_float.S in Sources */, + CD132CDD152A511C00B4F5A8 /* synth_stereo_neon_s32.S in Sources */, + CD132CDE152A511C00B4F5A8 /* synth_stereo_neon.S in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD6D72CD152B748200CF4285 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CDB0288C152B760700B01410 /* compat.c in Sources */, + CDB0288E152B760700B01410 /* dct64.c in Sources */, + CDB02892152B760D00B01410 /* dither.c in Sources */, + CDB02893152B760D00B01410 /* equalizer.c in Sources */, + CDB02894152B760D00B01410 /* feature.c in Sources */, + CDB02895152B760D00B01410 /* format.c in Sources */, + CDB02897152B761300B01410 /* frame.c in Sources */, + CDB0289C152B761300B01410 /* icy.c in Sources */, + CDB0289E152B761300B01410 /* icy2utf8.c in Sources */, + CDB028A0152B761C00B01410 /* id3.c in Sources */, + CDB028A2152B761C00B01410 /* index.c in Sources */, + CDB028A7152B761C00B01410 /* layer1.c in Sources */, + CDB028A8152B762E00B01410 /* layer2.c in Sources */, + CDB028A9152B763500B01410 /* layer3.c in Sources */, + CDB028AA152B763500B01410 /* lfs_alias.c in Sources */, + CDB028AB152B763500B01410 /* libmpg123.c in Sources */, + CDB028AE152B764100B01410 /* ntom.c in Sources */, + CDB028B0152B764100B01410 /* optimize.c in Sources */, + CDB028B2152B764100B01410 /* parse.c in Sources */, + CDB028B4152B764100B01410 /* readers.c in Sources */, + CDB028B6152B764900B01410 /* stringbuf.c in Sources */, + CDB028B7152B764900B01410 /* synth.c in Sources */, + CDB028B9152B764900B01410 /* synth_8bit.c in Sources */, + CDB028BC152B764900B01410 /* synth_real.c in Sources */, + CDB028BD152B764900B01410 /* synth_s32.c in Sources */, + CDB028C0152B765000B01410 /* tabinit.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + CD132C19152A48C200B4F5A8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = NO; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( + "synth_neon*", + "synth_stereo_neon*", + "dct64_neon*", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 4.3; + SDKROOT = iphoneos; + }; + name = Debug; + }; + CD132C1A152A48C200B4F5A8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = YES; + EXCLUDED_SOURCE_FILE_NAMES = ""; + "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( + "synth_neon*", + "synth_stereo_neon*", + "dct64_neon*", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 4.3; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + CD132C1C152A48C200B4F5A8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DSTROOT = /tmp/libmpg123.dst; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + CD132C1D152A48C200B4F5A8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DSTROOT = /tmp/libmpg123.dst; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; + CD6D72D2152B748200CF4285 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = lib; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + CD6D72D3152B748200CF4285 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EXECUTABLE_PREFIX = lib; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + CD132C08152A48C100B4F5A8 /* Build configuration list for PBXProject "mpg123" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD132C19152A48C200B4F5A8 /* Debug */, + CD132C1A152A48C200B4F5A8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CD132C1B152A48C200B4F5A8 /* Build configuration list for PBXNativeTarget "mpg123-ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD132C1C152A48C200B4F5A8 /* Debug */, + CD132C1D152A48C200B4F5A8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CD6D72D4152B748200CF4285 /* Build configuration list for PBXNativeTarget "mpg123-mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD6D72D2152B748200CF4285 /* Debug */, + CD6D72D3152B748200CF4285 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = CD132C05152A48C100B4F5A8 /* Project object */; +} diff --git a/jni/mpg123-1.13.4/ports/mpg123_.pas b/jni/mpg123-1.17.0/ports/mpg123_.pas similarity index 100% rename from jni/mpg123-1.13.4/ports/mpg123_.pas rename to jni/mpg123-1.17.0/ports/mpg123_.pas diff --git a/jni/mpg123-1.13.4/scripts/benchmark-cpu.pl b/jni/mpg123-1.17.0/scripts/benchmark-cpu.pl similarity index 100% rename from jni/mpg123-1.13.4/scripts/benchmark-cpu.pl rename to jni/mpg123-1.17.0/scripts/benchmark-cpu.pl diff --git a/jni/mpg123-1.17.0/scripts/conplay b/jni/mpg123-1.17.0/scripts/conplay new file mode 100755 index 00000000..fc0cf976 --- /dev/null +++ b/jni/mpg123-1.17.0/scripts/conplay @@ -0,0 +1,128 @@ +#!/usr/bin/env perl + +# Hacked by Thomas Orgis, use at your leisure. + +use strict; +use locale; + +use File::Basename qw(basename dirname); + +my @mpg123_command = qw(mpg123 --continue -Cv --rva-album); +my $listfile = "conplay.m3u"; +my $glob = '*.mp[123]'; + +my $dir = shift; + +unless(defined $dir) +{ + print STDERR "\nThis little wrapper runs $mpg123_command[0] on a given directory (hand in '.' for the current one), playing all $glob files therein in terminal control mode. The extra trick is that a playlist file ($listfile by default) is read and updated (created) with the position you left playback at (via 'q' key), to return on next invokation.\n"; + print STDERR "\nIf you give an existing file instead of a directory, or some non-existing path, as first and only paramter, it is used as playlist name and the directory part is used as the base directory for playback.\n"; + print STDERR "\nThe name stands for CONtinued PLAYback. What did you think?;-)\n\n"; + exit; +} + +if(-f $dir or (not -e $dir)) +{ + $listfile = basename($dir); + $dir = dirname($dir); +} + + +chdir($dir) or die "Cannot enter $dir ($!)!\n"; + +print STDERR "Playing things in: $dir\n"; + +my @files; +my $entry = 1; +my $frame = 0; + +if(-e $listfile) +{ + open(LIST, '<', $listfile) or die "Cannot read playlist ($!)!\n"; + while() + { + chomp; + unless(/^#/) + { + push(@files, $_); + } + elsif(/^#\s*current entry:\s*(\d+)$/) + { + $entry = $1; + } + elsif(/^#\s*current frame:\s*(\d+)$/) + { + $frame = $1; + } + } + close(LIST); +} +else +{ + @files = get_files($glob); + write_list(); +} + +unless(@files) +{ + print STDERR "There are no files to play.\n"; + exit; +} + +if($entry < 0 or $entry > $#files or $frame < 0) +{ + die "You got bad data in your playlist file (mismatch between current entry and total count, bad frame index). Clean that up.\n"; +} + +push(@mpg123_command, '-k', $frame, '--listentry', $entry, '-@', $listfile); +print STDERR "running player:\n\t@mpg123_command\n\n"; + +open(MPG123, '-|', @mpg123_command) or die "Cannot run mpg123!"; +while() +{ + print STDOUT $_; + if(/^\[CONTINUE\]\s+track\s+(\d+)\s+frame\s+(\d+)/) + { + $entry = $1; + $frame = $2; + } + if(/^\[BOOKMARK\]\s+track\s+(\d+)\s+frame\s+(\d+)/) + { + print STDERR "\nGot bookmark at track $1, frame $2; not yet doing anything with that, besides storing.\n"; + $entry = $1; + $frame = $2; + } +} +close(MPG123); + +print STDERR "Continue point is in track $entry, frame $frame.\n"; +write_list(); + +sub write_list +{ + unless(@files) + { + print STDERR "Refusing to write empty playlist.\n"; + return; + } + open(LIST, '>', $listfile) or die "Cannot write Playlist"; + print LIST "#M3U\n"; + print LIST "#current entry: $entry\n"; + print LIST "#current frame: $frame\n"; + for my $f (@files) + { + print LIST "$f\n"; + } + close(LIST); +} + +sub get_files +{ + my $glob = shift; + my @files; + open(FIND, '-|', 'find', '.', '-type', 'f', '-name', $glob) or die "Cannot exec find to find files: ($!)\n"; + @files = ; + close(FIND); + chomp(@files); + return sort @files; +} diff --git a/jni/mpg123-1.17.0/scripts/mpg123info b/jni/mpg123-1.17.0/scripts/mpg123info new file mode 100755 index 00000000..7b069868 --- /dev/null +++ b/jni/mpg123-1.17.0/scripts/mpg123info @@ -0,0 +1,71 @@ +#!/bin/bash + +if test $# -eq 0; then + echo "Give me some MPEG 1.0/2.0/2.5 layer 1/2/3 audio file name(s) and I give you meta info about it in an easily-parseable format: + +name=value + +for simple value association and + +name.=value + +to add another line to existing value (multiline comments)." +fi + +for i in "$@" +do + echo lp "$i" + echo tag + echo scan + echo format + echo sample +done | +mpg123 -t -R | +perl -e ' +while() +{ +if(/\@T \{/) +{ + print "# meta info for: ".(shift @ARGV)."\n"; + $field = undef; + %count = (); + %linecount = (); +} +elsif(/\@T ID3:(.*)$/) +{ + $field = undef; + print "ID3v1.title=".substr($1, 0, 30)."\n"; + print "ID3v1.artist=".substr($1, 30, 30)."\n"; + print "ID3v1.album=".substr($1, 60, 30)."\n"; + print "ID3v1.year=".substr($1, 90, 4)."\n"; + print "ID3v1.comment=".substr($1, 94, 30)."\n"; + print "ID3v1.genre=".substr($1, 124)."\n"; +} +elsif(/\@T ID3\.([^:]+):(.*)$/) +{ + $field = undef; + print "ID3.$1=$2\n"; +} +elsif(/\@T (ID3v2\.\S{4})(|\s+lang\(([^\(\)]*)\)\s+desc\(([^\(\)]*)\)):/) +{ + $class = $1; + $field = ++$count{$class} > 1 ? "$class$count{$class}" : $class; + print "$field.lang=$3\n" if(defined $3); + print "$field.desc=$4\n" if(defined $4); +} +elsif(/\@T =(.*)$/) +{ + next unless defined $field; + print "$field".(++$linecount{$field} > 1 ? ".=" : "=").$1."\n"; +} +elsif(/\@FORMAT\s+(\d+)\s+(\d+)/) +{ + print "format.rate=$1\n"; + print "format.channels=$2\n"; +} +elsif(/\@SAMPLE\s+(\d+)\s+(\d+)/) +{ + print "samples=$2\n"; +} +} +' "$@" diff --git a/jni/mpg123-1.17.0/scripts/tag_lyrics.py b/jni/mpg123-1.17.0/scripts/tag_lyrics.py new file mode 100644 index 00000000..1feb081c --- /dev/null +++ b/jni/mpg123-1.17.0/scripts/tag_lyrics.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# needs mutagen +# grabbed from: http://code.activestate.com/recipes/577138-embed-lyrics-into-mp3-files-using-mutagen-uslt-tag/ +# simplified to only work on one file and get lyrics from stdin +# I suspect this is public domain code. Just a usage example of the mutagen lib. + +import os +import sys +import codecs +from mutagen.mp3 import MP3 +from mutagen.id3 import ID3NoHeaderError +from mutagen.id3 import ID3, USLT + +TEXT_ENCODING = 'utf8' +TEXT_LANG = 'XXX' +TEXT_DESC = '' + +# get workdir from first arg or use current dir +if (len(sys.argv) > 1): + fname = sys.argv[1] + print "fname=" + fname +else: + print 'Give me at least a file name to work on, plus the lyrics from stdin' + print 'Optionally, you can provide the language (3 lowercase letters) of the lyrics and a description' + sys.exit() + +if (len(sys.argv) > 2): + TEXT_LANG = sys.argv[2] + +if (len(sys.argv) > 3): + TEXT_DESC = sys.argv[3] + +print "reading lyrics from standard input ..." + +lyrics = sys.stdin.read().strip() + +# try to find the right encoding +for enc in ('utf8','iso-8859-1','iso-8859-15','cp1252','cp1251','latin1'): + try: + lyrics = lyrics.decode(enc) + TEXT_DESC = TEXT_DESC.decode(enc) + print enc, + break + except: + pass + +print "Adding lyrics to " + fname +print "Language: " + TEXT_LANG +print "Description: " + TEXT_DESC + +# create ID3 tag if not exists +try: + tags = ID3(fname) +except ID3NoHeaderError: + print "Adding ID3 header;", + tags = ID3() + +# remove old unsychronized lyrics +if len(tags.getall(u"USLT::'"+TEXT_LANG+"'")) != 0: + print "Removing Lyrics." + tags.delall(u"USLT::'"+TEXT_LANG+"'") + #tags.save(fname) # hm, why? + +#tags.add(USLT(encoding=3, lang=u'eng', desc=u'desc', text=lyrics)) +# apparently the description is important when more than one +# USLT frames are present +#tags[u"USLT::'eng'"] = (USLT(encoding=3, lang=u'eng', desc=u'desc', text=lyrics)) +tags[u"USLT::'"+TEXT_LANG+"'"] = (USLT(encoding=3, lang=TEXT_LANG, desc=TEXT_DESC, text=lyrics)) +print 'Added USLT frame to', fname + +tags.save(fname) + +print 'Done' + diff --git a/jni/mpg123-1.17.0/src/.deps/audio.Po b/jni/mpg123-1.17.0/src/.deps/audio.Po new file mode 100644 index 00000000..26d70b56 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/audio.Po @@ -0,0 +1,228 @@ +audio.o: audio.c \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + mpg123app.h config.h ../src/libmpg123/compat.h config.h \ + ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h common.h buffer.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h \ + ../src/libmpg123/debug.h + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +common.h: + +buffer.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/buffer.Po b/jni/mpg123-1.17.0/src/.deps/buffer.Po new file mode 100644 index 00000000..c25b34ad --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/buffer.Po @@ -0,0 +1,207 @@ +buffer.o: buffer.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h common.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +common.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/common.Po b/jni/mpg123-1.17.0/src/.deps/common.Po new file mode 100644 index 00000000..0669a967 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/common.Po @@ -0,0 +1,207 @@ +common.o: common.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + common.h ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +common.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/compat.Po b/jni/mpg123-1.17.0/src/.deps/compat.Po new file mode 100644 index 00000000..563139d9 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/compat.Po @@ -0,0 +1,188 @@ +compat.o: libmpg123/compat.c config.h libmpg123/compat.h \ + libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + libmpg123/true.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + libmpg123/debug.h + +config.h: + +libmpg123/compat.h: + +libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +libmpg123/true.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/control_generic.Po b/jni/mpg123-1.17.0/src/.deps/control_generic.Po new file mode 100644 index 00000000..0c43ee6c --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/control_generic.Po @@ -0,0 +1,252 @@ +control_generic.o: control_generic.c mpg123app.h config.h \ + ../src/libmpg123/compat.h config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/ctype.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sockios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/sockios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/uio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + common.h buffer.h genre.h playlist.h ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/ctype.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sockios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/sockios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/uio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +common.h: + +buffer.h: + +genre.h: + +playlist.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/dither.Po b/jni/mpg123-1.17.0/src/.deps/dither.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/dither.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/equalizer.Po b/jni/mpg123-1.17.0/src/.deps/equalizer.Po new file mode 100644 index 00000000..19ac93e6 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/equalizer.Po @@ -0,0 +1,187 @@ +equalizer.o: equalizer.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: diff --git a/jni/mpg123-1.17.0/src/.deps/genre.Po b/jni/mpg123-1.17.0/src/.deps/genre.Po new file mode 100644 index 00000000..33a89687 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/genre.Po @@ -0,0 +1 @@ +genre.o: genre.c diff --git a/jni/mpg123-1.17.0/src/.deps/getlopt.Po b/jni/mpg123-1.17.0/src/.deps/getlopt.Po new file mode 100644 index 00000000..ecc63443 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/getlopt.Po @@ -0,0 +1,177 @@ +getlopt.o: getlopt.c \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + config.h getlopt.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + ../src/libmpg123/compat.h config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h ../src/libmpg123/debug.h + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +config.h: + +getlopt.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/httpget.Po b/jni/mpg123-1.17.0/src/.deps/httpget.Po new file mode 100644 index 00000000..3322f43c --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/httpget.Po @@ -0,0 +1,209 @@ +httpget.o: httpget.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h resolver.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + ../src/libmpg123/true.h ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +resolver.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +../src/libmpg123/true.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/local.Po b/jni/mpg123-1.17.0/src/.deps/local.Po new file mode 100644 index 00000000..c909a385 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/local.Po @@ -0,0 +1,193 @@ +local.o: local.c config.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/locale.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + ../src/libmpg123/compat.h config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h mpg123app.h xfermem.h httpget.h \ + ../src/libmpg123/mpg123.h audio.h module.h local.h \ + ../src/libmpg123/debug.h + +config.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/locale.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +mpg123app.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/metaprint.Po b/jni/mpg123-1.17.0/src/.deps/metaprint.Po new file mode 100644 index 00000000..76e96595 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/metaprint.Po @@ -0,0 +1,191 @@ +metaprint.o: metaprint.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h genre.h ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +genre.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/mpg123-id3dump.Po b/jni/mpg123-1.17.0/src/.deps/mpg123-id3dump.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/mpg123-id3dump.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/mpg123-strip.Po b/jni/mpg123-1.17.0/src/.deps/mpg123-strip.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/mpg123-strip.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/mpg123.Po b/jni/mpg123-1.17.0/src/.deps/mpg123.Po new file mode 100644 index 00000000..182c4a6d --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/mpg123.Po @@ -0,0 +1,244 @@ +mpg123.o: mpg123.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sched.h \ + common.h getlopt.h buffer.h term.h playlist.h metaprint.h streamdump.h \ + ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/wait.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/resource.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/wait.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sched.h: + +common.h: + +getlopt.h: + +buffer.h: + +term.h: + +playlist.h: + +metaprint.h: + +streamdump.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/noise.Po b/jni/mpg123-1.17.0/src/.deps/noise.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/noise.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/plain_id3.Po b/jni/mpg123-1.17.0/src/.deps/plain_id3.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/plain_id3.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/playlist.Po b/jni/mpg123-1.17.0/src/.deps/playlist.Po new file mode 100644 index 00000000..f8d647aa --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/playlist.Po @@ -0,0 +1,199 @@ +playlist.o: playlist.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h getlopt.h term.h playlist.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/time.h \ + ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +getlopt.h: + +term.h: + +playlist.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/time.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/resolver.Po b/jni/mpg123-1.17.0/src/.deps/resolver.Po new file mode 100644 index 00000000..c45378e3 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/resolver.Po @@ -0,0 +1,278 @@ +resolver.o: resolver.c mpg123app.h config.h ../src/libmpg123/compat.h \ + config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h ../src/libmpg123/true.h resolver.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netdb.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/socket.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sockios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/sockios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/uio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/param.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/param.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/param.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netinet/in.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/in.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/byteorder.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/little_endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/swab.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/generic.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/in6.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ipv6.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netinet/in6.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/arpa/inet.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +../src/libmpg123/true.h: + +resolver.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netdb.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/socket.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sockios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/sockios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/uio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/param.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/param.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/param.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netinet/in.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/in.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/byteorder.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/little_endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/swab.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/byteorder/generic.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/in6.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ipv6.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/netinet/in6.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/arpa/inet.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/seek_whence.Po b/jni/mpg123-1.17.0/src/.deps/seek_whence.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/seek_whence.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/streamdump.Po b/jni/mpg123-1.17.0/src/.deps/streamdump.Po new file mode 100644 index 00000000..87efa85a --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/streamdump.Po @@ -0,0 +1,207 @@ +streamdump.o: streamdump.c streamdump.h mpg123app.h config.h \ + ../src/libmpg123/compat.h config.h ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + ../src/libmpg123/debug.h + +streamdump.h: + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/term.Po b/jni/mpg123-1.17.0/src/.deps/term.Po new file mode 100644 index 00000000..b34ca860 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/term.Po @@ -0,0 +1,233 @@ +term.o: term.c mpg123app.h config.h ../src/libmpg123/compat.h config.h \ + ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/termios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctls.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termbits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl_compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/termios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termios.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/ctype.h \ + buffer.h term.h common.h playlist.h metaprint.h ../src/libmpg123/debug.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/termios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctls.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termbits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl_compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/termios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termios.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/ctype.h: + +buffer.h: + +term.h: + +common.h: + +playlist.h: + +metaprint.h: + +../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/.deps/text.Po b/jni/mpg123-1.17.0/src/.deps/text.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/text.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/wav.Po b/jni/mpg123-1.17.0/src/.deps/wav.Po new file mode 100644 index 00000000..bbd16606 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/wav.Po @@ -0,0 +1,207 @@ +wav.o: wav.c mpg123app.h config.h ../src/libmpg123/compat.h config.h \ + ../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + ../src/libmpg123/true.h xfermem.h httpget.h ../src/libmpg123/mpg123.h \ + audio.h module.h local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + ../src/libmpg123/debug.h wavhead.h + +mpg123app.h: + +config.h: + +../src/libmpg123/compat.h: + +config.h: + +../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +../src/libmpg123/true.h: + +xfermem.h: + +httpget.h: + +../src/libmpg123/mpg123.h: + +audio.h: + +module.h: + +local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +../src/libmpg123/debug.h: + +wavhead.h: diff --git a/jni/mpg123-1.17.0/src/.deps/win32_net.Po b/jni/mpg123-1.17.0/src/.deps/win32_net.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/win32_net.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/win32_support.Po b/jni/mpg123-1.17.0/src/.deps/win32_support.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/win32_support.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/.deps/xfermem.Po b/jni/mpg123-1.17.0/src/.deps/xfermem.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/.deps/xfermem.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.13.4/src/Makefile b/jni/mpg123-1.17.0/src/Makefile similarity index 51% rename from jni/mpg123-1.13.4/src/Makefile rename to jni/mpg123-1.17.0/src/Makefile index dd992a50..4f10afd5 100644 --- a/jni/mpg123-1.13.4/src/Makefile +++ b/jni/mpg123-1.17.0/src/Makefile @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # src/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/mpg123 pkgincludedir = $(includedir)/mpg123 pkglibdir = $(libdir)/mpg123 @@ -32,19 +76,22 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -bin_PROGRAMS = mpg123$(EXEEXT) -EXTRA_PROGRAMS = tests/seek_accuracy$(EXEEXT) \ - tests/seek_whence$(EXEEXT) tests/noise$(EXEEXT) \ +build_triplet = 86_64-unknown-linux-gnu +host_triplet = arm-unknown-linux-androideabi +bin_PROGRAMS = mpg123$(EXEEXT) mpg123-id3dump$(EXEEXT) \ + mpg123-strip$(EXEEXT) +EXTRA_PROGRAMS = tests/seek_whence$(EXEEXT) tests/noise$(EXEEXT) \ tests/text$(EXEEXT) tests/plain_id3$(EXEEXT) #am__append_1 = \ # win32_support.c \ # win32_net.c +#am__append_2 = \ +# win32_support.c + subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.h.in $(top_srcdir)/build/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,9 +123,22 @@ am_mpg123_OBJECTS = audio.$(OBJEXT) buffer.$(OBJEXT) common.$(OBJEXT) \ term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) \ $(am__objects_1) mpg123_OBJECTS = $(am_mpg123_OBJECTS) -mpg123_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpg123_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +am__v_lt_1 = +mpg123_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(mpg123_LDFLAGS) $(LDFLAGS) -o $@ +am__mpg123_id3dump_SOURCES_DIST = mpg123-id3dump.c getlopt.c getlopt.h \ + libmpg123/compat.c libmpg123/compat.h win32_support.c +#am__objects_2 = win32_support.$(OBJEXT) +am_mpg123_id3dump_OBJECTS = mpg123-id3dump.$(OBJEXT) getlopt.$(OBJEXT) \ + compat.$(OBJEXT) $(am__objects_2) +mpg123_id3dump_OBJECTS = $(am_mpg123_id3dump_OBJECTS) +am_mpg123_strip_OBJECTS = mpg123-strip.$(OBJEXT) getlopt.$(OBJEXT) \ + compat.$(OBJEXT) +mpg123_strip_OBJECTS = $(am_mpg123_strip_OBJECTS) am_tests_noise_OBJECTS = noise.$(OBJEXT) compat.$(OBJEXT) \ dither.$(OBJEXT) tests_noise_OBJECTS = $(am_tests_noise_OBJECTS) @@ -86,44 +146,91 @@ tests_noise_LDADD = $(LDADD) am__dirstamp = $(am__leading_dot)dirstamp am_tests_plain_id3_OBJECTS = plain_id3.$(OBJEXT) compat.$(OBJEXT) tests_plain_id3_OBJECTS = $(am_tests_plain_id3_OBJECTS) -am_tests_seek_accuracy_OBJECTS = seek_accuracy.$(OBJEXT) \ - compat.$(OBJEXT) -tests_seek_accuracy_OBJECTS = $(am_tests_seek_accuracy_OBJECTS) am_tests_seek_whence_OBJECTS = seek_whence.$(OBJEXT) compat.$(OBJEXT) tests_seek_whence_OBJECTS = $(am_tests_seek_whence_OBJECTS) am_tests_text_OBJECTS = text.$(OBJEXT) compat.$(OBJEXT) tests_text_OBJECTS = $(am_tests_text_OBJECTS) +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I. depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(mpg123_SOURCES) $(tests_noise_SOURCES) \ - $(tests_plain_id3_SOURCES) $(tests_seek_accuracy_SOURCES) \ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(mpg123_SOURCES) $(mpg123_id3dump_SOURCES) \ + $(mpg123_strip_SOURCES) $(tests_noise_SOURCES) \ + $(tests_plain_id3_SOURCES) $(tests_seek_whence_SOURCES) \ + $(tests_text_SOURCES) +DIST_SOURCES = $(am__mpg123_SOURCES_DIST) \ + $(am__mpg123_id3dump_SOURCES_DIST) $(mpg123_strip_SOURCES) \ + $(tests_noise_SOURCES) $(tests_plain_id3_SOURCES) \ $(tests_seek_whence_SOURCES) $(tests_text_SOURCES) -DIST_SOURCES = $(am__mpg123_SOURCES_DIST) $(tests_noise_SOURCES) \ - $(tests_plain_id3_SOURCES) $(tests_seek_accuracy_SOURCES) \ - $(tests_seek_whence_SOURCES) $(tests_text_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,7 +260,7 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11 +ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14 AIX_CFLAGS = AIX_LDFLAGS = AIX_LIBS = @@ -162,32 +269,33 @@ ALIB_LDFLAGS = ALIB_LIBS = ALSA_CFLAGS = ALSA_LDFLAGS = -ALSA_LIBS = -AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar -API_VERSION = 29 -AR = ar +ALSA_LIBS = -lasound +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +API_VERSION = 38 +AR = arm-linux-androideabi-ar ARTS_CFLAGS = ARTS_LDFLAGS = ARTS_LIBS = AS = as -AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11 -AWK = gawk -CC = gcc -CCAS = gcc +AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf +AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader +AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14 +AWK = mawk +CC = arm-linux-androideabi-gcc +CCAS = arm-linux-androideabi-gcc CCASDEPMODE = depmode=gcc3 CCASFLAGS = -g -O2 CCDEPMODE = depmode=gcc3 CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 COREAUDIO_CFLAGS = COREAUDIO_LDFLAGS = -COREAUDIO_LIBS = -CPP = gcc -E -CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT +COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices +CPP = arm-linux-androideabi-gcc -E +CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED CYGPATH_W = echo -DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo -DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT) +DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo +DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT) DEFS = -DHAVE_CONFIG_H DEPDIR = .deps DLLTOOL = dlltool @@ -221,10 +329,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s JACK_CFLAGS = JACK_LDFLAGS = JACK_LIBS = -LD = /usr/bin/ld +LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld LDFLAGS = -LFS_LOBJ = lfs_wrap.lo lfs_alias.lo -LIBMPG123_VERSION = 29:6:29 +LFS_LOBJ = lfs_alias.lo +LIBMPG123_VERSION = 38:4:38 LIBOBJS = LIBS = -lm LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -232,7 +340,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_LDFLAGS = -export-dynamic -MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo +MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo MANIFEST_TOOL = : MINT_CFLAGS = MINT_LDFLAGS = @@ -241,8 +349,8 @@ MKDIR_P = /bin/mkdir -p MODULE_OBJ = legacy_module.$(OBJEXT) NAS_CFLAGS = NAS_LDFLAGS = -NAS_LIBS = -NM = /usr/bin/nm -B +NAS_LIBS = -laudio +NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o @@ -251,7 +359,7 @@ OPENAL_LDFLAGS = OPENAL_LIBS = OS2_CFLAGS = OS2_LDFLAGS = -OS2_LIBS = +OS2_LIBS = -los2me -lmmpm2 -lsocket OSS_CFLAGS = OSS_LDFLAGS = OSS_LIBS = @@ -260,27 +368,30 @@ OTOOL64 = OUTPUT_CFLAGS = OUTPUT_LDFLAGS = OUTPUT_LIBS = -OUTPUT_MOD = dummy -OUTPUT_OBJ = output/dummy.$(OBJEXT) +OUTPUT_MOD = oss +OUTPUT_OBJ = output/oss.$(OBJEXT) PACKAGE = mpg123 PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net PACKAGE_NAME = mpg123 -PACKAGE_STRING = mpg123 1.13.4 +PACKAGE_STRING = mpg123 1.17.0 PACKAGE_TARNAME = mpg123 PACKAGE_URL = -PACKAGE_VERSION = 1.13.4 +PACKAGE_VERSION = 1.17.0 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PORTAUDIO_CFLAGS = PORTAUDIO_LDFLAGS = -PORTAUDIO_LIBS = -PULSE_CFLAGS = +PORTAUDIO_LIBS = -lportaudio +PULSE_CFLAGS = -D_REENTRANT PULSE_LDFLAGS = -PULSE_LIBS = -RANLIB = ranlib -SDL_CFLAGS = +PULSE_LIBS = -lpulse-simple -lpulse +QSA_CFLAGS = +QSA_LDFLAGS = +QSA_LIBS = +RANLIB = arm-linux-androideabi-ranlib +SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL SDL_LDFLAGS = -SDL_LIBS = +SDL_LIBS = -lSDL SED = /bin/sed SET_MAKE = SGI_CFLAGS = @@ -289,54 +400,63 @@ SGI_LIBS = SHELL = /bin/bash SNDIO_CFLAGS = SNDIO_LDFLAGS = -SNDIO_LIBS = -STRIP = strip +SNDIO_LIBS = -lsndio +STRIP = arm-linux-androideabi-strip SUN_CFLAGS = SUN_LDFLAGS = SUN_LIBS = -VERSION = 1.13.4 +TINYALSA_CFLAGS = +TINYALSA_LDFLAGS = +TINYALSA_LIBS = -ltinyalsa +VERSION = 1.17.0 WIN32_CFLAGS = WIN32_LDFLAGS = -WIN32_LIBS = -abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src -abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src -abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -ac_ct_AR = ar -ac_ct_CC = gcc +WIN32_LIBS = -lwinmm +WIN32_WASAPI_CFLAGS = +WIN32_WASAPI_LDFLAGS = +WIN32_WASAPI_LIBS = -lole32 -lavrt +YASM = yasm +YASMFLAGS = -pgas -rgas -mamd64 +YASM_FORMAT = +abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src +abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src +abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +ac_ct_AR = +ac_ct_CC = ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 +build = 86_64-unknown-linux-gnu +build_alias = 86_64-unknown-linux-gnu +build_cpu = 86_64 build_os = linux-gnu -build_vendor = pc +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc +host = arm-unknown-linux-androideabi +host_alias = arm-linux-androideabi +host_cpu = arm +host_os = linux-androideabi +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh +install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -346,20 +466,23 @@ sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . sysconfdir = ${prefix}/etc -target_alias = +target_alias = arm-linux-androideabi top_build_prefix = ../ top_builddir = .. top_srcdir = .. -AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" -mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la legacy_module.$(OBJEXT) output/dummy.$(OBJEXT) +AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" $(LTDLINCL) \ + -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 +mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la legacy_module.$(OBJEXT) output/oss.$(OBJEXT) mpg123_LDFLAGS = -# Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. -INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 # libltdl is not mentioned here... it's not that trivial -mpg123_DEPENDENCIES = output/dummy.$(OBJEXT) legacy_module.$(OBJEXT) libmpg123/libmpg123.la +mpg123_DEPENDENCIES = output/oss.$(OBJEXT) legacy_module.$(OBJEXT) libmpg123/libmpg123.la SUBDIRS = output libmpg123 -EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h +EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h mpg123-with-modules CLEANFILES = *.a +mpg123_id3dump_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_id3dump_LDADD = libmpg123/libmpg123.la +mpg123_strip_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_strip_LDADD = libmpg123/libmpg123.la mpg123_SOURCES = audio.c audio.h buffer.c buffer.h common.c common.h \ libmpg123/compat.c libmpg123/compat.h control_generic.c \ equalizer.c getlopt.c getlopt.h httpget.c httpget.h resolver.c \ @@ -367,13 +490,14 @@ mpg123_SOURCES = audio.c audio.h buffer.c buffer.h common.c common.h \ metaprint.c metaprint.h local.h local.c playlist.c playlist.h \ streamdump.h streamdump.c term.c term.h wav.c win32_support.h \ wavhead.h xfermem.c xfermem.h $(am__append_1) -tests_seek_accuracy_SOURCES = \ -tests/seek_accuracy.c \ -libmpg123/compat.h \ -libmpg123/compat.c +mpg123_id3dump_SOURCES = mpg123-id3dump.c getlopt.c getlopt.h \ + libmpg123/compat.c libmpg123/compat.h $(am__append_2) +mpg123_strip_SOURCES = mpg123-strip.c \ + getlopt.c \ + getlopt.h \ + libmpg123/compat.c \ + libmpg123/compat.h -tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.la -tests_seek_accuracy_LDADD = libmpg123/libmpg123.la tests_seek_whence_SOURCES = \ tests/seek_whence.c \ libmpg123/compat.h \ @@ -440,10 +564,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -457,14 +579,19 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -485,7 +612,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -498,27 +626,37 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -mpg123$(EXEEXT): $(mpg123_OBJECTS) $(mpg123_DEPENDENCIES) + +mpg123$(EXEEXT): $(mpg123_OBJECTS) $(mpg123_DEPENDENCIES) $(EXTRA_mpg123_DEPENDENCIES) @rm -f mpg123$(EXEEXT) - $(mpg123_LINK) $(mpg123_OBJECTS) $(mpg123_LDADD) $(LIBS) + $(AM_V_CCLD)$(mpg123_LINK) $(mpg123_OBJECTS) $(mpg123_LDADD) $(LIBS) + +mpg123-id3dump$(EXEEXT): $(mpg123_id3dump_OBJECTS) $(mpg123_id3dump_DEPENDENCIES) $(EXTRA_mpg123_id3dump_DEPENDENCIES) + @rm -f mpg123-id3dump$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mpg123_id3dump_OBJECTS) $(mpg123_id3dump_LDADD) $(LIBS) + +mpg123-strip$(EXEEXT): $(mpg123_strip_OBJECTS) $(mpg123_strip_DEPENDENCIES) $(EXTRA_mpg123_strip_DEPENDENCIES) + @rm -f mpg123-strip$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mpg123_strip_OBJECTS) $(mpg123_strip_LDADD) $(LIBS) tests/$(am__dirstamp): @$(MKDIR_P) tests @: > tests/$(am__dirstamp) -tests/noise$(EXEEXT): $(tests_noise_OBJECTS) $(tests_noise_DEPENDENCIES) tests/$(am__dirstamp) + +tests/noise$(EXEEXT): $(tests_noise_OBJECTS) $(tests_noise_DEPENDENCIES) $(EXTRA_tests_noise_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/noise$(EXEEXT) - $(LINK) $(tests_noise_OBJECTS) $(tests_noise_LDADD) $(LIBS) -tests/plain_id3$(EXEEXT): $(tests_plain_id3_OBJECTS) $(tests_plain_id3_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_noise_OBJECTS) $(tests_noise_LDADD) $(LIBS) + +tests/plain_id3$(EXEEXT): $(tests_plain_id3_OBJECTS) $(tests_plain_id3_DEPENDENCIES) $(EXTRA_tests_plain_id3_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/plain_id3$(EXEEXT) - $(LINK) $(tests_plain_id3_OBJECTS) $(tests_plain_id3_LDADD) $(LIBS) -tests/seek_accuracy$(EXEEXT): $(tests_seek_accuracy_OBJECTS) $(tests_seek_accuracy_DEPENDENCIES) tests/$(am__dirstamp) - @rm -f tests/seek_accuracy$(EXEEXT) - $(LINK) $(tests_seek_accuracy_OBJECTS) $(tests_seek_accuracy_LDADD) $(LIBS) -tests/seek_whence$(EXEEXT): $(tests_seek_whence_OBJECTS) $(tests_seek_whence_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_plain_id3_OBJECTS) $(tests_plain_id3_LDADD) $(LIBS) + +tests/seek_whence$(EXEEXT): $(tests_seek_whence_OBJECTS) $(tests_seek_whence_DEPENDENCIES) $(EXTRA_tests_seek_whence_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/seek_whence$(EXEEXT) - $(LINK) $(tests_seek_whence_OBJECTS) $(tests_seek_whence_LDADD) $(LIBS) -tests/text$(EXEEXT): $(tests_text_OBJECTS) $(tests_text_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_seek_whence_OBJECTS) $(tests_seek_whence_LDADD) $(LIBS) + +tests/text$(EXEEXT): $(tests_text_OBJECTS) $(tests_text_DEPENDENCIES) $(EXTRA_tests_text_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/text$(EXEEXT) - $(LINK) $(tests_text_OBJECTS) $(tests_text_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tests_text_OBJECTS) $(tests_text_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -538,12 +676,13 @@ include ./$(DEPDIR)/getlopt.Po include ./$(DEPDIR)/httpget.Po include ./$(DEPDIR)/local.Po include ./$(DEPDIR)/metaprint.Po +include ./$(DEPDIR)/mpg123-id3dump.Po +include ./$(DEPDIR)/mpg123-strip.Po include ./$(DEPDIR)/mpg123.Po include ./$(DEPDIR)/noise.Po include ./$(DEPDIR)/plain_id3.Po include ./$(DEPDIR)/playlist.Po include ./$(DEPDIR)/resolver.Po -include ./$(DEPDIR)/seek_accuracy.Po include ./$(DEPDIR)/seek_whence.Po include ./$(DEPDIR)/streamdump.Po include ./$(DEPDIR)/term.Po @@ -554,123 +693,109 @@ include ./$(DEPDIR)/win32_support.Po include ./$(DEPDIR)/xfermem.Po .c.o: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c $< +# $(AM_V_CC_no)$(COMPILE) -c -o $@ $< .c.obj: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `$(CYGPATH_W) '$<'` +# $(AM_V_CC_no)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: - $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ + $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CC)source='$<' object='$@' libtool=yes \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ $< +# $(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $< compat.o: libmpg123/compat.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.o -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c - $(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po -# source='libmpg123/compat.c' object='compat.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.o -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c + $(AM_V_at)$(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po +# $(AM_V_CC)source='libmpg123/compat.c' object='compat.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c compat.obj: libmpg123/compat.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.obj -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` - $(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po -# source='libmpg123/compat.c' object='compat.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.obj -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po +# $(AM_V_CC)source='libmpg123/compat.c' object='compat.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` noise.o: tests/noise.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.o -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c - $(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po -# source='tests/noise.c' object='noise.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.o -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c + $(AM_V_at)$(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po +# $(AM_V_CC)source='tests/noise.c' object='noise.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c noise.obj: tests/noise.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.obj -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` - $(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po -# source='tests/noise.c' object='noise.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.obj -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po +# $(AM_V_CC)source='tests/noise.c' object='noise.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` dither.o: libmpg123/dither.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.o -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c - $(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po -# source='libmpg123/dither.c' object='dither.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.o -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c + $(AM_V_at)$(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po +# $(AM_V_CC)source='libmpg123/dither.c' object='dither.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c dither.obj: libmpg123/dither.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.obj -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` - $(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po -# source='libmpg123/dither.c' object='dither.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.obj -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po +# $(AM_V_CC)source='libmpg123/dither.c' object='dither.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` plain_id3.o: tests/plain_id3.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.o -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c - $(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po -# source='tests/plain_id3.c' object='plain_id3.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.o -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c + $(AM_V_at)$(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po +# $(AM_V_CC)source='tests/plain_id3.c' object='plain_id3.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c plain_id3.obj: tests/plain_id3.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.obj -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` - $(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po -# source='tests/plain_id3.c' object='plain_id3.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.obj -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po +# $(AM_V_CC)source='tests/plain_id3.c' object='plain_id3.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` - -seek_accuracy.o: tests/seek_accuracy.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_accuracy.o -MD -MP -MF $(DEPDIR)/seek_accuracy.Tpo -c -o seek_accuracy.o `test -f 'tests/seek_accuracy.c' || echo '$(srcdir)/'`tests/seek_accuracy.c - $(am__mv) $(DEPDIR)/seek_accuracy.Tpo $(DEPDIR)/seek_accuracy.Po -# source='tests/seek_accuracy.c' object='seek_accuracy.o' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_accuracy.o `test -f 'tests/seek_accuracy.c' || echo '$(srcdir)/'`tests/seek_accuracy.c - -seek_accuracy.obj: tests/seek_accuracy.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_accuracy.obj -MD -MP -MF $(DEPDIR)/seek_accuracy.Tpo -c -o seek_accuracy.obj `if test -f 'tests/seek_accuracy.c'; then $(CYGPATH_W) 'tests/seek_accuracy.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_accuracy.c'; fi` - $(am__mv) $(DEPDIR)/seek_accuracy.Tpo $(DEPDIR)/seek_accuracy.Po -# source='tests/seek_accuracy.c' object='seek_accuracy.obj' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_accuracy.obj `if test -f 'tests/seek_accuracy.c'; then $(CYGPATH_W) 'tests/seek_accuracy.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_accuracy.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` seek_whence.o: tests/seek_whence.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.o -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c - $(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po -# source='tests/seek_whence.c' object='seek_whence.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.o -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c + $(AM_V_at)$(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po +# $(AM_V_CC)source='tests/seek_whence.c' object='seek_whence.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c seek_whence.obj: tests/seek_whence.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.obj -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` - $(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po -# source='tests/seek_whence.c' object='seek_whence.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.obj -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po +# $(AM_V_CC)source='tests/seek_whence.c' object='seek_whence.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` text.o: tests/text.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.o -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c - $(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po -# source='tests/text.c' object='text.o' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.o -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c + $(AM_V_at)$(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po +# $(AM_V_CC)source='tests/text.c' object='text.o' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c text.obj: tests/text.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.obj -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` - $(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po -# source='tests/text.c' object='text.obj' libtool=no \ + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.obj -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` + $(AM_V_at)$(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po +# $(AM_V_CC)source='tests/text.c' object='text.obj' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` +# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -680,22 +805,25 @@ clean-libtool: -rm -rf tests/.libs tests/_libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -710,57 +838,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -776,12 +859,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -793,15 +871,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -810,6 +884,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -846,13 +935,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -890,10 +976,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -977,99 +1068,105 @@ ps-am: uninstall-am: uninstall-binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # That is not nice... but it is how I manage to get the dependency on output/alsa.o without error about .deps/output/alsa.Tpo . # Did I mention that recursive make sucks? +# Actually ... does that really make really here? Not been updated +# for some time before. I need to revisit our build system. # `%'-style pattern rules are a GNU make extension -#find output/ -name '*.c' | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; +#find output/ -name '*.c' | sort | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; #print "$mod: $_ audio.h module.h\n"; #print "\tcd output && \$(MAKE)\n\n";' -output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h - cd output && $(MAKE) - -output/win32.$(OBJEXT): output/win32.c audio.h module.h - cd output && $(MAKE) - -output/alsa05.$(OBJEXT): output/alsa05.c audio.h module.h - cd output && $(MAKE) - -output/sdl.$(OBJEXT): output/sdl.c audio.h module.h - cd output && $(MAKE) - -output/dummy.$(OBJEXT): output/dummy.c audio.h module.h +output/aix.$(OBJEXT): output/aix.c audio.h module.h cd output && $(MAKE) output/alib.$(OBJEXT): output/alib.c audio.h module.h cd output && $(MAKE) -output/libao.$(OBJEXT): output/libao.c audio.h module.h - cd output && $(MAKE) - -output/sun.$(OBJEXT): output/sun.c audio.h module.h - cd output && $(MAKE) - -output/aix.$(OBJEXT): output/aix.c audio.h module.h - cd output && $(MAKE) - -output/oss.$(OBJEXT): output/oss.c audio.h module.h - cd output && $(MAKE) - -output/mint.$(OBJEXT): output/mint.c audio.h module.h - cd output && $(MAKE) - -output/pulse.$(OBJEXT): output/pulse.c audio.h module.h - cd output && $(MAKE) - -output/jack.$(OBJEXT): output/jack.c audio.h module.h - cd output && $(MAKE) - -output/os2.$(OBJEXT): output/os2.c audio.h module.h - cd output && $(MAKE) - -output/nas.$(OBJEXT): output/nas.c audio.h module.h - cd output && $(MAKE) - -output/sgi.$(OBJEXT): output/sgi.c audio.h module.h - cd output && $(MAKE) - -output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h +output/alsa.$(OBJEXT): output/alsa.c audio.h module.h cd output && $(MAKE) output/arts.$(OBJEXT): output/arts.c audio.h module.h cd output && $(MAKE) -output/esd.$(OBJEXT): output/esd.c audio.h module.h +output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h cd output && $(MAKE) -output/alsa.$(OBJEXT): output/alsa.c audio.h module.h +output/dummy.$(OBJEXT): output/dummy.c audio.h module.h + cd output && $(MAKE) + +output/esd.$(OBJEXT): output/esd.c audio.h module.h cd output && $(MAKE) output/hp.$(OBJEXT): output/hp.c audio.h module.h cd output && $(MAKE) +output/jack.$(OBJEXT): output/jack.c audio.h module.h + cd output && $(MAKE) + +output/mint.$(OBJEXT): output/mint.c audio.h module.h + cd output && $(MAKE) + +output/nas.$(OBJEXT): output/nas.c audio.h module.h + cd output && $(MAKE) + +output/openal.$(OBJEXT): output/openal.c audio.h module.h + cd output && $(MAKE) + +output/os2.$(OBJEXT): output/os2.c audio.h module.h + cd output && $(MAKE) + +output/oss.$(OBJEXT): output/oss.c audio.h module.h + cd output && $(MAKE) + +output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h + cd output && $(MAKE) + +output/pulse.$(OBJEXT): output/pulse.c audio.h module.h + cd output && $(MAKE) + +output/qsa.$(OBJEXT): output/qsa.c audio.h module.h + cd output && $(MAKE) + +output/sdl.$(OBJEXT): output/sdl.c audio.h module.h + cd output && $(MAKE) + +output/sgi.$(OBJEXT): output/sgi.c audio.h module.h + cd output && $(MAKE) + output/sndio.$(OBJEXT): output/sndio.c audio.h module.h cd output && $(MAKE) +output/sun.$(OBJEXT): output/sun.c audio.h module.h + cd output && $(MAKE) + +output/tinyalsa.$(OBJEXT): output/tinyalsa.c audio.h module.h + cd output && $(MAKE) + +output/win32.$(OBJEXT): output/win32.c audio.h module.h + cd output && $(MAKE) + +output/win32_wasapi.$(OBJEXT): output/win32_wasapi.c audio.h module.h + cd output && $(MAKE) + # Would have to mention _all_ source files... Dammit, that's what the libmpg123/Makefile.am does! # But again, the a make $something here needs that stupid rule... WHY??? libmpg123/libmpg123.la: config.h libmpg123/mpg123.h diff --git a/jni/mpg123-1.13.4/src/Makefile.am b/jni/mpg123-1.17.0/src/Makefile.am similarity index 76% rename from jni/mpg123-1.13.4/src/Makefile.am rename to jni/mpg123-1.17.0/src/Makefile.am index 242a9f0b..db420aa2 100644 --- a/jni/mpg123-1.13.4/src/Makefile.am +++ b/jni/mpg123-1.17.0/src/Makefile.am @@ -7,20 +7,25 @@ AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -# Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. -INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 +AM_CPPFLAGS += $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 # libltdl is not mentioned here... it's not that trivial mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.la SUBDIRS = output libmpg123 -EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h +EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h mpg123-with-modules CLEANFILES = *.a -bin_PROGRAMS = mpg123 +bin_PROGRAMS = mpg123 mpg123-id3dump mpg123-strip -EXTRA_PROGRAMS = tests/seek_accuracy tests/seek_whence tests/noise tests/text tests/plain_id3 +mpg123_id3dump_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_id3dump_LDADD = libmpg123/libmpg123.la + +mpg123_strip_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_strip_LDADD = libmpg123/libmpg123.la + +EXTRA_PROGRAMS = tests/seek_whence tests/noise tests/text tests/plain_id3 mpg123_SOURCES = \ audio.c \ @@ -60,99 +65,113 @@ mpg123_SOURCES = \ xfermem.c \ xfermem.h +mpg123_id3dump_SOURCES = mpg123-id3dump.c \ + getlopt.c \ + getlopt.h \ + libmpg123/compat.c \ + libmpg123/compat.h + +mpg123_strip_SOURCES = mpg123-strip.c \ + getlopt.c \ + getlopt.h \ + libmpg123/compat.c \ + libmpg123/compat.h + if WIN32_CODES mpg123_SOURCES += \ win32_support.c \ win32_net.c + +mpg123_id3dump_SOURCES += \ + win32_support.c endif # That is not nice... but it is how I manage to get the dependency on output/alsa.o without error about .deps/output/alsa.Tpo . # Did I mention that recursive make sucks? +# Actually ... does that really make really here? Not been updated +# for some time before. I need to revisit our build system. # `%'-style pattern rules are a GNU make extension -#find output/ -name '*.c' | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; +#find output/ -name '*.c' | sort | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; #print "$mod: $_ audio.h module.h\n"; #print "\tcd output && \$(MAKE)\n\n";' -output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h - cd output && $(MAKE) - -output/win32.$(OBJEXT): output/win32.c audio.h module.h - cd output && $(MAKE) - -output/alsa05.$(OBJEXT): output/alsa05.c audio.h module.h - cd output && $(MAKE) - -output/sdl.$(OBJEXT): output/sdl.c audio.h module.h - cd output && $(MAKE) - -output/dummy.$(OBJEXT): output/dummy.c audio.h module.h +output/aix.$(OBJEXT): output/aix.c audio.h module.h cd output && $(MAKE) output/alib.$(OBJEXT): output/alib.c audio.h module.h cd output && $(MAKE) -output/libao.$(OBJEXT): output/libao.c audio.h module.h - cd output && $(MAKE) - -output/sun.$(OBJEXT): output/sun.c audio.h module.h - cd output && $(MAKE) - -output/aix.$(OBJEXT): output/aix.c audio.h module.h - cd output && $(MAKE) - -output/oss.$(OBJEXT): output/oss.c audio.h module.h - cd output && $(MAKE) - -output/mint.$(OBJEXT): output/mint.c audio.h module.h - cd output && $(MAKE) - -output/pulse.$(OBJEXT): output/pulse.c audio.h module.h - cd output && $(MAKE) - -output/jack.$(OBJEXT): output/jack.c audio.h module.h - cd output && $(MAKE) - -output/os2.$(OBJEXT): output/os2.c audio.h module.h - cd output && $(MAKE) - -output/nas.$(OBJEXT): output/nas.c audio.h module.h - cd output && $(MAKE) - -output/sgi.$(OBJEXT): output/sgi.c audio.h module.h - cd output && $(MAKE) - -output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h +output/alsa.$(OBJEXT): output/alsa.c audio.h module.h cd output && $(MAKE) output/arts.$(OBJEXT): output/arts.c audio.h module.h cd output && $(MAKE) -output/esd.$(OBJEXT): output/esd.c audio.h module.h +output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h cd output && $(MAKE) -output/alsa.$(OBJEXT): output/alsa.c audio.h module.h +output/dummy.$(OBJEXT): output/dummy.c audio.h module.h + cd output && $(MAKE) + +output/esd.$(OBJEXT): output/esd.c audio.h module.h cd output && $(MAKE) output/hp.$(OBJEXT): output/hp.c audio.h module.h cd output && $(MAKE) +output/jack.$(OBJEXT): output/jack.c audio.h module.h + cd output && $(MAKE) + +output/mint.$(OBJEXT): output/mint.c audio.h module.h + cd output && $(MAKE) + +output/nas.$(OBJEXT): output/nas.c audio.h module.h + cd output && $(MAKE) + +output/openal.$(OBJEXT): output/openal.c audio.h module.h + cd output && $(MAKE) + +output/os2.$(OBJEXT): output/os2.c audio.h module.h + cd output && $(MAKE) + +output/oss.$(OBJEXT): output/oss.c audio.h module.h + cd output && $(MAKE) + +output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h + cd output && $(MAKE) + +output/pulse.$(OBJEXT): output/pulse.c audio.h module.h + cd output && $(MAKE) + +output/qsa.$(OBJEXT): output/qsa.c audio.h module.h + cd output && $(MAKE) + +output/sdl.$(OBJEXT): output/sdl.c audio.h module.h + cd output && $(MAKE) + +output/sgi.$(OBJEXT): output/sgi.c audio.h module.h + cd output && $(MAKE) + output/sndio.$(OBJEXT): output/sndio.c audio.h module.h cd output && $(MAKE) +output/sun.$(OBJEXT): output/sun.c audio.h module.h + cd output && $(MAKE) + +output/tinyalsa.$(OBJEXT): output/tinyalsa.c audio.h module.h + cd output && $(MAKE) + +output/win32.$(OBJEXT): output/win32.c audio.h module.h + cd output && $(MAKE) + +output/win32_wasapi.$(OBJEXT): output/win32_wasapi.c audio.h module.h + cd output && $(MAKE) # Would have to mention _all_ source files... Dammit, that's what the libmpg123/Makefile.am does! # But again, the a make $something here needs that stupid rule... WHY??? libmpg123/libmpg123.la: config.h libmpg123/mpg123.h cd libmpg123 && $(MAKE) -tests_seek_accuracy_SOURCES = \ -tests/seek_accuracy.c \ -libmpg123/compat.h \ -libmpg123/compat.c - -tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.la -tests_seek_accuracy_LDADD = libmpg123/libmpg123.la - tests_seek_whence_SOURCES = \ tests/seek_whence.c \ libmpg123/compat.h \ diff --git a/jni/mpg123-1.13.4/src/Makefile.in b/jni/mpg123-1.17.0/src/Makefile.in similarity index 55% rename from jni/mpg123-1.13.4/src/Makefile.in rename to jni/mpg123-1.17.0/src/Makefile.in index 74d64ea4..17e0e307 100644 --- a/jni/mpg123-1.13.4/src/Makefile.in +++ b/jni/mpg123-1.17.0/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,17 +78,20 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = mpg123$(EXEEXT) -EXTRA_PROGRAMS = tests/seek_accuracy$(EXEEXT) \ - tests/seek_whence$(EXEEXT) tests/noise$(EXEEXT) \ +bin_PROGRAMS = mpg123$(EXEEXT) mpg123-id3dump$(EXEEXT) \ + mpg123-strip$(EXEEXT) +EXTRA_PROGRAMS = tests/seek_whence$(EXEEXT) tests/noise$(EXEEXT) \ tests/text$(EXEEXT) tests/plain_id3$(EXEEXT) @WIN32_CODES_TRUE@am__append_1 = \ @WIN32_CODES_TRUE@ win32_support.c \ @WIN32_CODES_TRUE@ win32_net.c +@WIN32_CODES_TRUE@am__append_2 = \ +@WIN32_CODES_TRUE@ win32_support.c + subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.h.in $(top_srcdir)/build/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -76,9 +123,22 @@ am_mpg123_OBJECTS = audio.$(OBJEXT) buffer.$(OBJEXT) common.$(OBJEXT) \ term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) \ $(am__objects_1) mpg123_OBJECTS = $(am_mpg123_OBJECTS) -mpg123_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpg123_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +mpg123_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(mpg123_LDFLAGS) $(LDFLAGS) -o $@ +am__mpg123_id3dump_SOURCES_DIST = mpg123-id3dump.c getlopt.c getlopt.h \ + libmpg123/compat.c libmpg123/compat.h win32_support.c +@WIN32_CODES_TRUE@am__objects_2 = win32_support.$(OBJEXT) +am_mpg123_id3dump_OBJECTS = mpg123-id3dump.$(OBJEXT) getlopt.$(OBJEXT) \ + compat.$(OBJEXT) $(am__objects_2) +mpg123_id3dump_OBJECTS = $(am_mpg123_id3dump_OBJECTS) +am_mpg123_strip_OBJECTS = mpg123-strip.$(OBJEXT) getlopt.$(OBJEXT) \ + compat.$(OBJEXT) +mpg123_strip_OBJECTS = $(am_mpg123_strip_OBJECTS) am_tests_noise_OBJECTS = noise.$(OBJEXT) compat.$(OBJEXT) \ dither.$(OBJEXT) tests_noise_OBJECTS = $(am_tests_noise_OBJECTS) @@ -86,44 +146,91 @@ tests_noise_LDADD = $(LDADD) am__dirstamp = $(am__leading_dot)dirstamp am_tests_plain_id3_OBJECTS = plain_id3.$(OBJEXT) compat.$(OBJEXT) tests_plain_id3_OBJECTS = $(am_tests_plain_id3_OBJECTS) -am_tests_seek_accuracy_OBJECTS = seek_accuracy.$(OBJEXT) \ - compat.$(OBJEXT) -tests_seek_accuracy_OBJECTS = $(am_tests_seek_accuracy_OBJECTS) am_tests_seek_whence_OBJECTS = seek_whence.$(OBJEXT) compat.$(OBJEXT) tests_seek_whence_OBJECTS = $(am_tests_seek_whence_OBJECTS) am_tests_text_OBJECTS = text.$(OBJEXT) compat.$(OBJEXT) tests_text_OBJECTS = $(am_tests_text_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(mpg123_SOURCES) $(tests_noise_SOURCES) \ - $(tests_plain_id3_SOURCES) $(tests_seek_accuracy_SOURCES) \ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(mpg123_SOURCES) $(mpg123_id3dump_SOURCES) \ + $(mpg123_strip_SOURCES) $(tests_noise_SOURCES) \ + $(tests_plain_id3_SOURCES) $(tests_seek_whence_SOURCES) \ + $(tests_text_SOURCES) +DIST_SOURCES = $(am__mpg123_SOURCES_DIST) \ + $(am__mpg123_id3dump_SOURCES_DIST) $(mpg123_strip_SOURCES) \ + $(tests_noise_SOURCES) $(tests_plain_id3_SOURCES) \ $(tests_seek_whence_SOURCES) $(tests_text_SOURCES) -DIST_SOURCES = $(am__mpg123_SOURCES_DIST) $(tests_noise_SOURCES) \ - $(tests_plain_id3_SOURCES) $(tests_seek_accuracy_SOURCES) \ - $(tests_seek_whence_SOURCES) $(tests_text_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -164,6 +271,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LDFLAGS = @ALSA_LDFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ AR = @AR@ ARTS_CFLAGS = @ARTS_CFLAGS@ @@ -277,6 +385,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PULSE_CFLAGS = @PULSE_CFLAGS@ PULSE_LDFLAGS = @PULSE_LDFLAGS@ PULSE_LIBS = @PULSE_LIBS@ +QSA_CFLAGS = @QSA_CFLAGS@ +QSA_LDFLAGS = @QSA_LDFLAGS@ +QSA_LIBS = @QSA_LIBS@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LDFLAGS = @SDL_LDFLAGS@ @@ -294,10 +405,19 @@ STRIP = @STRIP@ SUN_CFLAGS = @SUN_CFLAGS@ SUN_LDFLAGS = @SUN_LDFLAGS@ SUN_LIBS = @SUN_LIBS@ +TINYALSA_CFLAGS = @TINYALSA_CFLAGS@ +TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@ +TINYALSA_LIBS = @TINYALSA_LIBS@ VERSION = @VERSION@ WIN32_CFLAGS = @WIN32_CFLAGS@ WIN32_LDFLAGS = @WIN32_LDFLAGS@ WIN32_LIBS = @WIN32_LIBS@ +WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@ +WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@ +WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@ +YASM = @YASM@ +YASMFLAGS = @YASMFLAGS@ +YASM_FORMAT = @YASM_FORMAT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -350,16 +470,19 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" +AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" $(LTDLINCL) \ + -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -# Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. -INCLUDES = $(LTDLINCL) -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src/libmpg123 # libltdl is not mentioned here... it's not that trivial mpg123_DEPENDENCIES = @OUTPUT_OBJ@ @MODULE_OBJ@ libmpg123/libmpg123.la SUBDIRS = output libmpg123 -EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h +EXTRA_DIST = legacy_module.c module.c sfifo.c sfifo.h mpg123-with-modules CLEANFILES = *.a +mpg123_id3dump_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_id3dump_LDADD = libmpg123/libmpg123.la +mpg123_strip_DEPENDENCIES = libmpg123/libmpg123.la +mpg123_strip_LDADD = libmpg123/libmpg123.la mpg123_SOURCES = audio.c audio.h buffer.c buffer.h common.c common.h \ libmpg123/compat.c libmpg123/compat.h control_generic.c \ equalizer.c getlopt.c getlopt.h httpget.c httpget.h resolver.c \ @@ -367,13 +490,14 @@ mpg123_SOURCES = audio.c audio.h buffer.c buffer.h common.c common.h \ metaprint.c metaprint.h local.h local.c playlist.c playlist.h \ streamdump.h streamdump.c term.c term.h wav.c win32_support.h \ wavhead.h xfermem.c xfermem.h $(am__append_1) -tests_seek_accuracy_SOURCES = \ -tests/seek_accuracy.c \ -libmpg123/compat.h \ -libmpg123/compat.c +mpg123_id3dump_SOURCES = mpg123-id3dump.c getlopt.c getlopt.h \ + libmpg123/compat.c libmpg123/compat.h $(am__append_2) +mpg123_strip_SOURCES = mpg123-strip.c \ + getlopt.c \ + getlopt.h \ + libmpg123/compat.c \ + libmpg123/compat.h -tests_seek_accuracy_DEPENDENCIES = libmpg123/libmpg123.la -tests_seek_accuracy_LDADD = libmpg123/libmpg123.la tests_seek_whence_SOURCES = \ tests/seek_whence.c \ libmpg123/compat.h \ @@ -440,10 +564,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -457,14 +579,19 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -485,7 +612,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -498,27 +626,37 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -mpg123$(EXEEXT): $(mpg123_OBJECTS) $(mpg123_DEPENDENCIES) + +mpg123$(EXEEXT): $(mpg123_OBJECTS) $(mpg123_DEPENDENCIES) $(EXTRA_mpg123_DEPENDENCIES) @rm -f mpg123$(EXEEXT) - $(mpg123_LINK) $(mpg123_OBJECTS) $(mpg123_LDADD) $(LIBS) + $(AM_V_CCLD)$(mpg123_LINK) $(mpg123_OBJECTS) $(mpg123_LDADD) $(LIBS) + +mpg123-id3dump$(EXEEXT): $(mpg123_id3dump_OBJECTS) $(mpg123_id3dump_DEPENDENCIES) $(EXTRA_mpg123_id3dump_DEPENDENCIES) + @rm -f mpg123-id3dump$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mpg123_id3dump_OBJECTS) $(mpg123_id3dump_LDADD) $(LIBS) + +mpg123-strip$(EXEEXT): $(mpg123_strip_OBJECTS) $(mpg123_strip_DEPENDENCIES) $(EXTRA_mpg123_strip_DEPENDENCIES) + @rm -f mpg123-strip$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(mpg123_strip_OBJECTS) $(mpg123_strip_LDADD) $(LIBS) tests/$(am__dirstamp): @$(MKDIR_P) tests @: > tests/$(am__dirstamp) -tests/noise$(EXEEXT): $(tests_noise_OBJECTS) $(tests_noise_DEPENDENCIES) tests/$(am__dirstamp) + +tests/noise$(EXEEXT): $(tests_noise_OBJECTS) $(tests_noise_DEPENDENCIES) $(EXTRA_tests_noise_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/noise$(EXEEXT) - $(LINK) $(tests_noise_OBJECTS) $(tests_noise_LDADD) $(LIBS) -tests/plain_id3$(EXEEXT): $(tests_plain_id3_OBJECTS) $(tests_plain_id3_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_noise_OBJECTS) $(tests_noise_LDADD) $(LIBS) + +tests/plain_id3$(EXEEXT): $(tests_plain_id3_OBJECTS) $(tests_plain_id3_DEPENDENCIES) $(EXTRA_tests_plain_id3_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/plain_id3$(EXEEXT) - $(LINK) $(tests_plain_id3_OBJECTS) $(tests_plain_id3_LDADD) $(LIBS) -tests/seek_accuracy$(EXEEXT): $(tests_seek_accuracy_OBJECTS) $(tests_seek_accuracy_DEPENDENCIES) tests/$(am__dirstamp) - @rm -f tests/seek_accuracy$(EXEEXT) - $(LINK) $(tests_seek_accuracy_OBJECTS) $(tests_seek_accuracy_LDADD) $(LIBS) -tests/seek_whence$(EXEEXT): $(tests_seek_whence_OBJECTS) $(tests_seek_whence_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_plain_id3_OBJECTS) $(tests_plain_id3_LDADD) $(LIBS) + +tests/seek_whence$(EXEEXT): $(tests_seek_whence_OBJECTS) $(tests_seek_whence_DEPENDENCIES) $(EXTRA_tests_seek_whence_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/seek_whence$(EXEEXT) - $(LINK) $(tests_seek_whence_OBJECTS) $(tests_seek_whence_LDADD) $(LIBS) -tests/text$(EXEEXT): $(tests_text_OBJECTS) $(tests_text_DEPENDENCIES) tests/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(tests_seek_whence_OBJECTS) $(tests_seek_whence_LDADD) $(LIBS) + +tests/text$(EXEEXT): $(tests_text_OBJECTS) $(tests_text_DEPENDENCIES) $(EXTRA_tests_text_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/text$(EXEEXT) - $(LINK) $(tests_text_OBJECTS) $(tests_text_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(tests_text_OBJECTS) $(tests_text_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -538,12 +676,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/local.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metaprint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpg123-id3dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpg123-strip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpg123.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noise.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain_id3.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seek_accuracy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seek_whence.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/streamdump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/term.Po@am__quote@ @@ -554,123 +693,109 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfermem.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< compat.o: libmpg123/compat.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.o -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpg123/compat.c' object='compat.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.o -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmpg123/compat.c' object='compat.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.o `test -f 'libmpg123/compat.c' || echo '$(srcdir)/'`libmpg123/compat.c compat.obj: libmpg123/compat.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.obj -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpg123/compat.c' object='compat.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat.obj -MD -MP -MF $(DEPDIR)/compat.Tpo -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/compat.Tpo $(DEPDIR)/compat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmpg123/compat.c' object='compat.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat.obj `if test -f 'libmpg123/compat.c'; then $(CYGPATH_W) 'libmpg123/compat.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/compat.c'; fi` noise.o: tests/noise.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.o -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/noise.c' object='noise.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.o -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/noise.c' object='noise.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.o `test -f 'tests/noise.c' || echo '$(srcdir)/'`tests/noise.c noise.obj: tests/noise.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.obj -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/noise.c' object='noise.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT noise.obj -MD -MP -MF $(DEPDIR)/noise.Tpo -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/noise.Tpo $(DEPDIR)/noise.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/noise.c' object='noise.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o noise.obj `if test -f 'tests/noise.c'; then $(CYGPATH_W) 'tests/noise.c'; else $(CYGPATH_W) '$(srcdir)/tests/noise.c'; fi` dither.o: libmpg123/dither.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.o -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpg123/dither.c' object='dither.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.o -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmpg123/dither.c' object='dither.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.o `test -f 'libmpg123/dither.c' || echo '$(srcdir)/'`libmpg123/dither.c dither.obj: libmpg123/dither.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.obj -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpg123/dither.c' object='dither.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dither.obj -MD -MP -MF $(DEPDIR)/dither.Tpo -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dither.Tpo $(DEPDIR)/dither.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmpg123/dither.c' object='dither.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dither.obj `if test -f 'libmpg123/dither.c'; then $(CYGPATH_W) 'libmpg123/dither.c'; else $(CYGPATH_W) '$(srcdir)/libmpg123/dither.c'; fi` plain_id3.o: tests/plain_id3.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.o -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/plain_id3.c' object='plain_id3.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.o -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/plain_id3.c' object='plain_id3.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.o `test -f 'tests/plain_id3.c' || echo '$(srcdir)/'`tests/plain_id3.c plain_id3.obj: tests/plain_id3.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.obj -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/plain_id3.c' object='plain_id3.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_id3.obj -MD -MP -MF $(DEPDIR)/plain_id3.Tpo -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/plain_id3.Tpo $(DEPDIR)/plain_id3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/plain_id3.c' object='plain_id3.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` - -seek_accuracy.o: tests/seek_accuracy.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_accuracy.o -MD -MP -MF $(DEPDIR)/seek_accuracy.Tpo -c -o seek_accuracy.o `test -f 'tests/seek_accuracy.c' || echo '$(srcdir)/'`tests/seek_accuracy.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/seek_accuracy.Tpo $(DEPDIR)/seek_accuracy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/seek_accuracy.c' object='seek_accuracy.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_accuracy.o `test -f 'tests/seek_accuracy.c' || echo '$(srcdir)/'`tests/seek_accuracy.c - -seek_accuracy.obj: tests/seek_accuracy.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_accuracy.obj -MD -MP -MF $(DEPDIR)/seek_accuracy.Tpo -c -o seek_accuracy.obj `if test -f 'tests/seek_accuracy.c'; then $(CYGPATH_W) 'tests/seek_accuracy.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_accuracy.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/seek_accuracy.Tpo $(DEPDIR)/seek_accuracy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/seek_accuracy.c' object='seek_accuracy.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_accuracy.obj `if test -f 'tests/seek_accuracy.c'; then $(CYGPATH_W) 'tests/seek_accuracy.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_accuracy.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_id3.obj `if test -f 'tests/plain_id3.c'; then $(CYGPATH_W) 'tests/plain_id3.c'; else $(CYGPATH_W) '$(srcdir)/tests/plain_id3.c'; fi` seek_whence.o: tests/seek_whence.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.o -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/seek_whence.c' object='seek_whence.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.o -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/seek_whence.c' object='seek_whence.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.o `test -f 'tests/seek_whence.c' || echo '$(srcdir)/'`tests/seek_whence.c seek_whence.obj: tests/seek_whence.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.obj -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/seek_whence.c' object='seek_whence.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seek_whence.obj -MD -MP -MF $(DEPDIR)/seek_whence.Tpo -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/seek_whence.Tpo $(DEPDIR)/seek_whence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/seek_whence.c' object='seek_whence.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seek_whence.obj `if test -f 'tests/seek_whence.c'; then $(CYGPATH_W) 'tests/seek_whence.c'; else $(CYGPATH_W) '$(srcdir)/tests/seek_whence.c'; fi` text.o: tests/text.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.o -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/text.c' object='text.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.o -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/text.c' object='text.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.o `test -f 'tests/text.c' || echo '$(srcdir)/'`tests/text.c text.obj: tests/text.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.obj -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tests/text.c' object='text.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT text.obj -MD -MP -MF $(DEPDIR)/text.Tpo -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/text.Tpo $(DEPDIR)/text.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/text.c' object='text.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o text.obj `if test -f 'tests/text.c'; then $(CYGPATH_W) 'tests/text.c'; else $(CYGPATH_W) '$(srcdir)/tests/text.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -680,22 +805,25 @@ clean-libtool: -rm -rf tests/.libs tests/_libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -710,57 +838,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -776,12 +859,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -793,15 +871,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -810,6 +884,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -846,13 +935,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -890,10 +976,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -977,99 +1068,105 @@ ps-am: uninstall-am: uninstall-binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # That is not nice... but it is how I manage to get the dependency on output/alsa.o without error about .deps/output/alsa.Tpo . # Did I mention that recursive make sucks? +# Actually ... does that really make really here? Not been updated +# for some time before. I need to revisit our build system. # `%'-style pattern rules are a GNU make extension -#find output/ -name '*.c' | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; +#find output/ -name '*.c' | sort | perl -ne 'chomp; $mod=$_; $mod=~s/\.c$/.\$(OBJEXT)/; #print "$mod: $_ audio.h module.h\n"; #print "\tcd output && \$(MAKE)\n\n";' -output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h - cd output && $(MAKE) - -output/win32.$(OBJEXT): output/win32.c audio.h module.h - cd output && $(MAKE) - -output/alsa05.$(OBJEXT): output/alsa05.c audio.h module.h - cd output && $(MAKE) - -output/sdl.$(OBJEXT): output/sdl.c audio.h module.h - cd output && $(MAKE) - -output/dummy.$(OBJEXT): output/dummy.c audio.h module.h +output/aix.$(OBJEXT): output/aix.c audio.h module.h cd output && $(MAKE) output/alib.$(OBJEXT): output/alib.c audio.h module.h cd output && $(MAKE) -output/libao.$(OBJEXT): output/libao.c audio.h module.h - cd output && $(MAKE) - -output/sun.$(OBJEXT): output/sun.c audio.h module.h - cd output && $(MAKE) - -output/aix.$(OBJEXT): output/aix.c audio.h module.h - cd output && $(MAKE) - -output/oss.$(OBJEXT): output/oss.c audio.h module.h - cd output && $(MAKE) - -output/mint.$(OBJEXT): output/mint.c audio.h module.h - cd output && $(MAKE) - -output/pulse.$(OBJEXT): output/pulse.c audio.h module.h - cd output && $(MAKE) - -output/jack.$(OBJEXT): output/jack.c audio.h module.h - cd output && $(MAKE) - -output/os2.$(OBJEXT): output/os2.c audio.h module.h - cd output && $(MAKE) - -output/nas.$(OBJEXT): output/nas.c audio.h module.h - cd output && $(MAKE) - -output/sgi.$(OBJEXT): output/sgi.c audio.h module.h - cd output && $(MAKE) - -output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h +output/alsa.$(OBJEXT): output/alsa.c audio.h module.h cd output && $(MAKE) output/arts.$(OBJEXT): output/arts.c audio.h module.h cd output && $(MAKE) -output/esd.$(OBJEXT): output/esd.c audio.h module.h +output/coreaudio.$(OBJEXT): output/coreaudio.c audio.h module.h cd output && $(MAKE) -output/alsa.$(OBJEXT): output/alsa.c audio.h module.h +output/dummy.$(OBJEXT): output/dummy.c audio.h module.h + cd output && $(MAKE) + +output/esd.$(OBJEXT): output/esd.c audio.h module.h cd output && $(MAKE) output/hp.$(OBJEXT): output/hp.c audio.h module.h cd output && $(MAKE) +output/jack.$(OBJEXT): output/jack.c audio.h module.h + cd output && $(MAKE) + +output/mint.$(OBJEXT): output/mint.c audio.h module.h + cd output && $(MAKE) + +output/nas.$(OBJEXT): output/nas.c audio.h module.h + cd output && $(MAKE) + +output/openal.$(OBJEXT): output/openal.c audio.h module.h + cd output && $(MAKE) + +output/os2.$(OBJEXT): output/os2.c audio.h module.h + cd output && $(MAKE) + +output/oss.$(OBJEXT): output/oss.c audio.h module.h + cd output && $(MAKE) + +output/portaudio.$(OBJEXT): output/portaudio.c audio.h module.h + cd output && $(MAKE) + +output/pulse.$(OBJEXT): output/pulse.c audio.h module.h + cd output && $(MAKE) + +output/qsa.$(OBJEXT): output/qsa.c audio.h module.h + cd output && $(MAKE) + +output/sdl.$(OBJEXT): output/sdl.c audio.h module.h + cd output && $(MAKE) + +output/sgi.$(OBJEXT): output/sgi.c audio.h module.h + cd output && $(MAKE) + output/sndio.$(OBJEXT): output/sndio.c audio.h module.h cd output && $(MAKE) +output/sun.$(OBJEXT): output/sun.c audio.h module.h + cd output && $(MAKE) + +output/tinyalsa.$(OBJEXT): output/tinyalsa.c audio.h module.h + cd output && $(MAKE) + +output/win32.$(OBJEXT): output/win32.c audio.h module.h + cd output && $(MAKE) + +output/win32_wasapi.$(OBJEXT): output/win32_wasapi.c audio.h module.h + cd output && $(MAKE) + # Would have to mention _all_ source files... Dammit, that's what the libmpg123/Makefile.am does! # But again, the a make $something here needs that stupid rule... WHY??? libmpg123/libmpg123.la: config.h libmpg123/mpg123.h diff --git a/jni/mpg123-1.13.4/src/audio.c b/jni/mpg123-1.17.0/src/audio.c similarity index 98% rename from jni/mpg123-1.13.4/src/audio.c rename to jni/mpg123-1.17.0/src/audio.c index 896b50a0..9a3369e6 100644 --- a/jni/mpg123-1.13.4/src/audio.c +++ b/jni/mpg123-1.17.0/src/audio.c @@ -43,16 +43,16 @@ static int builtin_close(struct audio_output_struct *ao) switch(param.outmode) { case DECODE_WAV: - wav_close(); + return wav_close(); break; case DECODE_AU: - au_close(); + return au_close(); break; case DECODE_CDR: - cdr_close(); + return cdr_close(); break; } - return 0; + return -1; } static int builtin_nothingint(struct audio_output_struct *ao){ return 0; } static void builtin_nothing(struct audio_output_struct *ao){} @@ -474,6 +474,7 @@ int init_output(audio_output_t **ao) /* No +1024 for NtoM rounding problems anymore! */ xfermem_init (&buffermem, bufferbytes ,0,0); sigemptyset (&newsigset); + /* ThOr: I'm not quite sure why we need to block that signal here. */ sigaddset (&newsigset, SIGUSR1); sigprocmask (SIG_BLOCK, &newsigset, &oldsigset); #if !defined(WIN32) && !defined(GENERIC) @@ -513,6 +514,8 @@ int init_output(audio_output_t **ao) default: /* parent */ xfermem_init_writer (buffermem); } + /* ThOr: I want that USR1 signal back for control. */ + sigprocmask(SIG_UNBLOCK, &newsigset, NULL); } #else if(param.usebuffer) diff --git a/jni/mpg123-1.13.4/src/audio.h b/jni/mpg123-1.17.0/src/audio.h similarity index 100% rename from jni/mpg123-1.13.4/src/audio.h rename to jni/mpg123-1.17.0/src/audio.h diff --git a/jni/mpg123-1.13.4/src/buffer.c b/jni/mpg123-1.17.0/src/buffer.c similarity index 100% rename from jni/mpg123-1.13.4/src/buffer.c rename to jni/mpg123-1.17.0/src/buffer.c diff --git a/jni/mpg123-1.13.4/src/buffer.h b/jni/mpg123-1.17.0/src/buffer.h similarity index 100% rename from jni/mpg123-1.13.4/src/buffer.h rename to jni/mpg123-1.17.0/src/buffer.h diff --git a/jni/mpg123-1.13.4/src/common.c b/jni/mpg123-1.17.0/src/common.c similarity index 86% rename from jni/mpg123-1.13.4/src/common.c rename to jni/mpg123-1.17.0/src/common.c index 98562025..320a9312 100644 --- a/jni/mpg123-1.13.4/src/common.c +++ b/jni/mpg123-1.17.0/src/common.c @@ -8,7 +8,6 @@ #include "mpg123app.h" #include -#include #include "common.h" #include "debug.h" @@ -196,9 +195,30 @@ unsigned int roundui(double val) return (unsigned int) ((val-base) < 0.5 ? base : base + 1 ); } +/* Split into mm:ss.xx or hh:mm:ss, depending on value. */ +static void settle_time(double tim, unsigned long *times, char *sep) +{ + if(tim >= 3600.) + { + *sep = ':'; + times[0] = (unsigned long) tim/3600; + tim -= times[0]*3600; + times[1] = (unsigned long) tim/60; + tim -= times[1]*60; + times[2] = (unsigned long) tim; + } + else + { + *sep = '.'; + times[0] = (unsigned long) tim/60; + times[1] = (unsigned long) tim%60; + times[2] = (unsigned long) (tim*100)%100; + } +} + void print_stat(mpg123_handle *fr, long offset, long buffsize) { - double tim1,tim2; + double tim[2]; off_t rno, no; double basevol, realvol; char *icy; @@ -219,13 +239,25 @@ void print_stat(mpg123_handle *fr, long offset, long buffsize) } #endif #endif - if( MPG123_OK == mpg123_position(fr, offset, buffsize, &no, &rno, &tim1, &tim2) + if( MPG123_OK == mpg123_position(fr, offset, buffsize, &no, &rno, tim, tim+1) && MPG123_OK == mpg123_getvolume(fr, &basevol, &realvol, NULL) ) { - fprintf(stderr, "\rFrame# %5"OFF_P" [%5"OFF_P"], Time: %02lu:%02u.%02u [%02u:%02u.%02u], RVA:%6s, Vol: %3u(%3u)", + int ti; + /* Deal with overly long times. */ + unsigned long times[2][3]; + char timesep[2]; + char sign[2] = {' ', ' '}; + for(ti=0; ti<2; ++ti) + { + if(tim[ti] < 0.){ sign[ti] = '-'; tim[ti] = -tim[ti]; } + settle_time(tim[ti], times[ti], ×ep[ti]); + } + fprintf(stderr, "\rFrame# %5"OFF_P" [%5"OFF_P"], Time:%c%02lu:%02lu%c%02lu%c[%02lu:%02lu%c%02lu], RVA:%6s, Vol: %3u(%3u)", (off_p)no, (off_p)rno, - (unsigned long) tim1/60, (unsigned int)tim1%60, (unsigned int)(tim1*100)%100, - (unsigned int)tim2/60, (unsigned int)tim2%60, (unsigned int)(tim2*100)%100, + sign[0], + times[0][0], times[0][1], timesep[0], times[0][2], + sign[1], + times[1][0], times[1][1], timesep[1], times[1][2], rva_name[param.rva], roundui(basevol*100), roundui(realvol*100) ); if(param.usebuffer) fprintf(stderr,", [%8ld] ",(long)buffsize); } diff --git a/jni/mpg123-1.13.4/src/common.h b/jni/mpg123-1.17.0/src/common.h similarity index 100% rename from jni/mpg123-1.13.4/src/common.h rename to jni/mpg123-1.17.0/src/common.h diff --git a/jni/mpg123-1.13.4/src/config.h b/jni/mpg123-1.17.0/src/config.h similarity index 87% rename from jni/mpg123-1.13.4/src/config.h rename to jni/mpg123-1.17.0/src/config.h index b3a6cfaa..395660da 100644 --- a/jni/mpg123-1.13.4/src/config.h +++ b/jni/mpg123-1.17.0/src/config.h @@ -2,8 +2,8 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ /* Define if your architecture wants/needs/can use attribute_align_arg and - alignment checks. It's for 32bit x86... */ -#define ABI_ALIGN_FUN 1 + alignment checks. It is for 32bit x86... */ +/* #undef ABI_ALIGN_FUN */ /* Define to use proper rounding. */ /* #undef ACCURATE_ROUNDING */ @@ -11,6 +11,12 @@ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ +/* Define if .balign is present. */ +#define ASMALIGN_BALIGN 1 + +/* Define if .align just takes byte count. */ +/* #undef ASMALIGN_BYTE */ + /* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */ /* #undef ASMALIGN_EXP */ @@ -21,13 +27,16 @@ /* #undef DEBUG */ /* The default audio output module(s) to use */ -#define DEFAULT_OUTPUT_MODULE "dummy" +#define DEFAULT_OUTPUT_MODULE "oss" /* Define if building with dynamcally linked libmpg123 */ #define DYNAMIC_BUILD 1 +/* Use EFBIG as substitude for EOVERFLOW, mingw.org may lack the latter */ +/* #undef EOVERFLOW */ + /* Define if FIFO support is enabled. */ -#define FIFO 1 +/* #undef FIFO */ /* Define if frame index should be used. */ #define FRAME_INDEX 1 @@ -78,13 +87,13 @@ #define HAVE_DLFCN_H 1 /* Define if getaddrinfo accepts the AI_ADDRCONFIG flag */ -#define HAVE_GAI_ADDRCONFIG 1 +/* #undef HAVE_GAI_ADDRCONFIG */ /* Define to 1 if you have the `getaddrinfo' function. */ #define HAVE_GETADDRINFO 1 /* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 +/* #undef HAVE_GETPAGESIZE */ /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 @@ -93,7 +102,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_LANGINFO_H 1 +/* #undef HAVE_LANGINFO_H */ /* Define to 1 if you have the `m' library (-lm). */ #define HAVE_LIBM 1 @@ -105,7 +114,7 @@ #define HAVE_LIMITS_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_SOUNDCARD_H */ +#define HAVE_LINUX_SOUNDCARD_H 1 /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 @@ -120,10 +129,10 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mkfifo' function. */ -#define HAVE_MKFIFO 1 +/* #undef HAVE_MKFIFO */ /* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* #undef HAVE_MMAP */ /* Define to 1 if you have the header file. */ #define HAVE_NETDB_H 1 @@ -135,7 +144,7 @@ /* #undef HAVE_NETINET_TCP_H */ /* Define to 1 if you have the `nl_langinfo' function. */ -#define HAVE_NL_LANGINFO 1 +/* #undef HAVE_NL_LANGINFO */ /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENAL_ALC_H */ @@ -150,7 +159,7 @@ /* #undef HAVE_OS2_H */ /* Define to 1 if you have the `random' function. */ -#define HAVE_RANDOM 1 +/* #undef HAVE_RANDOM */ /* Define to 1 if you have the header file. */ #define HAVE_SCHED_H 1 @@ -213,7 +222,7 @@ #define HAVE_SYS_RESOURCE_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_SYS_SIGNAL_H 1 +/* #undef HAVE_SYS_SIGNAL_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_SOCKET_H 1 @@ -246,7 +255,7 @@ /* #undef HAVE_WS2TCPIP_H */ /* Define to indicate that float storage follows IEEE754. */ -#define IEEE_FLOAT 1 +/* #undef IEEE_FLOAT */ /* size of the frame index seek table */ #define INDEX_SIZE 1000 @@ -254,8 +263,8 @@ /* Define if IPV6 support is enabled. */ #define IPV6 1 -/* Define this to the size of long type in bits, used for LFS small/native - alias functions. */ +/* Define this to the size of native offset type in bits, used for LFS alias + functions. */ #define LFS_ALIAS_BITS 32 /* Define to the sub-directory in which libtool stores uninstalled libraries. @@ -266,13 +275,13 @@ #define MODULE_FILE_SUFFIX ".la" /* Define if network support is enabled. */ -/* #undef NETWORK */ +#define NETWORK 1 /* Define to disable 16 bit integer output. */ /* #undef NO_16BIT */ /* Define to disable 32 bit and 24 bit integer output. */ -/* #undef NO_32BIT */ +#define NO_32BIT 1 /* Define to disable 8 bit integer output. */ /* #undef NO_8BIT */ @@ -285,7 +294,7 @@ /* #undef NO_ERETURN */ /* Define to disable error messages. */ -/* #undef NO_ERROR */ +/* #undef NO_ERRORMSG */ /* Define to disable feeder and buffered readers. */ /* #undef NO_FEEDER */ @@ -309,7 +318,7 @@ /* #undef NO_NTOM */ /* Define to disable real output. */ -/* #undef NO_REAL */ +#define NO_REAL 1 /* Define to disable string functions. */ /* #undef NO_STRING */ @@ -327,7 +336,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.13.4" +#define PACKAGE_STRING "mpg123 1.17.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -336,7 +345,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.13.4" +#define PACKAGE_VERSION "1.17.0" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -348,7 +357,7 @@ #define SIZEOF_LONG 4 /* The size of `off_t', as computed by sizeof. */ -#define SIZEOF_OFF_T 8 +#define SIZEOF_OFF_T 4 /* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 4 @@ -362,8 +371,17 @@ /* Define if modules are enabled */ /* #undef USE_MODULES */ +/* Define for new Huffman decoding scheme. */ +#define USE_NEW_HUFFTABLE 1 + +/* Define to use yasm for assemble AVX sources. */ +/* #undef USE_YASM_FOR_AVX */ + /* Version number of package */ -#define VERSION "1.13.4" +#define VERSION "1.17.0" + +/* Define to use Win32 named pipes */ +/* #undef WANT_WIN32_FIFO */ /* Define to use Win32 sockets */ /* #undef WANT_WIN32_SOCKETS */ @@ -371,6 +389,9 @@ /* Define to use Unicode for Windows */ /* #undef WANT_WIN32_UNICODE */ +/* WinXP and above for ipv6 */ +/* #undef WINVER */ + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD @@ -383,12 +404,20 @@ # endif #endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ -#define _FILE_OFFSET_BITS 64 +/* #undef _FILE_OFFSET_BITS */ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ +/* WinXP and above for ipv6 */ +/* #undef _WIN32_WINNT */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -404,6 +433,9 @@ /* Define to `int' if does not define. */ /* #undef int32_t */ +/* Define to the native offset type (long or actually off_t). */ +#define lfs_alias_t off_t + /* Define to `long int' if does not define. */ /* #undef off_t */ diff --git a/jni/mpg123-1.13.4/src/config.h.in b/jni/mpg123-1.17.0/src/config.h.in similarity index 92% rename from jni/mpg123-1.13.4/src/config.h.in rename to jni/mpg123-1.17.0/src/config.h.in index bb5bb4ba..60f55481 100644 --- a/jni/mpg123-1.13.4/src/config.h.in +++ b/jni/mpg123-1.17.0/src/config.h.in @@ -1,7 +1,7 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ /* Define if your architecture wants/needs/can use attribute_align_arg and - alignment checks. It's for 32bit x86... */ + alignment checks. It is for 32bit x86... */ #undef ABI_ALIGN_FUN /* Define to use proper rounding. */ @@ -10,6 +10,12 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if .balign is present. */ +#undef ASMALIGN_BALIGN + +/* Define if .align just takes byte count. */ +#undef ASMALIGN_BYTE + /* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */ #undef ASMALIGN_EXP @@ -25,6 +31,9 @@ /* Define if building with dynamcally linked libmpg123 */ #undef DYNAMIC_BUILD +/* Use EFBIG as substitude for EOVERFLOW, mingw.org may lack the latter */ +#undef EOVERFLOW + /* Define if FIFO support is enabled. */ #undef FIFO @@ -253,8 +262,8 @@ /* Define if IPV6 support is enabled. */ #undef IPV6 -/* Define this to the size of long type in bits, used for LFS small/native - alias functions. */ +/* Define this to the size of native offset type in bits, used for LFS alias + functions. */ #undef LFS_ALIAS_BITS /* Define to the sub-directory in which libtool stores uninstalled libraries. @@ -284,7 +293,7 @@ #undef NO_ERETURN /* Define to disable error messages. */ -#undef NO_ERROR +#undef NO_ERRORMSG /* Define to disable feeder and buffered readers. */ #undef NO_FEEDER @@ -361,15 +370,27 @@ /* Define if modules are enabled */ #undef USE_MODULES +/* Define for new Huffman decoding scheme. */ +#undef USE_NEW_HUFFTABLE + +/* Define to use yasm for assemble AVX sources. */ +#undef USE_YASM_FOR_AVX + /* Version number of package */ #undef VERSION +/* Define to use Win32 named pipes */ +#undef WANT_WIN32_FIFO + /* Define to use Win32 sockets */ #undef WANT_WIN32_SOCKETS /* Define to use Unicode for Windows */ #undef WANT_WIN32_UNICODE +/* WinXP and above for ipv6 */ +#undef WINVER + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD @@ -382,12 +403,20 @@ # endif #endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* WinXP and above for ipv6 */ +#undef _WIN32_WINNT + /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -403,6 +432,9 @@ /* Define to `int' if does not define. */ #undef int32_t +/* Define to the native offset type (long or actually off_t). */ +#undef lfs_alias_t + /* Define to `long int' if does not define. */ #undef off_t diff --git a/jni/mpg123-1.13.4/src/control_generic.c b/jni/mpg123-1.17.0/src/control_generic.c similarity index 86% rename from jni/mpg123-1.13.4/src/control_generic.c rename to jni/mpg123-1.17.0/src/control_generic.c index 7f171496..c08bed52 100644 --- a/jni/mpg123-1.13.4/src/control_generic.c +++ b/jni/mpg123-1.17.0/src/control_generic.c @@ -9,17 +9,18 @@ #include "mpg123app.h" #include +#include #if !defined (WIN32) || defined (__CYGWIN__) #include #include #endif -#include #include #include #include "common.h" #include "buffer.h" #include "genre.h" +#include "playlist.h" #define MODE_STOPPED 0 #define MODE_PLAYING 1 #define MODE_PAUSED 2 @@ -32,6 +33,9 @@ extern audio_output_t *ao; int control_file = STDIN_FILENO; #else #define control_file STDIN_FILENO +#ifdef WANT_WIN32_FIFO +#error Control interface does not work on win32 stdin +#endif /* WANT_WIN32_FIFO */ #endif FILE *outstream; static int mode = MODE_STOPPED; @@ -226,7 +230,10 @@ static void generic_load(mpg123_handle *fr, char *arg, int state) return; } mpg123_seek(fr, 0, SEEK_SET); /* This finds ID3v2 at beginning. */ - if(mpg123_meta_check(fr) & MPG123_NEW_ID3) generic_sendinfoid3(fr); + if(mpg123_meta_check(fr) & MPG123_NEW_ID3) + { + generic_sendinfoid3(fr); + } else generic_sendinfo(arg); if(htd.icy_name.fill) generic_sendmsg("I ICY-NAME: %s", htd.icy_name.p); @@ -237,6 +244,45 @@ static void generic_load(mpg123_handle *fr, char *arg, int state) generic_sendmsg(mode == MODE_PAUSED ? "P 1" : "P 2"); } +static void generic_loadlist(mpg123_handle *fr, char *arg) +{ + /* arguments are two: first the index to play, then the URL */ + long entry; + long i = 0; + char *file = NULL; + char *thefile = NULL; + + /* I feel retarted with string parsing outside Perl. */ + while(*arg && isspace(*arg)) ++arg; + entry = atol(arg); + while(*arg && !isspace(*arg)) ++arg; + while(*arg && isspace(*arg)) ++arg; + if(!*arg) + { + generic_sendmsg("E empty list name"); + return; + } + + /* Now got the plain playlist path in arg. On to evil manupulation of mpg123's playlist code. */ + param.listname = arg; + param.listentry = 0; /* The playlist shall not filter. */ + prepare_playlist(0, NULL); + while((file = get_next_file())) + { + ++i; + /* semantics: 0 brings you to the last track */ + if(entry == 0 || entry == i) thefile = file; + + generic_sendmsg("I LISTENTRY %li: %s", i, file); + } + if(!i) generic_sendmsg("I LIST EMPTY"); + + /* If we have something to play, play it. */ + if(thefile) generic_load(fr, thefile, MODE_PLAYING); + + free_playlist(); /* Free memory after it is not needed anymore. */ +} + int control_generic (mpg123_handle *fr) { struct timeval tv; @@ -256,13 +302,15 @@ int control_generic (mpg123_handle *fr) #ifndef WIN32 setlinebuf(outstream); #else /* perhaps just use setvbuf as it's C89 */ + /* fprintf(outstream, "You are on Win32 and want to use the control interface... tough luck: We need a replacement for select on STDIN first.\n"); return 0; setvbuf(outstream, (char*)NULL, _IOLBF, 0); + */ #endif /* the command behaviour is different, so is the ID */ /* now also with version for command availability */ - fprintf(outstream, "@R MPG123 (ThOr) v6\n"); + fprintf(outstream, "@R MPG123 (ThOr) v8\n"); #ifdef FIFO if(param.fifo) { @@ -271,6 +319,7 @@ int control_generic (mpg123_handle *fr) error("You wanted an empty FIFO name??"); return 1; } +#ifndef WANT_WIN32_FIFO unlink(param.fifo); if(mkfifo(param.fifo, 0666) == -1) { @@ -278,7 +327,12 @@ int control_generic (mpg123_handle *fr) return 1; } debug("going to open named pipe ... blocking until someone gives command"); +#endif /* WANT_WIN32_FIFO */ +#ifdef WANT_WIN32_FIFO + control_file = win32_fifo_mkfifo(param.fifo); +#else control_file = open(param.fifo,O_RDONLY); +#endif /* WANT_WIN32_FIFO */ debug("opened"); } #endif @@ -291,7 +345,11 @@ int control_generic (mpg123_handle *fr) FD_SET(control_file, &fds); /* play frame if no command needs to be processed */ if (mode == MODE_PLAYING) { +#ifdef WANT_WIN32_FIFO + n = win32_fifo_read_peek(&tv); +#else n = select(32, &fds, NULL, NULL, &tv); +#endif if (n == 0) { if (!play_frame()) { @@ -331,7 +389,11 @@ int control_generic (mpg123_handle *fr) else { /* wait for command */ while (1) { +#ifdef WANT_WIN32_FIFO + n = win32_fifo_read_peek(NULL); +#else n = select(32, &fds, NULL, NULL, NULL); +#endif if (n > 0) break; } @@ -355,14 +417,23 @@ int control_generic (mpg123_handle *fr) /* read as much as possible, maybe multiple commands */ /* When there is nothing to read (EOF) or even an error, it is the end */ - if((len = read(control_file, buf, REMOTE_BUFFER_SIZE)) < 1) +#ifdef WANT_WIN32_FIFO + len = win32_fifo_read(buf,REMOTE_BUFFER_SIZE); +#else + len = read(control_file, buf, REMOTE_BUFFER_SIZE); +#endif + if(len < 1) { #ifdef FIFO if(len == 0 && param.fifo) { debug("fifo ended... reopening"); +#ifdef WANT_WIN32_FIFO + win32_fifo_mkfifo(param.fifo); +#else close(control_file); control_file = open(param.fifo,O_RDONLY|O_NONBLOCK); +#endif if(control_file < 0){ error1("open of fifo failed... %s", strerror(errno)); break; } continue; } @@ -460,6 +531,17 @@ int control_generic (mpg123_handle *fr) continue; } + if(!strcasecmp(comstr, "FORMAT")) + { + long rate; + int ch; + int ret = mpg123_getformat(fr, &rate, &ch, NULL); + /* I need to have portable printf specifiers that do not truncate the type... more autoconf... */ + if(ret < 0) generic_sendmsg("E %s", mpg123_strerror(fr)); + else generic_sendmsg("FORMAT %li %i", rate, ch); + continue; + } + if(!strcasecmp(comstr, "SHOWEQ")) { int i; @@ -496,22 +578,24 @@ int control_generic (mpg123_handle *fr) generic_sendmsg("H HELP/H: command listing (LONG/SHORT forms), command case insensitve"); generic_sendmsg("H LOAD/L : load and start playing resource "); generic_sendmsg("H LOADPAUSED/LP : load but do not start playing resource "); + generic_sendmsg("H LOADLIST : load a playlist from given , and display its entries, optionally load and play one of these specificed by the integer (<0: just list, 0: play last track, >0:play track with that position in list)"); generic_sendmsg("H PAUSE/P: pause playback"); generic_sendmsg("H STOP/S: stop playback (closes file)"); generic_sendmsg("H JUMP/J |<+offset>|<-offset>|<[+|-]seconds>s: jump to mpeg frame or change position by offset, same in seconds if number followed by \"s\""); generic_sendmsg("H VOLUME/V : set volume in % (0..100...); float value"); generic_sendmsg("H RVA off|(mix|radio)|(album|audiophile): set rva mode"); generic_sendmsg("H EQ/E : set equalizer value for frequency band 0 to 31 on channel %i (left) or %i (right) or %i (both)", MPG123_LEFT, MPG123_RIGHT, MPG123_LR); - generic_sendmsg("H EQFILE : load EQ settings from a file"); + generic_sendmsg("H EQFILE : load EQ settings from a file"); generic_sendmsg("H SHOWEQ: show all equalizer settings (as lines in a SHOWEQ block (like TAG))"); generic_sendmsg("H SEEK/K |<+offset>|<-offset>: jump to output sample position or change position by offset"); generic_sendmsg("H SCAN: scan through the file, building seek index"); generic_sendmsg("H SAMPLE: print out the sample position and total number of samples"); + generic_sendmsg("H FORMAT: print out sampling rate in Hz and channel count"); generic_sendmsg("H SEQ : simple eq setting..."); generic_sendmsg("H PITCH <[+|-]value>: adjust playback speed (+0.01 is 1 %% faster)"); generic_sendmsg("H SILENCE: be silent during playback (meaning silence in text form)"); - generic_sendmsg("H STATE: Print auxilliary state info in several lines (just try it to see what info is there)."); - generic_sendmsg("H TAG/T: Print all available (ID3) tag info, for ID3v2 that gives output of all collected text fields, using the ID3v2.3/4 4-character names."); + generic_sendmsg("H STATE: Print auxiliary state info in several lines (just try it to see what info is there)."); + generic_sendmsg("H TAG/T: Print all available (ID3) tag info, for ID3v2 that gives output of all collected text fields, using the ID3v2.3/4 4-character names. NOTE: ID3v2 data will be deleted on non-forward seeks."); generic_sendmsg("H The output is multiple lines, begin marked by \"@T {\", end by \"@T }\"."); generic_sendmsg("H ID3v1 data is like in the @I info lines (see below), just with \"@T\" in front."); generic_sendmsg("H An ID3v2 data field is introduced via ([ ... ] means optional):"); @@ -592,6 +676,8 @@ int control_generic (mpg123_handle *fr) if(!strcasecmp(cmd, "K") || !strcasecmp(cmd, "SEEK")) { off_t soff; + off_t oldpos; + off_t newpos; char *spos = arg; int whence = SEEK_SET; if(mode == MODE_STOPPED) @@ -599,6 +685,7 @@ int control_generic (mpg123_handle *fr) generic_sendmsg("E No track loaded!"); continue; } + oldpos = mpg123_tell(fr); soff = (off_t) atobigint(spos); if(spos[0] == '-' || spos[0] == '+') whence = SEEK_CUR; @@ -609,13 +696,17 @@ int control_generic (mpg123_handle *fr) } if(param.usebuffer) buffer_resync(); - generic_sendmsg("K %li", (long)mpg123_tell(fr)); + newpos = mpg123_tell(fr); + if(newpos <= oldpos) mpg123_meta_free(fr); + + generic_sendmsg("K %"OFF_P, (off_p)newpos); continue; } /* JUMP */ if (!strcasecmp(cmd, "J") || !strcasecmp(cmd, "JUMP")) { char *spos; off_t offset; + off_t oldpos; double secs; spos = arg; @@ -624,6 +715,7 @@ int control_generic (mpg123_handle *fr) generic_sendmsg("E No track loaded!"); continue; } + oldpos = framenum; if(spos[strlen(spos)-1] == 's' && sscanf(arg, "%lf", &secs) == 1) offset = mpg123_timeframe(fr, secs); else offset = atol(spos); @@ -638,6 +730,7 @@ int control_generic (mpg123_handle *fr) } if(param.usebuffer) buffer_resync(); + if(framenum <= oldpos) mpg123_meta_free(fr); generic_sendmsg("J %d", framenum); continue; } @@ -679,6 +772,8 @@ int control_generic (mpg123_handle *fr) /* LOAD - actually play */ if (!strcasecmp(cmd, "L") || !strcasecmp(cmd, "LOAD")){ generic_load(fr, arg, MODE_PLAYING); continue; } + if (!strcasecmp(cmd, "L") || !strcasecmp(cmd, "LOADLIST")){ generic_loadlist(fr, arg); continue; } + /* LOADPAUSED */ if (!strcasecmp(cmd, "LP") || !strcasecmp(cmd, "LOADPAUSED")){ generic_load(fr, arg, MODE_PAUSED); continue; } @@ -719,8 +814,12 @@ int control_generic (mpg123_handle *fr) #endif debug("closing control"); #ifdef FIFO +#if WANT_WIN32_FIFO + win32_fifo_close(); +#else close(control_file); /* be it FIFO or STDIN */ if(param.fifo) unlink(param.fifo); +#endif /* WANT_WIN32_FIFO */ #endif debug("control_generic returning"); return 0; diff --git a/jni/mpg123-1.13.4/src/equalizer.c b/jni/mpg123-1.17.0/src/equalizer.c similarity index 100% rename from jni/mpg123-1.13.4/src/equalizer.c rename to jni/mpg123-1.17.0/src/equalizer.c diff --git a/jni/mpg123-1.13.4/src/genre.c b/jni/mpg123-1.17.0/src/genre.c similarity index 99% rename from jni/mpg123-1.13.4/src/genre.c rename to jni/mpg123-1.17.0/src/genre.c index 3b085591..f820d389 100644 --- a/jni/mpg123-1.13.4/src/genre.c +++ b/jni/mpg123-1.17.0/src/genre.c @@ -75,7 +75,7 @@ char *genre_table[] = "Native American", "Cabaret", "New Wave", - "Psychadelic", + "Psychedelic", "Rave", "Showtunes", "Trailer", diff --git a/jni/mpg123-1.13.4/src/genre.h b/jni/mpg123-1.17.0/src/genre.h similarity index 100% rename from jni/mpg123-1.13.4/src/genre.h rename to jni/mpg123-1.17.0/src/genre.h diff --git a/jni/mpg123-1.13.4/src/getlopt.c b/jni/mpg123-1.17.0/src/getlopt.c similarity index 100% rename from jni/mpg123-1.13.4/src/getlopt.c rename to jni/mpg123-1.17.0/src/getlopt.c diff --git a/jni/mpg123-1.13.4/src/getlopt.h b/jni/mpg123-1.17.0/src/getlopt.h similarity index 100% rename from jni/mpg123-1.13.4/src/getlopt.h rename to jni/mpg123-1.17.0/src/getlopt.h diff --git a/jni/mpg123-1.13.4/src/httpget.c b/jni/mpg123-1.17.0/src/httpget.c similarity index 98% rename from jni/mpg123-1.13.4/src/httpget.c rename to jni/mpg123-1.17.0/src/httpget.c index 12cddba6..d813d73c 100644 --- a/jni/mpg123-1.13.4/src/httpget.c +++ b/jni/mpg123-1.17.0/src/httpget.c @@ -1,7 +1,7 @@ /* httpget.c: http communication - copyright ?-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright ?-2011 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written Oliver Fromme old timestamp: Wed Apr 9 20:57:47 MET DST 1997 @@ -75,10 +75,12 @@ static const char* mime_file[] = "audio/mp3", "audio/x-mp3", "audio/mpeg3", "audio/x-mpeg3", "audio/mpg", "audio/x-mpg", - "audio/x-mpegaudio", NULL + "audio/x-mpegaudio", + "application/octet-stream", /* Assume raw binary data is some MPEG data. */ + NULL }; static const char* mime_m3u[] = { "audio/mpegurl", "audio/mpeg-url", "audio/x-mpegurl", NULL }; -static const char* mime_pls[] = { "audio/x-scpls", "audio/scpls", "application/pls", NULL }; +static const char* mime_pls[] = { "audio/x-scpls", "audio/scpls", "application/pls", "application/x-scpls", NULL }; static const char** mimes[] = { mime_file, mime_m3u, mime_pls, NULL }; int debunk_mime(const char* mime) @@ -545,6 +547,7 @@ int http_open(char* url, struct httpdata *hd) if(strncasecmp(purl.p, "http://", 7) != 0) mpg123_set_string(&request_url, "http://"); else mpg123_set_string(&request_url, ""); + mpg123_chomp_string(&purl); mpg123_add_string(&request_url, purl.p); if (hd->proxystate >= PROXY_HOST) diff --git a/jni/mpg123-1.13.4/src/httpget.h b/jni/mpg123-1.17.0/src/httpget.h similarity index 100% rename from jni/mpg123-1.13.4/src/httpget.h rename to jni/mpg123-1.17.0/src/httpget.h diff --git a/jni/mpg123-1.13.4/src/legacy_module.c b/jni/mpg123-1.17.0/src/legacy_module.c similarity index 100% rename from jni/mpg123-1.13.4/src/legacy_module.c rename to jni/mpg123-1.17.0/src/legacy_module.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/compat.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/compat.Plo new file mode 100644 index 00000000..785af11a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/compat.Plo @@ -0,0 +1,187 @@ +compat.lo: compat.c ../../src/config.h compat.h intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + debug.h + +../../src/config.h: + +compat.h: + +intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnow.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnow.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnow.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnowext.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnowext.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_3dnowext.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_avx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_avx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_avx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_sse.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_sse.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_sse.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_x86_64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_x86_64.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct36_x86_64.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64.Plo new file mode 100644 index 00000000..7c835b12 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64.Plo @@ -0,0 +1,195 @@ +dct64.lo: dct64.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnow.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnow.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnow.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnowext.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnowext.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_3dnowext.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_altivec.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_altivec.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_altivec.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_avx_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i386.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i386.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i386.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i486.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i486.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_i486.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_mmx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_mmx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_mmx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_neon_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_sse_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dct64_x86_64_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/dither.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/dither.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/dither.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer.Plo new file mode 100644 index 00000000..62e5e5d0 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer.Plo @@ -0,0 +1,195 @@ +equalizer.lo: equalizer.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer_3dnow.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer_3dnow.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/equalizer_3dnow.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/feature.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/feature.Plo new file mode 100644 index 00000000..6b0ef718 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/feature.Plo @@ -0,0 +1,195 @@ +feature.lo: feature.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/format.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/format.Plo new file mode 100644 index 00000000..7a730cb2 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/format.Plo @@ -0,0 +1,197 @@ +format.lo: format.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/frame.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/frame.Plo new file mode 100644 index 00000000..1d042d3a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/frame.Plo @@ -0,0 +1,199 @@ +frame.lo: frame.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h getcpuflags.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +getcpuflags.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags_x86_64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags_x86_64.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/getcpuflags_x86_64.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/icy.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/icy.Plo new file mode 100644 index 00000000..5b845f2b --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/icy.Plo @@ -0,0 +1,173 @@ +icy.lo: icy.c icy.h compat.h ../../src/config.h intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h + +icy.h: + +compat.h: + +../../src/config.h: + +intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/icy2utf8.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/icy2utf8.Plo new file mode 100644 index 00000000..0258d38f --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/icy2utf8.Plo @@ -0,0 +1,169 @@ +icy2utf8.lo: icy2utf8.c compat.h ../../src/config.h intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h + +compat.h: + +../../src/config.h: + +intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/id3.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/id3.Plo new file mode 100644 index 00000000..70f75d9c --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/id3.Plo @@ -0,0 +1,197 @@ +id3.lo: id3.c mpg123lib_intern.h ../../src/config.h intsym.h abi_align.h \ + compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/index.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/index.Plo new file mode 100644 index 00000000..315b80f8 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/index.Plo @@ -0,0 +1,173 @@ +index.lo: index.c index.h ../../src/config.h compat.h intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h debug.h + +index.h: + +../../src/config.h: + +compat.h: + +intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/layer1.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer1.Plo new file mode 100644 index 00000000..2f8fdc63 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer1.Plo @@ -0,0 +1,197 @@ +layer1.lo: layer1.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h getbits.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +getbits.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/layer2.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer2.Plo new file mode 100644 index 00000000..2973f0a0 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer2.Plo @@ -0,0 +1,201 @@ +layer2.lo: layer2.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h l2tables.h getbits.h l12_integer_tables.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +l2tables.h: + +getbits.h: + +l12_integer_tables.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/layer3.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer3.Plo new file mode 100644 index 00000000..6b5e7130 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/layer3.Plo @@ -0,0 +1,203 @@ +layer3.lo: layer3.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h newhuffman.h getbits.h debug.h l3_integer_tables.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +newhuffman.h: + +getbits.h: + +debug.h: + +l3_integer_tables.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_alias.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_alias.Plo new file mode 100644 index 00000000..27a098c4 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_alias.Plo @@ -0,0 +1,171 @@ +lfs_alias.lo: lfs_alias.c ../../src/config.h compat.h intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h abi_align.h + +../../src/config.h: + +compat.h: + +intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +abi_align.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_wrap.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_wrap.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/lfs_wrap.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/libmpg123.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/libmpg123.Plo new file mode 100644 index 00000000..c8a9e97a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/libmpg123.Plo @@ -0,0 +1,201 @@ +libmpg123.lo: libmpg123.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h icy2utf8.h debug.h gapless.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +icy2utf8.h: + +debug.h: + +gapless.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/ntom.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/ntom.Plo new file mode 100644 index 00000000..bb039753 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/ntom.Plo @@ -0,0 +1,197 @@ +ntom.lo: ntom.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/optimize.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/optimize.Plo new file mode 100644 index 00000000..0c33e229 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/optimize.Plo @@ -0,0 +1,197 @@ +optimize.lo: optimize.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/parse.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/parse.Plo new file mode 100644 index 00000000..00d24b1e --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/parse.Plo @@ -0,0 +1,217 @@ +parse.lo: parse.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + getbits.h mpeghead.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +getbits.h: + +mpeghead.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/readers.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/readers.Plo new file mode 100644 index 00000000..c3703886 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/readers.Plo @@ -0,0 +1,228 @@ +readers.lo: readers.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h \ + debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/errno-base.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/stringbuf.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/stringbuf.Plo new file mode 100644 index 00000000..39af761d --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/stringbuf.Plo @@ -0,0 +1,197 @@ +stringbuf.lo: stringbuf.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth.Plo new file mode 100644 index 00000000..3db107ed --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth.Plo @@ -0,0 +1,205 @@ +synth.lo: synth.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h sample.h debug.h synth.h synth_mono.h synth_ntom.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +sample.h: + +debug.h: + +synth.h: + +synth_mono.h: + +synth_ntom.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnow.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnow.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnow.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnowext.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnowext.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_3dnowext.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_8bit.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_8bit.Plo new file mode 100644 index 00000000..f557eda9 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_8bit.Plo @@ -0,0 +1,208 @@ +synth_8bit.lo: synth_8bit.c mpg123lib_intern.h ../../src/config.h \ + intsym.h abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h sample.h debug.h synth.h synth_mono.h synth_8bit.h \ + synth_ntom.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +sample.h: + +debug.h: + +synth.h: + +synth_mono.h: + +synth_8bit.h: + +synth_ntom.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_altivec.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_altivec.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_altivec.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm.Plo new file mode 100644 index 00000000..95498fc3 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm.Plo @@ -0,0 +1,7 @@ +synth_arm.lo: synth_arm.S mangle.h ../../src/config.h intsym.h + +mangle.h: + +../../src/config.h: + +intsym.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_arm_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i486.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i486.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i486.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586_dither.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586_dither.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_i586_dither.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_mmx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_mmx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_mmx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_neon_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_real.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_real.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_real.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_sse_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_avx_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_neon_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_sse_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_stereo_x86_64_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_accurate.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_accurate.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_accurate.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_float.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_float.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_float.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_s32.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_s32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/synth_x86_64_s32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit.Plo new file mode 100644 index 00000000..3dfe2ee0 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit.Plo @@ -0,0 +1,197 @@ +tabinit.lo: tabinit.c mpg123lib_intern.h ../../src/config.h intsym.h \ + abi_align.h compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + true.h mpg123.h optimize.h decode.h parse.h frame.h id3.h icy.h reader.h \ + index.h synths.h debug.h + +mpg123lib_intern.h: + +../../src/config.h: + +intsym.h: + +abi_align.h: + +compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +true.h: + +mpg123.h: + +optimize.h: + +decode.h: + +parse.h: + +frame.h: + +id3.h: + +icy.h: + +reader.h: + +index.h: + +synths.h: + +debug.h: diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit_mmx.Plo b/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit_mmx.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/tabinit_mmx.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.deps/testcpu.Po b/jni/mpg123-1.17.0/src/libmpg123/.deps/testcpu.Po new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.deps/testcpu.Po @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.exp b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.exp new file mode 100644 index 00000000..be8575ea --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.exp @@ -0,0 +1,111 @@ +mpg123_add_string +mpg123_add_substring +mpg123_chomp_string +mpg123_clip +mpg123_close +mpg123_copy_string +mpg123_current_decoder +mpg123_decode +mpg123_decode_frame +mpg123_decode_frame_32 +mpg123_decoder +mpg123_decoders +mpg123_delete +mpg123_delete_pars +mpg123_enc_from_id3 +mpg123_encodings +mpg123_encsize +mpg123_eq +mpg123_errcode +mpg123_exit +mpg123_feature +mpg123_feed +mpg123_feedseek +mpg123_feedseek_32 +mpg123_fmt +mpg123_fmt_all +mpg123_fmt_none +mpg123_fmt_support +mpg123_format +mpg123_format_all +mpg123_format_none +mpg123_format_support +mpg123_framebyframe_decode +mpg123_framebyframe_decode_32 +mpg123_framebyframe_next +mpg123_framedata +mpg123_framepos +mpg123_framepos_32 +mpg123_free_string +mpg123_geteq +mpg123_getformat +mpg123_getpar +mpg123_getparam +mpg123_getstate +mpg123_getvolume +mpg123_grow_string +mpg123_icy +mpg123_icy2utf8 +mpg123_id3 +mpg123_index +mpg123_index_32 +mpg123_info +mpg123_init +mpg123_init_string +mpg123_length +mpg123_length_32 +mpg123_meta_check +mpg123_meta_free +mpg123_new +mpg123_new_pars +mpg123_open +mpg123_open_32 +mpg123_open_fd +mpg123_open_fd_32 +mpg123_open_feed +mpg123_open_handle +mpg123_open_handle_32 +mpg123_outblock +mpg123_par +mpg123_param +mpg123_parnew +mpg123_plain_strerror +mpg123_position +mpg123_position_32 +mpg123_rates +mpg123_read +mpg123_replace_buffer +mpg123_replace_reader +mpg123_replace_reader_32 +mpg123_replace_reader_handle +mpg123_replace_reader_handle_32 +mpg123_reset_eq +mpg123_resize_string +mpg123_safe_buffer +mpg123_scan +mpg123_seek +mpg123_seek_32 +mpg123_seek_frame +mpg123_seek_frame_32 +mpg123_set_filesize +mpg123_set_filesize_32 +mpg123_set_index +mpg123_set_index_32 +mpg123_set_string +mpg123_set_substring +mpg123_spf +mpg123_store_utf8 +mpg123_strerror +mpg123_strlen +mpg123_supported_decoders +mpg123_tell +mpg123_tell_32 +mpg123_tell_stream +mpg123_tell_stream_32 +mpg123_tellframe +mpg123_tellframe_32 +mpg123_timeframe +mpg123_timeframe_32 +mpg123_tpf +mpg123_volume +mpg123_volume_change diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.la b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.la new file mode 120000 index 00000000..217c2c52 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.la @@ -0,0 +1 @@ +../libmpg123.la \ No newline at end of file diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.lai b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.lai new file mode 100644 index 00000000..1a4f9d3a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.lai @@ -0,0 +1,41 @@ +# libmpg123.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libmpg123.so.0' + +# Names of this library. +library_names='libmpg123.so.0.38.4 libmpg123.so.0 libmpg123.so' + +# The name of the static archive. +old_library='' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -lm' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for libmpg123. +current=38 +age=38 +revision=4 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/local/lib' diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0 b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0 new file mode 120000 index 00000000..56c92251 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0 @@ -0,0 +1 @@ +libmpg123.so.0.38.4 \ No newline at end of file diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0.38.4 b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0.38.4 new file mode 100755 index 00000000..3d23776c Binary files /dev/null and b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.so.0.38.4 differ diff --git a/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.ver b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.ver new file mode 100644 index 00000000..62d7b00c --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/.libs/libmpg123.ver @@ -0,0 +1,113 @@ +{ global: +mpg123_add_string; +mpg123_add_substring; +mpg123_chomp_string; +mpg123_clip; +mpg123_close; +mpg123_copy_string; +mpg123_current_decoder; +mpg123_decode; +mpg123_decode_frame; +mpg123_decode_frame_32; +mpg123_decoder; +mpg123_decoders; +mpg123_delete; +mpg123_delete_pars; +mpg123_enc_from_id3; +mpg123_encodings; +mpg123_encsize; +mpg123_eq; +mpg123_errcode; +mpg123_exit; +mpg123_feature; +mpg123_feed; +mpg123_feedseek; +mpg123_feedseek_32; +mpg123_fmt; +mpg123_fmt_all; +mpg123_fmt_none; +mpg123_fmt_support; +mpg123_format; +mpg123_format_all; +mpg123_format_none; +mpg123_format_support; +mpg123_framebyframe_decode; +mpg123_framebyframe_decode_32; +mpg123_framebyframe_next; +mpg123_framedata; +mpg123_framepos; +mpg123_framepos_32; +mpg123_free_string; +mpg123_geteq; +mpg123_getformat; +mpg123_getpar; +mpg123_getparam; +mpg123_getstate; +mpg123_getvolume; +mpg123_grow_string; +mpg123_icy; +mpg123_icy2utf8; +mpg123_id3; +mpg123_index; +mpg123_index_32; +mpg123_info; +mpg123_init; +mpg123_init_string; +mpg123_length; +mpg123_length_32; +mpg123_meta_check; +mpg123_meta_free; +mpg123_new; +mpg123_new_pars; +mpg123_open; +mpg123_open_32; +mpg123_open_fd; +mpg123_open_fd_32; +mpg123_open_feed; +mpg123_open_handle; +mpg123_open_handle_32; +mpg123_outblock; +mpg123_par; +mpg123_param; +mpg123_parnew; +mpg123_plain_strerror; +mpg123_position; +mpg123_position_32; +mpg123_rates; +mpg123_read; +mpg123_replace_buffer; +mpg123_replace_reader; +mpg123_replace_reader_32; +mpg123_replace_reader_handle; +mpg123_replace_reader_handle_32; +mpg123_reset_eq; +mpg123_resize_string; +mpg123_safe_buffer; +mpg123_scan; +mpg123_seek; +mpg123_seek_32; +mpg123_seek_frame; +mpg123_seek_frame_32; +mpg123_set_filesize; +mpg123_set_filesize_32; +mpg123_set_index; +mpg123_set_index_32; +mpg123_set_string; +mpg123_set_substring; +mpg123_spf; +mpg123_store_utf8; +mpg123_strerror; +mpg123_strlen; +mpg123_supported_decoders; +mpg123_tell; +mpg123_tell_32; +mpg123_tell_stream; +mpg123_tell_stream_32; +mpg123_tellframe; +mpg123_tellframe_32; +mpg123_timeframe; +mpg123_timeframe_32; +mpg123_tpf; +mpg123_volume; +mpg123_volume_change; +local: *; }; diff --git a/jni/mpg123-1.13.4/src/libmpg123/Makefile b/jni/mpg123-1.17.0/src/libmpg123/Makefile similarity index 61% rename from jni/mpg123-1.13.4/src/libmpg123/Makefile rename to jni/mpg123-1.17.0/src/libmpg123/Makefile index 70b6cde7..db6e65f0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/Makefile +++ b/jni/mpg123-1.17.0/src/libmpg123/Makefile @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # src/libmpg123/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/mpg123 pkgincludedir = $(includedir)/mpg123 pkglibdir = $(libdir)/mpg123 @@ -33,12 +77,12 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu +build_triplet = 86_64-unknown-linux-gnu +host_triplet = arm-unknown-linux-androideabi EXTRA_PROGRAMS = testcpu$(EXEEXT) subdir = src/libmpg123 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/mpg123.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/mpg123.h.in $(top_srcdir)/build/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -71,45 +115,103 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am_libmpg123_la_OBJECTS = compat.lo parse.lo frame.lo format.lo \ dct64.lo equalizer.lo id3.lo optimize.lo readers.lo tabinit.lo \ libmpg123.lo index.lo libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS) -libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +am__v_lt_1 = +libmpg123_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@ testcpu_SOURCES = testcpu.c testcpu_OBJECTS = testcpu.$(OBJEXT) testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT) +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I. -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CCASFLAGS) $(CCASFLAGS) +AM_V_CPPAS = $(am__v_CPPAS_$(V)) +am__v_CPPAS_ = $(am__v_CPPAS_$(AM_DEFAULT_VERBOSITY)) +am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ testcpu.c DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ testcpu.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(nodist_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11 +ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14 AIX_CFLAGS = AIX_LDFLAGS = AIX_LIBS = @@ -118,32 +220,33 @@ ALIB_LDFLAGS = ALIB_LIBS = ALSA_CFLAGS = ALSA_LDFLAGS = -ALSA_LIBS = -AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar -API_VERSION = 29 -AR = ar +ALSA_LIBS = -lasound +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +API_VERSION = 38 +AR = arm-linux-androideabi-ar ARTS_CFLAGS = ARTS_LDFLAGS = ARTS_LIBS = AS = as -AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11 -AWK = gawk -CC = gcc -CCAS = gcc +AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf +AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader +AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14 +AWK = mawk +CC = arm-linux-androideabi-gcc +CCAS = arm-linux-androideabi-gcc CCASDEPMODE = depmode=gcc3 CCASFLAGS = -g -O2 CCDEPMODE = depmode=gcc3 CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 COREAUDIO_CFLAGS = COREAUDIO_LDFLAGS = -COREAUDIO_LIBS = -CPP = gcc -E -CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT +COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices +CPP = arm-linux-androideabi-gcc -E +CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED CYGPATH_W = echo -DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo -DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT) +DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo +DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT) DEFS = -DHAVE_CONFIG_H DEPDIR = .deps DLLTOOL = dlltool @@ -177,10 +280,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s JACK_CFLAGS = JACK_LDFLAGS = JACK_LIBS = -LD = /usr/bin/ld +LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld LDFLAGS = -LFS_LOBJ = lfs_wrap.lo lfs_alias.lo -LIBMPG123_VERSION = 29:6:29 +LFS_LOBJ = lfs_alias.lo +LIBMPG123_VERSION = 38:4:38 LIBOBJS = LIBS = -lm LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -188,7 +291,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_LDFLAGS = -export-dynamic -MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo +MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo MANIFEST_TOOL = : MINT_CFLAGS = MINT_LDFLAGS = @@ -197,8 +300,8 @@ MKDIR_P = /bin/mkdir -p MODULE_OBJ = legacy_module.$(OBJEXT) NAS_CFLAGS = NAS_LDFLAGS = -NAS_LIBS = -NM = /usr/bin/nm -B +NAS_LIBS = -laudio +NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o @@ -207,7 +310,7 @@ OPENAL_LDFLAGS = OPENAL_LIBS = OS2_CFLAGS = OS2_LDFLAGS = -OS2_LIBS = +OS2_LIBS = -los2me -lmmpm2 -lsocket OSS_CFLAGS = OSS_LDFLAGS = OSS_LIBS = @@ -216,27 +319,30 @@ OTOOL64 = OUTPUT_CFLAGS = OUTPUT_LDFLAGS = OUTPUT_LIBS = -OUTPUT_MOD = dummy -OUTPUT_OBJ = output/dummy.$(OBJEXT) +OUTPUT_MOD = oss +OUTPUT_OBJ = output/oss.$(OBJEXT) PACKAGE = mpg123 PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net PACKAGE_NAME = mpg123 -PACKAGE_STRING = mpg123 1.13.4 +PACKAGE_STRING = mpg123 1.17.0 PACKAGE_TARNAME = mpg123 PACKAGE_URL = -PACKAGE_VERSION = 1.13.4 +PACKAGE_VERSION = 1.17.0 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PORTAUDIO_CFLAGS = PORTAUDIO_LDFLAGS = -PORTAUDIO_LIBS = -PULSE_CFLAGS = +PORTAUDIO_LIBS = -lportaudio +PULSE_CFLAGS = -D_REENTRANT PULSE_LDFLAGS = -PULSE_LIBS = -RANLIB = ranlib -SDL_CFLAGS = +PULSE_LIBS = -lpulse-simple -lpulse +QSA_CFLAGS = +QSA_LDFLAGS = +QSA_LIBS = +RANLIB = arm-linux-androideabi-ranlib +SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL SDL_LDFLAGS = -SDL_LIBS = +SDL_LIBS = -lSDL SED = /bin/sed SET_MAKE = SGI_CFLAGS = @@ -245,54 +351,63 @@ SGI_LIBS = SHELL = /bin/bash SNDIO_CFLAGS = SNDIO_LDFLAGS = -SNDIO_LIBS = -STRIP = strip +SNDIO_LIBS = -lsndio +STRIP = arm-linux-androideabi-strip SUN_CFLAGS = SUN_LDFLAGS = SUN_LIBS = -VERSION = 1.13.4 +TINYALSA_CFLAGS = +TINYALSA_LDFLAGS = +TINYALSA_LIBS = -ltinyalsa +VERSION = 1.17.0 WIN32_CFLAGS = WIN32_LDFLAGS = -WIN32_LIBS = -abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/libmpg123 -abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/libmpg123 -abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4 -ac_ct_AR = ar -ac_ct_CC = gcc +WIN32_LIBS = -lwinmm +WIN32_WASAPI_CFLAGS = +WIN32_WASAPI_LDFLAGS = +WIN32_WASAPI_LIBS = -lole32 -lavrt +YASM = yasm +YASMFLAGS = -pgas -rgas -mamd64 +YASM_FORMAT = +abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src/libmpg123 +abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src/libmpg123 +abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +ac_ct_AR = +ac_ct_CC = ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 +build = 86_64-unknown-linux-gnu +build_alias = 86_64-unknown-linux-gnu +build_cpu = 86_64 build_os = linux-gnu -build_vendor = pc +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc +host = arm-unknown-linux-androideabi +host_alias = arm-linux-androideabi +host_cpu = arm +host_os = linux-androideabi +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh +install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -302,14 +417,14 @@ sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . sysconfdir = ${prefix}/etc -target_alias = +target_alias = arm-linux-androideabi top_build_prefix = ../../ top_builddir = ../.. top_srcdir = ../.. #AM_CFLAGS = @AUDIO_CFLAGS@ #AM_LDFLAGS = -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 EXTRA_DIST = mpg123.h.in testcpu_dependencies = getcpuflags.$(OBJEXT) testcpu_sources = testcpu.c @@ -320,13 +435,14 @@ CLEANFILES = *.a # Libtool macros think they're smart. Because of that mpg123.la does not work, it must be libmpg123.la . lib_LTLIBRARIES = libmpg123.la nodist_include_HEADERS = mpg123.h -libmpg123_la_LDFLAGS = -no-undefined -version-info 29:6:29 -export-symbols-regex '^mpg123_' -libmpg123_la_LIBADD = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo lfs_wrap.lo lfs_alias.lo -libmpg123_la_DEPENDENCIES = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo lfs_wrap.lo lfs_alias.lo +libmpg123_la_LDFLAGS = -no-undefined -version-info 38:4:38 -export-symbols-regex '^mpg123_' +libmpg123_la_LIBADD = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo lfs_alias.lo +libmpg123_la_DEPENDENCIES = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo lfs_alias.lo libmpg123_la_SOURCES = \ intsym.h \ compat.c \ compat.h \ + mpeghead.h \ parse.c \ parse.h \ frame.c \ @@ -344,6 +460,7 @@ libmpg123_la_SOURCES = \ synths.h \ equalizer.c \ huffman.h \ + newhuffman.h \ icy.h \ icy2utf8.h \ id3.h \ @@ -355,7 +472,9 @@ libmpg123_la_SOURCES = \ readers.c \ tabinit.c \ libmpg123.c \ + gapless.h \ mpg123lib_intern.h \ + abi_align.h \ mangle.h \ getcpuflags.h \ index.h \ @@ -375,6 +494,9 @@ EXTRA_libmpg123_la_SOURCES = \ feature.c \ dct36_3dnowext.S \ dct36_3dnow.S \ + dct36_sse.S \ + dct36_x86_64.S \ + dct36_avx.S \ dct64_3dnowext.S \ dct64_3dnow.S \ dct64_altivec.c \ @@ -387,6 +509,8 @@ EXTRA_libmpg123_la_SOURCES = \ dct64_x86_64_float.S \ dct64_neon.S \ dct64_neon_float.S \ + dct64_avx.S \ + dct64_avx_float.S \ synth_3dnowext.S \ synth_3dnow.S \ synth_altivec.c \ @@ -420,6 +544,10 @@ EXTRA_libmpg123_la_SOURCES = \ synth_stereo_neon_float.S \ synth_stereo_neon_s32.S \ synth_stereo_neon_accurate.S \ + synth_stereo_avx.S \ + synth_stereo_avx_float.S \ + synth_stereo_avx_s32.S \ + synth_stereo_avx_accurate.S \ ntom.c \ synth.c \ synth_8bit.c \ @@ -429,9 +557,25 @@ EXTRA_libmpg123_la_SOURCES = \ tabinit_mmx.S \ stringbuf.c \ getcpuflags.S \ + getcpuflags_x86_64.S \ l12_integer_tables.h \ l3_integer_tables.h +#AVX_SRCS = \ +# dct36_avx.S \ +# dct64_avx.S \ +# dct64_avx_float.S \ +# synth_stereo_avx.S \ +# synth_stereo_avx_float.S \ +# synth_stereo_avx_s32.S \ +# synth_stereo_avx_accurate.S + +#AVX_OBJS = $(AVX_SRCS:.S=.o) +#ASM_DEPS = \ +# mangle.h \ +# $(top_builddir)/src/config.h \ +# intsym.h + all: all-am .SUFFIXES: @@ -468,9 +612,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): mpg123.h: $(top_builddir)/config.status $(srcdir)/mpg123.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -478,6 +622,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -493,17 +639,21 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES) - $(libmpg123_la_LINK) -rpath $(libdir) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS) -testcpu$(EXEEXT): $(testcpu_OBJECTS) $(testcpu_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES) $(EXTRA_libmpg123_la_DEPENDENCIES) + $(AM_V_CCLD)$(libmpg123_la_LINK) -rpath $(libdir) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS) + +testcpu$(EXEEXT): $(testcpu_OBJECTS) $(testcpu_DEPENDENCIES) $(EXTRA_testcpu_DEPENDENCIES) @rm -f testcpu$(EXEEXT) - $(LINK) $(testcpu_OBJECTS) $(testcpu_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testcpu_OBJECTS) $(testcpu_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -514,10 +664,15 @@ distclean-compile: include ./$(DEPDIR)/compat.Plo include ./$(DEPDIR)/dct36_3dnow.Plo include ./$(DEPDIR)/dct36_3dnowext.Plo +include ./$(DEPDIR)/dct36_avx.Plo +include ./$(DEPDIR)/dct36_sse.Plo +include ./$(DEPDIR)/dct36_x86_64.Plo include ./$(DEPDIR)/dct64.Plo include ./$(DEPDIR)/dct64_3dnow.Plo include ./$(DEPDIR)/dct64_3dnowext.Plo include ./$(DEPDIR)/dct64_altivec.Plo +include ./$(DEPDIR)/dct64_avx.Plo +include ./$(DEPDIR)/dct64_avx_float.Plo include ./$(DEPDIR)/dct64_i386.Plo include ./$(DEPDIR)/dct64_i486.Plo include ./$(DEPDIR)/dct64_mmx.Plo @@ -534,6 +689,7 @@ include ./$(DEPDIR)/feature.Plo include ./$(DEPDIR)/format.Plo include ./$(DEPDIR)/frame.Plo include ./$(DEPDIR)/getcpuflags.Plo +include ./$(DEPDIR)/getcpuflags_x86_64.Plo include ./$(DEPDIR)/icy.Plo include ./$(DEPDIR)/icy2utf8.Plo include ./$(DEPDIR)/id3.Plo @@ -570,6 +726,10 @@ include ./$(DEPDIR)/synth_sse.Plo include ./$(DEPDIR)/synth_sse_accurate.Plo include ./$(DEPDIR)/synth_sse_float.Plo include ./$(DEPDIR)/synth_sse_s32.Plo +include ./$(DEPDIR)/synth_stereo_avx.Plo +include ./$(DEPDIR)/synth_stereo_avx_accurate.Plo +include ./$(DEPDIR)/synth_stereo_avx_float.Plo +include ./$(DEPDIR)/synth_stereo_avx_s32.Plo include ./$(DEPDIR)/synth_stereo_neon.Plo include ./$(DEPDIR)/synth_stereo_neon_accurate.Plo include ./$(DEPDIR)/synth_stereo_neon_float.Plo @@ -590,46 +750,46 @@ include ./$(DEPDIR)/tabinit_mmx.Plo include ./$(DEPDIR)/testcpu.Po .S.o: - $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CPPAS)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) \ -# $(CPPASCOMPILE) -c -o $@ $< +# $(AM_V_CPPAS_no)$(CPPASCOMPILE) -c -o $@ $< .S.obj: - $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CPPAS)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) \ -# $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +# $(AM_V_CPPAS_no)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .S.lo: - $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ + $(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CPPAS)source='$<' object='$@' libtool=yes \ # DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) \ -# $(LTCPPASCOMPILE) -c -o $@ $< +# $(AM_V_CPPAS_no)$(LTCPPASCOMPILE) -c -o $@ $< .c.o: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c $< +# $(AM_V_CC_no)$(COMPILE) -c -o $@ $< .c.obj: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `$(CYGPATH_W) '$<'` +# $(AM_V_CC_no)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: - $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ + $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CC)source='$<' object='$@' libtool=yes \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ $< +# $(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -638,8 +798,11 @@ clean-libtool: -rm -rf .libs _libs install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -653,30 +816,17 @@ uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -688,15 +838,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -705,6 +851,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -756,10 +917,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -845,23 +1011,31 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ install-nodist_includeHEADERS install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-nodist_includeHEADERS +#$(AVX_OBJS): %.o: %.S $(ASM_DEPS) +# $(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) -DASMALIGN_BALIGN $< | yasm - -pgas -rgas -mamd64 -o $@ + +#$(AVX_OBJS:.o=.lo): %.lo: %.o +# @echo "# Generated by ltmain.sh (GNU libtool)" >$@ +# @echo "pic_object='$<'" >>$@ +# @echo "non_pic_object='$<'" >>$@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/jni/mpg123-1.13.4/src/libmpg123/Makefile.am b/jni/mpg123-1.17.0/src/libmpg123/Makefile.am similarity index 73% rename from jni/mpg123-1.13.4/src/libmpg123/Makefile.am rename to jni/mpg123-1.17.0/src/libmpg123/Makefile.am index 8f4092e7..0dab1aea 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/Makefile.am +++ b/jni/mpg123-1.17.0/src/libmpg123/Makefile.am @@ -6,7 +6,7 @@ #AM_CFLAGS = @AUDIO_CFLAGS@ #AM_LDFLAGS = -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 EXTRA_DIST = mpg123.h.in @@ -32,6 +32,7 @@ libmpg123_la_SOURCES = \ intsym.h \ compat.c \ compat.h \ + mpeghead.h \ parse.c \ parse.h \ frame.c \ @@ -49,6 +50,7 @@ libmpg123_la_SOURCES = \ synths.h \ equalizer.c \ huffman.h \ + newhuffman.h \ icy.h \ icy2utf8.h \ id3.h \ @@ -60,7 +62,9 @@ libmpg123_la_SOURCES = \ readers.c \ tabinit.c \ libmpg123.c \ + gapless.h \ mpg123lib_intern.h \ + abi_align.h \ mangle.h \ getcpuflags.h \ index.h \ @@ -80,6 +84,9 @@ EXTRA_libmpg123_la_SOURCES = \ feature.c \ dct36_3dnowext.S \ dct36_3dnow.S \ + dct36_sse.S \ + dct36_x86_64.S \ + dct36_avx.S \ dct64_3dnowext.S \ dct64_3dnow.S \ dct64_altivec.c \ @@ -92,6 +99,8 @@ EXTRA_libmpg123_la_SOURCES = \ dct64_x86_64_float.S \ dct64_neon.S \ dct64_neon_float.S \ + dct64_avx.S \ + dct64_avx_float.S \ synth_3dnowext.S \ synth_3dnow.S \ synth_altivec.c \ @@ -125,6 +134,10 @@ EXTRA_libmpg123_la_SOURCES = \ synth_stereo_neon_float.S \ synth_stereo_neon_s32.S \ synth_stereo_neon_accurate.S \ + synth_stereo_avx.S \ + synth_stereo_avx_float.S \ + synth_stereo_avx_s32.S \ + synth_stereo_avx_accurate.S \ ntom.c \ synth.c \ synth_8bit.c \ @@ -134,6 +147,35 @@ EXTRA_libmpg123_la_SOURCES = \ tabinit_mmx.S \ stringbuf.c \ getcpuflags.S \ + getcpuflags_x86_64.S \ l12_integer_tables.h \ l3_integer_tables.h +if USE_YASM_FOR_AVX +## Override rules for the sources that should be assembled with yasm + +AVX_SRCS = \ + dct36_avx.S \ + dct64_avx.S \ + dct64_avx_float.S \ + synth_stereo_avx.S \ + synth_stereo_avx_float.S \ + synth_stereo_avx_s32.S \ + synth_stereo_avx_accurate.S + +AVX_OBJS = $(AVX_SRCS:.S=.@OBJEXT@) + +ASM_DEPS = \ + mangle.h \ + $(top_builddir)/src/config.h \ + intsym.h + +$(AVX_OBJS): %.@OBJEXT@: %.S $(ASM_DEPS) + $(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) -DASMALIGN_BALIGN $< | @YASM@ - @YASMFLAGS@ @YASM_FORMAT@ -o $@ + +$(AVX_OBJS:.@OBJEXT@=.lo): %.lo: %.@OBJEXT@ + @echo "# Generated by ltmain.sh (GNU libtool)" >$@ + @echo "pic_object='$<'" >>$@ + @echo "non_pic_object='$<'" >>$@ + +endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/Makefile.in b/jni/mpg123-1.17.0/src/libmpg123/Makefile.in similarity index 68% rename from jni/mpg123-1.13.4/src/libmpg123/Makefile.in rename to jni/mpg123-1.17.0/src/libmpg123/Makefile.in index f19f68f2..4894ec76 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/Makefile.in +++ b/jni/mpg123-1.17.0/src/libmpg123/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,8 +81,8 @@ build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = testcpu$(EXEEXT) subdir = src/libmpg123 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/mpg123.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/mpg123.h.in $(top_srcdir)/build/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -71,41 +115,99 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am_libmpg123_la_OBJECTS = compat.lo parse.lo frame.lo format.lo \ dct64.lo equalizer.lo id3.lo optimize.lo readers.lo tabinit.lo \ libmpg123.lo index.lo libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS) -libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libmpg123_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@ testcpu_SOURCES = testcpu.c testcpu_OBJECTS = testcpu.$(OBJEXT) testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CCASFLAGS) $(CCASFLAGS) +AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) +am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) +am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ testcpu.c DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ testcpu.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(nodist_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -120,6 +222,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LDFLAGS = @ALSA_LDFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ AR = @AR@ ARTS_CFLAGS = @ARTS_CFLAGS@ @@ -233,6 +336,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PULSE_CFLAGS = @PULSE_CFLAGS@ PULSE_LDFLAGS = @PULSE_LDFLAGS@ PULSE_LIBS = @PULSE_LIBS@ +QSA_CFLAGS = @QSA_CFLAGS@ +QSA_LDFLAGS = @QSA_LDFLAGS@ +QSA_LIBS = @QSA_LIBS@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LDFLAGS = @SDL_LDFLAGS@ @@ -250,10 +356,19 @@ STRIP = @STRIP@ SUN_CFLAGS = @SUN_CFLAGS@ SUN_LDFLAGS = @SUN_LDFLAGS@ SUN_LIBS = @SUN_LIBS@ +TINYALSA_CFLAGS = @TINYALSA_CFLAGS@ +TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@ +TINYALSA_LIBS = @TINYALSA_LIBS@ VERSION = @VERSION@ WIN32_CFLAGS = @WIN32_CFLAGS@ WIN32_LDFLAGS = @WIN32_LDFLAGS@ WIN32_LIBS = @WIN32_LIBS@ +WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@ +WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@ +WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@ +YASM = @YASM@ +YASMFLAGS = @YASMFLAGS@ +YASM_FORMAT = @YASM_FORMAT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -309,7 +424,7 @@ top_srcdir = @top_srcdir@ #AM_CFLAGS = @AUDIO_CFLAGS@ #AM_LDFLAGS = -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 EXTRA_DIST = mpg123.h.in testcpu_dependencies = getcpuflags.$(OBJEXT) testcpu_sources = testcpu.c @@ -327,6 +442,7 @@ libmpg123_la_SOURCES = \ intsym.h \ compat.c \ compat.h \ + mpeghead.h \ parse.c \ parse.h \ frame.c \ @@ -344,6 +460,7 @@ libmpg123_la_SOURCES = \ synths.h \ equalizer.c \ huffman.h \ + newhuffman.h \ icy.h \ icy2utf8.h \ id3.h \ @@ -355,7 +472,9 @@ libmpg123_la_SOURCES = \ readers.c \ tabinit.c \ libmpg123.c \ + gapless.h \ mpg123lib_intern.h \ + abi_align.h \ mangle.h \ getcpuflags.h \ index.h \ @@ -375,6 +494,9 @@ EXTRA_libmpg123_la_SOURCES = \ feature.c \ dct36_3dnowext.S \ dct36_3dnow.S \ + dct36_sse.S \ + dct36_x86_64.S \ + dct36_avx.S \ dct64_3dnowext.S \ dct64_3dnow.S \ dct64_altivec.c \ @@ -387,6 +509,8 @@ EXTRA_libmpg123_la_SOURCES = \ dct64_x86_64_float.S \ dct64_neon.S \ dct64_neon_float.S \ + dct64_avx.S \ + dct64_avx_float.S \ synth_3dnowext.S \ synth_3dnow.S \ synth_altivec.c \ @@ -420,6 +544,10 @@ EXTRA_libmpg123_la_SOURCES = \ synth_stereo_neon_float.S \ synth_stereo_neon_s32.S \ synth_stereo_neon_accurate.S \ + synth_stereo_avx.S \ + synth_stereo_avx_float.S \ + synth_stereo_avx_s32.S \ + synth_stereo_avx_accurate.S \ ntom.c \ synth.c \ synth_8bit.c \ @@ -429,9 +557,25 @@ EXTRA_libmpg123_la_SOURCES = \ tabinit_mmx.S \ stringbuf.c \ getcpuflags.S \ + getcpuflags_x86_64.S \ l12_integer_tables.h \ l3_integer_tables.h +@USE_YASM_FOR_AVX_TRUE@AVX_SRCS = \ +@USE_YASM_FOR_AVX_TRUE@ dct36_avx.S \ +@USE_YASM_FOR_AVX_TRUE@ dct64_avx.S \ +@USE_YASM_FOR_AVX_TRUE@ dct64_avx_float.S \ +@USE_YASM_FOR_AVX_TRUE@ synth_stereo_avx.S \ +@USE_YASM_FOR_AVX_TRUE@ synth_stereo_avx_float.S \ +@USE_YASM_FOR_AVX_TRUE@ synth_stereo_avx_s32.S \ +@USE_YASM_FOR_AVX_TRUE@ synth_stereo_avx_accurate.S + +@USE_YASM_FOR_AVX_TRUE@AVX_OBJS = $(AVX_SRCS:.S=.@OBJEXT@) +@USE_YASM_FOR_AVX_TRUE@ASM_DEPS = \ +@USE_YASM_FOR_AVX_TRUE@ mangle.h \ +@USE_YASM_FOR_AVX_TRUE@ $(top_builddir)/src/config.h \ +@USE_YASM_FOR_AVX_TRUE@ intsym.h + all: all-am .SUFFIXES: @@ -468,9 +612,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): mpg123.h: $(top_builddir)/config.status $(srcdir)/mpg123.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -478,6 +622,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -493,17 +639,21 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES) - $(libmpg123_la_LINK) -rpath $(libdir) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS) -testcpu$(EXEEXT): $(testcpu_OBJECTS) $(testcpu_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES) $(EXTRA_libmpg123_la_DEPENDENCIES) + $(AM_V_CCLD)$(libmpg123_la_LINK) -rpath $(libdir) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS) + +testcpu$(EXEEXT): $(testcpu_OBJECTS) $(testcpu_DEPENDENCIES) $(EXTRA_testcpu_DEPENDENCIES) @rm -f testcpu$(EXEEXT) - $(LINK) $(testcpu_OBJECTS) $(testcpu_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(testcpu_OBJECTS) $(testcpu_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -514,10 +664,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct36_3dnow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct36_3dnowext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct36_avx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct36_sse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct36_x86_64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_3dnow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_3dnowext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_altivec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_avx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_avx_float.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_i386.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_i486.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dct64_mmx.Plo@am__quote@ @@ -534,6 +689,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcpuflags.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcpuflags_x86_64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icy2utf8.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Plo@am__quote@ @@ -570,6 +726,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_sse_accurate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_sse_float.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_sse_s32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_avx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_avx_accurate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_avx_float.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_avx_s32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_neon.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_neon_accurate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_stereo_neon_float.Plo@am__quote@ @@ -590,46 +750,46 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testcpu.Po@am__quote@ .S.o: -@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $< .S.obj: -@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .S.lo: -@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $< .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -638,8 +798,11 @@ clean-libtool: -rm -rf .libs _libs install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -653,30 +816,17 @@ uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -688,15 +838,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -705,6 +851,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -756,10 +917,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -845,23 +1011,31 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ install-nodist_includeHEADERS install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-nodist_includeHEADERS +@USE_YASM_FOR_AVX_TRUE@$(AVX_OBJS): %.@OBJEXT@: %.S $(ASM_DEPS) +@USE_YASM_FOR_AVX_TRUE@ $(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) -DASMALIGN_BALIGN $< | @YASM@ - @YASMFLAGS@ @YASM_FORMAT@ -o $@ + +@USE_YASM_FOR_AVX_TRUE@$(AVX_OBJS:.@OBJEXT@=.lo): %.lo: %.@OBJEXT@ +@USE_YASM_FOR_AVX_TRUE@ @echo "# Generated by ltmain.sh (GNU libtool)" >$@ +@USE_YASM_FOR_AVX_TRUE@ @echo "pic_object='$<'" >>$@ +@USE_YASM_FOR_AVX_TRUE@ @echo "non_pic_object='$<'" >>$@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/jni/mpg123-1.17.0/src/libmpg123/abi_align.h b/jni/mpg123-1.17.0/src/libmpg123/abi_align.h new file mode 100644 index 00000000..42222a12 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/abi_align.h @@ -0,0 +1,39 @@ +/* + mpg123lib_intern: Common non-public stuff for libmpg123 + + copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + derived from the old mpg123.h +*/ + +#ifndef MPG123_H_ABI_ALIGN +#define MPG123_H_ABI_ALIGN + +#include "config.h" + +/* ABI conformance for other compilers. + mpg123 needs 16byte-aligned stack for SSE and friends. + gcc provides that, but others don't necessarily. */ +#ifdef ABI_ALIGN_FUN +#ifndef attribute_align_arg +#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__>1) +# define attribute_align_arg __attribute__((force_align_arg_pointer)) +/* The gcc that can align the stack does not need the check... nor does it work with gcc 4.3+, anyway. */ +#else + +# define attribute_align_arg +/* Other compilers get code to catch misaligned stack. + Well, except Sun Studio, which accepts the aligned attribute but does not honor it. */ +#if !defined(__SUNPRO_C) +# define NEED_ALIGNCHECK +#endif + +#endif +#endif +#else +#define attribute_align_arg +/* We won't try the align check... */ +#endif + +#endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/compat.c b/jni/mpg123-1.17.0/src/libmpg123/compat.c similarity index 59% rename from jni/mpg123-1.13.4/src/libmpg123/compat.c rename to jni/mpg123-1.17.0/src/libmpg123/compat.c index 0f60026b..18ea76ef 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/compat.c +++ b/jni/mpg123-1.17.0/src/libmpg123/compat.c @@ -34,6 +34,16 @@ void *safe_realloc(void *ptr, size_t size) else return realloc(ptr, size); } +#ifndef HAVE_STRERROR +const char *strerror(int errnum) +{ + extern int sys_nerr; + extern char *sys_errlist[]; + + return (errnum < sys_nerr) ? sys_errlist[errnum] : ""; +} +#endif + #ifndef HAVE_STRDUP char *strdup(const char *src) { @@ -50,7 +60,7 @@ int compat_open(const char *filename, int flags) { int ret; #if defined (WANT_WIN32_UNICODE) - const wchar_t *frag = NULL; + wchar_t *frag = NULL; ret = win32_utf8_wide(filename, &frag, NULL); if ((frag == NULL) || (ret == 0)) goto fallback; /* Fallback to plain open when ucs-2 conversion fails */ @@ -88,55 +98,41 @@ int compat_close(int infd) /* Windows Unicode stuff */ #ifdef WANT_WIN32_UNICODE -int win32_wide_utf8(const wchar_t * const wptr, const char **const mbptr, size_t * const buflen) +int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen) { - size_t len; - char *buf; - int ret; + size_t len; + char *buf; + int ret = 0; - len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ - buf = calloc(len, sizeof (char)); /* Can we assume sizeof char always = 1? */ - debug2("win32_wide_utf8 allocated %u bytes at %p", len, buf); + len = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, NULL, 0, NULL, NULL); /* Get utf-8 string length */ + buf = calloc(len + 1, sizeof (char)); /* Can we assume sizeof char always = 1? */ - if(buf != NULL) - { - ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ - *mbptr = buf; /* Set string pointer to allocated buffer */ - if(buflen != NULL) *buflen = len * sizeof (char); /* Give length of allocated memory if needed. */ - - return ret; - } - else - { - if(buflen != NULL) *buflen = 0; - - return 0; - } + if(!buf) len = 0; + else { + if (len != 0) ret = WideCharToMultiByte(CP_UTF8, 0, wptr, -1, buf, len, NULL, NULL); /*Do actual conversion*/ + buf[len] = '0'; /* Must terminate */ + } + *mbptr = buf; /* Set string pointer to allocated buffer */ + if(buflen != NULL) *buflen = (len) * sizeof (char); /* Give length of allocated memory if needed. */ + return ret; } -int win32_utf8_wide(const char *const mbptr, const wchar_t ** const wptr, size_t * const buflen) +int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen) { - size_t len; - wchar_t *buf; - int ret; + size_t len; + wchar_t *buf; + int ret = 0; - len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ - buf = calloc(len, sizeof (wchar_t)); /* Allocate memory accordingly */ - debug2("win32_utf8_wide allocated %u bytes at %p", len, buf); + len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, NULL, 0); /* Get converted size */ + buf = calloc(len + 1, sizeof (wchar_t)); /* Allocate memory accordingly */ - if(buf != NULL) - { - ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ - *wptr = buf; /* Set string pointer to allocated buffer */ - if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ - - return ret; - } - else - { - if (buflen != NULL) *buflen = 0; - - return 0; - } + if(!buf) len = 0; + else { + if (len != 0) ret = MultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, mbptr, -1, buf, len); /* Do conversion */ + buf[len] = L'0'; /* Must terminate */ + } + *wptr = buf; /* Set string pointer to allocated buffer */ + if (buflen != NULL) *buflen = len * sizeof (wchar_t); /* Give length of allocated memory if needed. */ + return ret; /* Number of characters written */ } #endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/compat.h b/jni/mpg123-1.17.0/src/libmpg123/compat.h similarity index 94% rename from jni/mpg123-1.13.4/src/libmpg123/compat.h rename to jni/mpg123-1.17.0/src/libmpg123/compat.h index 537a77b7..2f3e116b 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/compat.h +++ b/jni/mpg123-1.17.0/src/libmpg123/compat.h @@ -76,6 +76,9 @@ #include #endif +/* compat_open makes little sense without */ +#include + /* To parse big numbers... */ #ifdef HAVE_ATOLL #define atobigint atoll @@ -87,6 +90,9 @@ typedef unsigned char byte; /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */ void *safe_realloc(void *ptr, size_t size); +#ifndef HAVE_STRERROR +const char *strerror(int errnum); +#endif #ifndef HAVE_STRDUP char *strdup(const char *s); @@ -150,7 +156,7 @@ int compat_close(int infd); * * WideCharToMultiByte - http://msdn.microsoft.com/en-us/library/dd374130(VS.85).aspx */ -int win32_wide_utf8 (const wchar_t * const wptr, const char **const mbptr, size_t * const buflen); +int win32_wide_utf8(const wchar_t * const wptr, char **mbptr, size_t * buflen); /** * win32_mbc2uni @@ -164,7 +170,7 @@ int win32_wide_utf8 (const wchar_t * const wptr, const char **const mbptr, size_ * MultiByteToWideChar - http://msdn.microsoft.com/en-us/library/dd319072(VS.85).aspx */ -int win32_utf8_wide (const char *const mbptr, const wchar_t ** const wptr, size_t * const buflen); +int win32_utf8_wide(const char *const mbptr, wchar_t **wptr, size_t *buflen); #endif /* That one comes from Tellie on OS/2, needed in resolver. */ @@ -172,4 +178,6 @@ int win32_utf8_wide (const char *const mbptr, const wchar_t ** const wptr, size_ typedef int socklen_t; #endif +#include "true.h" + #endif diff --git a/jni/mpg123-1.17.0/src/libmpg123/compat.lo b/jni/mpg123-1.17.0/src/libmpg123/compat.lo new file mode 100644 index 00000000..359e9a14 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/compat.lo @@ -0,0 +1,12 @@ +# compat.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/compat.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct36_3dnow.S b/jni/mpg123-1.17.0/src/libmpg123/dct36_3dnow.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct36_3dnow.S rename to jni/mpg123-1.17.0/src/libmpg123/dct36_3dnow.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct36_3dnowext.S b/jni/mpg123-1.17.0/src/libmpg123/dct36_3dnowext.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct36_3dnowext.S rename to jni/mpg123-1.17.0/src/libmpg123/dct36_3dnowext.S diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct36_avx.S b/jni/mpg123-1.17.0/src/libmpg123/dct36_avx.S new file mode 100644 index 00000000..e302b6dd --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct36_avx.S @@ -0,0 +1,358 @@ +/* + dct36_avx: AVX optimized dct36 for x86-64 + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +#define in %rcx +#define out1 %rdx +#define out2 %r8 +#define w %r9 +#define ts %r10 +#define COS9_ %rax +#define tfcos36_ %r11 +#else +#define in %rdi +#define out1 %rsi +#define out2 %rdx +#define w %rcx +#define ts %r8 +#define COS9_ %rax +#define tfcos36_ %r9 +#endif + +/* + void dct36_avx(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf); +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN16 +dct36_avx_COS9: + .long 0x3f5db3d7 + .long 0x3f5db3d7 + .long 0x3f000000 + .long 0x3f000000 + .long 0x3f7c1c5c + .long 0x3f7c1c5c + .long 0x3f708fb2 + .long 0x3f708fb2 + .long 0x3f248dbb + .long 0x3f248dbb + .long 0x3e31d0d4 + .long 0x3e31d0d4 + .long 0x3eaf1d44 + .long 0x3eaf1d44 + .long 0x3f441b7d + .long 0x3f441b7d + ALIGN16 +dct36_avx_tfcos36: + .long 0x3f007d2b + .long 0x3f0483ee + .long 0x3f0d3b7d + .long 0x3f1c4257 + .long 0x40b79454 + .long 0x3ff746ea + .long 0x3f976fd9 + .long 0x3f5f2944 + .long 0x3f3504f3 + ALIGN16 +dct36_avx_sign: + .long 0x80000000,0x80000000,0x80000000,0x80000000 + .text + ALIGN16 + .globl ASM_NAME(dct36_avx) +ASM_NAME(dct36_avx): +#ifdef IS_MSABI + push %rbp + mov %rsp, %rbp + sub $160, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movaps %xmm15, 144(%rsp) + movq 48(%rbp), ts +#endif + lea dct36_avx_COS9(%rip), COS9_ + lea dct36_avx_tfcos36(%rip), tfcos36_ + + xorps %xmm4, %xmm4 + movups (in), %xmm0 + movups 16(in), %xmm1 + movups 32(in), %xmm2 + movups 48(in), %xmm3 + movlps 64(in), %xmm4 + vshufps $0x93, %xmm0, %xmm0, %xmm5 + vshufps $0x93, %xmm1, %xmm1, %xmm6 + vshufps $0x93, %xmm2, %xmm2, %xmm7 + vshufps $0x93, %xmm3, %xmm3, %xmm8 + vshufps $0xe1, %xmm4, %xmm4, %xmm9 + movss %xmm8, %xmm9 #[fg--] + addps %xmm9, %xmm4 #[gh--] + movss %xmm7, %xmm8 + addps %xmm8, %xmm3 #[cdef] + movss %xmm6, %xmm7 + addps %xmm7, %xmm2 #[89ab] + movss %xmm5, %xmm6 + addps %xmm6, %xmm1 #[4567] + xorps %xmm6, %xmm6 + movss %xmm6, %xmm5 + addps %xmm5, %xmm0 #[0123] + + vblendps $0x5, %xmm6, %xmm3, %xmm7 + vshufps $0x4e, %xmm4, %xmm3, %xmm4 + addps %xmm7, %xmm4 + vblendps $0x5, %xmm6, %xmm2, %xmm7 + vshufps $0x4e, %xmm3, %xmm2, %xmm3 + addps %xmm7, %xmm3 + vblendps $0x5, %xmm6, %xmm1, %xmm7 + vshufps $0x4e, %xmm2, %xmm1, %xmm2 + addps %xmm7, %xmm2 + vblendps $0x5, %xmm6, %xmm0, %xmm7 + vshufps $0x4e, %xmm1, %xmm0, %xmm1 + addps %xmm7, %xmm1 + vmovlhps %xmm0, %xmm6, %xmm0 + +/* +xmm0 in[-,-,0,1] +xmm1 in[2,3,4,5] +xmm2 in[6,7,8,9] +xmm3 in[10,11,12,13] +xmm4 in[14,15,16,17] +*/ + + vblendps $0xc, %xmm3, %xmm2, %xmm5 + blendps $0xc, %xmm4, %xmm3 + blendps $0xc, %xmm2, %xmm4 + movaps %xmm5, %xmm2 + +/* +xmm2 in[6,7,12,13] +xmm3 in[10,11,16,17] +xmm4 in[14,15,8,9] +*/ + + movaps (COS9_), %xmm15 + movaps 16(COS9_), %xmm6 + movaps 32(COS9_), %xmm7 + movaps 48(COS9_), %xmm8 + vmulps %xmm2, %xmm15, %xmm5 + addps %xmm0, %xmm5 + +/* +xmm5 [ta33,tb33,ta66,tb66] +xmm6 COS9_[1,1,2,2] +xmm7 COS9_[5,5,8,8] +xmm8 COS9_[7,7,4,4] +xmm15 COS9_[3,3,6,6] +*/ + + vmulps %xmm1, %xmm6, %xmm9 + vmulps %xmm3, %xmm7, %xmm12 + vmulps %xmm4, %xmm8, %xmm13 + addps %xmm5, %xmm9 + addps %xmm13, %xmm12 + addps %xmm9, %xmm12 + + vsubps %xmm3, %xmm1, %xmm13 + vshufps $0xe0, %xmm2, %xmm0, %xmm14 + vsubps %xmm14, %xmm0, %xmm14 + subps %xmm4, %xmm13 + mulps %xmm15, %xmm13 + addps %xmm14, %xmm13 + + vmulps %xmm1, %xmm7, %xmm9 + vmulps %xmm3, %xmm8, %xmm15 + vmulps %xmm4, %xmm6, %xmm14 + subps %xmm5, %xmm9 + subps %xmm15, %xmm14 + addps %xmm9, %xmm14 + + mulps %xmm1, %xmm8 + mulps %xmm3, %xmm6 + mulps %xmm4, %xmm7 + subps %xmm5, %xmm8 + subps %xmm7, %xmm6 + vaddps %xmm6, %xmm8, %xmm15 + + movss 32(tfcos36_), %xmm5 + subps %xmm1, %xmm0 + subps %xmm2, %xmm4 + addps %xmm3, %xmm0 + addps %xmm4, %xmm0 + shufps $0xaf, %xmm0, %xmm0 + vmulss %xmm5, %xmm0, %xmm11 + +/* +xmm12 [1a-0,1b-0, 2a-0, 2b-0] +xmm13 [1a-1,1b-1, 2a-1, 2b-1] +xmm14 [1a-2,1b-2,-2a-2,-2b-2] +xmm15 [1a-3,1b-3,-2a-3,-2b-3] +*/ + vunpckhps %xmm13, %xmm12, %xmm5 + vunpcklps %xmm13, %xmm12, %xmm12 + vunpckhps %xmm15, %xmm14, %xmm6 + vunpcklps %xmm15, %xmm14, %xmm14 + xorps dct36_avx_sign(%rip), %xmm6 + +/* +xmm12 [1a-0,1a-1,1b-0,1b-1] +xmm5 [2a-0,2a-1,2b-0,2b-1] +xmm14 [1a-2,1a-3,1b-2,1b-3] +xmm6 [2a-2,2a-3,2b-2,2b-3] +*/ + + vmovlhps %xmm14, %xmm12, %xmm0 + movhlps %xmm12, %xmm14 + vmovlhps %xmm6, %xmm5, %xmm1 + vmovhlps %xmm5, %xmm6, %xmm15 + +/* +xmm0 tmp1a +xmm1 tmp2a +xmm14 tmp1b +xmm15 tmp2b +*/ + + movaps (tfcos36_), %xmm6 + movaps 16(tfcos36_), %xmm7 + vsubps %xmm14, %xmm15, %xmm10 + addps %xmm14, %xmm15 + vsubps %xmm0, %xmm1, %xmm14 + addps %xmm1, %xmm0 + vmulps %xmm6, %xmm15, %xmm1 + mulps %xmm10, %xmm7 + +/* +%xmm0 tmp[0,1,2,3] +%xmm1 tmp[17,16,15,14] +%xmm14 tmp[8,7,6,5] +%xmm7 tmp[9,10,11,12] +%xmm11 tmp[13,-,4,-] +*/ + + movups 108(w), %xmm2 + movups 92(w), %xmm3 + shufps $0x1b, %xmm3, %xmm3 + movups 36(w), %xmm4 + movups 20(w), %xmm5 + shufps $0x1b, %xmm5, %xmm5 + vsubps %xmm1, %xmm0, %xmm6 + addps %xmm1, %xmm0 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movups 36(out1), %xmm1 + movups 20(out1), %xmm3 + shufps $0x1b, %xmm6, %xmm6 + addps %xmm4, %xmm1 + addps %xmm6, %xmm3 + shufps $0x1b, %xmm0, %xmm0 + movups %xmm2, 36(out2) + movups %xmm0, 20(out2) + movss %xmm1, 32*36(ts) + movss %xmm3, 32*20(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*44(ts) + movss %xmm4, 32*28(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*40(ts) + movss %xmm3, 32*24(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*48(ts) + movss %xmm4, 32*32(ts) + + movhlps %xmm11, %xmm0 + movss 124(w), %xmm2 + movss 88(w), %xmm3 + movss 52(w), %xmm4 + movss 16(w), %xmm5 + movss %xmm0, %xmm6 + addss %xmm11, %xmm0 + subss %xmm11, %xmm6 + mulss %xmm0, %xmm2 + mulss %xmm3, %xmm0 + mulss %xmm6, %xmm4 + mulss %xmm5, %xmm6 + addss 52(out1), %xmm4 + addss 16(out1), %xmm6 + movss %xmm2, 52(out2) + movss %xmm0, 16(out2) + movss %xmm4, 32*52(ts) + movss %xmm6, 32*16(ts) + + movaps %xmm14, %xmm0 + movaps %xmm7, %xmm1 + MOVUAPS 128(w), %xmm2 + movups 72(w), %xmm3 + shufps $0x1b, %xmm2, %xmm2 + movlps 56(w), %xmm4 + movhps 64(w), %xmm4 + MOVUAPS (w), %xmm5 + shufps $0x1b, %xmm4, %xmm4 + vsubps %xmm1, %xmm0, %xmm6 + addps %xmm1, %xmm0 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movlps 56(out1), %xmm1 + movhps 64(out1), %xmm1 + movups (out1), %xmm3 + shufps $0x1b, %xmm4, %xmm4 + addps %xmm6, %xmm3 + addps %xmm4, %xmm1 + shufps $0x1b, %xmm2, %xmm2 + movups %xmm0, (out2) + movlps %xmm2, 56(out2) + movhps %xmm2, 64(out2) + movss %xmm1, 32*56(ts) + movss %xmm3, (ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*64(ts) + movss %xmm4, 32*8(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*60(ts) + movss %xmm3, 32*4(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*68(ts) + movss %xmm4, 32*12(ts) + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + movaps 144(%rsp), %xmm15 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct36_sse.S b/jni/mpg123-1.17.0/src/libmpg123/dct36_sse.S new file mode 100644 index 00000000..474a0f52 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct36_sse.S @@ -0,0 +1,389 @@ +/* + dct36_sse: SSE optimized dct36 + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#define in %edi +#define out1 %edi +#define out2 %edx +#define w %ecx +#define ts %eax +#define COS9_ %eax +#define tfcos36_ %edx +#define tmp %esi + +/* + void dct36_sse(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf); +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN16 +dct36_sse_COS9: + .long 0x3f5db3d7 + .long 0x3f5db3d7 + .long 0x3f000000 + .long 0x3f000000 + .long 0x3f7c1c5c + .long 0x3f7c1c5c + .long 0x3f708fb2 + .long 0x3f708fb2 + .long 0x3f248dbb + .long 0x3f248dbb + .long 0x3e31d0d4 + .long 0x3e31d0d4 + .long 0x3eaf1d44 + .long 0x3eaf1d44 + .long 0x3f441b7d + .long 0x3f441b7d + ALIGN16 +dct36_sse_tfcos36: + .long 0x3f007d2b + .long 0x3f0483ee + .long 0x3f0d3b7d + .long 0x3f1c4257 + .long 0x40b79454 + .long 0x3ff746ea + .long 0x3f976fd9 + .long 0x3f5f2944 + .long 0x3f3504f3 + ALIGN16 +dct36_sse_mask: + .long 0,0xffffffff,0,0xffffffff + ALIGN16 +dct36_sse_sign: + .long 0x80000000,0x80000000,0x80000000,0x80000000 + .text + ALIGN16 + .globl ASM_NAME(dct36_sse) +ASM_NAME(dct36_sse): + push %ebp + mov %esp, %ebp + and $-16, %esp + sub $80, %esp + push %ebx + push %esi + push %edi + call 1f +1: + pop %ebx + lea dct36_sse_COS9-1b(%ebx), COS9_ + lea dct36_sse_tfcos36-1b(%ebx), tfcos36_ + lea 12(%esp), tmp + movl 8(%ebp), in + + xorps %xmm0, %xmm0 + xorps %xmm5, %xmm5 + movlps 64(in), %xmm5 + movups 48(in), %xmm4 + movups 32(in), %xmm3 + movups 16(in), %xmm2 + movups (in), %xmm1 + movaps %xmm5, %xmm6 + shufps $0xe1, %xmm6, %xmm6 + movaps %xmm4, %xmm7 + shufps $0x93, %xmm7, %xmm7 + movss %xmm7, %xmm6 + addps %xmm6, %xmm5 + movaps %xmm3, %xmm6 + shufps $0x93, %xmm6, %xmm6 + movss %xmm6, %xmm7 + addps %xmm7, %xmm4 + movaps %xmm2, %xmm7 + shufps $0x93, %xmm7, %xmm7 + movss %xmm7, %xmm6 + addps %xmm6, %xmm3 + movaps %xmm1, %xmm6 + shufps $0x93, %xmm6, %xmm6 + movss %xmm6, %xmm7 + addps %xmm7, %xmm2 + movss %xmm0, %xmm6 + addps %xmm6, %xmm1 + + movaps dct36_sse_mask-1b(%ebx), %xmm0 + movaps %xmm4, %xmm6 + shufps $0x4e, %xmm5, %xmm4 + movaps %xmm3, %xmm7 + shufps $0x4e, %xmm6, %xmm3 + andps %xmm0, %xmm6 + addps %xmm6, %xmm4 + movaps %xmm2, %xmm6 + shufps $0x4e, %xmm7, %xmm2 + andps %xmm0, %xmm7 + addps %xmm7, %xmm3 + movaps %xmm1, %xmm7 + shufps $0x4e, %xmm6, %xmm1 + andps %xmm0, %xmm6 + addps %xmm6, %xmm2 + movaps %xmm7, %xmm6 + andps %xmm0, %xmm7 + xorps %xmm0, %xmm0 + addps %xmm7, %xmm1 + movlhps %xmm6, %xmm0 + +/* +xmm0 in[-,-,0,1] +xmm1 in[2,3,4,5] +xmm2 in[6,7,8,9] +xmm3 in[10,11,12,13] +xmm4 in[14,15,16,17] +*/ + + movaps %xmm2, %xmm5 + shufps $0xe4, %xmm3, %xmm5 + shufps $0xe4, %xmm4, %xmm3 + shufps $0xe4, %xmm2, %xmm4 + movaps %xmm5, %xmm2 + +/* +xmm2 in[6,7,12,13] +xmm3 in[10,11,16,17] +xmm4 in[14,15,8,9] +*/ + + mulps (COS9_), %xmm5 + addps %xmm0, %xmm5 + + movaps %xmm0, (tmp) + movaps %xmm2, 16(tmp) + +/* +0(tmp) in[-,-,0,1] +xmm5 [ta33,tb33,ta66,tb66] +*/ + + movaps %xmm1, %xmm6 + subps %xmm3, %xmm6 + subps %xmm4, %xmm6 + xorps %xmm7, %xmm7 + shufps $0xe0, %xmm2, %xmm7 + mulps (COS9_), %xmm6 + subps %xmm7, %xmm0 + addps %xmm0, %xmm6 + movaps %xmm6, 48(tmp) + + movaps 16(COS9_), %xmm2 + + movaps %xmm1, %xmm0 + movaps %xmm3, %xmm6 + movaps %xmm4, %xmm7 + mulps %xmm2, %xmm0 + mulps 32(COS9_), %xmm6 + mulps 48(COS9_), %xmm7 + addps %xmm5, %xmm0 + addps %xmm7, %xmm6 + addps %xmm6, %xmm0 + movaps %xmm0, 32(tmp) + + movaps %xmm1, %xmm0 + movaps %xmm3, %xmm6 + movaps %xmm4, %xmm7 + mulps 32(COS9_), %xmm0 + mulps 48(COS9_), %xmm6 + mulps %xmm2, %xmm7 + subps %xmm5, %xmm0 + subps %xmm6, %xmm7 + addps %xmm7, %xmm0 + movaps %xmm0, 64(tmp) + + movaps %xmm1, %xmm6 + movaps %xmm4, %xmm7 + mulps 48(COS9_), %xmm6 + mulps %xmm3, %xmm2 + mulps 32(COS9_), %xmm7 + subps %xmm5, %xmm6 + subps %xmm7, %xmm2 + addps %xmm2, %xmm6 + + movaps (tmp), %xmm0 + movss 32(tfcos36_), %xmm5 + subps %xmm1, %xmm0 + subps 16(tmp), %xmm4 + addps %xmm3, %xmm0 + addps %xmm4, %xmm0 + shufps $0xaf, %xmm0, %xmm0 + mulss %xmm5, %xmm0 + movaps %xmm0, (tmp) + + movaps 32(tmp), %xmm0 + movaps 48(tmp), %xmm1 + movaps 64(tmp), %xmm2 + +/* +xmm0 [1a-0,1b-0, 2a-0, 2b-0] +xmm1 [1a-1,1b-1, 2a-1, 2b-1] +xmm2 [1a-2,1b-2,-2a-2,-2b-2] +xmm6 [1a-3,1b-3,-2a-3,-2b-3] +*/ + + movaps %xmm0, %xmm3 + unpcklps %xmm1, %xmm0 + unpckhps %xmm1, %xmm3 + movaps %xmm2, %xmm5 + unpcklps %xmm6, %xmm2 + unpckhps %xmm6, %xmm5 + xorps dct36_sse_sign-1b(%ebx), %xmm5 + +/* +xmm0 [1a-0,1a-1,1b-0,1b-1] +xmm3 [2a-0,2a-1,2b-0,2b-1] +xmm2 [1a-2,1a-3,1b-2,1b-3] +xmm5 [2a-2,2a-3,2b-2,2b-3] +*/ + + movaps %xmm0, %xmm1 + movlhps %xmm2, %xmm0 + movhlps %xmm1, %xmm2 + movaps %xmm3, %xmm4 + movlhps %xmm5, %xmm3 + movhlps %xmm4, %xmm5 + +/* +xmm0 tmp1a +xmm3 tmp2a +xmm2 tmp1b +xmm5 tmp2b +*/ + + movaps (tfcos36_), %xmm6 + movaps 16(tfcos36_), %xmm7 + movaps %xmm5, %xmm1 + addps %xmm2, %xmm5 + subps %xmm2, %xmm1 + movaps %xmm3, %xmm2 + addps %xmm0, %xmm3 + subps %xmm0, %xmm2 + mulps %xmm6, %xmm5 + mulps %xmm1, %xmm7 + + movaps %xmm2, 16(tmp) + +/* +%xmm3 tmp[0,1,2,3] +%xmm5 tmp[17,16,15,14] +16(tmp) tmp[8,7,6,5] +%xmm7 tmp[9,10,11,12] +0(tmp) tmp[13,-,4,-] +*/ + + movl 12(%ebp), out1 + movl 16(%ebp), out2 + movl 20(%ebp), w + movl 24(%ebp), ts + + movaps %xmm3, %xmm0 + movaps %xmm5, %xmm1 + movups 108(w), %xmm2 + movups 92(w), %xmm3 + shufps $0x1b, %xmm3, %xmm3 + movups 36(w), %xmm4 + movups 20(w), %xmm5 + shufps $0x1b, %xmm5, %xmm5 + movaps %xmm0, %xmm6 + addps %xmm1, %xmm0 + subps %xmm1, %xmm6 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movups 36(out1), %xmm1 + movups 20(out1), %xmm3 + shufps $0x1b, %xmm6, %xmm6 + addps %xmm4, %xmm1 + addps %xmm6, %xmm3 + shufps $0x1b, %xmm0, %xmm0 + movups %xmm2, 36(out2) + movups %xmm0, 20(out2) + movss %xmm1, 32*36(ts) + movss %xmm3, 32*20(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*44(ts) + movss %xmm4, 32*28(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*40(ts) + movss %xmm3, 32*24(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*48(ts) + movss %xmm4, 32*32(ts) + + movss 8(tmp), %xmm0 + movss (tmp), %xmm1 + movss 124(w), %xmm2 + movss 88(w), %xmm3 + movss 52(w), %xmm4 + movss 16(w), %xmm5 + movss %xmm0, %xmm6 + addss %xmm1, %xmm0 + subss %xmm1, %xmm6 + mulss %xmm0, %xmm2 + mulss %xmm3, %xmm0 + mulss %xmm6, %xmm4 + mulss %xmm5, %xmm6 + addss 52(out1), %xmm4 + addss 16(out1), %xmm6 + movss %xmm2, 52(out2) + movss %xmm0, 16(out2) + movss %xmm4, 32*52(ts) + movss %xmm6, 32*16(ts) + + movaps 16(tmp), %xmm0 + movaps %xmm7, %xmm1 + MOVUAPS 128(w), %xmm2 + movups 72(w), %xmm3 + shufps $0x1b, %xmm2, %xmm2 + movlps 56(w), %xmm4 + movhps 64(w), %xmm4 + MOVUAPS (w), %xmm5 + shufps $0x1b, %xmm4, %xmm4 + movaps %xmm0, %xmm6 + addps %xmm1, %xmm0 + subps %xmm1, %xmm6 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movlps 56(out1), %xmm1 + movhps 64(out1), %xmm1 + movups (out1), %xmm3 + shufps $0x1b, %xmm4, %xmm4 + addps %xmm6, %xmm3 + addps %xmm4, %xmm1 + shufps $0x1b, %xmm2, %xmm2 + movups %xmm0, (out2) + movlps %xmm2, 56(out2) + movhps %xmm2, 64(out2) + movss %xmm1, 32*56(ts) + movss %xmm3, (ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*64(ts) + movss %xmm4, 32*8(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*60(ts) + movss %xmm3, 32*4(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*68(ts) + movss %xmm4, 32*12(ts) + + pop %edi + pop %esi + pop %ebx + mov %ebp, %esp + pop %ebp + + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct36_x86_64.S b/jni/mpg123-1.17.0/src/libmpg123/dct36_x86_64.S new file mode 100644 index 00000000..35676c3f --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct36_x86_64.S @@ -0,0 +1,394 @@ +/* + dct36_x86_64: SSE optimized dct36 for x86-64 + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +#define in %rcx +#define out1 %rdx +#define out2 %r8 +#define w %r9 +#define ts %r10 +#define COS9_ %rax +#define tfcos36_ %r11 +#else +#define in %rdi +#define out1 %rsi +#define out2 %rdx +#define w %rcx +#define ts %r8 +#define COS9_ %rax +#define tfcos36_ %r9 +#endif + +/* + void dct36_x86_64(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf); +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN16 +dct36_x86_64_COS9: + .long 0x3f5db3d7 + .long 0x3f5db3d7 + .long 0x3f000000 + .long 0x3f000000 + .long 0x3f7c1c5c + .long 0x3f7c1c5c + .long 0x3f708fb2 + .long 0x3f708fb2 + .long 0x3f248dbb + .long 0x3f248dbb + .long 0x3e31d0d4 + .long 0x3e31d0d4 + .long 0x3eaf1d44 + .long 0x3eaf1d44 + .long 0x3f441b7d + .long 0x3f441b7d + ALIGN16 +dct36_x86_64_tfcos36: + .long 0x3f007d2b + .long 0x3f0483ee + .long 0x3f0d3b7d + .long 0x3f1c4257 + .long 0x40b79454 + .long 0x3ff746ea + .long 0x3f976fd9 + .long 0x3f5f2944 + .long 0x3f3504f3 + ALIGN16 +dct36_x86_64_mask: + .long 0,0xffffffff,0,0xffffffff + ALIGN16 +dct36_x86_64_sign: + .long 0x80000000,0x80000000,0x80000000,0x80000000 + .text + ALIGN16 + .globl ASM_NAME(dct36_x86_64) +ASM_NAME(dct36_x86_64): +#ifdef IS_MSABI + push %rbp + mov %rsp, %rbp + sub $160, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movaps %xmm15, 144(%rsp) + movq 48(%rbp), ts +#endif + lea dct36_x86_64_COS9(%rip), COS9_ + lea dct36_x86_64_tfcos36(%rip), tfcos36_ + + xorps %xmm5, %xmm5 + movups (in), %xmm1 + movups 16(in), %xmm2 + movups 32(in), %xmm3 + movups 48(in), %xmm4 + movlps 64(in), %xmm5 + xorps %xmm6, %xmm6 + movaps %xmm1, %xmm7 + shufps $0x93, %xmm7, %xmm7 + movaps %xmm2, %xmm8 + shufps $0x93, %xmm8, %xmm8 + movaps %xmm3, %xmm9 + shufps $0x93, %xmm9, %xmm9 + movaps %xmm4, %xmm10 + shufps $0x93, %xmm10, %xmm10 + movaps %xmm5, %xmm11 + shufps $0xe1, %xmm11, %xmm11 + movss %xmm10, %xmm11 + addps %xmm11, %xmm5 + movss %xmm9, %xmm10 + addps %xmm10, %xmm4 + movss %xmm8, %xmm9 + addps %xmm9, %xmm3 + movss %xmm7, %xmm8 + addps %xmm8, %xmm2 + movss %xmm6, %xmm7 + addps %xmm7, %xmm1 + + movaps dct36_x86_64_mask(%rip), %xmm0 + movaps %xmm4, %xmm6 + shufps $0x4e, %xmm5, %xmm4 + movaps %xmm3, %xmm7 + shufps $0x4e, %xmm6, %xmm3 + andps %xmm0, %xmm6 + addps %xmm6, %xmm4 + movaps %xmm2, %xmm6 + shufps $0x4e, %xmm7, %xmm2 + andps %xmm0, %xmm7 + addps %xmm7, %xmm3 + movaps %xmm1, %xmm7 + shufps $0x4e, %xmm6, %xmm1 + andps %xmm0, %xmm6 + addps %xmm6, %xmm2 + movaps %xmm7, %xmm6 + andps %xmm0, %xmm7 + xorps %xmm0, %xmm0 + addps %xmm7, %xmm1 + movlhps %xmm6, %xmm0 + +/* +xmm0 in[-,-,0,1] +xmm1 in[2,3,4,5] +xmm2 in[6,7,8,9] +xmm3 in[10,11,12,13] +xmm4 in[14,15,16,17] +*/ + + movaps %xmm2, %xmm5 + shufps $0xe4, %xmm3, %xmm5 + shufps $0xe4, %xmm4, %xmm3 + shufps $0xe4, %xmm2, %xmm4 + movaps %xmm5, %xmm2 +/* +xmm2 in[6,7,12,13] +xmm3 in[10,11,16,17] +xmm4 in[14,15,8,9] +*/ + + movaps (COS9_), %xmm15 + movaps 16(COS9_), %xmm6 + movaps 32(COS9_), %xmm7 + movaps 48(COS9_), %xmm8 + mulps %xmm15, %xmm5 + addps %xmm0, %xmm5 + +/* +xmm5 [ta33,tb33,ta66,tb66] +xmm6 COS9_[1,1,2,2] +xmm7 COS9_[5,5,8,8] +xmm8 COS9_[7,7,4,4] +xmm15 COS9_[3,3,6,6] +*/ + movaps %xmm6, %xmm9 + movaps %xmm7, %xmm12 + movaps %xmm8, %xmm13 + mulps %xmm1, %xmm9 + mulps %xmm3, %xmm12 + mulps %xmm4, %xmm13 + addps %xmm5, %xmm9 + addps %xmm13, %xmm12 + addps %xmm9, %xmm12 + + movaps %xmm1, %xmm13 + subps %xmm3, %xmm13 + movaps %xmm0, %xmm10 + shufps $0xe0, %xmm2, %xmm10 + movaps %xmm0, %xmm14 + subps %xmm10, %xmm14 + subps %xmm4, %xmm13 + mulps %xmm15, %xmm13 + addps %xmm14, %xmm13 + + movaps %xmm7, %xmm9 + movaps %xmm8, %xmm15 + movaps %xmm6, %xmm14 + mulps %xmm1, %xmm9 + mulps %xmm3, %xmm15 + mulps %xmm4, %xmm14 + subps %xmm5, %xmm9 + subps %xmm15, %xmm14 + addps %xmm9, %xmm14 + + mulps %xmm1, %xmm8 + mulps %xmm3, %xmm6 + mulps %xmm4, %xmm7 + subps %xmm5, %xmm8 + subps %xmm7, %xmm6 + addps %xmm6, %xmm8 + movaps %xmm8, %xmm15 + + movss 32(tfcos36_), %xmm5 + subps %xmm1, %xmm0 + subps %xmm2, %xmm4 + addps %xmm3, %xmm0 + addps %xmm4, %xmm0 + shufps $0xaf, %xmm0, %xmm0 + mulss %xmm5, %xmm0 + movaps %xmm0, %xmm11 + +/* +xmm12 [1a-0,1b-0, 2a-0, 2b-0] +xmm13 [1a-1,1b-1, 2a-1, 2b-1] +xmm14 [1a-2,1b-2,-2a-2,-2b-2] +xmm15 [1a-3,1b-3,-2a-3,-2b-3] +*/ + movaps %xmm12, %xmm5 + unpckhps %xmm13, %xmm5 + unpcklps %xmm13, %xmm12 + movaps %xmm14, %xmm6 + unpckhps %xmm15, %xmm6 + unpcklps %xmm15, %xmm14 + xorps dct36_x86_64_sign(%rip), %xmm6 + +/* +xmm12 [1a-0,1a-1,1b-0,1b-1] +xmm5 [2a-0,2a-1,2b-0,2b-1] +xmm14 [1a-2,1a-3,1b-2,1b-3] +xmm6 [2a-2,2a-3,2b-2,2b-3] +*/ + + movaps %xmm12, %xmm0 + movlhps %xmm14, %xmm12 + movhlps %xmm0, %xmm14 + movaps %xmm5, %xmm0 + movlhps %xmm6, %xmm0 + movhlps %xmm5, %xmm6 + movaps %xmm6, %xmm15 + +/* +xmm12 tmp1a +xmm0 tmp2a +xmm14 tmp1b +xmm15 tmp2b +*/ + + movaps (tfcos36_), %xmm6 + movaps 16(tfcos36_), %xmm7 + movaps %xmm15, %xmm10 + addps %xmm14, %xmm15 + subps %xmm14, %xmm10 + movaps %xmm0, %xmm14 + addps %xmm12, %xmm0 + subps %xmm12, %xmm14 + mulps %xmm6, %xmm15 + mulps %xmm10, %xmm7 + +/* +%xmm0 tmp[0,1,2,3] +%xmm15 tmp[17,16,15,14] +%xmm14 tmp[8,7,6,5] +%xmm7 tmp[9,10,11,12] +%xmm11 tmp[13,-,4,-] +*/ + + movaps %xmm15, %xmm1 + movups 108(w), %xmm2 + movups 92(w), %xmm3 + shufps $0x1b, %xmm3, %xmm3 + movups 36(w), %xmm4 + movups 20(w), %xmm5 + shufps $0x1b, %xmm5, %xmm5 + movaps %xmm0, %xmm6 + addps %xmm1, %xmm0 + subps %xmm1, %xmm6 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movups 36(out1), %xmm1 + movups 20(out1), %xmm3 + shufps $0x1b, %xmm6, %xmm6 + addps %xmm4, %xmm1 + addps %xmm6, %xmm3 + shufps $0x1b, %xmm0, %xmm0 + movups %xmm2, 36(out2) + movups %xmm0, 20(out2) + movss %xmm1, 32*36(ts) + movss %xmm3, 32*20(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*44(ts) + movss %xmm4, 32*28(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*40(ts) + movss %xmm3, 32*24(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*48(ts) + movss %xmm4, 32*32(ts) + + movhlps %xmm11, %xmm0 + movaps %xmm11, %xmm1 + movss 124(w), %xmm2 + movss 88(w), %xmm3 + movss 52(w), %xmm4 + movss 16(w), %xmm5 + movss %xmm0, %xmm6 + addss %xmm1, %xmm0 + subss %xmm1, %xmm6 + mulss %xmm0, %xmm2 + mulss %xmm3, %xmm0 + mulss %xmm6, %xmm4 + mulss %xmm5, %xmm6 + addss 52(out1), %xmm4 + addss 16(out1), %xmm6 + movss %xmm2, 52(out2) + movss %xmm0, 16(out2) + movss %xmm4, 32*52(ts) + movss %xmm6, 32*16(ts) + + movaps %xmm14, %xmm0 + movaps %xmm7, %xmm1 + MOVUAPS 128(w), %xmm2 + movups 72(w), %xmm3 + shufps $0x1b, %xmm2, %xmm2 + movlps 56(w), %xmm4 + movhps 64(w), %xmm4 + MOVUAPS (w), %xmm5 + shufps $0x1b, %xmm4, %xmm4 + movaps %xmm0, %xmm6 + addps %xmm1, %xmm0 + subps %xmm1, %xmm6 + mulps %xmm0, %xmm2 + mulps %xmm3, %xmm0 + mulps %xmm6, %xmm4 + mulps %xmm5, %xmm6 + movlps 56(out1), %xmm1 + movhps 64(out1), %xmm1 + movups (out1), %xmm3 + shufps $0x1b, %xmm4, %xmm4 + addps %xmm6, %xmm3 + addps %xmm4, %xmm1 + shufps $0x1b, %xmm2, %xmm2 + movups %xmm0, (out2) + movlps %xmm2, 56(out2) + movhps %xmm2, 64(out2) + movss %xmm1, 32*56(ts) + movss %xmm3, (ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*64(ts) + movss %xmm4, 32*8(ts) + shufps $0xb1, %xmm1, %xmm1 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm1, 32*60(ts) + movss %xmm3, 32*4(ts) + movhlps %xmm1, %xmm2 + movhlps %xmm3, %xmm4 + movss %xmm2, 32*68(ts) + movss %xmm4, 32*12(ts) + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + movaps 144(%rsp), %xmm15 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64.c b/jni/mpg123-1.17.0/src/libmpg123/dct64.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64.c rename to jni/mpg123-1.17.0/src/libmpg123/dct64.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct64.lo b/jni/mpg123-1.17.0/src/libmpg123/dct64.lo new file mode 100644 index 00000000..7cf64551 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct64.lo @@ -0,0 +1,12 @@ +# dct64.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/dct64.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_3dnow.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_3dnow.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_3dnow.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_3dnow.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_3dnowext.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_3dnowext.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_3dnowext.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_3dnowext.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_altivec.c b/jni/mpg123-1.17.0/src/libmpg123/dct64_altivec.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_altivec.c rename to jni/mpg123-1.17.0/src/libmpg123/dct64_altivec.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct64_avx.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_avx.S new file mode 100644 index 00000000..3a8468e8 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct64_avx.S @@ -0,0 +1,324 @@ +/* + dct36_sse: AVX optimized dct64 for x86-64 + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#define samples %rdx +#define costab %rcx +#define out0 %rdi +#define out1 %rsi + +/* + void dct64_avx(short *out0, short *out1, real *samples); +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN32 +costab_avx: + .long 1056974725 + .long 1057056395 + .long 1057223771 + .long 1057485416 + .long 1057855544 + .long 1058356026 + .long 1059019886 + .long 1059897405 + .long 1061067246 + .long 1062657950 + .long 1064892987 + .long 1066774581 + .long 1069414683 + .long 1073984175 + .long 1079645762 + .long 1092815430 + .long 1057005197 + .long 1057342072 + .long 1058087743 + .long 1059427869 + .long 1061799040 + .long 1065862217 + .long 1071413542 + .long 1084439708 + .long 1057128951 + .long 1058664893 + .long 1063675095 + .long 1076102863 + .long 1057655764 + .long 1067924853 + .long 1060439283 + .long 0 + .text + ALIGN16 +.globl ASM_NAME(dct64_avx) +ASM_NAME(dct64_avx): +#ifdef IS_MSABI + push %rbp + mov %rsp, %rbp + sub $112, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + push %rdi + push %rsi + mov %rcx, %rdi + mov %rdx, %rsi + mov %r8, %rdx +#endif + leaq costab_avx(%rip), costab + + vmovups (samples), %ymm0 # input[0,1,2,3,4,5,6,7] + vmovups 32(samples), %ymm1 # input[8,9,10,11,12,13,14,15] + vperm2f128 $0x23, 64(samples), %ymm2, %ymm2 + vperm2f128 $0x23, 96(samples), %ymm3, %ymm3 + vshufps $0x1b, %ymm2, %ymm2, %ymm2 # input[23,22,21,20,19,18,17,16] + vshufps $0x1b, %ymm3, %ymm3, %ymm3 # input[31,30,29,28,27,26,25,24] + vsubps %ymm2, %ymm1, %ymm6 + vsubps %ymm3, %ymm0, %ymm7 + vaddps %ymm0, %ymm3, %ymm4 # bufs[0,1,2,3,4,5,6,7] + vaddps %ymm1, %ymm2, %ymm5 # bufs[8,9,10,11,12,13,14,15] + vmulps (costab), %ymm7, %ymm7 # bufs[31,30,29,28,27,26,25,24] cos64[0,1,2,3,4,5,6,7] + vmulps 32(costab), %ymm6, %ymm6 # bufs[23,22,21,20,19,18,17,16] cos64[8,9,10,11,12,13,14,15] + + vmovaps 64(costab), %ymm8 # cos32[0,1,2,3,4,5,6,7] + + vshufps $0x1b, %ymm5, %ymm5, %ymm5 + vshufps $0x1b, %ymm6, %ymm6, %ymm6 + vperm2f128 $0x01, %ymm5, %ymm5, %ymm5 # bufs[15,14,13,12,11,10,9,8] + vperm2f128 $0x01, %ymm6, %ymm6, %ymm6 # bufs[16,17,18,19,20,21,22,23] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm6, %ymm7, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[32,33,34,35,36,37,38,39] + vaddps %ymm6, %ymm7, %ymm2 # bufs[48,49,50,51,52,53,54,55] + vmulps %ymm1, %ymm8, %ymm1 # bufs[47,46,45,44,43,42,41,40] + vmulps %ymm3, %ymm8, %ymm3 # bufs[63,62,61,60,59,58,57,56] + + vmovaps 96(costab), %ymm8 # cos16[0,1,2,3]:cos8[0,1]:cos4[0]:- + vperm2f128 $0x00, %ymm8, %ymm8, %ymm9 # cos16[0,1,2,3,0,1,2,3] + + vperm2f128 $0x20, %ymm1, %ymm0, %ymm4 # bufs[32,33,34,35,47,46,45,44] + vperm2f128 $0x31, %ymm1, %ymm0, %ymm5 + vshufps $0x1b, %ymm5, %ymm5, %ymm5 # bufs[39,38,37,36,40,41,42,43] + vperm2f128 $0x20, %ymm3, %ymm2, %ymm6 # bufs[48,49,50,51,63,62,61,60] + vperm2f128 $0x31, %ymm3, %ymm2, %ymm7 + vshufps $0x1b, %ymm7, %ymm7, %ymm7 # bufs[55,54,53,52,56,57,58,59] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[0,1,2,3,8,9,10,11] + vaddps %ymm7, %ymm6, %ymm2 # bufs[16,17,18,19,24,25,26,27] + vmulps %ymm1, %ymm9, %ymm1 # bufs[7,6,5,4,15,14,13,12] + vmulps %ymm3, %ymm9, %ymm3 # bufs[23,22,21,20,31,30,29,28] + + vperm2f128 $0x11, %ymm8, %ymm8, %ymm8 # cos8[0,1]:cos4[0]:-:cos8[0,1]:cos4[0]:- + vmovddup %ymm8, %ymm9 # cos8[0,1,0,1,0,1,0,1] + + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[0,7,1,6,8,15,9,14] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[2,5,3,4,10,13,11,12] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[16,23,17,22,24,31,25,30] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[18,21,19,20,26,29,27,28] + vshufps $0xd8, %ymm4, %ymm4, %ymm4 # bufs[0,1,7,6,8,9,15,14] + vshufps $0x72, %ymm5, %ymm5, %ymm5 # bufs[3,2,4,5,11,10,12,13] + vshufps $0xd8, %ymm6, %ymm6, %ymm6 # bufs[16,17,23,22,24,25,31,30] + vshufps $0x72, %ymm7, %ymm7, %ymm7 # bufs[19,18,20,21,27,26,28,29] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[32,33,36,37,40,41,44,45] + vaddps %ymm7, %ymm6, %ymm2 # bufs[48,49,52,53,56,57,60,61] + vmulps %ymm1, %ymm9, %ymm1 # bufs[35,34,39,38,43,42,47,46] + vmulps %ymm3, %ymm9, %ymm3 # bufs[51,50,55,54,59,58,63,62] + + vpermilps $0xaa, %ymm8, %ymm8 # cos4[0,0,0,0,0,0,0,0] + + vshufps $0xd8, %ymm0, %ymm0, %ymm0 # bufs[32,36,33,37,40,44,41,45] + vshufps $0xd8, %ymm1, %ymm1, %ymm1 # bufs[35,39,34,38,43,47,42,46] + vshufps $0xd8, %ymm2, %ymm2, %ymm2 # bufs[48,52,49,53,56,60,57,61] + vshufps $0xd8, %ymm3, %ymm3, %ymm3 # bufs[51,55,50,54,59,63,58,62] + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[32,35,36,39,40,43,44,47] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[33,34,37,38,41,42,45,46] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[48,51,52,55,56,59,60,63] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[49,50,53,54,57,58,61,62] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[0,2,4,6,8,10,12,14] + vaddps %ymm7, %ymm6, %ymm2 # bufs[16,18,20,22,24,26,28,30] + vmulps %ymm1, %ymm8, %ymm1 # bufs[1,3,5,7,9,11,13,15] + vmulps %ymm3, %ymm8, %ymm3 # bufs[17,19,21,23,25,27,29,31] + + vxorps %ymm8, %ymm8, %ymm8 + vblendps $0xaa, %ymm1, %ymm8, %ymm5 + vblendps $0xaa, %ymm3, %ymm8, %ymm6 + vaddps %ymm5, %ymm0, %ymm0 + vaddps %ymm6, %ymm2, %ymm2 + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[0,1,2,3,8,9,10,11] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[4,5,6,7,12,13,14,15] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[16,17,18,19,24,25,26,27] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[20,21,22,23,28,29,30,31] + + vextractf128 $0x1, %ymm4, %xmm0 # bufs[8,9,10,11] + vextractf128 $0x1, %ymm5, %xmm1 # bufs[12,13,14,15] + vextractf128 $0x1, %ymm6, %xmm2 # bufs[24,25,26,27] + vextractf128 $0x1, %ymm7, %xmm3 # bufs[28,29,30,31] + + vshufps $0x1e, %xmm5, %xmm5, %xmm9 # bufs[6,7,5,4] + vshufps $0x1e, %xmm1, %xmm1, %xmm10 # bufs[14,15,13,12] + vshufps $0x1e, %xmm7, %xmm7, %xmm11 # bufs[22,23,21,20] + vshufps $0x1e, %xmm3, %xmm3, %xmm12 # bufs[30,31,29,28] + vblendps $0x7, %xmm9, %xmm8, %xmm9 # bufs[6,7,5,-] + vblendps $0x7, %xmm10, %xmm8, %xmm10 # bufs[14,15,13,-] + vblendps $0x7, %xmm11, %xmm8, %xmm11 # bufs[22,23,21,-] + vblendps $0x7, %xmm12, %xmm8, %xmm12 # bufs[30,31,29,-] + vaddps %xmm5, %xmm9, %xmm5 + vaddps %xmm1, %xmm10, %xmm1 + vaddps %xmm7, %xmm11, %xmm7 + vaddps %xmm3, %xmm12, %xmm3 + + prefetcht0 512(out0) + + vshufps $0x1e, %xmm0, %xmm0, %xmm9 # bufs[10,11,9,8] + vshufps $0x1e, %xmm2, %xmm2, %xmm10 # bufs[26,27,25,24] + vaddps %xmm1, %xmm0, %xmm0 + vaddps %xmm3, %xmm2, %xmm2 + vblendps $0x7, %xmm9, %xmm8, %xmm9 # bufs[10,11,9,-] + vblendps $0x7, %xmm10, %xmm8, %xmm10 # bufs[26,27,25,-] + vaddps %xmm1, %xmm9, %xmm1 + vaddps %xmm3, %xmm10, %xmm3 + + vzeroupper + prefetcht0 512(out1) + + cvtps2dq %xmm4, %xmm4 + cvtps2dq %xmm0, %xmm0 + cvtps2dq %xmm5, %xmm5 + cvtps2dq %xmm1, %xmm1 + packssdw %xmm5, %xmm4 + packssdw %xmm1, %xmm0 + movq %xmm4, %rcx + pshufd $0x4e, %xmm4, %xmm5 + movq %xmm0, %rdx + pshufd $0x4e, %xmm0, %xmm1 + movq %xmm5, %r8 + movq %xmm1, %r9 + + addq $512, out0 + movq $-64, %rax + + movw %cx, (out0) + movw %dx, (out0,%rax,1) + movw %r8w, (out0,%rax,2) + movw %r9w, -64(out0,%rax,2) + leaq (out0,%rax,4), out0 + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + movw %cx, (out0,%rax,4) + negq %rax + movw %cx, (out1) + movw %dx, (out1,%rax,1) + movw %r8w, (out1,%rax,2) + movw %r9w, 64(out1,%rax,2) + leaq (out1,%rax,4), out1 + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + negq %rax + movw %cx, (out0) + movw %dx, (out0,%rax,1) + movw %r8w, (out0,%rax,2) + movw %r9w, -64(out0,%rax,2) + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + negq %rax + movw %cx, (out1) + movw %dx, (out1,%rax,1) + movw %r8w, (out1,%rax,2) + movw %r9w, 64(out1,%rax,2) + + leaq -32(out0,%rax,4), out0 + negq %rax + leaq 32(out1,%rax,4), out1 + + vshufps $0x1e, %xmm6, %xmm6, %xmm0 + vblendps $0x7, %xmm0, %xmm8, %xmm0 + addps %xmm2, %xmm6 + addps %xmm7, %xmm2 + addps %xmm3, %xmm7 + addps %xmm0, %xmm3 + cvtps2dq %xmm6, %xmm6 + cvtps2dq %xmm2, %xmm2 + cvtps2dq %xmm7, %xmm7 + cvtps2dq %xmm3, %xmm3 + packssdw %xmm7, %xmm6 + packssdw %xmm3, %xmm2 + movq %xmm6, %rcx + pshufd $0x4e, %xmm6, %xmm7 + movq %xmm2, %rdx + pshufd $0x4e, %xmm2, %xmm3 + movq %xmm7, %r8 + movq %xmm3, %r9 + + movw %cx, (out0) + movw %dx, (out0,%rax,1) + movw %r8w, (out0,%rax,2) + movw %r9w, -64(out0,%rax,2) + leaq (out0,%rax,4), out0 + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + negq %rax + movw %cx, (out1) + movw %dx, (out1,%rax,1) + movw %r8w, (out1,%rax,2) + movw %r9w, 64(out1,%rax,2) + leaq (out1,%rax,4), out1 + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + negq %rax + movw %cx, (out0) + movw %dx, (out0,%rax,1) + movw %r8w, (out0,%rax,2) + movw %r9w, -64(out0,%rax,2) + shr $16, %rcx + shr $16, %rdx + shr $16, %r8 + shr $16, %r9 + negq %rax + movw %cx, (out1) + movw %dx, (out1,%rax,1) + movw %r8w, (out1,%rax,2) + movw %r9w, 64(out1,%rax,2) + +#ifdef IS_MSABI + pop %rsi + pop %rdi + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/dct64_avx_float.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_avx_float.S new file mode 100644 index 00000000..e4c024e2 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/dct64_avx_float.S @@ -0,0 +1,294 @@ +/* + dct64_x86_64_float: SSE optimized dct64 for x86-64 (float output version) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#define samples %rdx +#define costab %rcx +#define out0 %rdi +#define out1 %rsi + +/* + void dct64_real_avx(real *out0, real *out1, real *samples); +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN32 +costab_avx: + .long 1056974725 + .long 1057056395 + .long 1057223771 + .long 1057485416 + .long 1057855544 + .long 1058356026 + .long 1059019886 + .long 1059897405 + .long 1061067246 + .long 1062657950 + .long 1064892987 + .long 1066774581 + .long 1069414683 + .long 1073984175 + .long 1079645762 + .long 1092815430 + .long 1057005197 + .long 1057342072 + .long 1058087743 + .long 1059427869 + .long 1061799040 + .long 1065862217 + .long 1071413542 + .long 1084439708 + .long 1057128951 + .long 1058664893 + .long 1063675095 + .long 1076102863 + .long 1057655764 + .long 1067924853 + .long 1060439283 + .long 0 + .text + ALIGN16 +.globl ASM_NAME(dct64_real_avx) +ASM_NAME(dct64_real_avx): +#ifdef IS_MSABI + push %rbp + mov %rsp, %rbp + sub $112, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + push %rdi + push %rsi + mov %rcx, %rdi + mov %rdx, %rsi + mov %r8, %rdx +#endif + leaq costab_avx(%rip), costab + + vmovups (samples), %ymm0 # input[0,1,2,3,4,5,6,7] + vmovups 32(samples), %ymm1 # input[8,9,10,11,12,13,14,15] + vperm2f128 $0x23, 64(samples), %ymm2, %ymm2 + vperm2f128 $0x23, 96(samples), %ymm3, %ymm3 + vshufps $0x1b, %ymm2, %ymm2, %ymm2 # input[23,22,21,20,19,18,17,16] + vshufps $0x1b, %ymm3, %ymm3, %ymm3 # input[31,30,29,28,27,26,25,24] + vsubps %ymm2, %ymm1, %ymm6 + vsubps %ymm3, %ymm0, %ymm7 + vaddps %ymm0, %ymm3, %ymm4 # bufs[0,1,2,3,4,5,6,7] + vaddps %ymm1, %ymm2, %ymm5 # bufs[8,9,10,11,12,13,14,15] + vmulps (costab), %ymm7, %ymm7 # bufs[31,30,29,28,27,26,25,24] cos64[0,1,2,3,4,5,6,7] + vmulps 32(costab), %ymm6, %ymm6 # bufs[23,22,21,20,19,18,17,16] cos64[8,9,10,11,12,13,14,15] + + vmovaps 64(costab), %ymm8 # cos32[0,1,2,3,4,5,6,7] + + vshufps $0x1b, %ymm5, %ymm5, %ymm5 + vshufps $0x1b, %ymm6, %ymm6, %ymm6 + vperm2f128 $0x01, %ymm5, %ymm5, %ymm5 # bufs[15,14,13,12,11,10,9,8] + vperm2f128 $0x01, %ymm6, %ymm6, %ymm6 # bufs[16,17,18,19,20,21,22,23] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm6, %ymm7, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[32,33,34,35,36,37,38,39] + vaddps %ymm6, %ymm7, %ymm2 # bufs[48,49,50,51,52,53,54,55] + vmulps %ymm1, %ymm8, %ymm1 # bufs[47,46,45,44,43,42,41,40] + vmulps %ymm3, %ymm8, %ymm3 # bufs[63,62,61,60,59,58,57,56] + + vmovaps 96(costab), %ymm8 # cos16[0,1,2,3]:cos8[0,1]:cos4[0]:- + vperm2f128 $0x00, %ymm8, %ymm8, %ymm9 # cos16[0,1,2,3,0,1,2,3] + + vperm2f128 $0x20, %ymm1, %ymm0, %ymm4 # bufs[32,33,34,35,47,46,45,44] + vperm2f128 $0x31, %ymm1, %ymm0, %ymm5 + vshufps $0x1b, %ymm5, %ymm5, %ymm5 # bufs[39,38,37,36,40,41,42,43] + vperm2f128 $0x20, %ymm3, %ymm2, %ymm6 # bufs[48,49,50,51,63,62,61,60] + vperm2f128 $0x31, %ymm3, %ymm2, %ymm7 + vshufps $0x1b, %ymm7, %ymm7, %ymm7 # bufs[55,54,53,52,56,57,58,59] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[0,1,2,3,8,9,10,11] + vaddps %ymm7, %ymm6, %ymm2 # bufs[16,17,18,19,24,25,26,27] + vmulps %ymm1, %ymm9, %ymm1 # bufs[7,6,5,4,15,14,13,12] + vmulps %ymm3, %ymm9, %ymm3 # bufs[23,22,21,20,31,30,29,28] + + vperm2f128 $0x11, %ymm8, %ymm8, %ymm8 # cos8[0,1]:cos4[0]:-:cos8[0,1]:cos4[0]:- + vmovddup %ymm8, %ymm9 # cos8[0,1,0,1,0,1,0,1] + + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[0,7,1,6,8,15,9,14] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[2,5,3,4,10,13,11,12] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[16,23,17,22,24,31,25,30] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[18,21,19,20,26,29,27,28] + vshufps $0xd8, %ymm4, %ymm4, %ymm4 # bufs[0,1,7,6,8,9,15,14] + vshufps $0x72, %ymm5, %ymm5, %ymm5 # bufs[3,2,4,5,11,10,12,13] + vshufps $0xd8, %ymm6, %ymm6, %ymm6 # bufs[16,17,23,22,24,25,31,30] + vshufps $0x72, %ymm7, %ymm7, %ymm7 # bufs[19,18,20,21,27,26,28,29] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[32,33,36,37,40,41,44,45] + vaddps %ymm7, %ymm6, %ymm2 # bufs[48,49,52,53,56,57,60,61] + vmulps %ymm1, %ymm9, %ymm1 # bufs[35,34,39,38,43,42,47,46] + vmulps %ymm3, %ymm9, %ymm3 # bufs[51,50,55,54,59,58,63,62] + + vpermilps $0xaa, %ymm8, %ymm8 # cos4[0,0,0,0,0,0,0,0] + + vshufps $0xd8, %ymm0, %ymm0, %ymm0 # bufs[32,36,33,37,40,44,41,45] + vshufps $0xd8, %ymm1, %ymm1, %ymm1 # bufs[35,39,34,38,43,47,42,46] + vshufps $0xd8, %ymm2, %ymm2, %ymm2 # bufs[48,52,49,53,56,60,57,61] + vshufps $0xd8, %ymm3, %ymm3, %ymm3 # bufs[51,55,50,54,59,63,58,62] + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[32,35,36,39,40,43,44,47] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[33,34,37,38,41,42,45,46] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[48,51,52,55,56,59,60,63] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[49,50,53,54,57,58,61,62] + vsubps %ymm5, %ymm4, %ymm1 + vsubps %ymm7, %ymm6, %ymm3 + vaddps %ymm5, %ymm4, %ymm0 # bufs[0,2,4,6,8,10,12,14] + vaddps %ymm7, %ymm6, %ymm2 # bufs[16,18,20,22,24,26,28,30] + vmulps %ymm1, %ymm8, %ymm1 # bufs[1,3,5,7,9,11,13,15] + vmulps %ymm3, %ymm8, %ymm3 # bufs[17,19,21,23,25,27,29,31] + + vxorps %ymm8, %ymm8, %ymm8 + vblendps $0xaa, %ymm1, %ymm8, %ymm5 + vblendps $0xaa, %ymm3, %ymm8, %ymm6 + vaddps %ymm5, %ymm0, %ymm0 + vaddps %ymm6, %ymm2, %ymm2 + vunpcklps %ymm1, %ymm0, %ymm4 # bufs[0,1,2,3,8,9,10,11] + vunpckhps %ymm1, %ymm0, %ymm5 # bufs[4,5,6,7,12,13,14,15] + vunpcklps %ymm3, %ymm2, %ymm6 # bufs[16,17,18,19,24,25,26,27] + vunpckhps %ymm3, %ymm2, %ymm7 # bufs[20,21,22,23,28,29,30,31] + + vextractf128 $0x1, %ymm4, %xmm0 # bufs[8,9,10,11] + vextractf128 $0x1, %ymm5, %xmm1 # bufs[12,13,14,15] + vextractf128 $0x1, %ymm6, %xmm2 # bufs[24,25,26,27] + vextractf128 $0x1, %ymm7, %xmm3 # bufs[28,29,30,31] + + vshufps $0x1e, %xmm5, %xmm5, %xmm9 # bufs[6,7,5,4] + vshufps $0x1e, %xmm1, %xmm1, %xmm10 # bufs[14,15,13,12] + vshufps $0x1e, %xmm7, %xmm7, %xmm11 # bufs[22,23,21,20] + vshufps $0x1e, %xmm3, %xmm3, %xmm12 # bufs[30,31,29,28] + vblendps $0x7, %xmm9, %xmm8, %xmm9 # bufs[6,7,5,-] + vblendps $0x7, %xmm10, %xmm8, %xmm10 # bufs[14,15,13,-] + vblendps $0x7, %xmm11, %xmm8, %xmm11 # bufs[22,23,21,-] + vblendps $0x7, %xmm12, %xmm8, %xmm12 # bufs[30,31,29,-] + vaddps %xmm5, %xmm9, %xmm5 + vaddps %xmm1, %xmm10, %xmm1 + vaddps %xmm7, %xmm11, %xmm7 + vaddps %xmm3, %xmm12, %xmm3 + + prefetcht0 1024(out0) + + vshufps $0x1e, %xmm0, %xmm0, %xmm9 # bufs[10,11,9,8] + vshufps $0x1e, %xmm2, %xmm2, %xmm10 # bufs[26,27,25,24] + vaddps %xmm1, %xmm0, %xmm0 + vaddps %xmm3, %xmm2, %xmm2 + vblendps $0x7, %xmm9, %xmm8, %xmm9 # bufs[10,11,9,-] + vblendps $0x7, %xmm10, %xmm8, %xmm10 # bufs[26,27,25,-] + vaddps %xmm1, %xmm9, %xmm1 + vaddps %xmm3, %xmm10, %xmm3 + + vzeroupper + prefetcht0 1024(out1) + + addq $1024, out0 + movq $-128, %rax + movss %xmm4, (out0) + movss %xmm0, (out0,%rax,1) + movss %xmm5, (out0,%rax,2) + movss %xmm1, -128(out0,%rax,2) + leaq (out0,%rax,4), out0 + movhlps %xmm4, %xmm9 + movhlps %xmm0, %xmm10 + movhlps %xmm5, %xmm11 + movhlps %xmm1, %xmm12 + vmovss %xmm9, (out0) + vmovss %xmm10, (out0,%rax,1) + vmovss %xmm11, (out0,%rax,2) + vmovss %xmm12, -128(out0,%rax,2) + leaq (out0,%rax,4), out0 + negq %rax + shufps $0xb1, %xmm4, %xmm4 + shufps $0xb1, %xmm0, %xmm0 + shufps $0xb1, %xmm5, %xmm5 + shufps $0xb1, %xmm1, %xmm1 + movss %xmm4, (out0) + movss %xmm4, (out1) + leaq (out1,%rax,1), out1 + movss %xmm0, (out1) + movss %xmm5, (out1,%rax,1) + movss %xmm1, (out1,%rax,2) + leaq (out1,%rax,4), out1 + movhlps %xmm4, %xmm4 + movhlps %xmm0, %xmm0 + movhlps %xmm5, %xmm5 + movhlps %xmm1, %xmm1 + movss %xmm4, -128(out1) + movss %xmm0, (out1) + movss %xmm5, (out1,%rax,1) + movss %xmm1, (out1,%rax,2) + + leaq -64(out0,%rax,8), out0 + negq %rax + vshufps $0x1e, %xmm6, %xmm6, %xmm0 + vblendps $0x7, %xmm0, %xmm8, %xmm0 + addps %xmm2, %xmm6 + addps %xmm7, %xmm2 + addps %xmm3, %xmm7 + addps %xmm0, %xmm3 + movss %xmm6, (out0) + movss %xmm2, (out0,%rax,1) + movss %xmm7, (out0,%rax,2) + movss %xmm3, -128(out0,%rax,2) + leaq (out0,%rax,4), out0 + movhlps %xmm6, %xmm0 + movhlps %xmm2, %xmm1 + movhlps %xmm7, %xmm4 + movhlps %xmm3, %xmm5 + movss %xmm0, (out0) + movss %xmm1, (out0,%rax,1) + movss %xmm4, (out0,%rax,2) + movss %xmm5, -128(out0,%rax,2) + leaq 64(out1,%rax,4), out1 + negq %rax + shufps $0xb1, %xmm6, %xmm6 + shufps $0xb1, %xmm2, %xmm2 + shufps $0xb1, %xmm7, %xmm7 + shufps $0xb1, %xmm3, %xmm3 + movss %xmm6, -128(out1) + movss %xmm2, (out1) + movss %xmm7, (out1,%rax,1) + movss %xmm3, (out1,%rax,2) + leaq (out1,%rax,4), out1 + movhlps %xmm6, %xmm6 + movhlps %xmm2, %xmm2 + movhlps %xmm7, %xmm7 + movhlps %xmm3, %xmm3 + movss %xmm6, -128(out1) + movss %xmm2, (out1) + movss %xmm7, (out1,%rax,1) + movss %xmm3, (out1,%rax,2) + +#ifdef IS_MSABI + pop %rsi + pop %rdi + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_i386.c b/jni/mpg123-1.17.0/src/libmpg123/dct64_i386.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_i386.c rename to jni/mpg123-1.17.0/src/libmpg123/dct64_i386.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_i486.c b/jni/mpg123-1.17.0/src/libmpg123/dct64_i486.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_i486.c rename to jni/mpg123-1.17.0/src/libmpg123/dct64_i486.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_mmx.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_mmx.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_mmx.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_mmx.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_neon.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_neon.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_neon.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_neon.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_neon_float.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_neon_float.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_neon_float.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_neon_float.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_sse.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_sse.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_sse.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_sse.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_sse_float.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_sse_float.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_sse_float.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_sse_float.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64.S similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64.S index 01440391..9d858623 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64.S +++ b/jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *out0 */ #define ARG0 %r9 /* short *out1 */ @@ -71,7 +71,7 @@ ASM_NAME(costab_x86_64): ALIGN16 .globl ASM_NAME(dct64_x86_64) ASM_NAME(dct64_x86_64): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $168, %rsp /* stack alignment + 10 xmm registers */ movaps %xmm6, (%rsp) @@ -446,7 +446,7 @@ ASM_NAME(dct64_x86_64): movw %ax, 416(ARG1) movw %cx, 480(ARG1) -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64_float.S b/jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64_float.S similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64_float.S rename to jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64_float.S index 168a3210..5197e4c0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/dct64_x86_64_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/dct64_x86_64_float.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *out0 */ #define ARG0 %r9 /* short *out1 */ @@ -71,7 +71,7 @@ ASM_NAME(costab_x86_64): ALIGN16 .globl ASM_NAME(dct64_real_x86_64) ASM_NAME(dct64_real_x86_64): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $168, %rsp /* stack alignment + 10 xmm registers */ movaps %xmm6, (%rsp) @@ -408,7 +408,7 @@ ASM_NAME(dct64_real_x86_64): movss %xmm2, 832(ARG1) movss %xmm3, 960(ARG1) -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/debug.h b/jni/mpg123-1.17.0/src/libmpg123/debug.h similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/debug.h rename to jni/mpg123-1.17.0/src/libmpg123/debug.h index 8cfd67b2..32d471cb 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/debug.h +++ b/jni/mpg123-1.17.0/src/libmpg123/debug.h @@ -97,7 +97,7 @@ #endif /* error macros also here... */ -#ifndef NO_ERROR +#ifndef NO_ERRORMSG #define error(s) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__) #define error1(s, a) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a) #define error2(s, a, b) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b) diff --git a/jni/mpg123-1.13.4/src/libmpg123/decode.h b/jni/mpg123-1.17.0/src/libmpg123/decode.h similarity index 95% rename from jni/mpg123-1.13.4/src/libmpg123/decode.h rename to jni/mpg123-1.17.0/src/libmpg123/decode.h index e2f167e9..fbd41548 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/decode.h +++ b/jni/mpg123-1.17.0/src/libmpg123/decode.h @@ -53,6 +53,8 @@ int synth_1to1_altivec (real*, int, mpg123_handle*, int); int synth_1to1_stereo_altivec(real*, real*, mpg123_handle*); int synth_1to1_x86_64 (real*, int, mpg123_handle*, int); int synth_1to1_stereo_x86_64(real*, real*, mpg123_handle*); +int synth_1to1_avx (real*, int, mpg123_handle*, int); +int synth_1to1_stereo_avx (real*, real*, mpg123_handle*); int synth_1to1_arm (real*, int, mpg123_handle*, int); int synth_1to1_neon (real*, int, mpg123_handle*, int); int synth_1to1_stereo_neon(real*, real*, mpg123_handle*); @@ -126,6 +128,8 @@ int synth_1to1_real_sse (real*, int, mpg123_handle*, int); int synth_1to1_real_stereo_sse (real*, real*, mpg123_handle*); int synth_1to1_real_x86_64 (real*, int, mpg123_handle*, int); int synth_1to1_real_stereo_x86_64(real*, real*, mpg123_handle*); +int synth_1to1_real_avx (real*, int, mpg123_handle*, int); +int synth_1to1_real_stereo_avx (real*, real*, mpg123_handle*); int synth_1to1_real_altivec (real*, int, mpg123_handle*, int); int synth_1to1_real_stereo_altivec(real*, real*, mpg123_handle*); int synth_1to1_real_neon (real*, int, mpg123_handle*, int); @@ -157,6 +161,8 @@ int synth_1to1_s32_sse (real*, int, mpg123_handle*, int); int synth_1to1_s32_stereo_sse (real*, real*, mpg123_handle*); int synth_1to1_s32_x86_64 (real*, int, mpg123_handle*, int); int synth_1to1_s32_stereo_x86_64(real*, real*, mpg123_handle*); +int synth_1to1_s32_avx (real*, int, mpg123_handle*, int); +int synth_1to1_s32_stereo_avx (real*, real*, mpg123_handle*); int synth_1to1_s32_altivec (real*, int, mpg123_handle*, int); int synth_1to1_s32_stereo_altivec(real*, real*, mpg123_handle*); int synth_1to1_s32_neon (real*, int, mpg123_handle*, int); @@ -195,6 +201,9 @@ void dct64_i486(int*, int* , real*); /* Yeah, of no use outside of synth_i486.c void dct36 (real *,real *,real *,real *,real *); void dct36_3dnow (real *,real *,real *,real *,real *); void dct36_3dnowext(real *,real *,real *,real *,real *); +void dct36_x86_64 (real *,real *,real *,real *,real *); +void dct36_sse (real *,real *,real *,real *,real *); +void dct36_avx (real *,real *,real *,real *,real *); /* Tools for NtoM resampling synth, defined in ntom.c . */ int synth_ntom_set_step(mpg123_handle *fr); /* prepare ntom decoding */ diff --git a/jni/mpg123-1.13.4/src/libmpg123/dither.c b/jni/mpg123-1.17.0/src/libmpg123/dither.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dither.c rename to jni/mpg123-1.17.0/src/libmpg123/dither.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/dither.h b/jni/mpg123-1.17.0/src/libmpg123/dither.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/dither.h rename to jni/mpg123-1.17.0/src/libmpg123/dither.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/equalizer.c b/jni/mpg123-1.17.0/src/libmpg123/equalizer.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/equalizer.c rename to jni/mpg123-1.17.0/src/libmpg123/equalizer.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/equalizer.lo b/jni/mpg123-1.17.0/src/libmpg123/equalizer.lo new file mode 100644 index 00000000..0be49798 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/equalizer.lo @@ -0,0 +1,12 @@ +# equalizer.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/equalizer.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/equalizer_3dnow.S b/jni/mpg123-1.17.0/src/libmpg123/equalizer_3dnow.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/equalizer_3dnow.S rename to jni/mpg123-1.17.0/src/libmpg123/equalizer_3dnow.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/feature.c b/jni/mpg123-1.17.0/src/libmpg123/feature.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/feature.c rename to jni/mpg123-1.17.0/src/libmpg123/feature.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/feature.lo b/jni/mpg123-1.17.0/src/libmpg123/feature.lo new file mode 100644 index 00000000..da050027 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/feature.lo @@ -0,0 +1,12 @@ +# feature.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/feature.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/format.c b/jni/mpg123-1.17.0/src/libmpg123/format.c similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/format.c rename to jni/mpg123-1.17.0/src/libmpg123/format.c index ad55a580..1f4d49ee 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/format.c +++ b/jni/mpg123-1.17.0/src/libmpg123/format.c @@ -155,14 +155,18 @@ static int freq_fit(mpg123_handle *fr, struct audioformat *nf, int f0, int f2) { nf->rate = frame_freq(fr)>>fr->p.down_sample; if(cap_fit(fr,nf,f0,f2)) return 1; - nf->rate>>=1; - if(cap_fit(fr,nf,f0,f2)) return 1; - nf->rate>>=1; - if(cap_fit(fr,nf,f0,f2)) return 1; + if(fr->p.flags & MPG123_AUTO_RESAMPLE) + { + nf->rate>>=1; + if(cap_fit(fr,nf,f0,f2)) return 1; + nf->rate>>=1; + if(cap_fit(fr,nf,f0,f2)) return 1; + } #ifndef NO_NTOM /* If nothing worked, try the other rates, only without constrains from user. In case you didn't guess: We enable flexible resampling if we find a working rate. */ - if(!fr->p.force_rate && fr->p.down_sample == 0) + if( fr->p.flags & MPG123_AUTO_RESAMPLE && + !fr->p.force_rate && fr->p.down_sample == 0) { int i; int c = nf->channels-1; @@ -428,7 +432,7 @@ off_t bytes_to_samples(mpg123_handle *fr , off_t b) #ifndef NO_32BIT /* Remove every fourth byte, facilitating conversion from 32 bit to 24 bit integers. - This has to be aware of endianess, of course. */ + This has to be aware of endianness, of course. */ static void chop_fourth_byte(struct outbuffer *buf) { unsigned char *wpos = buf->data; diff --git a/jni/mpg123-1.17.0/src/libmpg123/format.lo b/jni/mpg123-1.17.0/src/libmpg123/format.lo new file mode 100644 index 00000000..dcce86ba --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/format.lo @@ -0,0 +1,12 @@ +# format.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/format.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/frame.c b/jni/mpg123-1.17.0/src/libmpg123/frame.c similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/frame.c rename to jni/mpg123-1.17.0/src/libmpg123/frame.c index 79ceaee8..581a4fa0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/frame.c +++ b/jni/mpg123-1.17.0/src/libmpg123/frame.c @@ -36,11 +36,11 @@ static void *align_the_pointer(void *base, unsigned int alignment) static void frame_default_pars(mpg123_pars *mp) { mp->outscale = 1.0; -#ifdef GAPLESS - mp->flags = MPG123_GAPLESS; -#else mp->flags = 0; +#ifdef GAPLESS + mp->flags |= MPG123_GAPLESS; #endif + mp->flags |= MPG123_AUTO_RESAMPLE; #ifndef NO_NTOM mp->force_rate = 0; #endif @@ -59,6 +59,11 @@ static void frame_default_pars(mpg123_pars *mp) #endif mp->preframes = 4; /* That's good for layer 3 ISO compliance bitstream. */ mpg123_fmt_all(mp); + /* Default of keeping some 4K buffers at hand, should cover the "usual" use case (using 16K pipe buffers as role model). */ +#ifndef NO_FEEDER + mp->feedpool = 5; + mp->feedbuffer = 4096; +#endif } void frame_init(mpg123_handle *fr) @@ -68,8 +73,11 @@ void frame_init(mpg123_handle *fr) void frame_init_par(mpg123_handle *fr, mpg123_pars *mp) { - fr->own_buffer = FALSE; + fr->own_buffer = TRUE; fr->buffer.data = NULL; + fr->buffer.rdata = NULL; + fr->buffer.fill = 0; + fr->buffer.size = 0; fr->rawbuffs = NULL; fr->rawbuffss = 0; fr->rawdecwin = NULL; @@ -111,6 +119,10 @@ void frame_init_par(mpg123_handle *fr, mpg123_pars *mp) if(mp == NULL) frame_default_pars(&fr->p); else memcpy(&fr->p, mp, sizeof(struct mpg123_pars_struct)); +#ifndef NO_FEEDER + bc_prepare(&fr->rdat.buffer, fr->p.feedpool, fr->p.feedbuffer); +#endif + fr->down_sample = 0; /* Initialize to silence harmless errors when debugging. */ frame_fixed_reset(fr); /* Reset only the fixed data, dynamic buffers are not there yet! */ fr->synth = NULL; @@ -163,34 +175,51 @@ int attribute_align_arg mpg123_reset_eq(mpg123_handle *mh) int frame_outbuffer(mpg123_handle *fr) { - size_t size = mpg123_safe_buffer()*AUDIOBUFSIZE; - if(!fr->own_buffer) fr->buffer.data = NULL; - if(fr->buffer.data != NULL && fr->buffer.size != size) + size_t size = fr->outblock; + if(!fr->own_buffer) { - free(fr->buffer.data); - fr->buffer.data = NULL; + if(fr->buffer.size < size) + { + fr->err = MPG123_BAD_BUFFER; + if(NOQUIET) error2("have external buffer of size %"SIZE_P", need %"SIZE_P, (size_p)fr->buffer.size, (size_p)size); + + return MPG123_ERR; + } + } + + debug1("need frame buffer of %"SIZE_P, (size_p)size); + if(fr->buffer.rdata != NULL && fr->buffer.size != size) + { + free(fr->buffer.rdata); + fr->buffer.rdata = NULL; } fr->buffer.size = size; - if(fr->buffer.data == NULL) fr->buffer.data = (unsigned char*) malloc(fr->buffer.size); - if(fr->buffer.data == NULL) + fr->buffer.data = NULL; + /* be generous: use 16 byte alignment */ + if(fr->buffer.rdata == NULL) fr->buffer.rdata = (unsigned char*) malloc(fr->buffer.size+15); + if(fr->buffer.rdata == NULL) { fr->err = MPG123_OUT_OF_MEM; - return -1; + return MPG123_ERR; } + fr->buffer.data = aligned_pointer(fr->buffer.rdata, unsigned char*, 16); fr->own_buffer = TRUE; fr->buffer.fill = 0; - return 0; + return MPG123_OK; } int attribute_align_arg mpg123_replace_buffer(mpg123_handle *mh, unsigned char *data, size_t size) { - if(data == NULL || size < mpg123_safe_buffer()) + debug2("replace buffer with %p size %"SIZE_P, data, (size_p)size); + /* Will accept any size, the error comes later... */ + if(data == NULL) { mh->err = MPG123_BAD_BUFFER; return MPG123_ERR; } - if(mh->own_buffer && mh->buffer.data != NULL) free(mh->buffer.data); + if(mh->buffer.rdata != NULL) free(mh->buffer.rdata); mh->own_buffer = FALSE; + mh->buffer.rdata = NULL; mh->buffer.data = data; mh->buffer.size = size; mh->buffer.fill = 0; @@ -407,7 +436,7 @@ int frame_buffers_reset(mpg123_handle *fr) /* Wondering: could it be actually _wanted_ to retain buffer contents over different files? (special gapless / cut stuff) */ fr->bsbuf = fr->bsspace[1]; fr->bsbufold = fr->bsbuf; - fr->bitreservoir = 0; /* Not entirely sure if this is the right place for that counter. */ + fr->bitreservoir = 0; frame_decode_buffers_reset(fr); memset(fr->bsspace, 0, 2*(MAXFRAMESIZE+512)); memset(fr->ssave, 0, 34); @@ -473,10 +502,11 @@ static void frame_fixed_reset(mpg123_handle *fr) fr->to_decode = FALSE; fr->to_ignore = FALSE; fr->metaflags = 0; - fr->outblock = mpg123_safe_buffer(); + fr->outblock = 0; /* This will be set before decoding! */ fr->num = -1; + fr->input_offset = -1; fr->playnum = -1; - fr->accurate = TRUE; + fr->state_flags = FRAME_ACCURATE; fr->silent_resync = 0; fr->audio_start = 0; fr->clip = 0; @@ -504,7 +534,7 @@ static void frame_fixed_reset(mpg123_handle *fr) fr->fresh = 1; fr->new_format = 0; #ifdef GAPLESS - frame_gapless_init(fr,0,0); + frame_gapless_init(fr,-1,0,0); fr->lastoff = 0; fr->firstoff = 0; #endif @@ -544,12 +574,12 @@ static void frame_free_buffers(mpg123_handle *fr) void frame_exit(mpg123_handle *fr) { - if(fr->own_buffer && fr->buffer.data != NULL) + if(fr->buffer.rdata != NULL) { - debug1("freeing buffer at %p", (void*)fr->buffer.data); - free(fr->buffer.data); + debug1("freeing buffer at %p", (void*)fr->buffer.rdata); + free(fr->buffer.rdata); } - fr->buffer.data = NULL; + fr->buffer.rdata = NULL; frame_free_buffers(fr); frame_free_toc(fr); #ifdef FRAME_INDEX @@ -570,6 +600,9 @@ void frame_exit(mpg123_handle *fr) fr->wrapperclean(fr->wrapperdata); fr->wrapperdata = NULL; } +#ifndef NO_FEEDER + bc_cleanup(&fr->rdat.buffer); +#endif } int attribute_align_arg mpg123_info(mpg123_handle *mh, struct mpg123_frameinfo *mi) @@ -605,6 +638,17 @@ int attribute_align_arg mpg123_info(mpg123_handle *mh, struct mpg123_frameinfo * return MPG123_OK; } +int attribute_align_arg mpg123_framedata(mpg123_handle *mh, unsigned long *header, unsigned char **bodydata, size_t *bodybytes) +{ + if(mh == NULL) return MPG123_ERR; + if(!mh->to_decode) return MPG123_ERR; + + if(header != NULL) *header = mh->oldhead; + if(bodydata != NULL) *bodydata = mh->bsbuf; + if(bodybytes != NULL) *bodybytes = mh->framesize; + + return MPG123_OK; +} /* Fuzzy frame offset searching (guessing). @@ -634,7 +678,7 @@ static off_t frame_fuzzy_find(mpg123_handle *fr, off_t want_frame, off_t* get_fr /* Now estimate back what frame we get. */ *get_frame = (off_t) ((double)toc_entry/100. * fr->track_frames); - fr->accurate = FALSE; + fr->state_flags &= ~FRAME_ACCURATE; fr->silent_resync = 1; /* Question: Is the TOC for whole file size (with/without ID3) or the "real" audio data only? ID3v1 info could also matter. */ @@ -643,7 +687,7 @@ static off_t frame_fuzzy_find(mpg123_handle *fr, off_t want_frame, off_t* get_fr else if(fr->mean_framesize > 0) { /* Just guess with mean framesize (may be exact with CBR files). */ /* Query filelen here or not? */ - fr->accurate = FALSE; /* Fuzzy! */ + fr->state_flags &= ~FRAME_ACCURATE; /* Fuzzy! */ fr->silent_resync = 1; *get_frame = want_frame; ret = (off_t) (fr->audio_start+fr->mean_framesize*want_frame); @@ -690,7 +734,7 @@ off_t frame_index_find(mpg123_handle *fr, off_t want_frame, off_t* get_frame) /* We have index position, that yields frame and byte offsets. */ *get_frame = fi*fr->index.step; gopos = fr->index.data[fi]; - fr->accurate = TRUE; /* When using the frame index, we are accurate. */ + fr->state_flags |= FRAME_ACCURATE; /* When using the frame index, we are accurate. */ } else { @@ -791,36 +835,44 @@ off_t frame_offset(mpg123_handle *fr, off_t outs) #ifdef GAPLESS /* input in _input_ samples */ -void frame_gapless_init(mpg123_handle *fr, off_t b, off_t e) +void frame_gapless_init(mpg123_handle *fr, off_t framecount, off_t bskip, off_t eskip) { - fr->begin_s = b; - fr->end_s = e; + debug3("frame_gaples_init: given %"OFF_P" frames, skip %"OFF_P" and %"OFF_P, (off_p)framecount, (off_p)bskip, (off_p)eskip); + fr->gapless_frames = framecount; + if(fr->gapless_frames > 0) + { + fr->begin_s = bskip+GAPLESS_DELAY; + fr->end_s = framecount*spf(fr)-eskip+GAPLESS_DELAY; + } + else fr->begin_s = fr->end_s = 0; /* These will get proper values later, from above plus resampling info. */ fr->begin_os = 0; fr->end_os = 0; - debug2("frame_gapless_init: from %lu to %lu samples", (long unsigned)fr->begin_s, (long unsigned)fr->end_s); + fr->fullend_os = 0; + debug2("frame_gapless_init: from %"OFF_P" to %"OFF_P" samples", (off_p)fr->begin_s, (off_p)fr->end_s); } void frame_gapless_realinit(mpg123_handle *fr) { fr->begin_os = frame_ins2outs(fr, fr->begin_s); fr->end_os = frame_ins2outs(fr, fr->end_s); - debug2("frame_gapless_realinit: from %lu to %lu samples", (long unsigned)fr->begin_os, (long unsigned)fr->end_os); + fr->fullend_os = frame_ins2outs(fr, fr->gapless_frames*spf(fr)); + debug2("frame_gapless_realinit: from %"OFF_P" to %"OFF_P" samples", (off_p)fr->begin_os, (off_p)fr->end_os); } -/* When we got a new sample count, update the gaplessness. */ +/* At least note when there is trouble... */ void frame_gapless_update(mpg123_handle *fr, off_t total_samples) { - if(fr->end_s < 1) + off_t gapless_samples = fr->gapless_frames*spf(fr); + debug2("gapless update with new sample count %"OFF_P" as opposed to known %"OFF_P, total_samples, gapless_samples); + if(NOQUIET && total_samples != gapless_samples) + fprintf(stderr, "\nWarning: Real sample count differs from given gapless sample count. Frankenstein stream?\n"); + + if(gapless_samples > total_samples) { - fr->end_s = total_samples; - frame_gapless_realinit(fr); - } - else if(fr->end_s > total_samples) - { - if(NOQUIET) error2("end sample count smaller than gapless end! (%"OFF_P" < %"OFF_P").", (off_p)total_samples, (off_p)fr->end_s); - /* Humbly disabling gapless stuff on track end. */ - fr->end_s = 0; + if(NOQUIET) error2("End sample count smaller than gapless end! (%"OFF_P" < %"OFF_P"). Disabling gapless mode from now on.", (off_p)total_samples, (off_p)fr->end_s); + /* This invalidates the current position... but what should I do? */ + frame_gapless_init(fr, -1, 0, 0); frame_gapless_realinit(fr); fr->lastframe = -1; fr->lastoff = 0; @@ -849,7 +901,7 @@ void frame_set_frameseek(mpg123_handle *fr, off_t fe) { fr->firstframe = fe; #ifdef GAPLESS - if(fr->p.flags & MPG123_GAPLESS) + if(fr->p.flags & MPG123_GAPLESS && fr->gapless_frames > 0) { /* Take care of the beginning... */ off_t beg_f = frame_offset(fr, fr->begin_os); @@ -864,7 +916,7 @@ void frame_set_frameseek(mpg123_handle *fr, off_t fe) { fr->lastframe = frame_offset(fr,fr->end_os); fr->lastoff = fr->end_os - frame_outs(fr, fr->lastframe); - } else fr->lastoff = 0; + } else {fr->lastframe = -1; fr->lastoff = 0; } } else { fr->firstoff = fr->lastoff = 0; fr->lastframe = -1; } #endif fr->ignoreframe = ignoreframe(fr); @@ -890,6 +942,7 @@ void frame_skip(mpg123_handle *fr) void frame_set_seek(mpg123_handle *fr, off_t sp) { fr->firstframe = frame_offset(fr, sp); + debug1("frame_set_seek: from %"OFF_P, fr->num); #ifndef NO_NTOM if(fr->down_sample == 3) ntom_set_ntom(fr, fr->firstframe); #endif @@ -903,8 +956,6 @@ void frame_set_seek(mpg123_handle *fr, off_t sp) debug3("frame_set_seek: begin at %li frames, end at %li; ignore from %li", (long) fr->firstframe, (long) fr->lastframe, (long) fr->ignoreframe); #endif - /* Old bit reservoir should be invalid, eh? */ - fr->bitreservoir = 0; } int attribute_align_arg mpg123_volume_change(mpg123_handle *mh, double change) @@ -987,3 +1038,9 @@ int attribute_align_arg mpg123_getvolume(mpg123_handle *mh, double *base, double return MPG123_OK; } +off_t attribute_align_arg mpg123_framepos(mpg123_handle *mh) +{ + if(mh == NULL) return MPG123_ERR; + + return mh->input_offset; +} diff --git a/jni/mpg123-1.13.4/src/libmpg123/frame.h b/jni/mpg123-1.17.0/src/libmpg123/frame.h similarity index 92% rename from jni/mpg123-1.13.4/src/libmpg123/frame.h rename to jni/mpg123-1.17.0/src/libmpg123/frame.h index fb17379b..9135c436 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/frame.h +++ b/jni/mpg123-1.17.0/src/libmpg123/frame.h @@ -38,10 +38,11 @@ struct al_table /* the output buffer, used to be pcm_sample, pcm_point and audiobufsize */ struct outbuffer { - unsigned char *data; + unsigned char *data; /* main data pointer, aligned */ unsigned char *p; /* read pointer */ size_t fill; /* fill from read pointer */ - size_t size; /* that's actually more like a safe size, after we have more than that, flush it */ + size_t size; + unsigned char *rdata; /* unaligned base pointer */ }; struct audioformat @@ -77,9 +78,17 @@ struct mpg123_pars_struct long resync_limit; long index_size; /* Long, because: negative values have a meaning. */ long preframes; +#ifndef NO_FEEDER + long feedpool; + long feedbuffer; +#endif }; - +enum frame_state_flags +{ + FRAME_ACCURATE = 0x1 /**< 0001 Positions are considered accurate. */ + ,FRAME_FRANKENSTEIN = 0x2 /**< 0010 This stream is concatenated. */ +}; /* There is a lot to condense here... many ints can be merged as flags; though the main space is still consumed by buffers. */ struct mpg123_handle_struct @@ -149,7 +158,7 @@ struct mpg123_handle_struct #ifdef OPT_MULTI #ifndef NO_LAYER3 -#if (defined OPT_3DNOW || defined OPT_3DNOWEXT) +#if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX) void (*the_dct36)(real *,real *,real *,real *,real *); #endif #endif @@ -199,9 +208,10 @@ struct mpg123_handle_struct int freesize; /* free format frame size */ enum mpg123_vbr vbr; /* 1 if variable bitrate was detected */ off_t num; /* frame offset ... */ + off_t input_offset; /* byte offset of this frame in input stream */ off_t playnum; /* playback offset... includes repetitions, reset at seeks */ off_t audio_start; /* The byte offset in the file where audio data begins. */ - char accurate; /* Flag to see if we trust the frame number. */ + int state_flags; char silent_resync; /* Do not complain for the next n resyncs. */ unsigned char* xing_toc; /* The seek TOC from Xing header. */ int freeformat; @@ -237,7 +247,9 @@ struct mpg123_handle_struct unsigned char *bsbuf; unsigned char *bsbufold; int bsnum; + /* That is the header matching the last read frame body. */ unsigned long oldhead; + /* That is the header that is supposedly the first of the stream. */ unsigned long firsthead; int abr_rate; #ifdef FRAME_INDEX @@ -255,12 +267,14 @@ struct mpg123_handle_struct off_t lastframe; /* last frame to decode (for gapless or num_frames limit) */ off_t ignoreframe; /* frames to decode but discard before firstframe */ #ifdef GAPLESS + off_t gapless_frames; /* frame count for the gapless part */ off_t firstoff; /* number of samples to ignore from firstframe */ off_t lastoff; /* number of samples to use from lastframe */ off_t begin_s; /* overall begin offset in samples */ off_t begin_os; off_t end_s; /* overall end offset in samples */ off_t end_os; + off_t fullend_os; /* gapless_frames translated to output samples */ #endif unsigned int crc; /* Well, I need a safe 16bit type, actually. But wider doesn't hurt. */ struct reader *rd; /* pointer to the reading functions */ @@ -361,8 +375,7 @@ MPEG 2.5 #ifdef GAPLESS /* well, I take that one for granted... at least layer3 */ #define GAPLESS_DELAY 529 -/* still fine-tuning the "real music" window... see read_frame */ -void frame_gapless_init(mpg123_handle *fr, off_t b, off_t e); +void frame_gapless_init(mpg123_handle *fr, off_t framecount, off_t bskip, off_t eskip); void frame_gapless_realinit(mpg123_handle *fr); void frame_gapless_update(mpg123_handle *mh, off_t total_samples); /*void frame_gapless_position(mpg123_handle* fr); diff --git a/jni/mpg123-1.17.0/src/libmpg123/frame.lo b/jni/mpg123-1.17.0/src/libmpg123/frame.lo new file mode 100644 index 00000000..708ef282 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/frame.lo @@ -0,0 +1,12 @@ +# frame.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/frame.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.17.0/src/libmpg123/gapless.h b/jni/mpg123-1.17.0/src/libmpg123/gapless.h new file mode 100644 index 00000000..a98b86bc --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/gapless.h @@ -0,0 +1,119 @@ +/* + sampleadjust: gapless sample offset math + + copyright 1995-2012 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + This is no stand-alone header, precisely to be able to fool it into using fake handle types for testing the math. +*/ + +#include "debug.h" + +#ifdef GAPLESS +/* From internal sample number to external. */ +static off_t sample_adjust(mpg123_handle *mh, off_t x) +{ + off_t s; + if(mh->p.flags & MPG123_GAPLESS) + { + /* It's a bit tricky to do this computation for the padding samples. + They are not there on the outside. */ + if(x > mh->end_os) + { + if(x < mh->fullend_os) + s = mh->end_os - mh->begin_os; + else + s = x - (mh->fullend_os - mh->end_os + mh->begin_os); + } + else + s = x - mh->begin_os; + } + else + s = x; + + return s; +} + +/* from external samples to internal */ +static off_t sample_unadjust(mpg123_handle *mh, off_t x) +{ + off_t s; + if(mh->p.flags & MPG123_GAPLESS) + { + s = x + mh->begin_os; + /* There is a hole; we don't create sample positions in there. + Jump from the end of the gapless track directly to after the padding. */ + if(s >= mh->end_os) + s += mh->fullend_os - mh->end_os; + } + else s = x; + + return s; +} + +/* + Take the buffer after a frame decode (strictly: it is the data from frame fr->num!) and cut samples out. + fr->buffer.fill may then be smaller than before... +*/ +static void frame_buffercheck(mpg123_handle *fr) +{ + /* When we have no accurate position, gapless code does not make sense. */ + if(!(fr->state_flags & FRAME_ACCURATE)) return; + + /* Get a grip on dirty streams that start with a gapless header. + Simply accept all data from frames that are too much, + they are supposedly attached to the stream after the fact. */ + if(fr->gapless_frames > 0 && fr->num >= fr->gapless_frames) return; + + /* Important: We first cut samples from the end, then cut from beginning (including left-shift of the buffer). + This order works also for the case where firstframe == lastframe. */ + + /* The last interesting (planned) frame: Only use some leading samples. + Note a difference from the below: The last frame and offset are unchanges by seeks. + The lastoff keeps being valid. */ + if(fr->lastframe > -1 && fr->num >= fr->lastframe) + { + /* There can be more than one frame of padding at the end, so we ignore the whole frame if we are beyond lastframe. */ + off_t byteoff = (fr->num == fr->lastframe) ? samples_to_bytes(fr, fr->lastoff) : 0; + if((off_t)fr->buffer.fill > byteoff) + { + fr->buffer.fill = byteoff; + } + if(VERBOSE3) fprintf(stderr, "\nNote: Cut frame %"OFF_P" buffer on end of stream to %"OFF_P" samples, fill now %"SIZE_P" bytes.\n", (off_p)fr->num, (off_p)(fr->num == fr->lastframe ? fr->lastoff : 0), (size_p)fr->buffer.fill); + } + + /* The first interesting frame: Skip some leading samples. */ + if(fr->firstoff && fr->num == fr->firstframe) + { + off_t byteoff = samples_to_bytes(fr, fr->firstoff); + if((off_t)fr->buffer.fill > byteoff) + { + fr->buffer.fill -= byteoff; + /* buffer.p != buffer.data only for own buffer */ + debug6("cutting %li samples/%li bytes on begin, own_buffer=%i at %p=%p, buf[1]=%i", + (long)fr->firstoff, (long)byteoff, fr->own_buffer, (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]); + if(fr->own_buffer) fr->buffer.p = fr->buffer.data + byteoff; + else memmove(fr->buffer.data, fr->buffer.data + byteoff, fr->buffer.fill); + debug3("done cutting, buffer at %p =? %p, buf[1]=%i", + (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]); + } + else fr->buffer.fill = 0; + + if(VERBOSE3) fprintf(stderr, "\nNote: Cut frame %"OFF_P" buffer on beginning of stream by %"OFF_P" samples, fill now %"SIZE_P" bytes.\n", (off_p)fr->num, (off_p)fr->firstoff, (size_p)fr->buffer.fill); + /* We can only reach this frame again by seeking. And on seeking, firstoff will be recomputed. + So it is safe to null it here (and it makes the if() decision abort earlier). */ + fr->firstoff = 0; + } +} + +#define SAMPLE_ADJUST(mh,x) sample_adjust(mh,x) +#define SAMPLE_UNADJUST(mh,x) sample_unadjust(mh,x) +#define FRAME_BUFFERCHECK(mh) frame_buffercheck(mh) + +#else /* no gapless code included */ + +#define SAMPLE_ADJUST(mh,x) (x) +#define SAMPLE_UNADJUST(mh,x) (x) +#define FRAME_BUFFERCHECK(mh) + +#endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/getbits.h b/jni/mpg123-1.17.0/src/libmpg123/getbits.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/getbits.h rename to jni/mpg123-1.17.0/src/libmpg123/getbits.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/getcpuflags.S b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags.S similarity index 88% rename from jni/mpg123-1.13.4/src/libmpg123/getcpuflags.S rename to jni/mpg123-1.17.0/src/libmpg123/getcpuflags.S index 89c0f456..50a9d00a 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/getcpuflags.S +++ b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags.S @@ -51,6 +51,7 @@ ASM_NAME(getcpuflags): /* In principle, I would have to check the CPU's identify first to be sure how to interpret the extended flags. */ /* now get the info, first extended */ movl $0x0, 12(%esi) /* clear value */ + movl $0x0, 16(%esi) /* clear value */ /* only if supported... */ movl $0x80000000, %eax cpuid @@ -68,6 +69,15 @@ ASM_NAME(getcpuflags): movl %eax, (%esi) movl %ecx, 4(%esi) movl %edx, 8(%esi) +/* check if xgetbv instruction is available */ + test $0x04000000, %ecx + jz .Lend + test $0x08000000, %ecx + jz .Lend + xor %ecx, %ecx + .byte 0x0f, 0x01, 0xd0 /* xgetbv instruction */ + movl %eax, 16(%esi) + movl (%esi), %eax jmp .Lend ALIGN4 .Lnocpuid: @@ -77,6 +87,7 @@ ASM_NAME(getcpuflags): movl $0, 4(%esi) movl $0, 8(%esi) movl $0, 12(%esi) + movl $0, 16(%esi) ALIGN4 .Lend: /* return value are the id flags, still stored in %eax */ diff --git a/jni/mpg123-1.13.4/src/libmpg123/getcpuflags.h b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags.h similarity index 71% rename from jni/mpg123-1.13.4/src/libmpg123/getcpuflags.h rename to jni/mpg123-1.17.0/src/libmpg123/getcpuflags.h index 68dd9759..46c1fbca 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/getcpuflags.h +++ b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags.h @@ -12,7 +12,8 @@ /* standard level flags part 1 (ECX)*/ #define FLAG_SSE3 0x00000001 - +#define FLAG_SSSE3 0x00000200 +#define FLAG_AVX 0x1C000000 /* standard level flags part 2 (EDX) */ #define FLAG2_MMX 0x00800000 #define FLAG2_SSE 0x02000000 @@ -22,6 +23,9 @@ #define XFLAG_MMX 0x00800000 #define XFLAG_3DNOW 0x80000000 #define XFLAG_3DNOWEXT 0x40000000 +/* eXtended Control Register 0 */ +#define XCR0FLAG_AVX 0x00000006 + struct cpuflags { @@ -29,6 +33,7 @@ struct cpuflags unsigned int std; unsigned int std2; unsigned int ext; + unsigned int xcr0_lo; }; unsigned int getcpuflags(struct cpuflags* cf); @@ -43,5 +48,8 @@ unsigned int getcpuflags(struct cpuflags* cf); #define cpu_sse(s) (FLAG2_SSE & s.std2) #define cpu_sse2(s) (FLAG2_SSE2 & s.std2) #define cpu_sse3(s) (FLAG_SSE3 & s.std) +#define cpu_avx(s) ((FLAG_AVX & s.std) == FLAG_AVX && (XCR0FLAG_AVX & s.xcr0_lo) == XCR0FLAG_AVX) +#define cpu_fast_sse(s) ((((s.id & 0xf00)>>8) == 6 && FLAG_SSSE3 & s.std) /* for Intel/VIA; family 6 CPUs with SSSE3 */ || \ + (((s.id & 0xf00)>>8) == 0xf && (((s.id & 0x0ff00000)>>20) > 0 && ((s.id & 0x0ff00000)>>20) != 5))) /* for AMD; family > 0xF CPUs except Bobcat */ #endif diff --git a/jni/mpg123-1.17.0/src/libmpg123/getcpuflags_x86_64.S b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags_x86_64.S new file mode 100644 index 00000000..92fb7650 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/getcpuflags_x86_64.S @@ -0,0 +1,57 @@ +/* + getcpuflags_x86_64: get cpuflags for x86-64 + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + + .text + ALIGN4 + .globl ASM_NAME(getcpuflags) +ASM_NAME(getcpuflags): + push %rbp + mov %rsp, %rbp + push %rbx + +#ifdef IS_MSABI + push %rdi + mov %rcx, %rdi +#endif + + movl $0, 12(%rdi) + movl $0, 16(%rdi) + + mov $0x80000000, %eax + cpuid + cmp $0x80000001, %eax + jb 1f + mov $0x80000001, %eax + cpuid + movl %edx, 12(%rdi) +1: + mov $0x00000001, %eax + cpuid + movl %eax, (%rdi) + movl %ecx, 4(%rdi) + movl %edx, 8(%rdi) + test $0x04000000, %ecx + jz 2f + test $0x08000000, %ecx + jz 2f + xor %ecx, %ecx + .byte 0x0f, 0x01, 0xd0 /* xgetbv instruction */ + movl %eax, 16(%rdi) + movl (%rdi), %eax +2: +#ifdef IS_MSABI + pop %rdi +#endif + pop %rbx + mov %rbp, %rsp + pop %rbp + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.13.4/src/libmpg123/huffman.h b/jni/mpg123-1.17.0/src/libmpg123/huffman.h similarity index 95% rename from jni/mpg123-1.13.4/src/libmpg123/huffman.h rename to jni/mpg123-1.17.0/src/libmpg123/huffman.h index 74b543cc..576fbd88 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/huffman.h +++ b/jni/mpg123-1.17.0/src/libmpg123/huffman.h @@ -1,5 +1,5 @@ /* - huffman.h: huffman tables ... recalcualted to work with optimzed decoder scheme (MH) + huffman.h: huffman tables ... recalcualted to work with optimized decoder scheme (MH) copyright ?-2006 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -16,46 +16,46 @@ struct newhuff { unsigned int linbits; - short *table; + const short *table; }; -static short tab0[] = +static const short tab0[] = { 0 }; -static short tab1[] = +static const short tab1[] = { -5, -3, -1, 17, 1, 16, 0 }; -static short tab2[] = +static const short tab2[] = { -15, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 17, -1, 1, 16, 0 }; -static short tab3[] = +static const short tab3[] = { -13, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 16, 17, -1, 1, 0 }; -static short tab5[] = +static const short tab5[] = { -29, -25, -23, -15, -7, -5, -3, -1, 51, 35, 50, 49, -3, -1, 19, 3, -1, 48, 34, -3, -1, 18, 33, -1, 2, 32, 17, -1, 1, 16, 0 }; -static short tab6[] = +static const short tab6[] = { -25, -19, -13, -9, -5, -3, -1, 51, 3, 35, -1, 50, 48, -1, 19, 49, -3, -1, 34, 2, 18, -3, -1, 33, 32, 1, -1, 17, -1, 16, 0 }; -static short tab7[] = +static const short tab7[] = { -69, -65, -57, -39, -29, -17, -11, -7, -3, -1, 85, 69, -1, 84, 83, -1, 53, 68, -3, -1, 37, 82, 21, -5, -1, 81, -1, 5, 52, -1, @@ -64,7 +64,7 @@ static short tab7[] = -5, -1, 33, -1, 2, 32, 17, -1, 1, 16, 0 }; -static short tab8[] = +static const short tab8[] = { -65, -63, -59, -45, -31, -19, -13, -7, -5, -3, -1, 85, 84, 69, 83, -3, -1, 53, 68, 37, -3, -1, 82, 5, 21, -5, -1, 81, -1, 52, @@ -73,7 +73,7 @@ static short tab8[] = 2, 32, -1, 18, 33, 17, -3, -1, 1, 16, 0 }; -static short tab9[] = +static const short tab9[] = { -63, -53, -41, -29, -19, -11, -5, -3, -1, 85, 69, 53, -1, 83, -1, 84, 5, -3, -1, 68, 37, -1, 82, 21, -3, -1, 81, 52, -1, 67, @@ -82,7 +82,7 @@ static short tab9[] = 18, -1, 33, 32, -3, -1, 17, 1, -1, 16, 0 }; -static short tab10[] = +static const short tab10[] = { -125,-121,-111, -83, -55, -35, -21, -13, -7, -3, -1, 119, 103, -1, 118, 87, -3, -1, 117, 102, 71, -3, -1, 116, 86, -1, 101, 55, -9, -3, @@ -95,7 +95,7 @@ static short tab10[] = 2, 32, 17, -1, 1, 16, 0 }; -static short tab11[] = +static const short tab11[] = { -121,-113, -89, -59, -43, -27, -17, -7, -3, -1, 119, 103, -1, 118, 117, -3, -1, 102, 71, -1, 116, -1, 87, 85, -5, -3, -1, 86, 101, 55, @@ -108,7 +108,7 @@ static short tab11[] = 32, 17, -3, -1, 1, 16, 0 }; -static short tab12[] = +static const short tab12[] = { -115, -99, -73, -45, -27, -17, -9, -5, -3, -1, 119, 103, 118, -1, 87, 117, -3, -1, 102, 71, -1, 116, 101, -3, -1, 86, 55, -3, -1, 115, @@ -121,7 +121,7 @@ static short tab12[] = 2, 32, 0, 17, -1, 1, 16 }; -static short tab13[] = +static const short tab13[] = { -509,-503,-475,-405,-333,-265,-205,-153,-115, -83, -53, -35, -21, -13, -9, -7, -5, -3, -1, 254, 252, 253, 237, 255, -1, 239, 223, -3, -1, 238, @@ -160,7 +160,7 @@ static short tab13[] = 0 }; -static short tab15[] = +static const short tab15[] = { -495,-445,-355,-263,-183,-115, -77, -43, -27, -13, -7, -3, -1, 255, 239, -1, 254, 223, -1, 238, -1, 253, 207, -7, -3, -1, 252, 222, -1, 237, @@ -199,7 +199,7 @@ static short tab15[] = 0 }; -static short tab16[] = +static const short tab16[] = { -509,-503,-461,-323,-103, -37, -27, -15, -7, -3, -1, 239, 254, -1, 223, 253, -3, -1, 207, 252, -1, 191, 251, -5, -1, 175, -1, 250, 159, -3, @@ -238,7 +238,7 @@ static short tab16[] = 0 }; -static short tab24[] = +static const short tab24[] = { -451,-117, -43, -25, -15, -7, -3, -1, 239, 254, -1, 223, 253, -3, -1, 207, 252, -1, 191, 251, -5, -1, 250, -1, 175, 159, -1, 249, 248, -9, @@ -277,14 +277,14 @@ static short tab24[] = 0 }; -static short tab_c0[] = +static const short tab_c0[] = { -29, -21, -13, -7, -3, -1, 11, 15, -1, 13, 14, -3, -1, 7, 5, 9, -3, -1, 6, 3, -1, 10, 12, -3, -1, 2, 1, -1, 4, 8, 0 }; -static short tab_c1[] = +static const short tab_c1[] = { -15, -7, -3, -1, 15, 14, -1, 13, 12, -3, -1, 11, 10, -1, 9, 8, -7, -3, -1, 7, 6, -1, 5, 4, -3, -1, 3, 2, -1, 1, @@ -293,7 +293,7 @@ static short tab_c1[] = -static struct newhuff ht[] = +static const struct newhuff ht[] = { { /* 0 */ 0 , tab0 } , { /* 2 */ 0 , tab1 } , @@ -330,7 +330,7 @@ static struct newhuff ht[] = { /* 16 */ 13, tab24 } }; -static struct newhuff htc[] = +static const struct newhuff htc[] = { { /* 1 , 1 , */ 0 , tab_c0 } , { /* 1 , 1 , */ 0 , tab_c1 } diff --git a/jni/mpg123-1.13.4/src/libmpg123/icy.c b/jni/mpg123-1.17.0/src/libmpg123/icy.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/icy.c rename to jni/mpg123-1.17.0/src/libmpg123/icy.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/icy.h b/jni/mpg123-1.17.0/src/libmpg123/icy.h similarity index 93% rename from jni/mpg123-1.13.4/src/libmpg123/icy.h rename to jni/mpg123-1.17.0/src/libmpg123/icy.h index 050a0560..a5fd64ea 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/icy.h +++ b/jni/mpg123-1.17.0/src/libmpg123/icy.h @@ -26,8 +26,11 @@ void reset_icy(struct icy_meta *); #else +#undef init_icy #define init_icy(a) +#undef clear_icy #define clear_icy(a) +#undef reset_icy #define reset_icy(a) #endif /* NO_ICY */ diff --git a/jni/mpg123-1.17.0/src/libmpg123/icy.lo b/jni/mpg123-1.17.0/src/libmpg123/icy.lo new file mode 100644 index 00000000..d0eac20a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/icy.lo @@ -0,0 +1,12 @@ +# icy.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/icy.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/icy2utf8.c b/jni/mpg123-1.17.0/src/libmpg123/icy2utf8.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/icy2utf8.c rename to jni/mpg123-1.17.0/src/libmpg123/icy2utf8.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/icy2utf8.h b/jni/mpg123-1.17.0/src/libmpg123/icy2utf8.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/icy2utf8.h rename to jni/mpg123-1.17.0/src/libmpg123/icy2utf8.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/icy2utf8.lo b/jni/mpg123-1.17.0/src/libmpg123/icy2utf8.lo new file mode 100644 index 00000000..374d1756 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/icy2utf8.lo @@ -0,0 +1,12 @@ +# icy2utf8.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/icy2utf8.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/id3.c b/jni/mpg123-1.17.0/src/libmpg123/id3.c similarity index 86% rename from jni/mpg123-1.13.4/src/libmpg123/id3.c rename to jni/mpg123-1.17.0/src/libmpg123/id3.c index bc1c914a..ec88426a 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/id3.c +++ b/jni/mpg123-1.17.0/src/libmpg123/id3.c @@ -1,7 +1,7 @@ /* id3: ID3v2.3 and ID3v2.4 parsing (a relevant subset) - copyright 2006-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2006-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis */ @@ -13,9 +13,9 @@ #ifndef NO_ID3V2 /* Only the main parsing routine will always be there. */ /* We know the usual text frames plus some specifics. */ -#define KNOWN_FRAMES 4 -static const char frame_type[KNOWN_FRAMES][5] = { "COMM", "TXXX", "RVA2", "USLT" }; -enum frame_types { unknown = -2, text = -1, comment, extra, rva2, uslt }; +#define KNOWN_FRAMES 5 +static const char frame_type[KNOWN_FRAMES][5] = { "COMM", "TXXX", "RVA2", "USLT", "APIC" }; +enum frame_types { unknown = -2, text = -1, comment, extra, rva2, uslt, picture }; /* UTF support definitions */ @@ -25,7 +25,7 @@ static void convert_latin1 (mpg123_string *sb, const unsigned char* source, siz static void convert_utf16bom(mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet); static void convert_utf8 (mpg123_string *sb, const unsigned char* source, size_t len, const int noquiet); -static const text_converter text_converters[4] = +static const text_converter text_converters[4] = { convert_latin1, /* We always check for (multiple) BOM in 16bit unicode. Without BOM, UTF16 BE is the default. @@ -59,6 +59,8 @@ void init_id3(mpg123_handle *fr) fr->id3v2.text = NULL; fr->id3v2.extras = 0; fr->id3v2.extra = NULL; + fr->id3v2.pictures = 0; + fr->id3v2.picture = NULL; } /* Managing of the text, comment and extra lists. */ @@ -77,6 +79,15 @@ static void init_mpg123_text(mpg123_text *txt) txt->lang[2] = 0; } +static void init_mpg123_picture(mpg123_picture *pic) +{ + mpg123_init_string(&pic->mime_type); + mpg123_init_string(&pic->description); + pic->type = 0; + pic->size = 0; + pic->data = NULL; +} + /* Free memory of one element. */ static void free_mpg123_text(mpg123_text *txt) { @@ -84,10 +95,19 @@ static void free_mpg123_text(mpg123_text *txt) mpg123_free_string(&txt->description); } +static void free_mpg123_picture(mpg123_picture * pic) +{ + mpg123_free_string(&pic->mime_type); + mpg123_free_string(&pic->description); + if (pic->data != NULL) + free(pic->data); +} + /* Free memory of whole list. */ #define free_comment(mh) free_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments)) #define free_text(mh) free_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts)) #define free_extra(mh) free_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras)) +#define free_picture(mh) free_id3_picture(&((mh)->id3v2.picture), &((mh)->id3v2.pictures)) static void free_id3_text(mpg123_text **list, size_t *size) { size_t i; @@ -97,11 +117,21 @@ static void free_id3_text(mpg123_text **list, size_t *size) *list = NULL; *size = 0; } +static void free_id3_picture(mpg123_picture **list, size_t *size) +{ + size_t i; + for(i=0; i<*size; ++i) free_mpg123_picture(&((*list)[i])); + + free(*list); + *list = NULL; + *size = 0; +} /* Add items to the list. */ #define add_comment(mh) add_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments)) #define add_text(mh) add_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts)) #define add_extra(mh) add_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras)) +#define add_picture(mh) add_id3_picture(&((mh)->id3v2.picture), &((mh)->id3v2.pictures)) static mpg123_text *add_id3_text(mpg123_text **list, size_t *size) { mpg123_text *x = safe_realloc(*list, sizeof(mpg123_text)*(*size+1)); @@ -113,11 +143,24 @@ static mpg123_text *add_id3_text(mpg123_text **list, size_t *size) return &((*list)[*size-1]); /* Return pointer to the added text. */ } +static mpg123_picture *add_id3_picture(mpg123_picture **list, size_t *size) +{ + mpg123_picture *x = safe_realloc(*list, sizeof(mpg123_picture)*(*size+1)); + if(x == NULL) return NULL; /* bad */ + + *list = x; + *size += 1; + init_mpg123_picture(&((*list)[*size-1])); + + return &((*list)[*size-1]); /* Return pointer to the added picture. */ +} + /* Remove the last item. */ #define pop_comment(mh) pop_id3_text(&((mh)->id3v2.comment_list), &((mh)->id3v2.comments)) #define pop_text(mh) pop_id3_text(&((mh)->id3v2.text), &((mh)->id3v2.texts)) #define pop_extra(mh) pop_id3_text(&((mh)->id3v2.extra), &((mh)->id3v2.extras)) +#define pop_picture(mh) pop_id3_picture(&((mh)->id3v2.picture), &((mh)->id3v2.pictures)) static void pop_id3_text(mpg123_text **list, size_t *size) { mpg123_text *x; @@ -136,11 +179,30 @@ static void pop_id3_text(mpg123_text **list, size_t *size) *size = 0; } } +static void pop_id3_picture(mpg123_picture **list, size_t *size) +{ + mpg123_picture *x; + if(*size < 1) return; -/* OK, back t the higher level functions. */ + free_mpg123_picture(&((*list)[*size-1])); + if(*size > 1) + { + x = safe_realloc(*list, sizeof(mpg123_picture)*(*size-1)); + if(x != NULL){ *list = x; *size -= 1; } + } + else + { + free(*list); + *list = NULL; + *size = 0; + } +} + +/* OK, back to the higher level functions. */ void exit_id3(mpg123_handle *fr) { + free_picture(fr); free_comment(fr); free_extra(fr); free_text(fr); @@ -186,7 +248,7 @@ void id3_link(mpg123_handle *fr) ID3v2 standard says that there should be one text frame of specific type per tag, and subsequent tags overwrite old values. So, I always replace the text that may be stored already (perhaps with a list of zero-separated strings, though). */ -static void store_id3_text(mpg123_string *sb, char *source, size_t source_size, const int noquiet, const int notranslate) +static void store_id3_text(mpg123_string *sb, unsigned char *source, size_t source_size, const int noquiet, const int notranslate) { if(!source_size) { @@ -209,7 +271,7 @@ static void store_id3_text(mpg123_string *sb, char *source, size_t source_size, return; } - id3_to_utf8(sb, ((unsigned char *)source)[0], (unsigned char*)source+1, source_size-1, noquiet); + id3_to_utf8(sb, source[0], source+1, source_size-1, noquiet); if(sb->fill) debug1("UTF-8 string (the first one): %s", sb->p); else if(noquiet) error("unable to convert string to UTF-8 (out of memory, junk input?)!"); @@ -247,9 +309,9 @@ void id3_to_utf8(mpg123_string *sb, unsigned char encoding, const unsigned char text_converters[encoding](sb, source, source_size, noquiet); } -static char *next_text(char* prev, int encoding, size_t limit) +static unsigned char *next_text(unsigned char* prev, unsigned char encoding, size_t limit) { - char *text = prev; + unsigned char *text = prev; size_t width = encoding_widths[encoding]; /* So I go lengths to find zero or double zero... @@ -279,7 +341,7 @@ static char *next_text(char* prev, int encoding, size_t limit) return text; } -static const char *enc_name(int enc) +static const char *enc_name(unsigned char enc) { switch(enc) { @@ -291,7 +353,7 @@ static const char *enc_name(int enc) } } -static void process_text(mpg123_handle *fr, char *realdata, size_t realsize, char *id) +static void process_text(mpg123_handle *fr, unsigned char *realdata, size_t realsize, char *id) { /* Text encoding $xx */ /* The text (encoded) ... */ @@ -307,24 +369,82 @@ static void process_text(mpg123_handle *fr, char *realdata, size_t realsize, cha if(VERBOSE4) fprintf(stderr, "Note: ID3v2 %c%c%c%c text frame: %s\n", id[0], id[1], id[2], id[3], t->text.p); } +static void process_picture(mpg123_handle *fr, unsigned char *realdata, size_t realsize) +{ + unsigned char encoding = realdata[0]; + mpg123_picture *i = NULL; + unsigned char* workpoint; + if(realsize == 0) + { + debug("Empty id3 data!"); + return; + } + if(VERBOSE4) fprintf(stderr, "Note: Storing picture from APIC frame.\n"); + /* decompose realdata accordingly */ + i = add_picture(fr); + if(i == NULL) + { + if(NOQUIET) error("Unable to attach new picture!"); + return; + } + realdata++; realsize--; + /* get mime type (encoding is always latin-1) */ + workpoint = next_text(realdata, 0, realsize); + if (workpoint == NULL) { + pop_picture(fr); + if (NOQUIET) error("Unable to get mime type for picture; skipping picture."); + return; + } + id3_to_utf8(&i->mime_type, 0, realdata, workpoint - realdata, NOQUIET); + realsize -= workpoint - realdata; + realdata = workpoint; + /* get picture type */ + i->type = realdata[0]; + realdata++; realsize--; + /* get description (encoding is encoding) */ + workpoint = next_text(realdata, encoding, realsize); + if (workpoint == NULL) { + if (NOQUIET) error("Unable to get description for picture; skipping picture."); + pop_picture(fr); + return; + } + id3_to_utf8(&i->description, encoding, realdata, workpoint - realdata, NOQUIET); + realsize -= workpoint - realdata; + if (realsize == 0) { + if (NOQUIET) error("No picture data defined; skipping picture."); + pop_picture(fr); + return; + } + /* store_id3_picture(i, picture, realsize, NOQUIET)) */ + i->data = (unsigned char*)malloc(realsize); + if (i->data == NULL) { + if (NOQUIET) error("Unable to allocate memory for picture; skipping picture"); + pop_picture(fr); + return; + } + memcpy(i->data, workpoint, realsize); + i->size = realsize; + if(VERBOSE4) fprintf(stderr, "Note: ID3v2 APIC picture frame of type: %d\n", i->type); +} + /* Store a new comment that perhaps is a RVA / RVA_ALBUM/AUDIOPHILE / RVA_MIX/RADIO one Special gimmik: It also stores USLT to the texts. Stucture is the same as for comments. */ -static void process_comment(mpg123_handle *fr, enum frame_types tt, char *realdata, size_t realsize, int rva_level, char *id) +static void process_comment(mpg123_handle *fr, enum frame_types tt, unsigned char *realdata, size_t realsize, int rva_level, char *id) { /* Text encoding $xx */ /* Language $xx xx xx */ /* Short description (encoded!) $00 (00) */ /* Then the comment text (encoded) ... */ - char encoding = realdata[0]; - char *lang = realdata+1; /* I'll only use the 3 bytes! */ - char *descr = realdata+4; - char *text = NULL; + unsigned char encoding = realdata[0]; + unsigned char *lang = realdata+1; /* I'll only use the 3 bytes! */ + unsigned char *descr = realdata+4; + unsigned char *text = NULL; mpg123_text *xcom = NULL; mpg123_text localcom; /* UTF-8 variant for local processing. */ - if((int)realsize < descr-realdata) + if(realsize < (size_t)(descr-realdata)) { - if(NOQUIET) error1("Invalid frame size of %lu (too small for anything).", (unsigned long)realsize); + if(NOQUIET) error1("Invalid frame size of %"SIZE_P" (too small for anything).", (size_p)realsize); return; } xcom = (tt == uslt ? add_text(fr) : add_comment(fr)); @@ -393,14 +513,14 @@ static void process_comment(mpg123_handle *fr, enum frame_types tt, char *realda free_mpg123_text(&localcom); } -static void process_extra(mpg123_handle *fr, char* realdata, size_t realsize, int rva_level, char *id) +static void process_extra(mpg123_handle *fr, unsigned char* realdata, size_t realsize, int rva_level, char *id) { /* Text encoding $xx */ /* Description ... $00 (00) */ /* Text ... */ - char encoding = realdata[0]; - char *descr = realdata+1; /* remember, the encoding is descr[-1] */ - char *text; + unsigned char encoding = realdata[0]; + unsigned char *descr = realdata+1; /* remember, the encoding is descr[-1] */ + unsigned char *text; mpg123_text *xex; mpg123_text localex; @@ -654,6 +774,7 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes) { /* 4 or 3 bytes id */ strncpy(id, (char*) tagdata+pos, head_part); + id[head_part] = 0; /* terminate for 3 or 4 bytes */ pos += head_part; tagpos += head_part; /* size as 32 bits or 28 bits */ @@ -700,7 +821,7 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes) if(NOQUIET) warning("ID3v2: skipping invalid/unsupported frame"); continue; } - + for(i = 0; i < KNOWN_FRAMES; ++i) if(!strncmp(frame_type[i], id, 4)){ tt = i; break; } @@ -743,10 +864,10 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes) { case comment: case uslt: - process_comment(fr, tt, (char*)realdata, realsize, comment+1, id); + process_comment(fr, tt, realdata, realsize, comment+1, id); break; case extra: /* perhaps foobar2000's work */ - process_extra(fr, (char*)realdata, realsize, extra+1, id); + process_extra(fr, realdata, realsize, extra+1, id); break; case rva2: /* "the" RVA tag */ { @@ -780,8 +901,13 @@ int parse_new_id3(mpg123_handle *fr, unsigned long first4bytes) break; /* non-rva metainfo, simply store... */ case text: - process_text(fr, (char*)realdata, realsize, id); + process_text(fr, realdata, realsize, id); break; + case picture: + if (fr->p.flags & MPG123_PICTURE) + process_picture(fr, realdata, realsize); + + break; default: if(NOQUIET) error1("ID3v2: unknown frame type %i", tt); } if((flags & UNSYNC_FLAG) || (fflags & UNSYNC_FFLAG)) free(realdata); @@ -865,7 +991,7 @@ static void convert_latin1(mpg123_string *sb, const unsigned char* s, size_t l, 1: big endian This modifies source and len to indicate the data _after_ the BOM(s). - Note on nasty data: The last encountered BOM determines the endianess. + Note on nasty data: The last encountered BOM determines the endianness. I have seen data with multiple BOMS, namely from "the" id3v2 program. Not nice, but what should I do? */ @@ -912,7 +1038,7 @@ static void convert_utf16bom(mpg123_string *sb, const unsigned char* s, size_t l debug1("convert_utf16 with length %lu", (unsigned long)l); bom_endian = check_bom(&s, &l); - debug1("UTF16 endianess check: %i", bom_endian); + debug1("UTF16 endianness check: %i", bom_endian); if(bom_endian == -1) /* little-endian */ { @@ -970,7 +1096,7 @@ static void convert_utf16bom(mpg123_string *sb, const unsigned char* s, size_t l *p++ = 0x80 | ((codepoint>>6) & 0x3f); *p++ = 0x80 | (codepoint & 0x3f); } - else if (codepoint < 0x200000) + else if (codepoint < 0x200000) { *p++ = (unsigned char) (0xf0 | codepoint>>18); *p++ = (unsigned char) (0x80 | ((codepoint>>12) & 0x3f)); diff --git a/jni/mpg123-1.13.4/src/libmpg123/id3.h b/jni/mpg123-1.17.0/src/libmpg123/id3.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/id3.h rename to jni/mpg123-1.17.0/src/libmpg123/id3.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/id3.lo b/jni/mpg123-1.17.0/src/libmpg123/id3.lo new file mode 100644 index 00000000..a3b86501 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/id3.lo @@ -0,0 +1,12 @@ +# id3.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/id3.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/index.c b/jni/mpg123-1.17.0/src/libmpg123/index.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/index.c rename to jni/mpg123-1.17.0/src/libmpg123/index.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/index.h b/jni/mpg123-1.17.0/src/libmpg123/index.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/index.h rename to jni/mpg123-1.17.0/src/libmpg123/index.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/index.lo b/jni/mpg123-1.17.0/src/libmpg123/index.lo new file mode 100644 index 00000000..1124c318 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/index.lo @@ -0,0 +1,12 @@ +# index.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/index.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/intsym.h b/jni/mpg123-1.17.0/src/libmpg123/intsym.h similarity index 94% rename from jni/mpg123-1.13.4/src/libmpg123/intsym.h rename to jni/mpg123-1.17.0/src/libmpg123/intsym.h index f4ed46c7..ba2aba3e 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/intsym.h +++ b/jni/mpg123-1.17.0/src/libmpg123/intsym.h @@ -24,6 +24,8 @@ #define synth_1to1_stereo_altivec INT123_synth_1to1_stereo_altivec #define synth_1to1_x86_64 INT123_synth_1to1_x86_64 #define synth_1to1_stereo_x86_64 INT123_synth_1to1_stereo_x86_64 +#define synth_1to1_avx INT123_synth_1to1_avx +#define synth_1to1_stereo_avx INT123_synth_1to1_stereo_avx #define synth_1to1_arm INT123_synth_1to1_arm #define synth_1to1_neon INT123_synth_1to1_neon #define synth_1to1_stereo_neon INT123_synth_1to1_stereo_neon @@ -67,6 +69,8 @@ #define synth_1to1_real_stereo_sse INT123_synth_1to1_real_stereo_sse #define synth_1to1_real_x86_64 INT123_synth_1to1_real_x86_64 #define synth_1to1_real_stereo_x86_64 INT123_synth_1to1_real_stereo_x86_64 +#define synth_1to1_real_avx INT123_synth_1to1_real_avx +#define synth_1to1_real_stereo_avx INT123_synth_1to1_real_stereo_avx #define synth_1to1_real_altivec INT123_synth_1to1_real_altivec #define synth_1to1_real_stereo_altivec INT123_synth_1to1_real_stereo_altivec #define synth_1to1_real_neon INT123_synth_1to1_real_neon @@ -90,6 +94,8 @@ #define synth_1to1_s32_stereo_sse INT123_synth_1to1_s32_stereo_sse #define synth_1to1_s32_x86_64 INT123_synth_1to1_s32_x86_64 #define synth_1to1_s32_stereo_x86_64 INT123_synth_1to1_s32_stereo_x86_64 +#define synth_1to1_s32_avx INT123_synth_1to1_s32_avx +#define synth_1to1_s32_stereo_avx INT123_synth_1to1_s32_stereo_avx #define synth_1to1_s32_altivec INT123_synth_1to1_s32_altivec #define synth_1to1_s32_stereo_altivec INT123_synth_1to1_s32_stereo_altivec #define synth_1to1_s32_neon INT123_synth_1to1_s32_neon @@ -114,6 +120,9 @@ #define dct36 INT123_dct36 #define dct36_3dnow INT123_dct36_3dnow #define dct36_3dnowext INT123_dct36_3dnowext +#define dct36_sse INT123_dct36_sse +#define dct36_x86_64 INT123_dct36_x86_64 +#define dct36_avx INT123_dct36_avx #define synth_ntom_set_step INT123_synth_ntom_set_step #define ntom_val INT123_ntom_val #define ntom_frame_outsamples INT123_ntom_frame_outsamples @@ -220,6 +229,8 @@ #define dct64_real_sse INT123_dct64_real_sse #define dct64_x86_64 INT123_dct64_x86_64 #define dct64_real_x86_64 INT123_dct64_real_x86_64 +#define dct64_avx INT123_dct64_avx +#define dct64_real_avx INT123_dct64_real_avx #define dct64_neon INT123_dct64_neon #define dct64_real_neon INT123_dct64_real_neon #define do_equalizer_3dnow INT123_do_equalizer_3dnow @@ -243,6 +254,10 @@ #define synth_1to1_x86_64_accurate_asm INT123_synth_1to1_x86_64_accurate_asm #define synth_1to1_real_x86_64_asm INT123_synth_1to1_real_x86_64_asm #define synth_1to1_s32_x86_64_asm INT123_synth_1to1_s32_x86_64_asm +#define synth_1to1_s_avx_asm INT123_synth_1to1_s_avx_asm +#define synth_1to1_s_avx_accurate_asm INT123_synth_1to1_s_avx_accurate_asm +#define synth_1to1_real_s_avx_asm INT123_synth_1to1_real_s_avx_asm +#define synth_1to1_s32_s_avx_asm INT123_synth_1to1_s32_s_avx_asm #define synth_1to1_neon_asm INT123_synth_1to1_neon_asm #define synth_1to1_neon_accurate_asm INT123_synth_1to1_neon_accurate_asm #define synth_1to1_real_neon_asm INT123_synth_1to1_real_neon_asm diff --git a/jni/mpg123-1.13.4/src/libmpg123/l12_integer_tables.h b/jni/mpg123-1.17.0/src/libmpg123/l12_integer_tables.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/l12_integer_tables.h rename to jni/mpg123-1.17.0/src/libmpg123/l12_integer_tables.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/l2tables.h b/jni/mpg123-1.17.0/src/libmpg123/l2tables.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/l2tables.h rename to jni/mpg123-1.17.0/src/libmpg123/l2tables.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/l3_integer_tables.h b/jni/mpg123-1.17.0/src/libmpg123/l3_integer_tables.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/l3_integer_tables.h rename to jni/mpg123-1.17.0/src/libmpg123/l3_integer_tables.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/layer1.c b/jni/mpg123-1.17.0/src/libmpg123/layer1.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/layer1.c rename to jni/mpg123-1.17.0/src/libmpg123/layer1.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/layer1.lo b/jni/mpg123-1.17.0/src/libmpg123/layer1.lo new file mode 100644 index 00000000..e471b5ca --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/layer1.lo @@ -0,0 +1,12 @@ +# layer1.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/layer1.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/layer2.c b/jni/mpg123-1.17.0/src/libmpg123/layer2.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/layer2.c rename to jni/mpg123-1.17.0/src/libmpg123/layer2.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/layer2.lo b/jni/mpg123-1.17.0/src/libmpg123/layer2.lo new file mode 100644 index 00000000..7336cafb --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/layer2.lo @@ -0,0 +1,12 @@ +# layer2.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/layer2.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/layer3.c b/jni/mpg123-1.17.0/src/libmpg123/layer3.c similarity index 96% rename from jni/mpg123-1.13.4/src/libmpg123/layer3.c rename to jni/mpg123-1.17.0/src/libmpg123/layer3.c index c19dbc7a..a799ba24 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/layer3.c +++ b/jni/mpg123-1.17.0/src/libmpg123/layer3.c @@ -15,10 +15,16 @@ */ #include "mpg123lib_intern.h" +#ifdef USE_NEW_HUFFTABLE +#include "newhuffman.h" +#else #include "huffman.h" +#endif #include "getbits.h" #include "debug.h" + + /* define CUT_SFB21 if you want to cut-off the frequency above 16kHz */ #if 0 #define CUT_SFB21 @@ -31,8 +37,8 @@ /* static one-time calculated tables... or so */ static real ispow[8207]; static real aa_ca[8],aa_cs[8]; -static real win[4][36]; -static real win1[4][36]; +static ALIGNED(16) real win[4][36]; +static ALIGNED(16) real win1[4][36]; real COS9[9]; /* dct36_3dnow wants to use that */ static real COS6_1,COS6_2; real tfcos36[9]; /* dct36_3dnow wants to use that */ @@ -79,10 +85,10 @@ struct III_sideinfo struct bandInfoStruct { - int longIdx[23]; - int longDiff[22]; - int shortIdx[14]; - int shortDiff[13]; + unsigned short longIdx[23]; + unsigned char longDiff[22]; + unsigned short shortIdx[14]; + unsigned char shortDiff[13]; }; /* Techy details about our friendly MPEG data. Fairly constant over the years;-) */ @@ -270,7 +276,7 @@ void init_layer3(void) const struct bandInfoStruct *bi = &bandInfo[j]; int *mp; int cb,lwin; - const int *bdf; + const unsigned char *bdf; mp = map[j][0] = mapbuf0[j]; bdf = bi->longDiff; @@ -403,7 +409,7 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster if(si->main_data_begin > fr->bitreservoir) { - if(VERBOSE2) fprintf(stderr, "Note: missing %d bytes in bit reservoir for frame %li\n", (int)(si->main_data_begin - fr->bitreservoir), (long)fr->num); + if(!fr->to_ignore && VERBOSE2) fprintf(stderr, "Note: missing %d bytes in bit reservoir for frame %li\n", (int)(si->main_data_begin - fr->bitreservoir), (long)fr->num); /* overwrite main_data_begin for the really available bit reservoir */ backbits(fr, tab[1]); @@ -494,6 +500,7 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster if((gr_info->block_type == 2) && (!gr_info->mixed_block_flag) ) r0c = 5; else r0c = 7; + /* r0c+1+r1c+1 == 22, always. */ r1c = 20 - r0c; gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ; gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; @@ -511,12 +518,12 @@ static int III_get_side_info(mpg123_handle *fr, struct III_sideinfo *si,int ster for (i=0; i<3; i++) gr_info->table_select[i] = getbits_fast(fr, 5); - r0c = getbits_fast(fr, 4); - r1c = getbits_fast(fr, 3); + r0c = getbits_fast(fr, 4); /* 0 .. 15 */ + r1c = getbits_fast(fr, 3); /* 0 .. 7 */ gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ; - gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; - if(r0c + r1c + 2 > 22) gr_info->region2start = 576>>1; + /* max(r0c+r1c+2) = 15+7+2 = 24 */ + if(r0c+1+r1c+1 > 22) gr_info->region2start = 576>>1; else gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1; gr_info->block_type = 0; @@ -677,8 +684,11 @@ static int III_get_scale_factors_2(mpg123_handle *fr, int *scf,struct gr_info_s return numbits; } -static const int pretab1[22] = {0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0}; -static const int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +static unsigned char pretab_choice[2][22] = +{ + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0} +}; /* Dequantize samples @@ -716,16 +726,6 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in int bv = gr_info->big_values; int region1 = gr_info->region1start; int region2 = gr_info->region2start; - if(region1 > region2) - { - /* - That's not optimal: it fixes a segfault with fuzzed data, but also apparently triggers where it shouldn't, see bug 1641196. - The benefit of not crashing / having this security risk is bigger than these few frames of a lame-3.70 file that aren't audible anyway. - But still, I want to know if indeed this check or the old lame is at fault. - */ - if(NOQUIET) error("You got some really nasty file there... region1>region2!"); - return 1; - } l3 = ((576>>1)-bv)>>1; /* we may lose the 'odd' bit here !! check this later again */ @@ -778,10 +778,10 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in for(i=0;i<2;i++) { int lp = l[i]; - struct newhuff *h = ht+gr_info->table_select[i]; + const struct newhuff *h = ht+gr_info->table_select[i]; for(;lp;lp--,mc--) { - register int x,y; + register long x,y; if( (!mc) ) { mc = *m++; @@ -806,8 +806,20 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in } } { - register short *val = h->table; + const short *val = h->table; REFRESH_MASK; +#ifdef USE_NEW_HUFFTABLE + while((y=val[(unsigned long)mask>>(BITSHIFT+4)])<0) + { + val -= y; + num -= 4; + mask <<= 4; + } + num -= (y >> 8); + mask <<= (y >> 8); + x = (y >> 4) & 0xf; + y &= 0xf; +#else while((y=*val++)<0) { if (mask < 0) val -= y; @@ -817,6 +829,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in } x = y >> 4; y &= 0xf; +#endif } if(x == 15 && h->linbits) { @@ -871,8 +884,8 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in for(;l3 && (part2remain+num > 0);l3--) { - struct newhuff* h; - register short* val; + const struct newhuff* h; + const short* val; register short a; /* This is only a humble hack to prevent a special segfault. @@ -990,7 +1003,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in else { /* decoding with 'long' BandIndex table (block_type != 2) */ - const int *pretab = gr_info->preflag ? pretab1 : pretab2; + const unsigned char *pretab = pretab_choice[gr_info->preflag]; int i,max = -1; int cb = 0; int *m = map[sfreq][2]; @@ -1001,11 +1014,11 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in for(i=0;i<3;i++) { int lp = l[i]; - struct newhuff *h = ht+gr_info->table_select[i]; + const struct newhuff *h = ht+gr_info->table_select[i]; for(;lp;lp--,mc--) { - int x,y; + long x,y; if(!mc) { mc = *m++; @@ -1023,8 +1036,20 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in } } { - register short *val = h->table; + const short *val = h->table; REFRESH_MASK; +#ifdef USE_NEW_HUFFTABLE + while((y=val[(unsigned long)mask>>(BITSHIFT+4)])<0) + { + val -= y; + num -= 4; + mask <<= 4; + } + num -= (y >> 8); + mask <<= (y >> 8); + x = (y >> 4) & 0xf; + y &= 0xf; +#else while((y=*val++)<0) { if (mask < 0) val -= y; @@ -1034,6 +1059,7 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in } x = y >> 4; y &= 0xf; +#endif } if(x == 15 && h->linbits) @@ -1087,8 +1113,9 @@ static int III_dequantize_sample(mpg123_handle *fr, real xr[SBLIMIT][SSLIMIT],in /* short (count1table) values */ for(;l3 && (part2remain+num > 0);l3--) { - struct newhuff *h = htc+gr_info->count1table_select; - register short *val = h->table,a; + const struct newhuff *h = htc+gr_info->count1table_select; + const short *val = h->table; + register short a; REFRESH_MASK; while((a=*val++)<0) diff --git a/jni/mpg123-1.17.0/src/libmpg123/layer3.lo b/jni/mpg123-1.17.0/src/libmpg123/layer3.lo new file mode 100644 index 00000000..47c2975b --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/layer3.lo @@ -0,0 +1,12 @@ +# layer3.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/layer3.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.17.0/src/libmpg123/lfs_alias.c b/jni/mpg123-1.17.0/src/libmpg123/lfs_alias.c new file mode 100644 index 00000000..864b4fbb --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/lfs_alias.c @@ -0,0 +1,222 @@ +/* + lfs_alias: Aliases to the small/native API functions with the size of long int as suffix. + + copyright 2010-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Thomas Orgis + + Use case: Client code on Linux/x86-64 that defines _FILE_OFFSET_BITS to 64, + which is the only choice on that platform anyway. It should be no-op, but + prompts the platform-agnostic header of mpg123 to define API calls with the + corresponding suffix. This file provides the names for this case. It's cruft, + but glibc does it, too -- so people rely on it. + Oh, and it also caters for the lunatics that define _FILE_OFFSET_BITS=32 on + 32 bit platforms. In addition, it's needed for platforms that always have + off_t /= long, and clients still insisting on defining _FILE_OFFSET_BITS. + + Depending on use case, the aliases map to 32 (small) or 64 bit (large) offset + functions, to the ones from libmpg123 or the ones from lfs_wrap. + + So, two basic cases: + 1. mpg123_bla_32 alias for mpg123_bla (native) + 2. mpg123_bla alias for mpg123_bla_32 (wrapper) + Same for 64 bits. Confusing, I know. It sucks. + + Note that the mpg123 header is _not_ used here to avoid definition with whacky off_t. + The aliases are always about arguments of native alias_t type. This can be off_t, but + on Linux/x86, this is long int. The off_t declarations in mpg123.h confuse things, + so reproduce definitions for the wrapper functions in that case. The definitions are + pulled by an inline Perl script in any case ... no need to copy anything manually! + As a benefit, one can skip undefining possible largefile namings. +*/ + +#include "config.h" + +/* Hack for Solaris: Some system headers included from compat.h might force _FILE_OFFSET_BITS. Need to follow that here. + Also, want it around to have types defined. */ +#include "compat.h" + +#ifndef LFS_ALIAS_BITS +#error "I need the count of alias bits here." +#endif + +#define MACROCAT_REALLY(a, b) a ## b +#define MACROCAT(a, b) MACROCAT_REALLY(a, b) + +/* This is wicked switchery: Decide which way the aliases are facing. */ + +#if _FILE_OFFSET_BITS+0 == LFS_ALIAS_BITS + +/* The native functions have suffix, the aliases not. */ +#define NATIVE_SUFFIX MACROCAT(_, _FILE_OFFSET_BITS) +#define NATIVE_NAME(func) MACROCAT(func, NATIVE_SUFFIX) +#define ALIAS_NAME(func) func + +#else + +/* The alias functions have suffix, the native ones not. */ +#define ALIAS_SUFFIX MACROCAT(_, LFS_ALIAS_BITS) +#define ALIAS_NAME(func) MACROCAT(func, ALIAS_SUFFIX) +#define NATIVE_NAME(func) func + +#endif + +/* Copy of necessary definitions, actually just forward declarations. */ +struct mpg123_handle_struct; +typedef struct mpg123_handle_struct mpg123_handle; + + +/* Get attribute_align_arg, to stay safe. */ +#include "abi_align.h" + +/* + Extract the list of functions we need wrappers for, pregenerating the wrappers for simple cases (inline script for nedit): +perl -ne ' +if(/^\s*EXPORT\s+(\S+)\s+(mpg123_\S+)\((.*)\);\s*$/) +{ + my $type = $1; + my $name = $2; + my $args = $3; + next unless ($type =~ /off_t/ or $args =~ /off_t/ or ($name =~ /open/ and $name ne mpg123_open_feed)); + $type =~ s/off_t/lfs_alias_t/g; + my @nargs = (); + $args =~ s/off_t/lfs_alias_t/g; + foreach my $a (split(/,/, $args)) + { + $a =~ s/^.*\s\**([a-z_]+)$/$1/; + push(@nargs, $a); + } + my $nargs = join(", ", @nargs); + $nargs = "Human: figure me out." if($nargs =~ /\(/); + print <err = MPG123_LFS_OVERFLOW; + return MPG123_ERR; + } + return val; +} + #undef mpg123_tell /* off_t mpg123_tell(mpg123_handle *mh); */ long attribute_align_arg mpg123_tell(mpg123_handle *mh) diff --git a/jni/mpg123-1.13.4/src/libmpg123/libmpg123.c b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.c similarity index 90% rename from jni/mpg123-1.13.4/src/libmpg123/libmpg123.c rename to jni/mpg123-1.17.0/src/libmpg123/libmpg123.c index a1db9d3f..8cb219c7 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/libmpg123.c +++ b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.c @@ -1,7 +1,7 @@ /* libmpg123: MPEG Audio Decoder library - copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 1995-2012 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org */ @@ -10,68 +10,12 @@ #include "icy2utf8.h" #include "debug.h" -#ifdef GAPLESS -#define SAMPLE_ADJUST(x) ((x) - ((mh->p.flags & MPG123_GAPLESS) ? mh->begin_os : 0)) -#define SAMPLE_UNADJUST(x) ((x) + ((mh->p.flags & MPG123_GAPLESS) ? mh->begin_os : 0)) -#else -#define SAMPLE_ADJUST(x) (x) -#define SAMPLE_UNADJUST(x) (x) -#endif +#include "gapless.h" #define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe) static int initialized = 0; -#ifdef GAPLESS -/* - Take the buffer after a frame decode (strictly: it is the data from frame fr->num!) and cut samples out. - fr->buffer.fill may then be smaller than before... -*/ -static void frame_buffercheck(mpg123_handle *fr) -{ - /* When we have no accurate position, gapless code does not make sense. */ - if(!fr->accurate) return; - - /* Important: We first cut samples from the end, then cut from beginning (including left-shift of the buffer). - This order works also for the case where firstframe == lastframe. */ - - /* The last interesting (planned) frame: Only use some leading samples. - Note a difference from the below: The last frame and offset are unchanges by seeks. - The lastoff keeps being valid. */ - if(fr->lastframe > -1 && fr->num >= fr->lastframe) - { - /* There can be more than one frame of padding at the end, so we ignore the whole frame if we are beyond lastframe. */ - off_t byteoff = (fr->num == fr->lastframe) ? samples_to_bytes(fr, fr->lastoff) : 0; - if((off_t)fr->buffer.fill > byteoff) - { - fr->buffer.fill = byteoff; - } - debug1("Cut frame buffer on end of stream, fill now %"SIZE_P" bytes.", (size_p)fr->buffer.fill); - } - - /* The first interesting frame: Skip some leading samples. */ - if(fr->firstoff && fr->num == fr->firstframe) - { - off_t byteoff = samples_to_bytes(fr, fr->firstoff); - if((off_t)fr->buffer.fill > byteoff) - { - fr->buffer.fill -= byteoff; - /* buffer.p != buffer.data only for own buffer */ - debug6("cutting %li samples/%li bytes on begin, own_buffer=%i at %p=%p, buf[1]=%i", - (long)fr->firstoff, (long)byteoff, fr->own_buffer, (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]); - if(fr->own_buffer) fr->buffer.p = fr->buffer.data + byteoff; - else memmove(fr->buffer.data, fr->buffer.data + byteoff, fr->buffer.fill); - debug3("done cutting, buffer at %p =? %p, buf[1]=%i", - (void*)fr->buffer.p, (void*)fr->buffer.data, ((short*)fr->buffer.p)[2]); - } - else fr->buffer.fill = 0; - /* We can only reach this frame again by seeking. And on seeking, firstoff will be recomputed. - So it is safe to null it here (and it makes the if() decision abort earlier). */ - fr->firstoff = 0; - } -} -#endif - int attribute_align_arg mpg123_init(void) { if((sizeof(short) != 2) || (sizeof(long) < 4)) return MPG123_BAD_TYPES; @@ -123,18 +67,7 @@ mpg123_handle attribute_align_arg *mpg123_parnew(mpg123_pars *mp, const char* de } if(fr != NULL) { - /* Cleanup that mess! ... use mpg123_decoder / decode_update! */ - if(frame_outbuffer(fr) != 0) - { - err = MPG123_NO_BUFFERS; - frame_exit(fr); - free(fr); - fr = NULL; - } - else - { - fr->decoder_change = 1; - } + fr->decoder_change = 1; } else if(err == MPG123_OK) err = MPG123_OUT_OF_MEM; @@ -192,6 +125,11 @@ int attribute_align_arg mpg123_param(mpg123_handle *mh, enum mpg123_parms key, l r = frame_index_setup(mh); if(r != MPG123_OK) mh->err = MPG123_INDEX_FAIL; } +#endif +#ifndef NO_FEEDER + /* Feeder pool size is applied right away, reader will react to that. */ + if(key == MPG123_FEEDPOOL || key == MPG123_FEEDBUFFER) + bc_poolsize(&mh->rdat.buffer, mh->p.feedpool, mh->p.feedbuffer); #endif } return r; @@ -287,6 +225,22 @@ int attribute_align_arg mpg123_par(mpg123_pars *mp, enum mpg123_parms key, long if(val >= 0) mp->preframes = val; else ret = MPG123_BAD_VALUE; break; + case MPG123_FEEDPOOL: +#ifndef NO_FEEDER + if(val >= 0) mp->feedpool = val; + else ret = MPG123_BAD_VALUE; +#else + ret = MPG123_MISSING_FEATURE; +#endif + break; + case MPG123_FEEDBUFFER: +#ifndef NO_FEEDER + if(val > 0) mp->feedbuffer = val; + else ret = MPG123_BAD_VALUE; +#else + ret = MPG123_MISSING_FEATURE; +#endif + break; default: ret = MPG123_BAD_PARAM; } @@ -362,6 +316,20 @@ int attribute_align_arg mpg123_getpar(mpg123_pars *mp, enum mpg123_parms key, lo case MPG123_PREFRAMES: *val = mp->preframes; break; + case MPG123_FEEDPOOL: +#ifndef NO_FEEDER + *val = mp->feedpool; +#else + ret = MPG123_MISSING_FEATURE; +#endif + break; + case MPG123_FEEDBUFFER: +#ifndef NO_FEEDER + *val = mp->feedbuffer; +#else + ret = MPG123_MISSING_FEATURE; +#endif + break; default: ret = MPG123_BAD_PARAM; } @@ -379,7 +347,26 @@ int attribute_align_arg mpg123_getstate(mpg123_handle *mh, enum mpg123_state key switch(key) { case MPG123_ACCURATE: - theval = mh->accurate; + theval = mh->state_flags & FRAME_ACCURATE; + break; + case MPG123_FRANKENSTEIN: + theval = mh->state_flags & FRAME_FRANKENSTEIN; + break; + case MPG123_BUFFERFILL: +#ifndef NO_FEEDER + { + size_t sval = bc_fill(&mh->rdat.buffer); + theval = (long)sval; + if((size_t)theval != sval) + { + mh->err = MPG123_INT_OVERFLOW; + ret = MPG123_ERR; + } + } +#else + mh->err = MPG123_MISSING_FEATURE; + ret = MPG123_ERR; +#endif break; default: mh->err = MPG123_BAD_KEY; @@ -562,6 +549,9 @@ int decode_update(mpg123_handle *mh) else mh->single = (mh->p.flags & MPG123_FORCE_MONO)-1; if(set_synth_functions(mh) != 0) return -1;; + /* The needed size of output buffer may have changed. */ + if(frame_outbuffer(mh) != MPG123_OK) return -1; + do_rva(mh); debug3("done updating decoder structure with native rate %li and af.rate %li and down_sample %i", frame_freq(mh), mh->af.rate, mh->down_sample); @@ -576,7 +566,8 @@ size_t attribute_align_arg mpg123_safe_buffer(void) size_t attribute_align_arg mpg123_outblock(mpg123_handle *mh) { - if(mh != NULL) return mh->outblock; + /* Try to be helpful and never return zero output block size. */ + if(mh != NULL && mh->outblock > 0) return mh->outblock; else return mpg123_safe_buffer(); } @@ -612,7 +603,7 @@ static int get_next_frame(mpg123_handle *mh) else if(b <= 0) { /* More sophisticated error control? */ - if(b==0 || mh->rdat.filepos == mh->rdat.filelen) + if(b==0 || (mh->rdat.filelen >= 0 && mh->rdat.filepos == mh->rdat.filelen)) { /* We simply reached the end. */ mh->track_frames = mh->num + 1; debug("What about updating/checking gapless sample count here?"); @@ -757,10 +748,7 @@ int attribute_align_arg mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num decode_the_frame(mh); mh->to_decode = mh->to_ignore = FALSE; mh->buffer.p = mh->buffer.data; -#ifdef GAPLESS - /* This checks for individual samples to skip, for gapless mode or sample-accurate seek. */ - frame_buffercheck(mh); -#endif + FRAME_BUFFERCHECK(mh); *audio = mh->buffer.p; *bytes = mh->buffer.fill; return MPG123_OK; @@ -837,10 +825,7 @@ int attribute_align_arg mpg123_decode_frame(mpg123_handle *mh, off_t *num, unsig mh->to_decode = mh->to_ignore = FALSE; mh->buffer.p = mh->buffer.data; -#ifdef GAPLESS - /* This checks for individual samples to skip, for gapless mode or sample-accurate seek. */ - frame_buffercheck(mh); -#endif + FRAME_BUFFERCHECK(mh); if(audio != NULL) *audio = mh->buffer.p; if(bytes != NULL) *bytes = mh->buffer.fill; @@ -863,6 +848,7 @@ int attribute_align_arg mpg123_read(mpg123_handle *mh, unsigned char *out, size_ int attribute_align_arg mpg123_feed(mpg123_handle *mh, const unsigned char *in, size_t size) { if(mh == NULL) return MPG123_ERR; +#ifndef NO_FEEDER if(size > 0) { if(in != NULL) @@ -884,6 +870,10 @@ int attribute_align_arg mpg123_feed(mpg123_handle *mh, const unsigned char *in, } } return MPG123_OK; +#else + mh->err = MPG123_MISSING_FEATURE; + return MPG123_ERR; +#endif } /* @@ -907,6 +897,7 @@ int attribute_align_arg mpg123_decode(mpg123_handle *mh, const unsigned char *in if(done != NULL) *done = 0; if(mh == NULL) return MPG123_ERR; +#ifndef NO_FEEDER if(inmemsize > 0 && mpg123_feed(mh, inmemory, inmemsize) != MPG123_OK) { ret = MPG123_ERR; @@ -937,9 +928,7 @@ int attribute_align_arg mpg123_decode(mpg123_handle *mh, const unsigned char *in mh->to_decode = mh->to_ignore = FALSE; mh->buffer.p = mh->buffer.data; debug2("decoded frame %li, got %li samples in buffer", (long)mh->num, (long)(mh->buffer.fill / (samples_to_bytes(mh, 1)))); -#ifdef GAPLESS - frame_buffercheck(mh); /* Seek & gapless. */ -#endif + FRAME_BUFFERCHECK(mh); } if(mh->buffer.fill) /* Copy (part of) the decoded data to the caller's buffer. */ { @@ -963,6 +952,10 @@ int attribute_align_arg mpg123_decode(mpg123_handle *mh, const unsigned char *in decodeend: if(done != NULL) *done = mdone; return ret; +#else + mh->err = MPG123_MISSING_FEATURE; + return MPG123_ERR; +#endif } long attribute_align_arg mpg123_clip(mpg123_handle *mh) @@ -977,7 +970,8 @@ long attribute_align_arg mpg123_clip(mpg123_handle *mh) return ret; } -#define track_need_init(mh) (!(mh)->to_decode && (mh)->fresh) +/* Simples: Track needs initializtion if no initial frame has been read yet. */ +#define track_need_init(mh) ((mh)->num < 0) static int init_track(mpg123_handle *mh) { @@ -1048,7 +1042,7 @@ off_t attribute_align_arg mpg123_tell(mpg123_handle *mh) pos = frame_outs(mh, mh->num+1) - bytes_to_samples(mh, mh->buffer.fill); } /* Substract padding and delay from the beginning. */ - pos = SAMPLE_ADJUST(pos); + pos = SAMPLE_ADJUST(mh,pos); /* Negative sample offsets are not right, less than nothing is still nothing. */ return pos>0 ? pos : 0; } @@ -1133,10 +1127,9 @@ off_t attribute_align_arg mpg123_seek(mpg123_handle *mh, off_t sampleoff, int wh /* When we do not know the end already, we can try to find it. */ if(mh->track_frames < 1 && (mh->rdat.flags & READER_SEEKABLE)) mpg123_scan(mh); + if(mh->track_frames > 0) pos = SAMPLE_ADJUST(mh,frame_outs(mh, mh->track_frames)) - sampleoff; #ifdef GAPLESS - if(mh->end_os > 0) pos = SAMPLE_ADJUST(mh->end_os) - sampleoff; -#else - if(mh->track_frames > 0) pos = SAMPLE_ADJUST(frame_outs(mh, mh->track_frames)) - sampleoff; + else if(mh->end_os > 0) pos = SAMPLE_ADJUST(mh,mh->end_os) - sampleoff; #endif else { @@ -1148,7 +1141,7 @@ off_t attribute_align_arg mpg123_seek(mpg123_handle *mh, off_t sampleoff, int wh } if(pos < 0) pos = 0; /* pos now holds the wanted sample offset in adjusted samples */ - frame_set_seek(mh, SAMPLE_UNADJUST(pos)); + frame_set_seek(mh, SAMPLE_UNADJUST(mh,pos)); pos = do_the_seek(mh); if(pos < 0) return pos; @@ -1170,6 +1163,7 @@ off_t attribute_align_arg mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, in debug3("seek from %li to %li (whence=%i)", (long)pos, (long)sampleoff, whence); /* The special seek error handling does not apply here... there is no lowlevel I/O. */ if(pos < 0) return pos; /* mh == NULL is covered in mpg123_tell() */ +#ifndef NO_FEEDER if(input_offset == NULL) { mh->err = MPG123_NULL_POINTER; @@ -1183,10 +1177,9 @@ off_t attribute_align_arg mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, in case SEEK_CUR: pos += sampleoff; break; case SEEK_SET: pos = sampleoff; break; case SEEK_END: + if(mh->track_frames > 0) pos = SAMPLE_ADJUST(mh,frame_outs(mh, mh->track_frames)) - sampleoff; #ifdef GAPLESS - if(mh->end_os >= 0) pos = SAMPLE_ADJUST(mh->end_os) - sampleoff; -#else - if(mh->track_frames > 0) pos = SAMPLE_ADJUST(frame_outs(mh, mh->track_frames)) - sampleoff; + else if(mh->end_os >= 0) pos = SAMPLE_ADJUST(mh,mh->end_os) - sampleoff; #endif else { @@ -1197,7 +1190,7 @@ off_t attribute_align_arg mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, in default: mh->err = MPG123_BAD_WHENCE; return MPG123_ERR; } if(pos < 0) pos = 0; - frame_set_seek(mh, SAMPLE_UNADJUST(pos)); + frame_set_seek(mh, SAMPLE_UNADJUST(mh,pos)); pos = SEEKFRAME(mh); mh->buffer.fill = 0; @@ -1213,6 +1206,10 @@ off_t attribute_align_arg mpg123_feedseek(mpg123_handle *mh, off_t sampleoff, in feedseekend: return mpg123_tell(mh); +#else + mh->err = MPG123_MISSING_FEATURE; + return MPG123_ERR; +#endif } off_t attribute_align_arg mpg123_seek_frame(mpg123_handle *mh, off_t offset, int whence) @@ -1242,8 +1239,7 @@ off_t attribute_align_arg mpg123_seek_frame(mpg123_handle *mh, off_t offset, int return MPG123_ERR; } if(pos < 0) pos = 0; - /* Hm, do we need to seek right past the end? */ - else if(mh->track_frames > 0 && pos >= mh->track_frames) pos = mh->track_frames; + /* Not limiting the possible position on end for the chance that there might be more to the stream than announced via track_frames. */ frame_set_frameseek(mh, pos); pos = do_the_seek(mh); @@ -1283,23 +1279,16 @@ off_t attribute_align_arg mpg123_length(mpg123_handle *mh) length = frame_ins2outs(mh, length); debug1("mpg123_length: external sample length: %"OFF_P, (off_p)length); -#ifdef GAPLESS - if(mh->p.flags & MPG123_GAPLESS) - { - debug2("mpg123_length: begin_os = %"OFF_P", end_os = %"OFF_P, (off_p)mh->begin_os, (off_p)mh->end_os); - if(mh->end_os > 0 && length > mh->end_os) length = mh->end_os; - length -= mh->begin_os; - debug1("mpg123_length: after gapless correction: %"OFF_P, (off_p)length); - } -#endif + length = SAMPLE_ADJUST(mh,length); return length; } int attribute_align_arg mpg123_scan(mpg123_handle *mh) { int b; - off_t backframe; - int to_decode, to_ignore; + off_t oldpos; + off_t track_frames = 0; + off_t track_samples = 0; if(mh == NULL) return MPG123_ERR; if(!(mh->rdat.flags & READER_SEEKABLE)){ mh->err = MPG123_NO_SEEK; return MPG123_ERR; } @@ -1312,30 +1301,28 @@ int attribute_align_arg mpg123_scan(mpg123_handle *mh) if(b == MPG123_DONE) return MPG123_OK; else return MPG123_ERR; /* Must be error here, NEED_MORE is not for seekable streams. */ } - backframe = mh->num; - to_decode = mh->to_decode; - to_ignore = mh->to_ignore; + oldpos = mpg123_tell(mh); b = mh->rd->seek_frame(mh, 0); if(b<0 || mh->num != 0) return MPG123_ERR; /* One frame must be there now. */ - mh->track_frames = 1; - mh->track_samples = spf(mh); /* Internal samples. */ + track_frames = 1; + track_samples = spf(mh); /* Internal samples. */ debug("TODO: We should disable gapless code when encountering inconsistent spf(mh)!"); + /* Do not increment mh->track_frames in the loop as tha would confuse Frankenstein detection. */ while(read_frame(mh) == 1) { - ++mh->track_frames; - mh->track_samples += spf(mh); + ++track_frames; + track_samples += spf(mh); } + mh->track_frames = track_frames; + mh->track_samples = track_samples; + mpg123_seek_frame(mh, SEEK_SET, mh->track_frames); debug2("Scanning yielded %"OFF_P" track samples, %"OFF_P" frames.", (off_p)mh->track_samples, (off_p)mh->track_frames); #ifdef GAPLESS /* Also, think about usefulness of that extra value track_samples ... it could be used for consistency checking. */ frame_gapless_update(mh, mh->track_samples); -#endif - b = mh->rd->seek_frame(mh, backframe); - if(b<0 || mh->num != backframe) return MPG123_ERR; - mh->to_decode = to_decode; - mh->to_ignore = to_ignore; - return MPG123_OK; +#endif + return mpg123_seek(mh, oldpos, SEEK_SET) >= 0 ? MPG123_OK : MPG123_ERR; } int attribute_align_arg mpg123_meta_check(mpg123_handle *mh) @@ -1344,6 +1331,14 @@ int attribute_align_arg mpg123_meta_check(mpg123_handle *mh) else return 0; } +void attribute_align_arg mpg123_meta_free(mpg123_handle *mh) +{ + if(mh == NULL) return; + + reset_id3(mh); + reset_icy(&mh->icy); +} + int attribute_align_arg mpg123_id3(mpg123_handle *mh, mpg123_id3v1 **v1, mpg123_id3v2 **v2) { if(v1 != NULL) *v1 = NULL; @@ -1507,8 +1502,10 @@ int attribute_align_arg mpg123_set_index(mpg123_handle *mh, off_t *offsets, off_ int attribute_align_arg mpg123_close(mpg123_handle *mh) { if(mh == NULL) return MPG123_ERR; - if(mh->rd != NULL && mh->rd->close != NULL) mh->rd->close(mh); - mh->rd = NULL; + + /* mh->rd is never NULL! */ + if(mh->rd->close != NULL) mh->rd->close(mh); + if(mh->new_format) { debug("Hey, we are closing a track before the new format has been queried..."); @@ -1575,6 +1572,7 @@ static const char *mpg123_error[] = ,"Low-level seeking has failed (call to lseek(), usually)." ,"Custom I/O obviously not prepared." ,"Overflow in LFS (large file support) conversion." + ,"Overflow in integer conversion." }; const char* attribute_align_arg mpg123_plain_strerror(int errcode) diff --git a/jni/mpg123-1.13.4/src/libmpg123/libmpg123.la b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.la similarity index 85% rename from jni/mpg123-1.13.4/src/libmpg123/libmpg123.la rename to jni/mpg123-1.17.0/src/libmpg123/libmpg123.la index 2583880f..54f6b6d5 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/libmpg123.la +++ b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.la @@ -1,5 +1,5 @@ # libmpg123.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4 +# Generated by libtool (GNU libtool) 2.4.2 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -8,7 +8,7 @@ dlname='libmpg123.so.0' # Names of this library. -library_names='libmpg123.so.0.29.6 libmpg123.so.0 libmpg123.so' +library_names='libmpg123.so.0.38.4 libmpg123.so.0 libmpg123.so' # The name of the static archive. old_library='' @@ -23,9 +23,9 @@ dependency_libs=' -lm' weak_library_names='' # Version information for libmpg123. -current=29 -age=29 -revision=6 +current=38 +age=38 +revision=4 # Is this an already installed library? installed=no diff --git a/jni/mpg123-1.17.0/src/libmpg123/libmpg123.lo b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.lo new file mode 100644 index 00000000..47a2d369 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/libmpg123.lo @@ -0,0 +1,12 @@ +# libmpg123.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/libmpg123.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/mangle.h b/jni/mpg123-1.17.0/src/libmpg123/mangle.h similarity index 74% rename from jni/mpg123-1.13.4/src/libmpg123/mangle.h rename to jni/mpg123-1.17.0/src/libmpg123/mangle.h index 75c0c369..7cfe385b 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/mangle.h +++ b/jni/mpg123-1.17.0/src/libmpg123/mangle.h @@ -19,16 +19,40 @@ #define MOVUAPS movups #endif +/* + ALIGNX: align to X bytes + This differs per compiler/platform in taking the byte count or an exponent for base 2. + A way out is balign, if the assembler supports it (gas extension). +*/ + +#ifdef ASMALIGN_BALIGN + +#define ALIGN4 .balign 4 +#define ALIGN8 .balign 8 +#define ALIGN16 .balign 16 +#define ALIGN32 .balign 32 +#define ALIGN64 .balign 64 + +#else + #ifdef ASMALIGN_EXP #define ALIGN4 .align 2 #define ALIGN8 .align 3 #define ALIGN16 .align 4 #define ALIGN32 .align 5 +#define ALIGN64 .align 6 #else +#ifdef ASMALIGN_BYTE #define ALIGN4 .align 4 #define ALIGN8 .align 8 #define ALIGN16 .align 16 #define ALIGN32 .align 32 +#define ALIGN64 .align 64 +#else +#error "Dunno how assembler alignment works. Please specify." +#endif +#endif + #endif #define MANGLE_MACROCAT_REALLY(a, b) a ## b @@ -61,10 +85,14 @@ /* Mark non-executable stack. It's mainly for GNU on Linux... who else does (not) like this? */ #if !defined(__SUNPRO_C) && defined(__linux__) && defined(__ELF__) -#define NONEXEC_STACK .section .note.GNU-stack,"",%progbits +#define NONEXEC_STACK .section .note.GNU-stack,"",@progbits #else #define NONEXEC_STACK #endif +#if defined(__x86_64__) && (defined(_WIN64) || defined (__CYGWIN__)) +#define IS_MSABI 1 /* Not using SYSV */ +#endif + #endif /* !__MANGLE_H */ diff --git a/jni/mpg123-1.17.0/src/libmpg123/mpeghead.h b/jni/mpg123-1.17.0/src/libmpg123/mpeghead.h new file mode 100644 index 00000000..549d0ee9 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/mpeghead.h @@ -0,0 +1,89 @@ +/* + mpeghead: the bits of an MPEG frame header + + copyright ?-2011 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Michael Hipp & Thomas Orgis (from parse.c) +*/ +#ifndef MPG123_MPEGHEAD_H +#define MPG123_MPEGHEAD_H + +/* + Avoid human error, let perl do the work of dissecting an MPEG header into parts. + To be clear: Never edit the following definitions by hand, modify the code block inside this comment and run it through perl instead! + + $head = "AAAAAAAA AAABBCCD EEEEFFGH IIJJKLMM"; + %parts = qw(A sync B version C layer D crc E bitrate F samplerate G padding H private I channel J chanex K copyright L original M emphasis); + for(sort keys %parts) + { + $name = uc($parts{$_}); + $bits = $head; + $bits =~ s/$_/1/g; + $bits =~ s/[^1 ]/0/g; + print "\/\* $bits \*\/\n"; + $bits =~ s/\s//g; + print "#define HDR_$name".(" " x (18-length($name))).sprintf("0x%08x", eval("0b$bits"))."\n"; + $bits =~ m/(0*)$/; + print "#define HDR_${name}_VAL(h)".(" " x (11-length($name)))."(((h)\&HDR_$name) >> ".length($1).")\n"; + } +*/ + +/* 11111111 11100000 00000000 00000000 */ +#define HDR_SYNC 0xffe00000 +#define HDR_SYNC_VAL(h) (((h)&HDR_SYNC) >> 21) +/* 00000000 00011000 00000000 00000000 */ +#define HDR_VERSION 0x00180000 +#define HDR_VERSION_VAL(h) (((h)&HDR_VERSION) >> 19) +/* 00000000 00000110 00000000 00000000 */ +#define HDR_LAYER 0x00060000 +#define HDR_LAYER_VAL(h) (((h)&HDR_LAYER) >> 17) +/* 00000000 00000001 00000000 00000000 */ +#define HDR_CRC 0x00010000 +#define HDR_CRC_VAL(h) (((h)&HDR_CRC) >> 16) +/* 00000000 00000000 11110000 00000000 */ +#define HDR_BITRATE 0x0000f000 +#define HDR_BITRATE_VAL(h) (((h)&HDR_BITRATE) >> 12) +/* 00000000 00000000 00001100 00000000 */ +#define HDR_SAMPLERATE 0x00000c00 +#define HDR_SAMPLERATE_VAL(h) (((h)&HDR_SAMPLERATE) >> 10) +/* 00000000 00000000 00000010 00000000 */ +#define HDR_PADDING 0x00000200 +#define HDR_PADDING_VAL(h) (((h)&HDR_PADDING) >> 9) +/* 00000000 00000000 00000001 00000000 */ +#define HDR_PRIVATE 0x00000100 +#define HDR_PRIVATE_VAL(h) (((h)&HDR_PRIVATE) >> 8) +/* 00000000 00000000 00000000 11000000 */ +#define HDR_CHANNEL 0x000000c0 +#define HDR_CHANNEL_VAL(h) (((h)&HDR_CHANNEL) >> 6) +/* 00000000 00000000 00000000 00110000 */ +#define HDR_CHANEX 0x00000030 +#define HDR_CHANEX_VAL(h) (((h)&HDR_CHANEX) >> 4) +/* 00000000 00000000 00000000 00001000 */ +#define HDR_COPYRIGHT 0x00000008 +#define HDR_COPYRIGHT_VAL(h) (((h)&HDR_COPYRIGHT) >> 3) +/* 00000000 00000000 00000000 00000100 */ +#define HDR_ORIGINAL 0x00000004 +#define HDR_ORIGINAL_VAL(h) (((h)&HDR_ORIGINAL) >> 2) +/* 00000000 00000000 00000000 00000011 */ +#define HDR_EMPHASIS 0x00000003 +#define HDR_EMPHASIS_VAL(h) (((h)&HDR_EMPHASIS) >> 0) + +/* + A generic mask for telling if a header is somewhat valid for the current stream. + Meaning: Most basic info is not allowed to change. + Checking of channel count needs to be done, too, though. So, + if channel count matches, frames are decoded the same way: frame buffers and decoding + routines can stay the same, especially frame buffers (think spf * channels!). +*/ +#define HDR_CMPMASK (HDR_SYNC|HDR_VERSION|HDR_LAYER|HDR_SAMPLERATE) + +/* A stricter mask, for matching free format headers. */ +#define HDR_SAMEMASK (HDR_SYNC|HDR_VERSION|HDR_LAYER|HDR_BITRATE|HDR_SAMPLERATE|HDR_CHANNEL|HDR_CHANEX) + +/* Free format headers have zero bitrate value. */ +#define HDR_FREE_FORMAT(head) (!(head & HDR_BITRATE)) + +/* A mask for changed sampling rate (version or rate bits). */ +#define HDR_SAMPMASK (HDR_VERSION|HDR_SAMPLERATE) + +#endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/mpg123.h b/jni/mpg123-1.17.0/src/libmpg123/mpg123.h similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/mpg123.h rename to jni/mpg123-1.17.0/src/libmpg123/mpg123.h index 03cf9197..619f663c 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/mpg123.h +++ b/jni/mpg123-1.17.0/src/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.13.4) + libmpg123: MPEG Audio Decoder library (version 1.17.0) copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -12,7 +12,7 @@ /* A macro to check at compile time which set of API functions to expect. This should be incremented at least each time a new symbol is added to the header. */ -#define MPG123_API_VERSION 29 +#define MPG123_API_VERSION 38 /* These aren't actually in use... seems to work without using libtool. */ #ifdef BUILD_MPG123_DLL @@ -82,6 +82,7 @@ #define mpg123_set_filesize MPG123_LARGENAME(mpg123_set_filesize) #define mpg123_replace_reader MPG123_LARGENAME(mpg123_replace_reader) #define mpg123_replace_reader_handle MPG123_LARGENAME(mpg123_replace_reader_handle) +#define mpg123_framepos MPG123_LARGENAME(mpg123_framepos) #endif /* largefile hackery */ @@ -133,7 +134,7 @@ EXPORT void mpg123_delete(mpg123_handle *mh); /** Enumeration of the parameters types that it is possible to set/get. */ enum mpg123_parms { - MPG123_VERBOSE, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */ + MPG123_VERBOSE = 0, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */ MPG123_FLAGS, /**< set all flags, p.ex val = MPG123_GAPLESS|MPG123_MONO_MIX (integer) */ MPG123_ADD_FLAGS, /**< add some flags (integer) */ MPG123_FORCE_RATE, /**< when value > 0, force output rate to that value (integer) */ @@ -147,9 +148,11 @@ enum mpg123_parms MPG123_OUTSCALE, /**< the scale for output samples (amplitude - integer or float according to mpg123 output format, normally integer) */ MPG123_TIMEOUT, /**< timeout for reading from a stream (not supported on win32, integer) */ MPG123_REMOVE_FLAGS, /**< remove some flags (inverse of MPG123_ADD_FLAGS, integer) */ - MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). */ + MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). This can enlarge the limit for skipping junk on beginning, too (but not reduce it). */ MPG123_INDEX_SIZE /**< Set the frame index size (if supported). Values <0 mean that the index is allowed to grow dynamically in these steps (in positive direction, of course) -- Use this when you really want a full index with every individual frame. */ ,MPG123_PREFRAMES /**< Decode/ignore that many frames in advance for layer 3. This is needed to fill bit reservoir after seeking, for example (but also at least one frame in advance is needed to have all "normal" data for layer 3). Give a positive integer value, please.*/ + ,MPG123_FEEDPOOL /**< For feeder mode, keep that many buffers in a pool to avoid frequent malloc/free. The pool is allocated on mpg123_open_feed(). If you change this parameter afterwards, you can trigger growth and shrinkage during decoding. The default value could change any time. If you care about this, then set it. (integer) */ + ,MPG123_FEEDBUFFER /**< Minimal size of one internal feeder buffer, again, the default value is subject to change. (integer) */ }; /** Flag bits for MPG123_FLAGS, use the usual binary or to combine. */ @@ -170,6 +173,9 @@ enum mpg123_param_flags ,MPG123_PLAIN_ID3TEXT = 0x800 /**< 100000000000 Do not translate ID3 text data to UTF-8. ID3 strings will contain the raw text data, with the first byte containing the ID3 encoding code. */ ,MPG123_IGNORE_STREAMLENGTH = 0x1000 /**< 1000000000000 Ignore any stream length information contained in the stream, which can be contained in a 'TLEN' frame of an ID3v2 tag or a Xing tag */ ,MPG123_SKIP_ID3V2 = 0x2000 /**< 10 0000 0000 0000 Do not parse ID3v2 tags, just skip them. */ + ,MPG123_IGNORE_INFOFRAME = 0x4000 /**< 100 0000 0000 0000 Do not parse the LAME/Xing info frame, treat it as normal MPEG data. */ + ,MPG123_AUTO_RESAMPLE = 0x8000 /**< 1000 0000 0000 0000 Allow automatic internal resampling of any kind (default on if supported). Especially when going lowlevel with replacing output buffer, you might want to unset this flag. Setting MPG123_DOWNSAMPLE or MPG123_FORCE_RATE will override this. */ + ,MPG123_PICTURE = 0x10000 /**< 17th bit: Enable storage of pictures from tags (ID3v2 APIC). */ }; /** choices for MPG123_RVA */ @@ -278,6 +284,7 @@ enum mpg123_errors ,MPG123_LSEEK_FAILED /**< Low-level seek failed. */ ,MPG123_BAD_CUSTOM_IO /**< Custom I/O not prepared. */ ,MPG123_LFS_OVERFLOW /**< Offset value overflow during translation of large file API calls -- your client program cannot handle that large file. */ + ,MPG123_INT_OVERFLOW /**< Some integer overflow. */ }; /** Return a string describing that error errcode means. */ @@ -326,6 +333,16 @@ EXPORT const char* mpg123_current_decoder(mpg123_handle *mh); * * Functions to get and select the format of the decoded audio. * + * Before you dive in, please be warned that you might get confused by this. This seems to happen a lot, therefore I am trying to explain in advance. + * + * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including ptimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). + * + * To get to the point: What you do with mpg123_format() and friends is to fill the internal table of allowed formats before it is used. That includes removing support for some formats or adding your forced sample rate (see MPG123_FORCE_RATE) that will be used with the crude internal resampler. Also keep in mind that the sample encoding is just a question of choice -- the MPEG frames do only indicate their native sampling rate and channel count. If you want to decode to integer or float samples, 8 or 16 bit ... that is your decision. In a "clean" world, libmpg123 would always decode to 32 bit float and let you handle any sample conversion. But there are optimized routines that work faster by directly decoding to the desired encoding / accuracy. We prefer efficiency over conceptual tidyness. + * + * People often start out thinking that mpg123_format() should change the actual decoding format on the fly. That is wrong. It only has effect on the next natural change of output format, when libmpg123 will consult its format table again. To make life easier, you might want to call mpg123_format_none() before any thing else and then just allow one desired encoding and a limited set of sample rates / channel choices that you actually intend to deal with. You can force libmpg123 to decode everything to 44100 KHz, stereo, 16 bit integer ... it will duplicate mono channels and even do resampling if needed (unless that feature is disabled in the build, same with some encodings). But I have to stress that the resampling of libmpg123 is very crude and doesn't even contain any kind of "proper" interpolation. + * + * In any case, watch out for MPG123_NEW_FORMAT as return message from decoding routines and call mpg123_getformat() to get the currently active output format. + * * @{ */ @@ -364,7 +381,7 @@ enum mpg123_enc_enum ,MPG123_ENC_UNSIGNED_24 = MPG123_ENC_24|0x2000 /**< 0110 0000 0000 0000 unsigned 24 bit */ ,MPG123_ENC_FLOAT_32 = 0x200 /**< 0010 0000 0000 32bit float */ ,MPG123_ENC_FLOAT_64 = 0x400 /**< 0100 0000 0000 64bit float */ - ,MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16 | MPG123_ENC_UNSIGNED_16 | MPG123_ENC_UNSIGNED_8 + ,MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16 | MPG123_ENC_UNSIGNED_16 | MPG123_ENC_UNSIGNED_8 | MPG123_ENC_SIGNED_8 | MPG123_ENC_ULAW_8 | MPG123_ENC_ALAW_8 | MPG123_ENC_SIGNED_32 | MPG123_ENC_UNSIGNED_32 | MPG123_ENC_SIGNED_24 | MPG123_ENC_UNSIGNED_24 @@ -512,6 +529,24 @@ EXPORT int mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num, unsigned ch */ EXPORT int mpg123_framebyframe_next(mpg123_handle *mh); +/** Get access to the raw input data for the last parsed frame. + * This gives you a direct look (and write access) to the frame body data. + * Together with the raw header, you can reconstruct the whole raw MPEG stream without junk and meta data, or play games by actually modifying the frame body data before decoding this frame (mpg123_framebyframe_decode()). + * A more sane use would be to use this for CRC checking (see mpg123_info() and MPG123_CRC), the first two bytes of the body make up the CRC16 checksum, if present. + * You can provide NULL for a parameter pointer when you are not interested in the value. + * + * \param header the 4-byte MPEG header + * \param bodydata pointer to the frame body stored in the handle (without the header) + * \param bodybytes size of frame body in bytes (without the header) + * \return MPG123_OK if there was a yet un-decoded frame to get the data from, MPG123_ERR otherwise (without further explanation, the error state of the mpg123_handle is not modified by this function). + */ +EXPORT int mpg123_framedata(mpg123_handle *mh, unsigned long *header, unsigned char **bodydata, size_t *bodybytes); + +/** Get the input position (byte offset in stream) of the last parsed frame. + * This can be used for external seek index building, for example. + * It just returns the internally stored offset, regardless of validity -- you ensure that a valid frame has been parsed before! */ +EXPORT off_t mpg123_framepos(mpg123_handle *mh); + /*@}*/ @@ -684,7 +719,7 @@ struct mpg123_frameinfo long rate; /**< The sampling rate in Hz. */ enum mpg123_mode mode; /**< The audio mode (Mono, Stereo, Joint-stero, Dual Channel). */ int mode_ext; /**< The mode extension bit flag. */ - int framesize; /**< The size of the frame (in bytes). */ + int framesize; /**< The size of the frame (in bytes, including header). */ enum mpg123_flags flags; /**< MPEG Audio flag bits. Just now I realize that it should be declared as int, not enum. It's a bitwise combination of the enum values. */ int emphasis; /**< The emphasis type. */ int bitrate; /**< Bitrate of the frame (kbps). */ @@ -718,6 +753,9 @@ EXPORT int mpg123_set_filesize(mpg123_handle *mh, off_t size); /** Returns the time (seconds) per frame; <0 is error. */ EXPORT double mpg123_tpf(mpg123_handle *mh); +/** Returns the samples per frame for the most recently parsed frame; <0 is error. */ +EXPORT int mpg123_spf(mpg123_handle *mh); + /** Get and reset the clip count. */ EXPORT long mpg123_clip(mpg123_handle *mh); @@ -726,6 +764,8 @@ EXPORT long mpg123_clip(mpg123_handle *mh); enum mpg123_state { MPG123_ACCURATE = 1 /**< Query if positons are currently accurate (integer value, 0 if false, 1 if true) */ + ,MPG123_BUFFERFILL /**< Get fill of internal (feed) input buffer as integer byte count returned as long and as double. An error is returned on integer overflow while converting to (signed) long, but the returned floating point value shold still be fine. */ + ,MPG123_FRANKENSTEIN /**< Stream consists of carelessly stitched together files (the leading one featuring gapless info). */ }; /** Get various current decoder/stream state information. @@ -804,6 +844,12 @@ EXPORT int mpg123_set_substring(mpg123_string *sb, const char *stuff, size_t fr */ EXPORT size_t mpg123_strlen(mpg123_string *sb, int utf8); +/** Remove trailing \r and \n, if present. + * \return 0 on error, 1 on success + * \param sb the string + */ +EXPORT int mpg123_chomp_string(mpg123_string *sb); + /** The mpg123 text encodings. This contains encodings we encounter in ID3 tags or ICY meta info. */ enum mpg123_text_encoding { @@ -861,6 +907,45 @@ typedef struct mpg123_string text; /**< ... */ } mpg123_text; +/** The picture type values from ID3v2. */ +enum mpg123_id3_pic_type +{ + mpg123_id3_pic_other = 0 + ,mpg123_id3_pic_icon = 1 + ,mpg123_id3_pic_other_icon = 2 + ,mpg123_id3_pic_front_cover = 3 + ,mpg123_id3_pic_back_cover = 4 + ,mpg123_id3_pic_leaflet = 5 + ,mpg123_id3_pic_media = 6 + ,mpg123_id3_pic_lead = 7 + ,mpg123_id3_pic_artist = 8 + ,mpg123_id3_pic_conductor = 9 + ,mpg123_id3_pic_orchestra = 10 + ,mpg123_id3_pic_composer = 11 + ,mpg123_id3_pic_lyricist = 12 + ,mpg123_id3_pic_location = 13 + ,mpg123_id3_pic_recording = 14 + ,mpg123_id3_pic_performance = 15 + ,mpg123_id3_pic_video = 16 + ,mpg123_id3_pic_fish = 17 + ,mpg123_id3_pic_illustration = 18 + ,mpg123_id3_pic_artist_logo = 19 + ,mpg123_id3_pic_publisher_logo = 20 +}; + +/** Sub data structure for ID3v2, for storing picture data including comment. + * This is for the ID3v2 APIC field. You should consult the ID3v2 specification + * for the use of the APIC field ("frames" in ID3v2 documentation, I use "fields" + * here to separate from MPEG frames). */ +typedef struct +{ + char type; + mpg123_string description; + mpg123_string mime_type; + size_t size; + unsigned char* data; +} mpg123_picture; + /** Data structure for storing IDV3v2 tags. * This structure is not a direct binary mapping with the file contents. * The ID3v2 text frames are allowed to contain multiple strings. @@ -883,6 +968,8 @@ typedef struct size_t texts; /**< Numer of text fields. */ mpg123_text *extra; /**< The array of extra (TXXX) fields. */ size_t extras; /**< Number of extra text (TXXX) fields. */ + mpg123_picture *picture; /**< Array of ID3v2 pictures fields (APIC). */ + size_t pictures; /**< Number of picture (APIC) fields. */ } mpg123_id3v2; /** Data structure for ID3v1 tags (the last 128 bytes of a file). @@ -909,6 +996,9 @@ typedef struct The check function returns a combination of flags. */ EXPORT int mpg123_meta_check(mpg123_handle *mh); /* On error (no valid handle) just 0 is returned. */ +/** Clean up meta data storage (ID3v2 and ICY), freeing memory. */ +EXPORT void mpg123_meta_free(mpg123_handle *mh); + /** Point v1 and v2 to existing data structures wich may change on any next read/decode function call. * v1 and/or v2 can be set to NULL when there is no corresponding data. * \return Return value is MPG123_OK or MPG123_ERR, */ @@ -1026,7 +1116,6 @@ EXPORT int mpg123_replace_reader_handle(mpg123_handle *mh, ssize_t (*r_read) (vo /* @} */ - #ifdef __cplusplus } #endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/mpg123.h.in b/jni/mpg123-1.17.0/src/libmpg123/mpg123.h.in similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/mpg123.h.in rename to jni/mpg123-1.17.0/src/libmpg123/mpg123.h.in index 69b252c3..bd1e1b09 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/mpg123.h.in +++ b/jni/mpg123-1.17.0/src/libmpg123/mpg123.h.in @@ -82,6 +82,7 @@ #define mpg123_set_filesize MPG123_LARGENAME(mpg123_set_filesize) #define mpg123_replace_reader MPG123_LARGENAME(mpg123_replace_reader) #define mpg123_replace_reader_handle MPG123_LARGENAME(mpg123_replace_reader_handle) +#define mpg123_framepos MPG123_LARGENAME(mpg123_framepos) #endif /* largefile hackery */ @@ -133,7 +134,7 @@ EXPORT void mpg123_delete(mpg123_handle *mh); /** Enumeration of the parameters types that it is possible to set/get. */ enum mpg123_parms { - MPG123_VERBOSE, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */ + MPG123_VERBOSE = 0, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */ MPG123_FLAGS, /**< set all flags, p.ex val = MPG123_GAPLESS|MPG123_MONO_MIX (integer) */ MPG123_ADD_FLAGS, /**< add some flags (integer) */ MPG123_FORCE_RATE, /**< when value > 0, force output rate to that value (integer) */ @@ -147,9 +148,11 @@ enum mpg123_parms MPG123_OUTSCALE, /**< the scale for output samples (amplitude - integer or float according to mpg123 output format, normally integer) */ MPG123_TIMEOUT, /**< timeout for reading from a stream (not supported on win32, integer) */ MPG123_REMOVE_FLAGS, /**< remove some flags (inverse of MPG123_ADD_FLAGS, integer) */ - MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). */ + MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). This can enlarge the limit for skipping junk on beginning, too (but not reduce it). */ MPG123_INDEX_SIZE /**< Set the frame index size (if supported). Values <0 mean that the index is allowed to grow dynamically in these steps (in positive direction, of course) -- Use this when you really want a full index with every individual frame. */ ,MPG123_PREFRAMES /**< Decode/ignore that many frames in advance for layer 3. This is needed to fill bit reservoir after seeking, for example (but also at least one frame in advance is needed to have all "normal" data for layer 3). Give a positive integer value, please.*/ + ,MPG123_FEEDPOOL /**< For feeder mode, keep that many buffers in a pool to avoid frequent malloc/free. The pool is allocated on mpg123_open_feed(). If you change this parameter afterwards, you can trigger growth and shrinkage during decoding. The default value could change any time. If you care about this, then set it. (integer) */ + ,MPG123_FEEDBUFFER /**< Minimal size of one internal feeder buffer, again, the default value is subject to change. (integer) */ }; /** Flag bits for MPG123_FLAGS, use the usual binary or to combine. */ @@ -170,6 +173,9 @@ enum mpg123_param_flags ,MPG123_PLAIN_ID3TEXT = 0x800 /**< 100000000000 Do not translate ID3 text data to UTF-8. ID3 strings will contain the raw text data, with the first byte containing the ID3 encoding code. */ ,MPG123_IGNORE_STREAMLENGTH = 0x1000 /**< 1000000000000 Ignore any stream length information contained in the stream, which can be contained in a 'TLEN' frame of an ID3v2 tag or a Xing tag */ ,MPG123_SKIP_ID3V2 = 0x2000 /**< 10 0000 0000 0000 Do not parse ID3v2 tags, just skip them. */ + ,MPG123_IGNORE_INFOFRAME = 0x4000 /**< 100 0000 0000 0000 Do not parse the LAME/Xing info frame, treat it as normal MPEG data. */ + ,MPG123_AUTO_RESAMPLE = 0x8000 /**< 1000 0000 0000 0000 Allow automatic internal resampling of any kind (default on if supported). Especially when going lowlevel with replacing output buffer, you might want to unset this flag. Setting MPG123_DOWNSAMPLE or MPG123_FORCE_RATE will override this. */ + ,MPG123_PICTURE = 0x10000 /**< 17th bit: Enable storage of pictures from tags (ID3v2 APIC). */ }; /** choices for MPG123_RVA */ @@ -278,6 +284,7 @@ enum mpg123_errors ,MPG123_LSEEK_FAILED /**< Low-level seek failed. */ ,MPG123_BAD_CUSTOM_IO /**< Custom I/O not prepared. */ ,MPG123_LFS_OVERFLOW /**< Offset value overflow during translation of large file API calls -- your client program cannot handle that large file. */ + ,MPG123_INT_OVERFLOW /**< Some integer overflow. */ }; /** Return a string describing that error errcode means. */ @@ -326,6 +333,16 @@ EXPORT const char* mpg123_current_decoder(mpg123_handle *mh); * * Functions to get and select the format of the decoded audio. * + * Before you dive in, please be warned that you might get confused by this. This seems to happen a lot, therefore I am trying to explain in advance. + * + * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including ptimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again). + * + * To get to the point: What you do with mpg123_format() and friends is to fill the internal table of allowed formats before it is used. That includes removing support for some formats or adding your forced sample rate (see MPG123_FORCE_RATE) that will be used with the crude internal resampler. Also keep in mind that the sample encoding is just a question of choice -- the MPEG frames do only indicate their native sampling rate and channel count. If you want to decode to integer or float samples, 8 or 16 bit ... that is your decision. In a "clean" world, libmpg123 would always decode to 32 bit float and let you handle any sample conversion. But there are optimized routines that work faster by directly decoding to the desired encoding / accuracy. We prefer efficiency over conceptual tidyness. + * + * People often start out thinking that mpg123_format() should change the actual decoding format on the fly. That is wrong. It only has effect on the next natural change of output format, when libmpg123 will consult its format table again. To make life easier, you might want to call mpg123_format_none() before any thing else and then just allow one desired encoding and a limited set of sample rates / channel choices that you actually intend to deal with. You can force libmpg123 to decode everything to 44100 KHz, stereo, 16 bit integer ... it will duplicate mono channels and even do resampling if needed (unless that feature is disabled in the build, same with some encodings). But I have to stress that the resampling of libmpg123 is very crude and doesn't even contain any kind of "proper" interpolation. + * + * In any case, watch out for MPG123_NEW_FORMAT as return message from decoding routines and call mpg123_getformat() to get the currently active output format. + * * @{ */ @@ -364,7 +381,7 @@ enum mpg123_enc_enum ,MPG123_ENC_UNSIGNED_24 = MPG123_ENC_24|0x2000 /**< 0110 0000 0000 0000 unsigned 24 bit */ ,MPG123_ENC_FLOAT_32 = 0x200 /**< 0010 0000 0000 32bit float */ ,MPG123_ENC_FLOAT_64 = 0x400 /**< 0100 0000 0000 64bit float */ - ,MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16 | MPG123_ENC_UNSIGNED_16 | MPG123_ENC_UNSIGNED_8 + ,MPG123_ENC_ANY = ( MPG123_ENC_SIGNED_16 | MPG123_ENC_UNSIGNED_16 | MPG123_ENC_UNSIGNED_8 | MPG123_ENC_SIGNED_8 | MPG123_ENC_ULAW_8 | MPG123_ENC_ALAW_8 | MPG123_ENC_SIGNED_32 | MPG123_ENC_UNSIGNED_32 | MPG123_ENC_SIGNED_24 | MPG123_ENC_UNSIGNED_24 @@ -512,6 +529,24 @@ EXPORT int mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num, unsigned ch */ EXPORT int mpg123_framebyframe_next(mpg123_handle *mh); +/** Get access to the raw input data for the last parsed frame. + * This gives you a direct look (and write access) to the frame body data. + * Together with the raw header, you can reconstruct the whole raw MPEG stream without junk and meta data, or play games by actually modifying the frame body data before decoding this frame (mpg123_framebyframe_decode()). + * A more sane use would be to use this for CRC checking (see mpg123_info() and MPG123_CRC), the first two bytes of the body make up the CRC16 checksum, if present. + * You can provide NULL for a parameter pointer when you are not interested in the value. + * + * \param header the 4-byte MPEG header + * \param bodydata pointer to the frame body stored in the handle (without the header) + * \param bodybytes size of frame body in bytes (without the header) + * \return MPG123_OK if there was a yet un-decoded frame to get the data from, MPG123_ERR otherwise (without further explanation, the error state of the mpg123_handle is not modified by this function). + */ +EXPORT int mpg123_framedata(mpg123_handle *mh, unsigned long *header, unsigned char **bodydata, size_t *bodybytes); + +/** Get the input position (byte offset in stream) of the last parsed frame. + * This can be used for external seek index building, for example. + * It just returns the internally stored offset, regardless of validity -- you ensure that a valid frame has been parsed before! */ +EXPORT off_t mpg123_framepos(mpg123_handle *mh); + /*@}*/ @@ -684,7 +719,7 @@ struct mpg123_frameinfo long rate; /**< The sampling rate in Hz. */ enum mpg123_mode mode; /**< The audio mode (Mono, Stereo, Joint-stero, Dual Channel). */ int mode_ext; /**< The mode extension bit flag. */ - int framesize; /**< The size of the frame (in bytes). */ + int framesize; /**< The size of the frame (in bytes, including header). */ enum mpg123_flags flags; /**< MPEG Audio flag bits. Just now I realize that it should be declared as int, not enum. It's a bitwise combination of the enum values. */ int emphasis; /**< The emphasis type. */ int bitrate; /**< Bitrate of the frame (kbps). */ @@ -718,6 +753,9 @@ EXPORT int mpg123_set_filesize(mpg123_handle *mh, off_t size); /** Returns the time (seconds) per frame; <0 is error. */ EXPORT double mpg123_tpf(mpg123_handle *mh); +/** Returns the samples per frame for the most recently parsed frame; <0 is error. */ +EXPORT int mpg123_spf(mpg123_handle *mh); + /** Get and reset the clip count. */ EXPORT long mpg123_clip(mpg123_handle *mh); @@ -726,6 +764,8 @@ EXPORT long mpg123_clip(mpg123_handle *mh); enum mpg123_state { MPG123_ACCURATE = 1 /**< Query if positons are currently accurate (integer value, 0 if false, 1 if true) */ + ,MPG123_BUFFERFILL /**< Get fill of internal (feed) input buffer as integer byte count returned as long and as double. An error is returned on integer overflow while converting to (signed) long, but the returned floating point value shold still be fine. */ + ,MPG123_FRANKENSTEIN /**< Stream consists of carelessly stitched together files (the leading one featuring gapless info). */ }; /** Get various current decoder/stream state information. @@ -804,6 +844,12 @@ EXPORT int mpg123_set_substring(mpg123_string *sb, const char *stuff, size_t fr */ EXPORT size_t mpg123_strlen(mpg123_string *sb, int utf8); +/** Remove trailing \r and \n, if present. + * \return 0 on error, 1 on success + * \param sb the string + */ +EXPORT int mpg123_chomp_string(mpg123_string *sb); + /** The mpg123 text encodings. This contains encodings we encounter in ID3 tags or ICY meta info. */ enum mpg123_text_encoding { @@ -861,6 +907,45 @@ typedef struct mpg123_string text; /**< ... */ } mpg123_text; +/** The picture type values from ID3v2. */ +enum mpg123_id3_pic_type +{ + mpg123_id3_pic_other = 0 + ,mpg123_id3_pic_icon = 1 + ,mpg123_id3_pic_other_icon = 2 + ,mpg123_id3_pic_front_cover = 3 + ,mpg123_id3_pic_back_cover = 4 + ,mpg123_id3_pic_leaflet = 5 + ,mpg123_id3_pic_media = 6 + ,mpg123_id3_pic_lead = 7 + ,mpg123_id3_pic_artist = 8 + ,mpg123_id3_pic_conductor = 9 + ,mpg123_id3_pic_orchestra = 10 + ,mpg123_id3_pic_composer = 11 + ,mpg123_id3_pic_lyricist = 12 + ,mpg123_id3_pic_location = 13 + ,mpg123_id3_pic_recording = 14 + ,mpg123_id3_pic_performance = 15 + ,mpg123_id3_pic_video = 16 + ,mpg123_id3_pic_fish = 17 + ,mpg123_id3_pic_illustration = 18 + ,mpg123_id3_pic_artist_logo = 19 + ,mpg123_id3_pic_publisher_logo = 20 +}; + +/** Sub data structure for ID3v2, for storing picture data including comment. + * This is for the ID3v2 APIC field. You should consult the ID3v2 specification + * for the use of the APIC field ("frames" in ID3v2 documentation, I use "fields" + * here to separate from MPEG frames). */ +typedef struct +{ + char type; + mpg123_string description; + mpg123_string mime_type; + size_t size; + unsigned char* data; +} mpg123_picture; + /** Data structure for storing IDV3v2 tags. * This structure is not a direct binary mapping with the file contents. * The ID3v2 text frames are allowed to contain multiple strings. @@ -883,6 +968,8 @@ typedef struct size_t texts; /**< Numer of text fields. */ mpg123_text *extra; /**< The array of extra (TXXX) fields. */ size_t extras; /**< Number of extra text (TXXX) fields. */ + mpg123_picture *picture; /**< Array of ID3v2 pictures fields (APIC). */ + size_t pictures; /**< Number of picture (APIC) fields. */ } mpg123_id3v2; /** Data structure for ID3v1 tags (the last 128 bytes of a file). @@ -909,6 +996,9 @@ typedef struct The check function returns a combination of flags. */ EXPORT int mpg123_meta_check(mpg123_handle *mh); /* On error (no valid handle) just 0 is returned. */ +/** Clean up meta data storage (ID3v2 and ICY), freeing memory. */ +EXPORT void mpg123_meta_free(mpg123_handle *mh); + /** Point v1 and v2 to existing data structures wich may change on any next read/decode function call. * v1 and/or v2 can be set to NULL when there is no corresponding data. * \return Return value is MPG123_OK or MPG123_ERR, */ @@ -1026,7 +1116,6 @@ EXPORT int mpg123_replace_reader_handle(mpg123_handle *mh, ssize_t (*r_read) (vo /* @} */ - #ifdef __cplusplus } #endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/mpg123lib_intern.h b/jni/mpg123-1.17.0/src/libmpg123/mpg123lib_intern.h similarity index 89% rename from jni/mpg123-1.13.4/src/libmpg123/mpg123lib_intern.h rename to jni/mpg123-1.17.0/src/libmpg123/mpg123lib_intern.h index 80f9794b..73a43cdb 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/mpg123lib_intern.h +++ b/jni/mpg123-1.17.0/src/libmpg123/mpg123lib_intern.h @@ -16,29 +16,7 @@ #include "config.h" /* Load this before _anything_ */ #include "intsym.h" /* Prefixing of internal symbols that still are public in a static lib. */ -/* ABI conformance for other compilers. - mpg123 needs 16byte-aligned stack for SSE and friends. - gcc provides that, but others don't necessarily. */ -#ifdef ABI_ALIGN_FUN -#ifndef attribute_align_arg -#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__>1) -# define attribute_align_arg __attribute__((force_align_arg_pointer)) -/* The gcc that can align the stack does not need the check... nor does it work with gcc 4.3+, anyway. */ -#else - -# define attribute_align_arg -/* Other compilers get code to catch misaligned stack. - Well, except Sun Studio, which accepts the aligned attribute but does not honor it. */ -#if !defined(__SUNPRO_C) -# define NEED_ALIGNCHECK -#endif - -#endif -#endif -#else -#define attribute_align_arg -/* We won't try the align check... */ -#endif +#include "abi_align.h" /* export DLL symbols */ #if defined(WIN32) && defined(DYNAMIC_BUILD) @@ -137,7 +115,7 @@ static inline long scale_rounded(long x, int shift) "srwi %0, %0, %4 \n\t" \ "rlwimi %0, %1, %5, 0, %6 \n\t" \ : "=&r" (_mull), "=&r" (_mulh) \ - : "%r" (_x), "r" (_y), "i" (radix), "i" (32-(radix)), "i" ((radix)-1) \ + : "r" (_x), "r" (_y), "i" (radix), "i" (32-(radix)), "i" ((radix)-1) \ ); \ _mull; \ }) @@ -153,7 +131,7 @@ static inline long scale_rounded(long x, int shift) "slw %1, %1, %2 \n\t" \ "or %0, %0, %1 \n\t" \ : "=&r" (_mull), "=&r" (_mulh), "=&r" (_radix2) \ - : "%r" (_x), "r" (_y), "r" (_radix) \ + : "r" (_x), "r" (_y), "r" (_radix) \ : "cc" \ ); \ _mull; \ @@ -168,7 +146,7 @@ static inline long scale_rounded(long x, int shift) "mov %0, %0, lsr %4 \n\t" \ "orr %0, %0, %1, lsl %5 \n\t" \ : "=&r" (_mull), "=&r" (_mulh) \ - : "%r" (_x), "r" (_y), "M" (radix), "M" (32-(radix)) \ + : "r" (_x), "r" (_y), "M" (radix), "M" (32-(radix)) \ ); \ _mull; \ }) @@ -180,9 +158,10 @@ static inline long scale_rounded(long x, int shift) "smull %0, %1, %3, %4 \n\t" \ "mov %0, %0, lsr %5 \n\t" \ "rsb %2, %5, #32 \n\t" \ - "orr %0, %0, %1, lsl %2 \n\t" \ + "mov %1, %1, lsl %2 \n\t" \ + "orr %0, %0, %1 \n\t" \ : "=&r" (_mull), "=&r" (_mulh), "=&r" (_radix2) \ - : "%r" (_x), "r" (_y), "r" (_radix) \ + : "r" (_x), "r" (_y), "r" (_radix) \ ); \ _mull; \ }) diff --git a/jni/mpg123-1.17.0/src/libmpg123/newhuffman.h b/jni/mpg123-1.17.0/src/libmpg123/newhuffman.h new file mode 100644 index 00000000..4d108a95 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/newhuffman.h @@ -0,0 +1,824 @@ +/* + nwehuffman.h: optimized huffman tables (radix-4 lookup) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + + +#ifndef _MPG123_NEWHUFFMAN_H_ +#define _MPG123_NEWHUFFMAN_H_ + +struct newhuff +{ + unsigned int linbits; + const short *table; +}; + +static const short tab0_[] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const short tab1_[] = +{ + 0x0311, 0x0311, 0x0301, 0x0301, 0x0210, 0x0210, 0x0210, 0x0210, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, +}; + +static const short tab2_[] = +{ + -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, +}; + +static const short tab3_[] = +{ + -16, -32, 0x0310, 0x0310, 0x0211, 0x0211, 0x0211, 0x0211, + 0x0201, 0x0201, 0x0201, 0x0201, 0x0200, 0x0200, 0x0200, 0x0200, + 0x0222, 0x0222, 0x0222, 0x0222, 0x0202, 0x0202, 0x0202, 0x0202, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120 +}; + +static const short tab5_[] = +{ + -16, -32, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0433, 0x0423, 0x0332, 0x0332, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0313, 0x0313, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, +}; + +static const short tab6_[] = +{ + -16, -32, -48, 0x0412, 0x0421, 0x0420, 0x0301, 0x0301, + 0x0211, 0x0211, 0x0211, 0x0211, 0x0310, 0x0310, 0x0300, 0x0300, + 0x0333, 0x0333, 0x0303, 0x0303, 0x0223, 0x0223, 0x0223, 0x0223, + 0x0232, 0x0232, 0x0232, 0x0232, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, +}; + +static const short tab7_[] = +{ + -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -48, -64, -80, 0x0415, 0x0451, -96, 0x0450, -112, + 0x0424, 0x0442, 0x0314, 0x0314, 0x0341, 0x0341, 0x0340, 0x0340, + 0x0404, 0x0423, 0x0432, 0x0403, 0x0313, 0x0313, 0x0331, 0x0331, + 0x0330, 0x0330, 0x0322, 0x0322, 0x0212, 0x0212, 0x0212, 0x0212, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0255, 0x0255, 0x0255, 0x0255, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0253, 0x0253, 0x0253, 0x0253, + 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, 0x0135, + 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, +}; + +static const short tab8_[] = +{ + -16, -32, 0x0412, 0x0421, 0x0211, 0x0211, 0x0211, 0x0211, + 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, + -32, -48, -64, 0x0415, 0x0451, -80, -96, 0x0424, + 0x0442, 0x0414, 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, + 0x0413, 0x0431, 0x0403, 0x0430, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0355, 0x0355, 0x0354, 0x0354, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, +}; + +static const short tab9_[] = +{ + -16, -32, -48, -64, -80, 0x0412, 0x0421, 0x0420, + 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, 0x0300, 0x0300, + -80, 0x0435, 0x0453, -96, 0x0444, 0x0425, 0x0452, 0x0415, + 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, 0x0450, 0x0404, + 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0340, 0x0340, + 0x0214, 0x0214, 0x0214, 0x0214, 0x0241, 0x0241, 0x0241, 0x0241, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0203, 0x0203, 0x0203, 0x0203, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, + 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, 0x0145, + 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, 0x0154, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, +}; + +static const short tab10_[] = +{ + -16, -32, -48, 0x0411, 0x0301, 0x0301, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -48, -64, -80, -96, -112, -128, -144, 0x0417, + 0x0471, -160, -176, -192, 0x0416, 0x0461, 0x0460, -208, + -208, -224, 0x0414, 0x0441, 0x0440, 0x0423, 0x0432, 0x0403, + 0x0313, 0x0313, 0x0331, 0x0331, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x0377, 0x0377, 0x0367, 0x0367, 0x0376, 0x0376, 0x0357, 0x0357, + 0x0375, 0x0375, 0x0366, 0x0366, 0x0247, 0x0247, 0x0247, 0x0247, + 0x0274, 0x0274, 0x0274, 0x0274, 0x0256, 0x0256, 0x0256, 0x0256, + 0x0265, 0x0265, 0x0265, 0x0265, 0x0237, 0x0237, 0x0237, 0x0237, + 0x0273, 0x0273, 0x0273, 0x0273, 0x0246, 0x0246, 0x0246, 0x0246, + 0x0355, 0x0355, 0x0354, 0x0354, 0x0263, 0x0263, 0x0263, 0x0263, + 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, + 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, 0x0172, + 0x0264, 0x0264, 0x0264, 0x0264, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, + 0x0245, 0x0245, 0x0245, 0x0245, 0x0235, 0x0235, 0x0235, 0x0235, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, 0x0136, + 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, 0x0126, + 0x0225, 0x0225, 0x0225, 0x0225, 0x0252, 0x0252, 0x0252, 0x0252, + 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, + 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, 0x0151, + 0x0234, 0x0234, 0x0234, 0x0234, 0x0243, 0x0243, 0x0243, 0x0243, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, +}; + +static const short tab11_[] = +{ + -16, -32, -48, -64, 0x0412, -80, 0x0311, 0x0311, + 0x0301, 0x0301, 0x0310, 0x0310, 0x0200, 0x0200, 0x0200, 0x0200, + -80, -96, -112, -128, -144, 0x0427, 0x0472, -160, + 0x0371, 0x0371, 0x0417, 0x0470, 0x0436, 0x0463, 0x0460, -176, + -176, 0x0415, 0x0362, 0x0362, 0x0426, 0x0406, 0x0316, 0x0316, + 0x0361, 0x0361, 0x0451, 0x0434, 0x0450, -192, 0x0424, 0x0442, + 0x0414, 0x0441, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, + 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, + 0x0276, 0x0276, 0x0276, 0x0276, 0x0275, 0x0275, 0x0275, 0x0275, + 0x0266, 0x0266, 0x0266, 0x0266, 0x0247, 0x0247, 0x0247, 0x0247, + 0x0274, 0x0274, 0x0274, 0x0274, 0x0357, 0x0357, 0x0355, 0x0355, + 0x0256, 0x0256, 0x0256, 0x0256, 0x0265, 0x0265, 0x0265, 0x0265, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, + 0x0245, 0x0245, 0x0245, 0x0245, 0x0254, 0x0254, 0x0254, 0x0254, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0253, 0x0253, 0x0253, 0x0253, + 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, 0x0164, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, 0x0144, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, +}; + +static const short tab12_[] = +{ + -16, -32, -48, -64, -80, -96, 0x0412, 0x0421, + -112, 0x0400, 0x0311, 0x0311, 0x0301, 0x0301, 0x0310, 0x0310, + -112, -128, -144, -160, 0x0456, 0x0437, -176, 0x0427, + 0x0472, 0x0446, 0x0464, 0x0417, 0x0471, -192, 0x0436, 0x0463, + 0x0445, 0x0454, 0x0444, -192, 0x0326, 0x0326, 0x0362, 0x0362, + 0x0361, 0x0361, 0x0416, 0x0460, 0x0435, 0x0453, 0x0425, 0x0452, + 0x0315, 0x0315, 0x0351, 0x0351, 0x0334, 0x0334, 0x0343, 0x0343, + 0x0450, 0x0404, 0x0324, 0x0324, 0x0342, 0x0342, 0x0314, 0x0314, + 0x0233, 0x0233, 0x0233, 0x0233, 0x0241, 0x0241, 0x0241, 0x0241, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0340, 0x0340, 0x0303, 0x0303, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, + 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, 0x0131, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0267, 0x0267, 0x0267, 0x0267, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, 0x0155, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, +}; + +static const short tab13_[] = +{ + -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -64, -80, -96, -112, -128, -144, -160, -176, + -192, -208, -224, -240, -256, -272, -288, -304, + -304, -320, -336, -352, 0x0481, -368, -384, -400, + -416, -432, 0x0415, 0x0451, -448, -464, -480, 0x0414, + 0x0341, 0x0341, 0x0404, 0x0440, 0x0423, 0x0432, 0x0313, 0x0313, + 0x0331, 0x0331, 0x0303, 0x0303, 0x0330, 0x0330, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + -448, -464, -480, -496, -512, -528, -544, -560, + -576, -592, -608, -624, -640, -656, 0x041f, 0x04f1, + 0x04f0, -656, -672, -688, 0x04e2, -704, 0x041e, 0x04e1, + -720, -736, -752, -768, -784, -800, 0x04c6, 0x043d, + -800, 0x042d, 0x04d2, 0x041d, 0x04b7, -816, -832, 0x04c3, + -848, 0x044b, 0x03d1, 0x03d1, 0x040d, 0x04d0, 0x048a, 0x04a8, + 0x044c, 0x04c4, 0x046b, 0x04b6, 0x033c, 0x033c, 0x032c, 0x032c, + 0x03c2, 0x03c2, 0x035b, 0x035b, 0x04b5, 0x0489, 0x031c, 0x031c, + 0x03c1, 0x03c1, 0x0498, 0x040c, 0x03c0, 0x03c0, 0x04b4, 0x046a, + 0x04a6, 0x0479, 0x033b, 0x033b, 0x03b3, 0x03b3, 0x0488, 0x045a, + 0x032b, 0x032b, 0x04a5, 0x0469, 0x03a4, 0x03a4, 0x0478, 0x0487, + 0x0394, 0x0394, 0x0477, 0x0476, 0x02b2, 0x02b2, 0x02b2, 0x02b2, + 0x021b, 0x021b, 0x021b, 0x021b, 0x02b1, 0x02b1, 0x02b1, 0x02b1, + 0x030b, 0x030b, 0x03b0, 0x03b0, 0x0396, 0x0396, 0x034a, 0x034a, + 0x033a, 0x033a, 0x03a3, 0x03a3, 0x0359, 0x0359, 0x0395, 0x0395, + 0x022a, 0x022a, 0x022a, 0x022a, 0x02a2, 0x02a2, 0x02a2, 0x02a2, + 0x021a, 0x021a, 0x021a, 0x021a, 0x02a1, 0x02a1, 0x02a1, 0x02a1, + 0x030a, 0x030a, 0x0368, 0x0368, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x0386, 0x0386, 0x0349, 0x0349, 0x0293, 0x0293, 0x0293, 0x0293, + 0x0339, 0x0339, 0x0358, 0x0358, 0x0385, 0x0385, 0x0367, 0x0367, + 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, + 0x0357, 0x0357, 0x0375, 0x0375, 0x0238, 0x0238, 0x0238, 0x0238, + 0x0283, 0x0283, 0x0283, 0x0283, 0x0366, 0x0366, 0x0347, 0x0347, + 0x0374, 0x0374, 0x0356, 0x0356, 0x0365, 0x0365, 0x0373, 0x0373, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, + 0x0209, 0x0209, 0x0209, 0x0209, 0x0290, 0x0290, 0x0290, 0x0290, + 0x0248, 0x0248, 0x0248, 0x0248, 0x0284, 0x0284, 0x0284, 0x0284, + 0x0272, 0x0272, 0x0272, 0x0272, 0x0346, 0x0346, 0x0364, 0x0364, + 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, + 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, + 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, + 0x0237, 0x0237, 0x0237, 0x0237, 0x0227, 0x0227, 0x0227, 0x0227, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, + 0x0255, 0x0255, 0x0255, 0x0255, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, + 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, + 0x0262, 0x0262, 0x0262, 0x0262, 0x0235, 0x0235, 0x0235, 0x0235, + 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, + 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, + 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, + 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x0253, 0x0253, 0x0253, 0x0253, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + -448, 0x04ff, 0x04ef, 0x04df, 0x04ee, 0x04cf, 0x04de, 0x04bf, + 0x04fb, 0x04ce, 0x04dc, -464, 0x03ec, 0x03ec, 0x03dd, 0x03dd, + 0x04fa, 0x04cd, 0x03be, 0x03be, 0x03eb, 0x03eb, 0x039f, 0x039f, + 0x03f9, 0x03f9, 0x03ea, 0x03ea, 0x03bd, 0x03bd, 0x03db, 0x03db, + 0x038f, 0x038f, 0x03f8, 0x03f8, 0x03cc, 0x03cc, 0x04ae, 0x049e, + 0x038e, 0x038e, 0x047f, 0x047e, 0x02f7, 0x02f7, 0x02f7, 0x02f7, + 0x02da, 0x02da, 0x02da, 0x02da, 0x03ad, 0x03ad, 0x03bc, 0x03bc, + 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x026f, 0x026f, 0x026f, 0x026f, + 0x02e8, 0x02e8, 0x02e8, 0x02e8, 0x025f, 0x025f, 0x025f, 0x025f, + 0x029d, 0x029d, 0x029d, 0x029d, 0x02d9, 0x02d9, 0x02d9, 0x02d9, + 0x02f5, 0x02f5, 0x02f5, 0x02f5, 0x02e7, 0x02e7, 0x02e7, 0x02e7, + 0x02ac, 0x02ac, 0x02ac, 0x02ac, 0x02bb, 0x02bb, 0x02bb, 0x02bb, + 0x024f, 0x024f, 0x024f, 0x024f, 0x02f4, 0x02f4, 0x02f4, 0x02f4, + 0x03ca, 0x03ca, 0x03e6, 0x03e6, 0x02f3, 0x02f3, 0x02f3, 0x02f3, + 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, 0x013f, + 0x028d, 0x028d, 0x028d, 0x028d, 0x02d8, 0x02d8, 0x02d8, 0x02d8, + 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, + 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, 0x01f2, + 0x026e, 0x026e, 0x026e, 0x026e, 0x029c, 0x029c, 0x029c, 0x029c, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + 0x02c9, 0x02c9, 0x02c9, 0x02c9, 0x025e, 0x025e, 0x025e, 0x025e, + 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, 0x01ab, + 0x027d, 0x027d, 0x027d, 0x027d, 0x02d7, 0x02d7, 0x02d7, 0x02d7, + 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, + 0x02c8, 0x02c8, 0x02c8, 0x02c8, 0x02d6, 0x02d6, 0x02d6, 0x02d6, + 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, + 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, 0x01b9, + 0x029b, 0x029b, 0x029b, 0x029b, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, 0x01ba, + 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, 0x01e5, + 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, 0x01e4, + 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, 0x018c, + 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, + 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, 0x01e3, + 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, 0x012e, + 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, + 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, + 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, + 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, + 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, + 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, + 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, + 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, + 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, 0x01b8, + 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, + 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, + 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, 0x01a9, + 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, + 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, 0x01d3, + 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, + 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, + 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, + 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, + 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, + 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, 0x01a7, + 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, + 0x03fe, 0x03fe, 0x03fc, 0x03fc, 0x02fd, 0x02fd, 0x02fd, 0x02fd, + 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, + 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, 0x01af, + 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, 0x01e9, +}; + +static const short tab15_[] = +{ + -16, -32, -48, -64, -80, -96, -112, -128, + -144, -160, 0x0311, 0x0311, 0x0401, 0x0410, 0x0300, 0x0300, + -160, -176, -192, -208, -224, -240, -256, -272, + -288, -304, -320, -336, -352, -368, -384, -400, + -400, -416, -432, -448, -464, -480, -496, -512, + -528, -544, -560, -576, -592, -608, -624, -640, + -640, -656, 0x0491, -672, -688, -704, -720, -736, + 0x0428, 0x0482, 0x0418, 0x0481, -752, -768, -784, -800, + 0x0427, 0x0472, 0x0464, 0x0417, 0x0455, 0x0471, -800, 0x0436, + 0x0463, 0x0445, 0x0454, 0x0426, 0x0462, 0x0416, -816, 0x0435, + 0x0361, 0x0361, 0x0453, 0x0444, 0x0325, 0x0325, 0x0352, 0x0352, + 0x0315, 0x0315, 0x0351, 0x0351, 0x0405, 0x0450, 0x0334, 0x0334, + 0x0343, 0x0343, 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, + 0x0241, 0x0241, 0x0241, 0x0241, 0x0314, 0x0314, 0x0304, 0x0304, + 0x0223, 0x0223, 0x0223, 0x0223, 0x0232, 0x0232, 0x0232, 0x0232, + 0x0340, 0x0340, 0x0303, 0x0303, 0x0213, 0x0213, 0x0213, 0x0213, + 0x0231, 0x0231, 0x0231, 0x0231, 0x0230, 0x0230, 0x0230, 0x0230, + 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, 0x0122, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + -720, -736, 0x04ee, -752, -768, -784, 0x04fb, -800, + 0x04dd, 0x04af, 0x04fa, 0x04be, 0x04eb, 0x04cd, 0x04dc, 0x049f, + 0x04f9, 0x04ea, 0x04bd, 0x04db, 0x048f, 0x04f8, 0x04cc, 0x049e, + 0x04e9, 0x047f, 0x04f7, 0x04ad, 0x04da, 0x04bc, 0x046f, -800, + 0x03cb, 0x03cb, 0x03f6, 0x03f6, 0x048e, 0x04e8, 0x045f, 0x049d, + 0x03f5, 0x03f5, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, + 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x04d9, 0x048d, 0x034f, 0x034f, + 0x03f4, 0x03f4, 0x033f, 0x033f, 0x03f3, 0x03f3, 0x03d8, 0x03d8, + 0x03e6, 0x03e6, 0x032f, 0x032f, 0x03f2, 0x03f2, 0x046e, 0x04f0, + 0x031f, 0x031f, 0x03f1, 0x03f1, 0x039c, 0x039c, 0x03c9, 0x03c9, + 0x035e, 0x035e, 0x03ab, 0x03ab, 0x03ba, 0x03ba, 0x03e5, 0x03e5, + 0x037d, 0x037d, 0x03d7, 0x03d7, 0x034e, 0x034e, 0x03e4, 0x03e4, + 0x038c, 0x038c, 0x03c8, 0x03c8, 0x033e, 0x033e, 0x036d, 0x036d, + 0x03d6, 0x03d6, 0x03e3, 0x03e3, 0x039b, 0x039b, 0x03b9, 0x03b9, + 0x032e, 0x032e, 0x03aa, 0x03aa, 0x03e2, 0x03e2, 0x031e, 0x031e, + 0x03e1, 0x03e1, 0x040e, 0x04e0, 0x035d, 0x035d, 0x03d5, 0x03d5, + 0x037c, 0x037c, 0x03c7, 0x03c7, 0x034d, 0x034d, 0x038b, 0x038b, + 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x03b8, 0x03b8, 0x039a, 0x039a, + 0x03a9, 0x03a9, 0x036c, 0x036c, 0x03c6, 0x03c6, 0x033d, 0x033d, + 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x02d2, 0x02d2, 0x02d2, 0x02d2, + 0x032d, 0x032d, 0x030d, 0x030d, 0x021d, 0x021d, 0x021d, 0x021d, + 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, + 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x035c, 0x035c, 0x03d0, 0x03d0, + 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, + 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x024c, 0x024c, 0x024c, 0x024c, + 0x02c4, 0x02c4, 0x02c4, 0x02c4, 0x026b, 0x026b, 0x026b, 0x026b, + 0x02b6, 0x02b6, 0x02b6, 0x02b6, 0x0399, 0x0399, 0x030c, 0x030c, + 0x023c, 0x023c, 0x023c, 0x023c, 0x02c3, 0x02c3, 0x02c3, 0x02c3, + 0x027a, 0x027a, 0x027a, 0x027a, 0x02a7, 0x02a7, 0x02a7, 0x02a7, + 0x02a6, 0x02a6, 0x02a6, 0x02a6, 0x03c0, 0x03c0, 0x030b, 0x030b, + 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, 0x01c2, + 0x022c, 0x022c, 0x022c, 0x022c, 0x025b, 0x025b, 0x025b, 0x025b, + 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, + 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, + 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, + 0x02b4, 0x02b4, 0x02b4, 0x02b4, 0x026a, 0x026a, 0x026a, 0x026a, + 0x023b, 0x023b, 0x023b, 0x023b, 0x0279, 0x0279, 0x0279, 0x0279, + 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, + 0x0297, 0x0297, 0x0297, 0x0297, 0x0288, 0x0288, 0x0288, 0x0288, + 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, + 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, + 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, + 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, 0x01b1, + 0x02b0, 0x02b0, 0x02b0, 0x02b0, 0x0269, 0x0269, 0x0269, 0x0269, + 0x0296, 0x0296, 0x0296, 0x0296, 0x024a, 0x024a, 0x024a, 0x024a, + 0x02a4, 0x02a4, 0x02a4, 0x02a4, 0x0278, 0x0278, 0x0278, 0x0278, + 0x0287, 0x0287, 0x0287, 0x0287, 0x023a, 0x023a, 0x023a, 0x023a, + 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, + 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, + 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, + 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, + 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, + 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, + 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, + 0x020a, 0x020a, 0x020a, 0x020a, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, + 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, + 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, + 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, + 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, + 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, + 0x0277, 0x0277, 0x0277, 0x0277, 0x0209, 0x0209, 0x0209, 0x0209, + 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, + 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, + 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, + 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, 0x0190, + 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, + 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, + 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, + 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, 0x0180, + 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, 0x0173, + 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, 0x0146, + 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, 0x0170, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, 0x01ff, + 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, 0x01ef, + 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, 0x01fe, + 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, 0x01df, + 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, 0x01fd, + 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, 0x01cf, + 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, 0x01fc, + 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, 0x01de, + 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, 0x01ed, + 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, 0x01bf, + 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, 0x01ce, + 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, + 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, 0x01ae, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, +}; + +static const short tab16_[] = +{ + -16, -32, -48, -64, 0x0411, 0x0401, 0x0310, 0x0310, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + -64, -80, -96, 0x04ff, -112, -128, -144, 0x04f2, + -160, 0x041f, 0x04f1, -176, -192, -208, -224, -240, + -240, -256, -272, -288, -304, -320, -336, -352, + -368, -384, -400, -416, -432, -448, 0x0451, -464, + -464, -480, -496, 0x0414, 0x0441, -512, 0x0423, 0x0432, + 0x0313, 0x0313, 0x0331, 0x0331, 0x0403, 0x0430, 0x0322, 0x0322, + 0x0212, 0x0212, 0x0212, 0x0212, 0x0221, 0x0221, 0x0221, 0x0221, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x03ef, 0x03ef, 0x03fe, 0x03fe, 0x03df, 0x03df, 0x03fd, 0x03fd, + 0x03cf, 0x03cf, 0x03fc, 0x03fc, 0x03bf, 0x03bf, 0x03fb, 0x03fb, + 0x02af, 0x02af, 0x02af, 0x02af, 0x03fa, 0x03fa, 0x039f, 0x039f, + 0x03f9, 0x03f9, 0x03f8, 0x03f8, 0x028f, 0x028f, 0x028f, 0x028f, + 0x027f, 0x027f, 0x027f, 0x027f, 0x02f7, 0x02f7, 0x02f7, 0x02f7, + 0x026f, 0x026f, 0x026f, 0x026f, 0x02f6, 0x02f6, 0x02f6, 0x02f6, + 0x025f, 0x025f, 0x025f, 0x025f, 0x02f5, 0x02f5, 0x02f5, 0x02f5, + 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, + 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, 0x01f4, + 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, 0x01f3, + 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, + 0x023f, 0x023f, 0x023f, 0x023f, -416, -432, -448, -464, + 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, 0x012f, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + -448, -464, -480, -496, -512, -528, -544, -560, + -576, -592, -608, 0x04e3, -624, -640, -656, -672, + -672, -688, -704, 0x040d, -720, -736, -752, 0x043c, + -768, 0x041c, 0x04c0, -784, 0x03e2, 0x03e2, 0x042e, 0x041e, + 0x04d3, 0x042d, 0x04d2, 0x04d1, 0x043b, -784, 0x031d, 0x031d, + 0x04c4, 0x046b, 0x04c3, 0x04a7, 0x032c, 0x032c, 0x04c2, 0x04b5, + 0x04c1, 0x040c, 0x044b, 0x04b4, 0x046a, 0x04a6, 0x03b3, 0x03b3, + 0x045a, 0x04a5, 0x032b, 0x032b, 0x03b2, 0x03b2, 0x031b, 0x031b, + 0x03b1, 0x03b1, 0x040b, 0x04b0, 0x0469, 0x0496, 0x044a, 0x04a4, + 0x0478, 0x0487, 0x03a3, 0x03a3, 0x043a, 0x0459, 0x032a, 0x032a, + 0x0495, 0x0468, 0x03a1, 0x03a1, 0x0486, 0x0477, 0x0394, 0x0394, + 0x0449, 0x0457, 0x0367, 0x0367, 0x02a2, 0x02a2, 0x02a2, 0x02a2, + 0x021a, 0x021a, 0x021a, 0x021a, 0x030a, 0x030a, 0x03a0, 0x03a0, + 0x0339, 0x0339, 0x0393, 0x0393, 0x0358, 0x0358, 0x0385, 0x0385, + 0x0229, 0x0229, 0x0229, 0x0229, 0x0292, 0x0292, 0x0292, 0x0292, + 0x0376, 0x0376, 0x0309, 0x0309, 0x0219, 0x0219, 0x0219, 0x0219, + 0x0291, 0x0291, 0x0291, 0x0291, 0x0390, 0x0390, 0x0348, 0x0348, + 0x0384, 0x0384, 0x0375, 0x0375, 0x0338, 0x0338, 0x0383, 0x0383, + 0x0366, 0x0366, 0x0328, 0x0328, 0x0282, 0x0282, 0x0282, 0x0282, + 0x0347, 0x0347, 0x0374, 0x0374, 0x0218, 0x0218, 0x0218, 0x0218, + 0x0281, 0x0281, 0x0281, 0x0281, 0x0280, 0x0280, 0x0280, 0x0280, + 0x0308, 0x0308, 0x0356, 0x0356, 0x0237, 0x0237, 0x0237, 0x0237, + 0x0273, 0x0273, 0x0273, 0x0273, 0x0365, 0x0365, 0x0346, 0x0346, + 0x0227, 0x0227, 0x0227, 0x0227, 0x0272, 0x0272, 0x0272, 0x0272, + 0x0364, 0x0364, 0x0355, 0x0355, 0x0207, 0x0207, 0x0207, 0x0207, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, 0x0171, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0236, 0x0236, 0x0236, 0x0236, + 0x0263, 0x0263, 0x0263, 0x0263, 0x0245, 0x0245, 0x0245, 0x0245, + 0x0254, 0x0254, 0x0254, 0x0254, 0x0226, 0x0226, 0x0226, 0x0226, + 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, 0x0162, + 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, 0x0116, + 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, 0x0161, + 0x0206, 0x0206, 0x0206, 0x0206, 0x0260, 0x0260, 0x0260, 0x0260, + 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, 0x0153, + 0x0235, 0x0235, 0x0235, 0x0235, 0x0244, 0x0244, 0x0244, 0x0244, + 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, + 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, 0x0152, + 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, 0x0115, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, 0x0134, + 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, 0x0143, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, + 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, 0x0124, + 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, 0x0142, + 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, 0x0133, + 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, + 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, 0x0140, + 0x04ce, -448, 0x03de, 0x03de, 0x03e9, 0x03e9, 0x04ea, 0x04d9, + 0x02ee, 0x02ee, 0x02ee, 0x02ee, 0x03ed, 0x03ed, 0x03eb, 0x03eb, + 0x02be, 0x02be, 0x02be, 0x02be, 0x02cd, 0x02cd, 0x02cd, 0x02cd, + 0x03dc, 0x03dc, 0x03db, 0x03db, 0x02ae, 0x02ae, 0x02ae, 0x02ae, + 0x02cc, 0x02cc, 0x02cc, 0x02cc, 0x03ad, 0x03ad, 0x03da, 0x03da, + 0x037e, 0x037e, 0x03ac, 0x03ac, 0x02ca, 0x02ca, 0x02ca, 0x02ca, + 0x03c9, 0x03c9, 0x037d, 0x037d, 0x025e, 0x025e, 0x025e, 0x025e, + 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, 0x01bd, + 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, 0x019e, + 0x02bc, 0x02bc, 0x02bc, 0x02bc, 0x02cb, 0x02cb, 0x02cb, 0x02cb, + 0x028e, 0x028e, 0x028e, 0x028e, 0x02e8, 0x02e8, 0x02e8, 0x02e8, + 0x029d, 0x029d, 0x029d, 0x029d, 0x02e7, 0x02e7, 0x02e7, 0x02e7, + 0x02bb, 0x02bb, 0x02bb, 0x02bb, 0x028d, 0x028d, 0x028d, 0x028d, + 0x02d8, 0x02d8, 0x02d8, 0x02d8, 0x026e, 0x026e, 0x026e, 0x026e, + 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, 0x01e6, + 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, + 0x02ab, 0x02ab, 0x02ab, 0x02ab, 0x02ba, 0x02ba, 0x02ba, 0x02ba, + 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x02d7, 0x02d7, 0x02d7, 0x02d7, + 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, 0x014e, + 0x02e4, 0x02e4, 0x02e4, 0x02e4, 0x028c, 0x028c, 0x028c, 0x028c, + 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, 0x01c8, + 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, 0x013e, + 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, 0x016d, + 0x02d6, 0x02d6, 0x02d6, 0x02d6, 0x029b, 0x029b, 0x029b, 0x029b, + 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, 0x01e1, + 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, 0x01d4, + 0x02b8, 0x02b8, 0x02b8, 0x02b8, 0x02a9, 0x02a9, 0x02a9, 0x02a9, + 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, 0x017b, + 0x02b7, 0x02b7, 0x02b7, 0x02b7, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, + 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, 0x01e0, + 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, 0x015d, + 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, 0x01d5, + 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, 0x017c, + 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, 0x01c7, + 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, 0x014d, + 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, 0x018b, + 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, 0x019a, + 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, 0x016c, + 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, 0x01c6, + 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, 0x013d, + 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, 0x015c, + 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, 0x01c5, + 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, 0x018a, + 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x01a8, + 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, 0x0199, + 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, 0x014c, + 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, 0x01b6, + 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, 0x017a, + 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, 0x015b, + 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, 0x0189, + 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, 0x0198, + 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, 0x0179, + 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, 0x0197, + 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, + 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, 0x01ec, + 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, 0x01dd, +}; + +static const short tab24_[] = +{ + -16, -32, -48, 0x04ff, -64, -80, -96, -112, + -128, -144, -160, -176, 0x0411, 0x0401, 0x0410, 0x0400, + 0x04ef, 0x04fe, 0x04df, 0x04fd, 0x04cf, 0x04fc, 0x04bf, 0x04fb, + 0x03fa, 0x03fa, 0x04af, 0x049f, 0x03f9, 0x03f9, 0x03f8, 0x03f8, + 0x048f, 0x047f, 0x03f7, 0x03f7, 0x036f, 0x036f, 0x03f6, 0x03f6, + 0x035f, 0x035f, 0x03f5, 0x03f5, 0x034f, 0x034f, 0x03f4, 0x03f4, + 0x033f, 0x033f, 0x03f3, 0x03f3, 0x032f, 0x032f, 0x03f2, 0x03f2, + 0x03f1, 0x03f1, 0x041f, 0x04f0, -144, -160, -176, -192, + -192, -208, -224, -240, -256, -272, -288, -304, + -320, -336, -352, -368, -384, -400, -416, -432, + -432, -448, -464, -480, -496, -512, -528, -544, + -560, -576, -592, -608, -624, -640, -656, -672, + -672, -688, -704, -720, -736, -752, -768, -784, + -800, -816, -832, -848, -864, 0x0473, -880, 0x0472, + 0x0446, 0x0464, 0x0455, 0x0471, 0x0436, 0x0463, 0x0445, 0x0454, + 0x0426, 0x0462, 0x0416, 0x0461, -880, 0x0435, 0x0453, 0x0444, + 0x0425, 0x0452, 0x0415, -880, 0x0351, 0x0351, 0x0434, 0x0443, + 0x0324, 0x0324, 0x0342, 0x0342, 0x0333, 0x0333, 0x0314, 0x0314, + 0x0341, 0x0341, 0x0404, 0x0440, 0x0323, 0x0323, 0x0332, 0x0332, + 0x0213, 0x0213, 0x0213, 0x0213, 0x0231, 0x0231, 0x0231, 0x0231, + 0x0303, 0x0303, 0x0330, 0x0330, 0x0222, 0x0222, 0x0222, 0x0222, + 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, 0x0112, + 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, 0x0121, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0220, 0x0220, 0x0220, 0x0220, + 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, 0x010f, + 0x03ee, 0x03ee, 0x03de, 0x03de, 0x03ed, 0x03ed, 0x03ce, 0x03ce, + 0x03ec, 0x03ec, 0x03dd, 0x03dd, 0x03be, 0x03be, 0x03eb, 0x03eb, + 0x03cd, 0x03cd, 0x03dc, 0x03dc, 0x03ae, 0x03ae, 0x03ea, 0x03ea, + 0x03bd, 0x03bd, 0x03db, 0x03db, 0x03cc, 0x03cc, 0x039e, 0x039e, + 0x03e9, 0x03e9, 0x03ad, 0x03ad, 0x03da, 0x03da, 0x03bc, 0x03bc, + 0x03cb, 0x03cb, 0x038e, 0x038e, 0x03e8, 0x03e8, 0x039d, 0x039d, + 0x03d9, 0x03d9, 0x037e, 0x037e, 0x03e7, 0x03e7, 0x03ac, 0x03ac, + 0x03ca, 0x03ca, 0x03bb, 0x03bb, 0x038d, 0x038d, 0x03d8, 0x03d8, + 0x040e, 0x04e0, 0x030d, 0x030d, 0x02e6, 0x02e6, 0x02e6, 0x02e6, + 0x036e, 0x036e, 0x039c, 0x039c, 0x02c9, 0x02c9, 0x02c9, 0x02c9, + 0x025e, 0x025e, 0x025e, 0x025e, 0x02ba, 0x02ba, 0x02ba, 0x02ba, + 0x02e5, 0x02e5, 0x02e5, 0x02e5, 0x03ab, 0x03ab, 0x037d, 0x037d, + 0x02d7, 0x02d7, 0x02d7, 0x02d7, 0x02e4, 0x02e4, 0x02e4, 0x02e4, + 0x028c, 0x028c, 0x028c, 0x028c, 0x02c8, 0x02c8, 0x02c8, 0x02c8, + 0x034e, 0x034e, 0x032e, 0x032e, 0x023e, 0x023e, 0x023e, 0x023e, + 0x026d, 0x026d, 0x026d, 0x026d, 0x02d6, 0x02d6, 0x02d6, 0x02d6, + 0x02e3, 0x02e3, 0x02e3, 0x02e3, 0x029b, 0x029b, 0x029b, 0x029b, + 0x02b9, 0x02b9, 0x02b9, 0x02b9, 0x02aa, 0x02aa, 0x02aa, 0x02aa, + 0x02e2, 0x02e2, 0x02e2, 0x02e2, 0x021e, 0x021e, 0x021e, 0x021e, + 0x02e1, 0x02e1, 0x02e1, 0x02e1, 0x025d, 0x025d, 0x025d, 0x025d, + 0x02d5, 0x02d5, 0x02d5, 0x02d5, 0x027c, 0x027c, 0x027c, 0x027c, + 0x02c7, 0x02c7, 0x02c7, 0x02c7, 0x024d, 0x024d, 0x024d, 0x024d, + 0x028b, 0x028b, 0x028b, 0x028b, 0x02b8, 0x02b8, 0x02b8, 0x02b8, + 0x02d4, 0x02d4, 0x02d4, 0x02d4, 0x029a, 0x029a, 0x029a, 0x029a, + 0x02a9, 0x02a9, 0x02a9, 0x02a9, 0x026c, 0x026c, 0x026c, 0x026c, + 0x02c6, 0x02c6, 0x02c6, 0x02c6, 0x023d, 0x023d, 0x023d, 0x023d, + 0x02d3, 0x02d3, 0x02d3, 0x02d3, 0x022d, 0x022d, 0x022d, 0x022d, + 0x02d2, 0x02d2, 0x02d2, 0x02d2, 0x021d, 0x021d, 0x021d, 0x021d, + 0x027b, 0x027b, 0x027b, 0x027b, 0x02b7, 0x02b7, 0x02b7, 0x02b7, + 0x02d1, 0x02d1, 0x02d1, 0x02d1, 0x025c, 0x025c, 0x025c, 0x025c, + 0x02c5, 0x02c5, 0x02c5, 0x02c5, 0x028a, 0x028a, 0x028a, 0x028a, + 0x02a8, 0x02a8, 0x02a8, 0x02a8, 0x0299, 0x0299, 0x0299, 0x0299, + 0x024c, 0x024c, 0x024c, 0x024c, 0x02c4, 0x02c4, 0x02c4, 0x02c4, + 0x026b, 0x026b, 0x026b, 0x026b, 0x02b6, 0x02b6, 0x02b6, 0x02b6, + 0x03d0, 0x03d0, 0x030c, 0x030c, 0x023c, 0x023c, 0x023c, 0x023c, + 0x02c3, 0x02c3, 0x02c3, 0x02c3, 0x027a, 0x027a, 0x027a, 0x027a, + 0x02a7, 0x02a7, 0x02a7, 0x02a7, 0x022c, 0x022c, 0x022c, 0x022c, + 0x02c2, 0x02c2, 0x02c2, 0x02c2, 0x025b, 0x025b, 0x025b, 0x025b, + 0x02b5, 0x02b5, 0x02b5, 0x02b5, 0x021c, 0x021c, 0x021c, 0x021c, + 0x0289, 0x0289, 0x0289, 0x0289, 0x0298, 0x0298, 0x0298, 0x0298, + 0x02c1, 0x02c1, 0x02c1, 0x02c1, 0x024b, 0x024b, 0x024b, 0x024b, + 0x03c0, 0x03c0, 0x030b, 0x030b, 0x023b, 0x023b, 0x023b, 0x023b, + 0x03b0, 0x03b0, 0x030a, 0x030a, 0x021a, 0x021a, 0x021a, 0x021a, + 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, 0x01b4, + 0x026a, 0x026a, 0x026a, 0x026a, 0x02a6, 0x02a6, 0x02a6, 0x02a6, + 0x0279, 0x0279, 0x0279, 0x0279, 0x0297, 0x0297, 0x0297, 0x0297, + 0x03a0, 0x03a0, 0x0309, 0x0309, 0x0290, 0x0290, 0x0290, 0x0290, + 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, 0x01b3, + 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, 0x0188, + 0x022b, 0x022b, 0x022b, 0x022b, 0x025a, 0x025a, 0x025a, 0x025a, + 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, 0x01b2, + 0x02a5, 0x02a5, 0x02a5, 0x02a5, 0x021b, 0x021b, 0x021b, 0x021b, + 0x02b1, 0x02b1, 0x02b1, 0x02b1, 0x0269, 0x0269, 0x0269, 0x0269, + 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, 0x0196, + 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, 0x01a4, + 0x024a, 0x024a, 0x024a, 0x024a, 0x0278, 0x0278, 0x0278, 0x0278, + 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, 0x0187, + 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, 0x013a, + 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, 0x01a3, + 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, 0x0159, + 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, 0x0195, + 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, 0x012a, + 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, 0x01a2, + 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, 0x01a1, + 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, 0x0168, + 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, 0x0186, + 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, 0x0177, + 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, 0x0149, + 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, 0x0194, + 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, 0x0139, + 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, 0x0193, + 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, 0x0158, + 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, 0x0185, + 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, 0x0129, + 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, 0x0167, + 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, 0x0176, + 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, 0x0192, + 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, 0x0119, + 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, 0x0191, + 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, 0x0148, + 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, 0x0184, + 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, 0x0157, + 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, 0x0175, + 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, 0x0138, + 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, 0x0183, + 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, 0x0166, + 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, 0x0128, + 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, + 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, + 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, 0x0147, + 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, 0x0174, + 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, + 0x0208, 0x0208, 0x0208, 0x0208, 0x0280, 0x0280, 0x0280, 0x0280, + 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, 0x0156, + 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, 0x0165, + 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, + 0x0207, 0x0207, 0x0207, 0x0207, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, 0x0137, + 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, 0x0127, + 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, + 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, 0x0160, + 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, + 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, 0x0150, +}; + +static const short tab_c0[] = +{ + -29, -21, -13, -7, -3, -1, 11, 15, -1, 13, 14, -3, -1, 7, 5, + 9, -3, -1, 6, 3, -1, 10, 12, -3, -1, 2, 1, -1, 4, 8, + 0 +}; + +static const short tab_c1[] = +{ + -15, -7, -3, -1, 15, 14, -1, 13, 12, -3, -1, 11, 10, -1, 9, + 8, -7, -3, -1, 7, 6, -1, 5, 4, -3, -1, 3, 2, -1, 1, + 0 +}; + +static const struct newhuff ht[] = +{ + { /* 0 */ 0 , tab0_ } , + { /* 2 */ 0 , tab1_ } , + { /* 3 */ 0 , tab2_ } , + { /* 3 */ 0 , tab3_ } , + { /* 0 */ 0 , tab0_ } , + { /* 4 */ 0 , tab5_ } , + { /* 4 */ 0 , tab6_ } , + { /* 6 */ 0 , tab7_ } , + { /* 6 */ 0 , tab8_ } , + { /* 6 */ 0 , tab9_ } , + { /* 8 */ 0 , tab10_ } , + { /* 8 */ 0 , tab11_ } , + { /* 8 */ 0 , tab12_ } , + { /* 16 */ 0 , tab13_ } , + { /* 0 */ 0 , tab0_ } , + { /* 16 */ 0 , tab15_ } , + + { /* 16 */ 1 , tab16_ } , + { /* 16 */ 2 , tab16_ } , + { /* 16 */ 3 , tab16_ } , + { /* 16 */ 4 , tab16_ } , + { /* 16 */ 6 , tab16_ } , + { /* 16 */ 8 , tab16_ } , + { /* 16 */ 10, tab16_ } , + { /* 16 */ 13, tab16_ } , + { /* 16 */ 4 , tab24_ } , + { /* 16 */ 5 , tab24_ } , + { /* 16 */ 6 , tab24_ } , + { /* 16 */ 7 , tab24_ } , + { /* 16 */ 8 , tab24_ } , + { /* 16 */ 9 , tab24_ } , + { /* 16 */ 11, tab24_ } , + { /* 16 */ 13, tab24_ } +}; + +static const struct newhuff htc[] = +{ + { /* 1 , 1 , */ 0 , tab_c0 } , + { /* 1 , 1 , */ 0 , tab_c1 } +}; + +#endif diff --git a/jni/mpg123-1.13.4/src/libmpg123/ntom.c b/jni/mpg123-1.17.0/src/libmpg123/ntom.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/ntom.c rename to jni/mpg123-1.17.0/src/libmpg123/ntom.c diff --git a/jni/mpg123-1.17.0/src/libmpg123/ntom.lo b/jni/mpg123-1.17.0/src/libmpg123/ntom.lo new file mode 100644 index 00000000..67fb1d04 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/ntom.lo @@ -0,0 +1,12 @@ +# ntom.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/ntom.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/optimize.c b/jni/mpg123-1.17.0/src/libmpg123/optimize.c similarity index 78% rename from jni/mpg123-1.13.4/src/libmpg123/optimize.c rename to jni/mpg123-1.17.0/src/libmpg123/optimize.c index d5aae4cc..160786d9 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/optimize.c +++ b/jni/mpg123-1.17.0/src/libmpg123/optimize.c @@ -8,48 +8,11 @@ Currently, this file contains the struct and function to choose an optimization variant and works only when OPT_MULTI is in effect. */ +#define I_AM_OPTIMIZE #include "mpg123lib_intern.h" /* includes optimize.h */ #include "debug.h" -/* Must match the enum dectype! */ - -/* - It SUCKS having to define these names that way, but compile-time intialization of string arrays is a bitch. - GCC doesn't see constant stuff when it's wiggling in front of it! - Anyhow: Have a script for that: -names="generic generic_dither i386 i486 i586 i586_dither MMX 3DNow 3DNowExt AltiVec SSE x86-64" -for i in $names; do echo "##define dn_${i/-/_} \"$i\""; done -echo -n "static const char* decname[] = -{ - \"auto\" - " -for i in $names; do echo -n ", dn_${i/-/_}"; done -echo " - , \"nodec\" -};" -*/ -#define dn_generic "generic" -#define dn_generic_dither "generic_dither" -#define dn_i386 "i386" -#define dn_i486 "i486" -#define dn_i586 "i586" -#define dn_i586_dither "i586_dither" -#define dn_MMX "MMX" -#define dn_3DNow "3DNow" -#define dn_3DNowExt "3DNowExt" -#define dn_AltiVec "AltiVec" -#define dn_SSE "SSE" -#define dn_x86_64 "x86-64" -#define dn_ARM "ARM" -#define dn_NEON "NEON" -static const char* decname[] = -{ - "auto" - , dn_generic, dn_generic_dither, dn_i386, dn_i486, dn_i586, dn_i586_dither, dn_MMX, dn_3DNow, dn_3DNowExt, dn_AltiVec, dn_SSE, dn_x86_64, dn_ARM, dn_NEON - , "nodec" -}; - -#if (defined OPT_X86) && (defined OPT_MULTI) +#if ((defined OPT_X86) || (defined OPT_X86_64)) && (defined OPT_MULTI) #include "getcpuflags.h" static struct cpuflags cpu_flags; #else @@ -64,6 +27,7 @@ static struct cpuflags cpu_flags; #define cpu_sse(s) 1 #define cpu_sse2(s) 1 #define cpu_sse3(s) 1 +#define cpu_avx(s) 1 #endif /* Ugly macros to build conditional synth function array values. */ @@ -166,10 +130,19 @@ enum optdec defdec(void){ return defopt; } enum optcla decclass(const enum optdec type) { - return (type == mmx || type == sse || type == dreidnowext || type == x86_64 || type == neon) ? mmxsse : normal; + return + ( + type == mmx + || type == sse + || type == sse_vintage + || type == dreidnowext + || type == dreidnowext_vintage + || type == x86_64 + || type == neon + || type == avx + ) ? mmxsse : normal; } - static int find_synth(func_synth synth, const func_synth synths[r_limit][f_limit]) { enum synth_resample ri; @@ -182,6 +155,23 @@ static int find_synth(func_synth synth, const func_synth synths[r_limit][f_limi return FALSE; } + +/* After knowing that it is either vintage or current SSE, + this separates the two. In case of non-OPT_MULTI, only one + of OPT_SSE and OPT_SSE_VINTAGE is active. */ +static enum optdec sse_or_vintage(mpg123_handle *fr) +{ + enum optdec type; + type = sse_vintage; +# ifdef OPT_SSE +# ifdef OPT_MULTI + if(fr->cpu_opts.the_dct36 == dct36_sse) +# endif + type = sse; +# endif + return type; +} + /* Determine what kind of decoder is actually active This depends on runtime choices which may cause fallback to i386 or generic code. */ static int find_dectype(mpg123_handle *fr) @@ -199,14 +189,35 @@ static int find_dectype(mpg123_handle *fr) if(FALSE) ; /* Just to initialize the else if ladder. */ #ifndef NO_16BIT -#ifdef OPT_3DNOWEXT - else if(basic_synth == synth_1to1_3dnowext) type = dreidnowext; +#if defined(OPT_3DNOWEXT) || defined(OPT_3DNOWEXT_VINTAGE) + else if(basic_synth == synth_1to1_3dnowext) + { + type = dreidnowext; +# ifdef OPT_3DNOWEXT_VINTAGE +# ifdef OPT_MULTI + if(fr->cpu_opts.the_dct36 == dct36_3dnowext) +# endif + type = dreidnowext_vintage; +# endif + } #endif -#ifdef OPT_SSE - else if(basic_synth == synth_1to1_sse) type = sse; +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) + else if(basic_synth == synth_1to1_sse) + { + type = sse_or_vintage(fr); + } #endif -#ifdef OPT_3DNOW - else if(basic_synth == synth_1to1_3dnow) type = dreidnow; +#if defined(OPT_3DNOW) || defined(OPT_3DNOW_VINTAGE) + else if(basic_synth == synth_1to1_3dnow) + { + type = dreidnow; +# ifdef OPT_3DNOW_VINTAGE +# ifdef OPT_MULTI + if(fr->cpu_opts.the_dct36 == dct36_3dnow) +# endif + type = dreidnow_vintage; +# endif + } #endif #ifdef OPT_MMX else if(basic_synth == synth_1to1_mmx) type = mmx; @@ -223,6 +234,9 @@ static int find_dectype(mpg123_handle *fr) #ifdef OPT_X86_64 else if(basic_synth == synth_1to1_x86_64) type = x86_64; #endif +#ifdef OPT_AVX + else if(basic_synth == synth_1to1_avx) type = avx; +#endif #ifdef OPT_ARM else if(basic_synth == synth_1to1_arm) type = arm; #endif @@ -244,12 +258,18 @@ static int find_dectype(mpg123_handle *fr) #endif /* 16bit */ #ifndef NO_REAL -#ifdef OPT_SSE - else if(basic_synth == synth_1to1_real_sse) type = sse; +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) + else if(basic_synth == synth_1to1_real_sse) + { + type = sse_or_vintage(fr); + } #endif #ifdef OPT_X86_64 else if(basic_synth == synth_1to1_real_x86_64) type = x86_64; #endif +#ifdef OPT_AVX + else if(basic_synth == synth_1to1_real_avx) type = avx; +#endif #ifdef OPT_ALTIVEC else if(basic_synth == synth_1to1_real_altivec) type = altivec; #endif @@ -260,12 +280,18 @@ static int find_dectype(mpg123_handle *fr) #endif /* real */ #ifndef NO_32BIT -#ifdef OPT_SSE - else if(basic_synth == synth_1to1_s32_sse) type = sse; +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) + else if(basic_synth == synth_1to1_s32_sse) + { + type = sse_or_vintage(fr); + } #endif #ifdef OPT_X86_64 else if(basic_synth == synth_1to1_s32_x86_64) type = x86_64; #endif +#ifdef OPT_AVX + else if(basic_synth == synth_1to1_s32_avx) type = avx; +#endif #ifdef OPT_ALTIVEC else if(basic_synth == synth_1to1_s32_altivec) type = altivec; #endif @@ -407,8 +433,10 @@ int set_synth_functions(mpg123_handle *fr) # endif # ifdef ACCURATE_ROUNDING && fr->cpu_opts.type != sse + && fr->cpu_opts.type != sse_vintage && fr->cpu_opts.type != x86_64 && fr->cpu_opts.type != neon + && fr->cpu_opts.type != avx # endif ) { @@ -464,28 +492,31 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) #endif fr->cpu_opts.type = nodec; - /* covers any i386+ cpu; they actually differ only in the synth_1to1 function, mostly... */ -#ifdef OPT_X86 - #ifdef OPT_MULTI #ifndef NO_LAYER3 -#if (defined OPT_3DNOW || defined OPT_3DNOWEXT) +#if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX) fr->cpu_opts.the_dct36 = dct36; #endif #endif #endif - + /* covers any i386+ cpu; they actually differ only in the synth_1to1 function, mostly... */ +#ifdef OPT_X86 if(cpu_i586(cpu_flags)) { # ifdef OPT_MULTI debug2("standard flags: 0x%08x\textended flags: 0x%08x", cpu_flags.std, cpu_flags.ext); # endif - #ifdef OPT_SSE +# ifdef OPT_SSE if( !done && (auto_choose || want_dec == sse) && cpu_sse(cpu_flags) && cpu_mmx(cpu_flags) ) { - chosen = "SSE"; + chosen = dn_sse; fr->cpu_opts.type = sse; +#ifdef OPT_MULTI +# ifndef NO_LAYER3 + /* if(cpu_fast_sse(cpu_flags)) */ fr->cpu_opts.the_dct36 = dct36_sse; +# endif +#endif # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_sse; # ifdef ACCURATE_ROUNDING @@ -502,15 +533,52 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # endif done = 1; } - #endif +# endif +# ifdef OPT_SSE_VINTAGE + if( !done && (auto_choose || want_dec == sse_vintage) + && cpu_sse(cpu_flags) && cpu_mmx(cpu_flags) ) + { + chosen = dn_sse_vintage; + fr->cpu_opts.type = sse_vintage; +# ifndef NO_16BIT + fr->synths.plain[r_1to1][f_16] = synth_1to1_sse; +# ifdef ACCURATE_ROUNDING + fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_sse; +# endif +# endif +# ifndef NO_REAL + fr->synths.plain[r_1to1][f_real] = synth_1to1_real_sse; + fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_sse; +# endif +# ifndef NO_32BIT + fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_sse; + fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_sse; +# endif + done = 1; + } +# endif # ifdef OPT_3DNOWEXT - if( !done && (auto_choose || want_dec == dreidnowext ) + if( !done && (auto_choose || want_dec == dreidnowext) && cpu_3dnow(cpu_flags) && cpu_3dnowext(cpu_flags) && cpu_mmx(cpu_flags) ) { - chosen = "3DNowExt"; + chosen = dn_dreidnowext; fr->cpu_opts.type = dreidnowext; +# ifndef NO_16BIT + fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnowext; +# endif + done = 1; + } +# endif +# ifdef OPT_3DNOWEXT_VINTAGE + if( !done && (auto_choose || want_dec == dreidnowext_vintage) + && cpu_3dnow(cpu_flags) + && cpu_3dnowext(cpu_flags) + && cpu_mmx(cpu_flags) ) + { + chosen = dn_dreidnowext_vintage; + fr->cpu_opts.type = dreidnowext_vintage; #ifdef OPT_MULTI # ifndef NO_LAYER3 fr->cpu_opts.the_dct36 = dct36_3dnowext; @@ -521,13 +589,25 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # endif done = 1; } - #endif - #ifdef OPT_3DNOW +# endif +# ifdef OPT_3DNOW if( !done && (auto_choose || want_dec == dreidnow) && cpu_3dnow(cpu_flags) && cpu_mmx(cpu_flags) ) { - chosen = "3DNow"; + chosen = dn_dreidnow; fr->cpu_opts.type = dreidnow; +# ifndef NO_16BIT + fr->synths.plain[r_1to1][f_16] = synth_1to1_3dnow; +# endif + done = 1; + } +# endif +# ifdef OPT_3DNOW_VINTAGE + if( !done && (auto_choose || want_dec == dreidnow_vintage) + && cpu_3dnow(cpu_flags) && cpu_mmx(cpu_flags) ) + { + chosen = dn_dreidnow_vintage; + fr->cpu_opts.type = dreidnow_vintage; #ifdef OPT_MULTI # ifndef NO_LAYER3 fr->cpu_opts.the_dct36 = dct36_3dnow; @@ -538,12 +618,12 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # endif done = 1; } - #endif +# endif #ifdef OPT_MMX if( !done && (auto_choose || want_dec == mmx) && cpu_mmx(cpu_flags) ) { - chosen = "MMX"; + chosen = dn_mmx; fr->cpu_opts.type = mmx; # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_mmx; @@ -584,7 +664,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) But still... here it is... maybe for real use in future. */ if(!done && (auto_choose || want_dec == ivier)) { - chosen = "i486"; + chosen = dn_ivier; fr->cpu_opts.type = ivier; done = 1; } @@ -592,7 +672,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) #ifdef OPT_I386 if(!done && (auto_choose || want_dec == idrei)) { - chosen = "i386"; + chosen = dn_idrei; fr->cpu_opts.type = idrei; done = 1; } @@ -627,11 +707,42 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) #endif /* OPT_X86 */ +#ifdef OPT_AVX + if(!done && (auto_choose || want_dec == avx) && cpu_avx(cpu_flags)) + { + chosen = "x86-64 (AVX)"; + fr->cpu_opts.type = avx; +#ifdef OPT_MULTI +# ifndef NO_LAYER3 + fr->cpu_opts.the_dct36 = dct36_avx; +# endif +#endif +# ifndef NO_16BIT + fr->synths.plain[r_1to1][f_16] = synth_1to1_avx; + fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_avx; +# endif +# ifndef NO_REAL + fr->synths.plain[r_1to1][f_real] = synth_1to1_real_avx; + fr->synths.stereo[r_1to1][f_real] = synth_1to1_real_stereo_avx; +# endif +# ifndef NO_32BIT + fr->synths.plain[r_1to1][f_32] = synth_1to1_s32_avx; + fr->synths.stereo[r_1to1][f_32] = synth_1to1_s32_stereo_avx; +# endif + done = 1; + } +#endif + #ifdef OPT_X86_64 if(!done && (auto_choose || want_dec == x86_64)) { chosen = "x86-64 (SSE)"; fr->cpu_opts.type = x86_64; +#ifdef OPT_MULTI +# ifndef NO_LAYER3 + fr->cpu_opts.the_dct36 = dct36_x86_64; +# endif +#endif # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_x86_64; fr->synths.stereo[r_1to1][f_16] = synth_1to1_stereo_x86_64; @@ -668,7 +779,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # ifdef OPT_ALTIVEC if(!done && (auto_choose || want_dec == altivec)) { - chosen = "AltiVec"; + chosen = dn_altivec; fr->cpu_opts.type = altivec; # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_altivec; @@ -689,7 +800,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # ifdef OPT_NEON if(!done && (auto_choose || want_dec == neon)) { - chosen = "NEON"; + chosen = dn_neon; fr->cpu_opts.type = neon; # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_neon; @@ -710,7 +821,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # ifdef OPT_ARM if(!done && (auto_choose || want_dec == arm)) { - chosen = "ARM"; + chosen = dn_arm; fr->cpu_opts.type = arm; # ifndef NO_16BIT fr->synths.plain[r_1to1][f_16] = synth_1to1_arm; @@ -722,7 +833,7 @@ int frame_cpu_opt(mpg123_handle *fr, const char* cpu) # ifdef OPT_GENERIC if(!done && (auto_choose || want_dec == generic)) { - chosen = "generic"; + chosen = dn_generic; fr->cpu_opts.type = generic; done = 1; } @@ -789,12 +900,21 @@ static const char *mpg123_supported_decoder_list[] = #ifdef OPT_SSE NULL, #endif + #ifdef OPT_SSE_VINTAGE + NULL, + #endif #ifdef OPT_3DNOWEXT NULL, #endif + #ifdef OPT_3DNOWEXT_VINTAGE + NULL, + #endif #ifdef OPT_3DNOW NULL, #endif + #ifdef OPT_3DNOW_VINTAGE + NULL, + #endif #ifdef OPT_MMX NULL, #endif @@ -813,6 +933,9 @@ static const char *mpg123_supported_decoder_list[] = #ifdef OPT_ALTIVEC NULL, #endif + #ifdef OPT_AVX + NULL, + #endif #ifdef OPT_X86_64 NULL, #endif @@ -838,40 +961,52 @@ static const char *mpg123_supported_decoder_list[] = static const char *mpg123_decoder_list[] = { #ifdef OPT_SSE - dn_SSE, + dn_sse, + #endif + #ifdef OPT_SSE_VINTAGE + dn_sse_vintage, #endif #ifdef OPT_3DNOWEXT - dn_3DNowExt, + dn_dreidnowext, + #endif + #ifdef OPT_3DNOWEXT_VINTAGE + dn_dreidnowext_vintage, #endif #ifdef OPT_3DNOW - dn_3DNow, + dn_dreidnow, + #endif + #ifdef OPT_3DNOW_VINTAGE + dn_dreidnow_vintage, #endif #ifdef OPT_MMX - dn_MMX, + dn_mmx, #endif #ifdef OPT_I586 - dn_i586, + dn_ifuenf, #endif #ifdef OPT_I586_DITHER - dn_i586_dither, + dn_ifuenf_dither, #endif #ifdef OPT_I486 - dn_i486, + dn_ivier, #endif #ifdef OPT_I386 - dn_i386, + dn_idrei, #endif #ifdef OPT_ALTIVEC - dn_AltiVec, + dn_altivec, + #endif + #ifdef OPT_AVX + dn_avx, #endif #ifdef OPT_X86_64 dn_x86_64, #endif #ifdef OPT_ARM - dn_ARM, + dn_arm, #endif #ifdef OPT_NEON - dn_NEON, + dn_neon, #endif #ifdef OPT_GENERIC dn_generic, @@ -889,57 +1024,71 @@ void check_decoders(void ) return; #else const char **d = mpg123_supported_decoder_list; -#ifdef OPT_X86 +#if (defined OPT_X86) || (defined OPT_X86_64) getcpuflags(&cpu_flags); +#endif +#ifdef OPT_X86 if(cpu_i586(cpu_flags)) { /* not yet: if(cpu_sse2(cpu_flags)) printf(" SSE2"); if(cpu_sse3(cpu_flags)) printf(" SSE3"); */ #ifdef OPT_SSE - if(cpu_sse(cpu_flags)) *(d++) = decname[sse]; + if(cpu_sse(cpu_flags)) *(d++) = dn_sse; +#endif +#ifdef OPT_SSE_VINTAGE + if(cpu_sse(cpu_flags)) *(d++) = dn_sse_vintage; #endif #ifdef OPT_3DNOWEXT - if(cpu_3dnowext(cpu_flags)) *(d++) = decname[dreidnowext]; + if(cpu_3dnowext(cpu_flags)) *(d++) = dn_dreidnowext; +#endif +#ifdef OPT_3DNOWEXT_VINTAGE + if(cpu_3dnowext(cpu_flags)) *(d++) = dn_dreidnowext_vintage; #endif #ifdef OPT_3DNOW - if(cpu_3dnow(cpu_flags)) *(d++) = decname[dreidnow]; + if(cpu_3dnow(cpu_flags)) *(d++) = dn_dreidnow; +#endif +#ifdef OPT_3DNOW_VINTAGE + if(cpu_3dnow(cpu_flags)) *(d++) = dn_dreidnow_vintage; #endif #ifdef OPT_MMX - if(cpu_mmx(cpu_flags)) *(d++) = decname[mmx]; + if(cpu_mmx(cpu_flags)) *(d++) = dn_mmx; #endif #ifdef OPT_I586 - *(d++) = decname[ifuenf]; + *(d++) = dn_ifuenf; #endif #ifdef OPT_I586_DITHER - *(d++) = decname[ifuenf_dither]; + *(d++) = dn_ifuenf_dither; #endif } #endif /* just assume that the i486 built is run on a i486 cpu... */ #ifdef OPT_I486 - *(d++) = decname[ivier]; + *(d++) = dn_ivier; #endif #ifdef OPT_ALTIVEC - *(d++) = decname[altivec]; + *(d++) = dn_altivec; #endif /* every supported x86 can do i386, any cpu can do generic */ #ifdef OPT_I386 - *(d++) = decname[idrei]; + *(d++) = dn_idrei; +#endif +#ifdef OPT_AVX + if(cpu_avx(cpu_flags)) *(d++) = dn_avx; #endif #ifdef OPT_X86_64 - *(d++) = decname[x86_64]; + *(d++) = dn_x86_64; #endif #ifdef OPT_ARM - *(d++) = decname[arm]; + *(d++) = dn_arm; #endif #ifdef OPT_NEON - *(d++) = decname[neon]; + *(d++) = dn_neon; #endif #ifdef OPT_GENERIC - *(d++) = decname[generic]; + *(d++) = dn_generic; #endif #ifdef OPT_GENERIC_DITHER - *(d++) = decname[generic_dither]; + *(d++) = dn_generic_dither; #endif #endif /* ndef OPT_MULTI */ } diff --git a/jni/mpg123-1.13.4/src/libmpg123/optimize.h b/jni/mpg123-1.17.0/src/libmpg123/optimize.h similarity index 58% rename from jni/mpg123-1.13.4/src/libmpg123/optimize.h rename to jni/mpg123-1.17.0/src/libmpg123/optimize.h index 0d0affb4..64b165a4 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/optimize.h +++ b/jni/mpg123-1.17.0/src/libmpg123/optimize.h @@ -3,7 +3,7 @@ /* optimize: get a grip on the different optimizations - copyright 2007 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 2007-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Thomas Orgis, taking from mpg123.[hc] @@ -16,9 +16,14 @@ OPT_I586_DITHER (Intel Pentium with dithering/noise shaping for enhanced quality) OPT_MMX (Intel Pentium and compatibles with MMX, fast, but not the best accuracy) OPT_3DNOW (AMD 3DNow!, K6-2/3, Athlon, compatibles...) + OPT_3DNOW_VINTAGE OPT_3DNOWEXT (AMD 3DNow! extended, generally Athlon, compatibles...) + OPT_3DNOWEXT_VINTAGE + OPT_SSE + OPT_SSE_VINTAGE OPT_ALTIVEC (Motorola/IBM PPC with AltiVec under MacOSX) OPT_X86_64 (x86-64 / AMD64 / Intel 64) + OPT_AVX or you define OPT_MULTI and give a combination which makes sense (do not include i486, do not mix altivec and x86). @@ -33,13 +38,128 @@ /* Runtime optimization interface now here: */ +/* Nedit inline Perl script to generate decoder list and name mapping in one place + optimize.c defining I_AM_OPTIMIZE to get the names + +perl <<'EOT' +## order is important (autodec first, nodec last) +@names= +( + ['autodec', 'auto'] +,['generic', 'generic'] +,['generic_dither', 'generic_dither'] +,['idrei', 'i386'] +,['ivier', 'i486'] +,['ifuenf', 'i586'] +,['ifuenf_dither', 'i586_dither'] +,['mmx', 'MMX'] +,['dreidnow', '3DNow'] +,['dreidnowext', '3DNowExt'] +,['altivec', 'AltiVec'] +,['sse', 'SSE'] +,['x86_64', 'x86-64'] +,['arm','ARM'] +,['neon','NEON'] +,['avx','AVX'] +,['dreidnow_vintage', '3DNow_vintage'] +,['dreidnowext_vintage', '3DNowExt_vintage'] +,['sse_vintage', 'SSE_vintage'] +,['nodec', 'nodec'] +); + +print "enum optdec\n{\n"; +for my $n (@names) +{ + $name = $n->[0]; + $enum = $name eq 'autodec' ? $name = " $name=0" : ",$name"; + print "\t$enum\n" +} +print "};\n"; +print "##ifdef I_AM_OPTIMIZE\n"; +for my $n (@names) +{ + my $key = $n->[0]; + my $val = $n->[1]; + print "static const char dn_$key\[\] = \"$val\";\n"; +} +print "static const char* decname[] =\n{\n"; +for my $n (@names) +{ + my $key = $n->[0]; + print "\t".($key eq 'autodec' ? ' ' : ',')."dn_$key\n"; +} +print "};\n##endif" +EOT +*/ enum optdec -{ /* autodec needs to be =0 and the first, nodec needs to be the last -- for loops! */ - autodec=0, generic, generic_dither, idrei, - ivier, ifuenf, ifuenf_dither, mmx, - dreidnow, dreidnowext, altivec, sse, x86_64, arm, neon, - nodec +{ + autodec=0 + ,generic + ,generic_dither + ,idrei + ,ivier + ,ifuenf + ,ifuenf_dither + ,mmx + ,dreidnow + ,dreidnowext + ,altivec + ,sse + ,x86_64 + ,arm + ,neon + ,avx + ,dreidnow_vintage + ,dreidnowext_vintage + ,sse_vintage + ,nodec }; +#ifdef I_AM_OPTIMIZE +static const char dn_autodec[] = "auto"; +static const char dn_generic[] = "generic"; +static const char dn_generic_dither[] = "generic_dither"; +static const char dn_idrei[] = "i386"; +static const char dn_ivier[] = "i486"; +static const char dn_ifuenf[] = "i586"; +static const char dn_ifuenf_dither[] = "i586_dither"; +static const char dn_mmx[] = "MMX"; +static const char dn_dreidnow[] = "3DNow"; +static const char dn_dreidnowext[] = "3DNowExt"; +static const char dn_altivec[] = "AltiVec"; +static const char dn_sse[] = "SSE"; +static const char dn_x86_64[] = "x86-64"; +static const char dn_arm[] = "ARM"; +static const char dn_neon[] = "NEON"; +static const char dn_avx[] = "AVX"; +static const char dn_dreidnow_vintage[] = "3DNow_vintage"; +static const char dn_dreidnowext_vintage[] = "3DNowExt_vintage"; +static const char dn_sse_vintage[] = "SSE_vintage"; +static const char dn_nodec[] = "nodec"; +static const char* decname[] = +{ + dn_autodec + ,dn_generic + ,dn_generic_dither + ,dn_idrei + ,dn_ivier + ,dn_ifuenf + ,dn_ifuenf_dither + ,dn_mmx + ,dn_dreidnow + ,dn_dreidnowext + ,dn_altivec + ,dn_sse + ,dn_x86_64 + ,dn_arm + ,dn_neon + ,dn_avx + ,dn_dreidnow_vintage + ,dn_dreidnowext_vintage + ,dn_sse_vintage + ,dn_nodec +}; +#endif + enum optcla { nocla=0, normal, mmxsse }; /* - Set up the table of synth functions for current decoder choice. */ @@ -68,7 +188,9 @@ enum optcla decclass(const enum optdec); #if (defined OPT_I486) || (defined OPT_I586) || (defined OPT_I586_DITHER) \ || (defined OPT_MMX) || (defined OPT_SSE) || (defined_OPT_ALTIVEC) \ || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) || (defined OPT_X86_64) \ - || (defined OPT_NEON) || (defined OPT_GENERIC_DITHER) + || (defined OPT_3DNOW_VINTAGE) || (defined OPT_3DNOWEXT_VINTAGE) \ + || (defined OPT_SSE_VINTAGE) \ + || (defined OPT_NEON) || (defined OPT_AVX) || (defined OPT_GENERIC_DITHER) #error "Bad decoder choice together with fixed point math!" #endif #endif @@ -139,6 +261,16 @@ enum optcla decclass(const enum optdec); #define OPT_X86 #ifndef OPT_MULTI # define defopt sse +# define opt_dct36(fr) dct36_sse +#endif +#endif + +#ifdef OPT_SSE_VINTAGE +#define OPT_MMXORSSE +#define OPT_MPLAYER +#define OPT_X86 +#ifndef OPT_MULTI +# define defopt sse #endif #endif @@ -148,6 +280,16 @@ enum optcla decclass(const enum optdec); #define OPT_X86 #ifndef OPT_MULTI # define defopt dreidnowext +#endif +#endif + +/* same as above but also using 3DNowExt dct36 */ +#ifdef OPT_3DNOWEXT_VINTAGE +#define OPT_MMXORSSE +#define OPT_MPLAYER +#define OPT_X86 +#ifndef OPT_MULTI +# define defopt dreidnowext_vintage # define opt_dct36(fr) dct36_3dnowext #endif #endif @@ -162,6 +304,14 @@ extern const int costab_mmxsse[]; #define OPT_X86 #ifndef OPT_MULTI # define defopt dreidnow +#endif +#endif + +/* same as above but also using 3DNow dct36 */ +#ifdef OPT_3DNOW_VINTAGE +#define OPT_X86 +#ifndef OPT_MULTI +# define defopt dreidnow_vintage # define opt_dct36(fr) dct36_3dnow #endif #endif @@ -176,6 +326,15 @@ extern const int costab_mmxsse[]; #define OPT_MMXORSSE #ifndef OPT_MULTI # define defopt x86_64 +# define opt_dct36(fr) dct36_x86_64 +#endif +#endif + +#ifdef OPT_AVX +#define OPT_MMXORSSE +#ifndef OPT_MULTI +# define defopt avx +# define opt_dct36(fr) dct36_avx #endif #endif @@ -205,7 +364,7 @@ void check_decoders(void); # define defopt nodec -# if (defined OPT_3DNOW || defined OPT_3DNOWEXT) +# if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX) # define opt_dct36(fr) ((fr)->cpu_opts.the_dct36) # endif diff --git a/jni/mpg123-1.17.0/src/libmpg123/optimize.lo b/jni/mpg123-1.17.0/src/libmpg123/optimize.lo new file mode 100644 index 00000000..8e80f229 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/optimize.lo @@ -0,0 +1,12 @@ +# optimize.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/optimize.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/parse.c b/jni/mpg123-1.17.0/src/libmpg123/parse.c similarity index 59% rename from jni/mpg123-1.13.4/src/libmpg123/parse.c rename to jni/mpg123-1.17.0/src/libmpg123/parse.c index c826afce..41ea75e4 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/parse.c +++ b/jni/mpg123-1.17.0/src/libmpg123/parse.c @@ -1,7 +1,7 @@ /* parse: spawned from common; clustering around stream/frame parsing - copyright ?-2009 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright ?-2012 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Michael Hipp & Thomas Orgis */ @@ -28,50 +28,23 @@ #endif #define TRACK_MAX_FRAMES ULONG_MAX/4/1152 +#include "mpeghead.h" + #include "debug.h" #define bsbufid(fr) (fr)->bsbuf==(fr)->bsspace[0] ? 0 : ((fr)->bsbuf==fr->bsspace[1] ? 1 : ( (fr)->bsbuf==(fr)->bsspace[0]+512 ? 2 : ((fr)->bsbuf==fr->bsspace[1]+512 ? 3 : -1) ) ) -/* - AAAAAAAA AAABBCCD EEEEFFGH IIJJKLMM - A: sync - B: mpeg version - C: layer - D: CRC - E: bitrate - F: sampling rate - G: padding - H: private - I: channel mode - J: mode ext - K: copyright - L: original - M: emphasis - - old compare mask 0xfffffd00: - 11111111 11111111 11111101 00000000 - - means: everything must match excluding padding and channel mode, ext mode, ... - But a vbr stream's headers will differ in bitrate! - We are already strict in allowing only frames of same type in stream, we should at least watch out for VBR while being strict. - - So a better mask is: - 11111111 11111111 00001101 00000000 - - Even more, I'll allow varying crc bit. - 11111111 11111110 00001101 00000000 - - Still unsure about this private bit... well, as Marcel pointed out: - The decoder should not care about this. - 11111111 11111110 00001100 00000000 -*/ -#define HDRCMPMASK 0xfffe0c00 -/* - This needs cleanup ... The parser is not as strict as documented above. - Here comes a mask that checks for anything that can change sampling rate. - This includes change of MPEG version and frequency bits. - 00011000 00001100 00000000, BB and FF bits */ -#define HDRSAMPMASK 0x180c00 +/* PARSE_GOOD and PARSE_BAD have to be 1 and 0 (TRUE and FALSE), others can vary. */ +enum parse_codes +{ + PARSE_MORE = MPG123_NEED_MORE + ,PARSE_ERR = MPG123_ERR + ,PARSE_END = 10 /* No more audio data to find. */ + ,PARSE_GOOD = 1 /* Everything's fine. */ + ,PARSE_BAD = 0 /* Not fine (invalid data). */ + ,PARSE_RESYNC = 2 /* Header not good, go into resync. */ + ,PARSE_AGAIN = 3 /* Really start over, throw away and read a new header, again. */ +}; /* bitrates for [mpeg1/2][layer] */ static const int tabsel_123[2][3][16] = @@ -90,7 +63,10 @@ static const int tabsel_123[2][3][16] = static const long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 }; -static int decode_header(mpg123_handle *fr,unsigned long newhead); +static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeformat_count); +static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount); +static int do_readahead(mpg123_handle *fr, unsigned long newhead); +static int wetwork(mpg123_handle *fr, unsigned long *newheadp); /* These two are to be replaced by one function that gives all the frame parameters (for outsiders).*/ /* Those functions are unsafe regarding bad arguments (inside the mpg123_handle), but just returning anything would also be unsafe, the caller code has to be trusted. */ @@ -105,24 +81,21 @@ long frame_freq(mpg123_handle *fr) return freqs[fr->sampling_frequency]; } -#define free_format_header(head) ( ((head & 0xffe00000) == 0xffe00000) && ((head>>17)&3) && (((head>>12)&0xf) == 0x0) && (((head>>10)&0x3) != 0x3 )) - /* compiler is smart enought to inline this one or should I really do it as macro...? */ static int head_check(unsigned long head) { if ( - /* first 11 bits are set to 1 for frame sync */ - ((head & 0xffe00000) != 0xffe00000) + ((head & HDR_SYNC) != HDR_SYNC) || /* layer: 01,10,11 is 1,2,3; 00 is reserved */ - (!((head>>17)&3)) + (!(HDR_LAYER_VAL(head))) || /* 1111 means bad bitrate */ - (((head>>12)&0xf) == 0xf) + (HDR_BITRATE_VAL(head) == 0xf) || /* sampling freq: 11 is reserved */ - (((head>>10)&0x3) == 0x3 ) + (HDR_SAMPLERATE_VAL(head) == 0x3) /* here used to be a mpeg 2.5 check... re-enabled 2.5 decoding due to lack of evidence that it is really not good */ ) { @@ -147,14 +120,10 @@ static int check_lame_tag(mpg123_handle *fr) I hope that ensuring all zeros until tag start is enough. */ int lame_offset = (fr->stereo == 2) ? (fr->lsf ? 17 : 32 ) : (fr->lsf ? 9 : 17); - /* At least skip the decoder delay. */ -#ifdef GAPLESS - if(fr->p.flags & MPG123_GAPLESS) - { - if(fr->begin_s == 0) frame_gapless_init(fr, GAPLESS_DELAY, 0); - } -#endif + if(fr->p.flags & MPG123_IGNORE_INFOFRAME) return 0; + + /* Note: CRC or not, that does not matter here. */ if(fr->framesize >= 120+lame_offset) /* traditional Xing header is 120 bytes */ { int i; @@ -211,23 +180,13 @@ static int check_lame_tag(mpg123_handle *fr) } else { - /* - In theory, one should use that value for skipping... - When I know the exact number of samples I could simply count in flush_output, - but that's problematic with seeking and such. - I still miss the real solution for detecting the end. - */ fr->track_frames = (off_t) make_long(fr->bsbuf, lame_offset); if(fr->track_frames > TRACK_MAX_FRAMES) fr->track_frames = 0; /* endless stream? */ - #ifdef GAPLESS - /* if no further info there, remove/add at least the decoder delay */ +#ifdef GAPLESS + /* All or nothing: Only if encoder delay/padding is known we'll cut samples for gapless. */ if(fr->p.flags & MPG123_GAPLESS) - { - off_t length = fr->track_frames * spf(fr); - if(length > 1) - frame_gapless_init(fr, GAPLESS_DELAY, length+GAPLESS_DELAY); - } - #endif + frame_gapless_init(fr, fr->track_frames, 0, 0); +#endif if(VERBOSE3) fprintf(stderr, "Note: Xing: %lu frames\n", (long unsigned)fr->track_frames); } @@ -282,21 +241,35 @@ static int check_lame_tag(mpg123_handle *fr) lame_offset += 4; } /* I guess that either 0 or LAME extra data follows */ - /* there may this crc16 be floating around... (?) */ if(fr->bsbuf[lame_offset] != 0) { unsigned char lame_vbr; float replay_gain[2] = {0,0}; float peak = 0; - /* float gain_offset = 0; */ /* going to be +6 for old lame that used 83dB */ + float gain_offset = 0; /* going to be +6 for old lame that used 83dB */ char nb[10]; memcpy(nb, fr->bsbuf+lame_offset, 9); nb[9] = 0; if(VERBOSE3) fprintf(stderr, "Note: Info: Encoder: %s\n", nb); if(!strncmp("LAME", nb, 4)) { - /* gain_offset = 6; */ - debug("TODO: finish lame detetcion..."); + /* Lame versions before 3.95.1 used 83 dB reference level, later versions 89 dB. + We stick with 89 dB as being "normal", adding 6 dB. */ + unsigned int major, minor; + char rest[6]; + rest[0] = 0; + if(sscanf(nb+4, "%u.%u%s", &major, &minor, rest) >= 2) + { + debug3("LAME: %u/%u/%s", major, minor, rest); + /* We cannot detect LAME 3.95 reliably (same version string as 3.95.1), so this is a blind spot. + Everything < 3.95 is safe, though. */ + if(major < 3 || (major == 3 && minor < 95)) /* || (major == 3 && minor == 95 && rest[0] == 0)) */ + { + gain_offset = 6; + if(VERBOSE3) fprintf(stderr, "Note: Info: Old LAME detected, using ReplayGain preamp of %f dB.\n", gain_offset); + } + } + else if(VERBOSE3) fprintf(stderr, "Note: Info: Cannot determine LAME version.\n"); } lame_offset += 9; /* the 4 big bits are tag revision, the small bits vbr method */ @@ -356,7 +329,10 @@ static int check_lame_tag(mpg123_handle *fr) else if(gt == 2) gt = 1; /* audiophile */ else continue; /* get the 9 bits into a number, divide by 10, multiply sign... happy bit banging */ - replay_gain[0] = (float) ((fr->bsbuf[lame_offset] & 0x2) ? -0.1 : 0.1) * (make_short(fr->bsbuf, lame_offset) & 0x1f); + replay_gain[gt] = (float) ((fr->bsbuf[lame_offset] & 0x2) ? -0.1 : 0.1) * (make_short(fr->bsbuf, lame_offset) & 0x1ff); + /* If this is an automatic value from LAME (or whatever), the automatic gain offset applies. + If a user or whoever set the value, do not touch it! 011 is automatic origin. */ + if(origin == 3) replay_gain[gt] += gain_offset; } lame_offset += 2; } @@ -389,13 +365,9 @@ static int check_lame_tag(mpg123_handle *fr) #ifdef GAPLESS if(fr->p.flags & MPG123_GAPLESS) { - off_t length = fr->track_frames * spf(fr); - off_t skipbegin = GAPLESS_DELAY + ((((int) fr->bsbuf[lame_offset]) << 4) | (((int) fr->bsbuf[lame_offset+1]) >> 4)); - off_t skipend = -GAPLESS_DELAY + (((((int) fr->bsbuf[lame_offset+1]) << 8) | (((int) fr->bsbuf[lame_offset+2]))) & 0xfff); - debug3("preparing gapless mode for layer3: length %lu, skipbegin %lu, skipend %lu", - (long unsigned)length, (long unsigned)skipbegin, (long unsigned)skipend); - if(length > 1) - frame_gapless_init(fr, skipbegin, (skipend < length) ? length-skipend : length); + off_t skipbegin = ((((int) fr->bsbuf[lame_offset]) << 4) | (((int) fr->bsbuf[lame_offset+1]) >> 4)); + off_t skipend = (((((int) fr->bsbuf[lame_offset+1]) << 8) | (((int) fr->bsbuf[lame_offset+2]))) & 0xfff); + frame_gapless_init(fr, fr->track_frames, skipbegin, skipend); } #endif } @@ -412,31 +384,29 @@ static int check_lame_tag(mpg123_handle *fr) /* Just tell if the header is some mono. */ static int header_mono(unsigned long newhead) { - return ((newhead>>6)&0x3) == MPG_MD_MONO ? TRUE : FALSE; + return HDR_CHANNEL_VAL(newhead) == MPG_MD_MONO ? TRUE : FALSE; } -/* - That's a big one: read the next frame. 1 is success, <= 0 is some error - Special error READER_MORE means: Please feed more data and try again. -*/ -int read_frame(mpg123_handle *fr) +/* true if the two headers will work with the same decoding routines */ +static int head_compatible(unsigned long fred, unsigned long bret) { - /* TODO: rework this thing */ - unsigned long newhead; - off_t framepos; - int ret; - off_t oret; - /* stuff that needs resetting if complete frame reading fails */ - int oldsize = fr->framesize; - int oldphase = fr->halfphase; + return ( (fred & HDR_CMPMASK) == (bret & HDR_CMPMASK) + && header_mono(fred) == header_mono(bret) ); +} - /* The counter for the search-first-header loop. - It is persistent outside the loop to prevent seemingly endless loops - when repeatedly headers are found that do not have valid followup headers. */ - int headcount = 0; - - fr->fsizeold=fr->framesize; /* for Layer3 */ +static void halfspeed_prepare(mpg123_handle *fr) +{ + /* save for repetition */ + if(fr->p.halfspeed && fr->lay == 3) + { + debug("halfspeed - reusing old bsbuf "); + memcpy (fr->ssave, fr->bsbuf, fr->ssize); + } +} +/* If this returns 1, the next frame is the repetition. */ +static int halfspeed_do(mpg123_handle *fr) +{ /* Speed-down hack: Play it again, Sam (the frame, I mean). */ if (fr->p.halfspeed) { @@ -456,6 +426,45 @@ int read_frame(mpg123_handle *fr) fr->halfphase = fr->p.halfspeed - 1; } } + return 0; +} + +/* + Temporary macro until we got this worked out. + Idea is to filter out special return values that shall trigger direct jumps to end / resync / read again. + Particularily, the generic ret==PARSE_BAD==0 and ret==PARSE_GOOD==1 are not affected. +*/ +#define JUMP_CONCLUSION(ret) \ +{ \ +if(ret < 0){ debug1("%s", ret == MPG123_NEED_MORE ? "need more" : "read error"); goto read_frame_bad; } \ +else if(ret == PARSE_AGAIN) goto read_again; \ +else if(ret == PARSE_RESYNC) goto init_resync; \ +else if(ret == PARSE_END) goto read_frame_bad; \ +} + +/* + That's a big one: read the next frame. 1 is success, <= 0 is some error + Special error READER_MORE means: Please feed more data and try again. +*/ +int read_frame(mpg123_handle *fr) +{ + /* TODO: rework this thing */ + int freeformat_count = 0; + unsigned long newhead; + off_t framepos; + int ret; + /* stuff that needs resetting if complete frame reading fails */ + int oldsize = fr->framesize; + int oldphase = fr->halfphase; + + /* The counter for the search-first-header loop. + It is persistent outside the loop to prevent seemingly endless loops + when repeatedly headers are found that do not have valid followup headers. */ + long headcount = 0; + + fr->fsizeold=fr->framesize; /* for Layer3 */ + + if(halfspeed_do(fr) == 1) return 1; read_again: /* In case we are looping to find a valid frame, discard any buffered data before the current position. @@ -463,7 +472,7 @@ read_again: if(fr->rd->forget != NULL) fr->rd->forget(fr); debug2("trying to get frame %"OFF_P" at %"OFF_P, (off_p)fr->num+1, (off_p)fr->rd->tell(fr)); - if((ret = fr->rd->head_read(fr,&newhead)) <= 0){ debug("need more?"); goto read_frame_bad;} + if((ret = fr->rd->head_read(fr,&newhead)) <= 0){ debug1("need more? (%i)", ret); goto read_frame_bad;} init_resync: @@ -472,255 +481,41 @@ init_resync: { if(fr->oldhead == newhead) fr->header_change = 0; else - /* If they have the same sample rate. Note that only is _not_ the case for the first header, as we enforce sample rate match for following frames. - So, during one stream, only change of stereoness is possible and indicated by header_change == 2. */ - if((fr->oldhead & HDRSAMPMASK) == (newhead & HDRSAMPMASK)) - { - /* Now if both channel modes are mono or both stereo, it's no big deal. */ - if( header_mono(fr->oldhead) == header_mono(newhead)) - fr->header_change = 1; - } + /* Headers that match in this test behave the same for the outside world. + namely: same decoding routines, same amount of decoded data. */ + if(head_compatible(fr->oldhead, newhead)) + fr->header_change = 1; } #ifdef SKIP_JUNK - /* watch out for junk/tags on beginning of stream by invalid header */ - if(!fr->firsthead && !head_check(newhead)) { - - /* check for id3v2; first three bytes (of 4) are "ID3" */ - if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300) - { - int id3ret = 0; - id3ret = parse_new_id3(fr, newhead); - if (id3ret < 0){ debug("need more?"); ret = id3ret; goto read_frame_bad; } -#ifndef NO_ID3V2 - else if(id3ret > 0){ debug("got ID3v2"); fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; } - else debug("no useful ID3v2"); -#endif - - fr->oldhead = 0; - goto read_again; /* Also in case of invalid ID3 tag (ret==0), try to get on track again. */ - } - else if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Junk at the beginning (0x%08lx)\n",newhead); - - /* I even saw RIFF headers at the beginning of MPEG streams ;( */ - if(newhead == ('R'<<24)+('I'<<16)+('F'<<8)+'F') { - if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr, "Note: Looks like a RIFF header.\n"); - - if((ret=fr->rd->head_read(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; } - - while(newhead != ('d'<<24)+('a'<<16)+('t'<<8)+'a') - { - if((ret=fr->rd->head_shift(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; } - } - if((ret=fr->rd->head_read(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; } - - if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Skipped RIFF header!\n"); - - fr->oldhead = 0; - goto read_again; - } - /* unhandled junk... just continue search for a header */ - /* step in byte steps through next 64K */ - debug("searching for header..."); - - ret = 0; /* We will check the value after the loop. */ - for(; headcount<65536; headcount++) - { - if((ret=fr->rd->head_shift(fr,&newhead))<=0){ debug("need more?"); goto read_frame_bad; } - /* if(head_check(newhead)) */ - if(head_check(newhead) && (ret=decode_header(fr, newhead))) - break; - } - if(ret<0){ debug("need more?"); goto read_frame_bad; } - - if(headcount == 65536) - { - if(NOQUIET) error("Giving up searching valid MPEG header after (over) 64K of junk."); - return 0; - } - else debug1("hopefully found one at %"OFF_P, (off_p)fr->rd->tell(fr)); - /* - * should we additionaly check, whether a new frame starts at - * the next expected position? (some kind of read ahead) - * We could implement this easily, at least for files. - */ - } -#endif - - /* first attempt of read ahead check to find the real first header; cannot believe what junk is out there! */ - if(!fr->firsthead && fr->rdat.flags & (READER_SEEKABLE|READER_BUFFERED) && head_check(newhead) && (ret=decode_header(fr, newhead))) + if(!fr->firsthead && !head_check(newhead)) { - unsigned long nexthead = 0; - int hd = 0; - off_t start = fr->rd->tell(fr); - if(ret<0){ debug("need more?"); goto read_frame_bad; } - - debug2("doing ahead check with BPF %d at %"OFF_P, fr->framesize+4, (off_p)start); - /* step framesize bytes forward and read next possible header*/ - if((oret=fr->rd->skip_bytes(fr, fr->framesize))<0) - { - if(oret==READER_ERROR && NOQUIET) error("cannot seek!"); - - ret = oret; /* Purposeful negative values aren't big. */ - goto read_frame_bad; - } - hd = fr->rd->head_read(fr,&nexthead); - if(hd==MPG123_NEED_MORE){ debug("need more?"); ret = hd; goto read_frame_bad; } - if((ret=fr->rd->back_bytes(fr, fr->rd->tell(fr)-start))<0) - { - if(ret==READER_ERROR && NOQUIET) error("cannot seek!"); - else debug("need more?"); - goto read_frame_bad; - } - debug1("After fetching next header, at %"OFF_P, (off_p)fr->rd->tell(fr)); - if(!hd) - { - if(NOQUIET) warning("cannot read next header, a one-frame stream? Duh..."); - } - else - { - debug2("does next header 0x%08lx match first 0x%08lx?", nexthead, newhead); - /* not allowing free format yet */ - if(!head_check(nexthead) || (nexthead & HDRCMPMASK) != (newhead & HDRCMPMASK)) - { - debug("No, the header was not valid, start from beginning..."); - fr->oldhead = 0; /* start over */ - /* try next byte for valid header */ - if((ret=fr->rd->back_bytes(fr, 3))<0) - { - if(NOQUIET) error("cannot seek!"); - else debug("need more?"); - goto read_frame_bad; - } - goto read_again; - } - } + ret = skip_junk(fr, &newhead, &headcount); + JUMP_CONCLUSION(ret); } +#endif - /* - Why has this head check been avoided here before? And apart from that: - Tricky business: Bug 3267863 triggers endless loop because an invalid free format header does not trigger head_check(), hence does not trigger resync. - This whole logic is going to be reworked, code untangled, but 1.13.3 needs some minimal patching. - So we try to fully decode the header (which includes free format size checking), not just check. - */ - /* Check in advance to avoid premature error message in decode_header() */ ret = head_check(newhead); - if(ret) - { - ret = decode_header(fr, newhead); - if(ret < 0) goto read_frame_bad; + if(ret) ret = decode_header(fr, newhead, &freeformat_count); + + JUMP_CONCLUSION(ret); /* That only continues for ret == PARSE_BAD or PARSE_GOOD. */ + if(ret == PARSE_BAD) + { /* Header was not good. */ + ret = wetwork(fr, &newhead); /* Messy stuff, handle junk, resync ... */ + JUMP_CONCLUSION(ret); + /* Normally, we jumped already. If for some reason everything's fine to continue, do continue. */ + if(ret != PARSE_GOOD) goto read_frame_bad; } - if(!ret) + if(!fr->firsthead) { - /* and those ugly ID3 tags */ - if((newhead & 0xffffff00) == ('T'<<24)+('A'<<16)+('G'<<8)) - { - fr->id3buf[0] = (unsigned char) ((newhead >> 24) & 0xff); - fr->id3buf[1] = (unsigned char) ((newhead >> 16) & 0xff); - fr->id3buf[2] = (unsigned char) ((newhead >> 8) & 0xff); - fr->id3buf[3] = (unsigned char) ( newhead & 0xff); - if((ret=fr->rd->fullread(fr,fr->id3buf+4,124)) < 0){ debug("need more?"); goto read_frame_bad; } - fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; - fr->rdat.flags |= READER_ID3TAG; /* that marks id3v1 */ - if (VERBOSE3) fprintf(stderr,"Note: Skipped ID3v1 tag.\n"); - goto read_again; - } - /* duplicated code from above! */ - /* check for id3v2; first three bytes (of 4) are "ID3" */ - if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300) - { - int id3length = 0; - id3length = parse_new_id3(fr, newhead); - if(id3length < 0){ debug("need more?"); ret = id3length; goto read_frame_bad; } - - fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; - goto read_again; - } - else if(NOQUIET && fr->silent_resync == 0) - { - fprintf(stderr,"Note: Illegal Audio-MPEG-Header 0x%08lx at offset %"OFF_P".\n", - newhead, (off_p)fr->rd->tell(fr)-4); - } - - /* We reach this point only for invalid headers. - And: All paths lead to a jump out of this block! So there is no "after". */ - - if(NOQUIET && (newhead & 0xffffff00) == ('b'<<24)+('m'<<16)+('p'<<8)) fprintf(stderr,"Note: Could be a BMP album art.\n"); - /* Do resync if not forbidden by flag. - I used to have a check for not-icy-meta here, but concluded that the desync issues came from a reader bug, not the stream. */ - if( !(fr->p.flags & MPG123_NO_RESYNC) ) - { - long try = 0; - long limit = fr->p.resync_limit; - - /* If a resync is needed the bitreservoir of previous frames is no longer valid */ - fr->bitreservoir = 0; - - /* TODO: make this more robust, I'd like to cat two mp3 fragments together (in a dirty way) and still have mpg123 beign able to decode all it somehow. */ - if(NOQUIET && fr->silent_resync == 0) fprintf(stderr, "Note: Trying to resync...\n"); - /* Read more bytes until we find something that looks - reasonably like a valid header. This is not a - perfect strategy, but it should get us back on the - track within a short time (and hopefully without - too much distortion in the audio output). */ - do - { - ++try; - if(limit >= 0 && try >= limit) break; - - if((ret=fr->rd->head_shift(fr,&newhead)) <= 0) - { - debug("need more?"); - if(NOQUIET) fprintf (stderr, "Note: Hit end of (available) data during resync.\n"); - - goto read_frame_bad; - } - if(VERBOSE3) debug3("resync try %li at %"OFF_P", got newhead 0x%08lx", try, (off_p)fr->rd->tell(fr), newhead); - - if(!fr->oldhead) - { - debug("going to init_resync..."); - goto init_resync; /* "considered harmful", eh? */ - } - /* we should perhaps collect a list of valid headers that occured in file... there can be more */ - /* Michael's new resync routine seems to work better with the one frame readahead (and some input buffering?) */ - } while - ( - !head_check(newhead) /* Simply check for any valid header... we have the readahead to get it straight now(?) */ - /* (newhead & HDRCMPMASK) != (fr->oldhead & HDRCMPMASK) - && (newhead & HDRCMPMASK) != (fr->firsthead & HDRCMPMASK)*/ - ); - /* too many false positives - }while (!(head_check(newhead) && decode_header(fr, newhead))); */ - if(NOQUIET && fr->silent_resync == 0) fprintf (stderr, "Note: Skipped %li bytes in input.\n", try); - - if(limit >= 0 && try >= limit) - { - if(NOQUIET) - error1("Giving up resync after %li bytes - your stream is not nice... (maybe increasing resync limit could help).", try); - - fr->err = MPG123_RESYNC_FAIL; - return READER_ERROR; - } - else - { - debug1("Found valid header 0x%lx... unsetting firsthead to reinit stream.", newhead); - fr->firsthead = 0; - goto init_resync; - } - } - else - { - if(NOQUIET) error("not attempting to resync..."); - - fr->err = MPG123_OUT_OF_SYNC; - return READER_ERROR; - } + ret = do_readahead(fr, newhead); + /* readahead can fail mit NEED_MORE, in which case we must also make the just read header available again for next go */ + if(ret < 0) fr->rd->back_bytes(fr, 4); + JUMP_CONCLUSION(ret); } - /* There used to be code here ... and turned out to be totally redundant. */ - /* Past this point we know the header is good and we can start reading in the actual frame. */ + /* Now we should have our valid header and proceed to reading the frame. */ /* if filepos is invalid, so is framepos */ framepos = fr->rd->tell(fr) - 4; @@ -775,19 +570,29 @@ init_resync: ++fr->num; /* 0 for first frame! */ debug4("Frame %"OFF_P" %08lx %i, next filepos=%"OFF_P, (off_p)fr->num, newhead, fr->framesize, (off_p)fr->rd->tell(fr)); - - /* save for repetition */ - if(fr->p.halfspeed && fr->lay == 3) + if(!(fr->state_flags & FRAME_FRANKENSTEIN) && ( + (fr->track_frames > 0 && fr->num >= fr->track_frames) +#ifdef GAPLESS + || (fr->gapless_frames > 0 && fr->num >= fr->gapless_frames) +#endif + )) { - debug("halfspeed - reusing old bsbuf "); - memcpy (fr->ssave, fr->bsbuf, fr->ssize); + fr->state_flags |= FRAME_FRANKENSTEIN; + if(NOQUIET) fprintf(stderr, "\nWarning: Encountered more data after announced end of track (frame %"OFF_P"/%"OFF_P"). Frankenstein!\n", (off_p)fr->num, +#ifdef GAPLESS + fr->gapless_frames > 0 ? (off_p)fr->gapless_frames : +#endif + (off_p)fr->track_frames); } + halfspeed_prepare(fr); + /* index the position */ + fr->input_offset = framepos; #ifdef FRAME_INDEX /* Keep track of true frame positions in our frame index. but only do so when we are sure that the frame number is accurate... */ - if(fr->accurate && FI_NEXT(fr->index, fr->num)) + if((fr->state_flags & FRAME_ACCURATE) && FI_NEXT(fr->index, fr->num)) fi_add(&fr->index, framepos); #endif @@ -798,9 +603,11 @@ init_resync: fr->to_decode = fr->to_ignore = TRUE; if(fr->error_protection) fr->crc = getbits(fr, 16); /* skip crc */ + fr->oldhead = newhead; + return 1; read_frame_bad: - /* Also if we searched for valid data in vain, we can forget skipped data. + /* Also if we searched for valid data in vein, we can forget skipped data. Otherwise, the feeder would hold every dead old byte in memory until the first valid frame! */ if(fr->rd->forget != NULL) fr->rd->forget(fr); @@ -816,9 +623,9 @@ read_frame_bad: /* * read ahead and find the next MPEG header, to guess framesize * return value: success code - * 1: found a valid frame size (stored in the handle). + * PARSE_GOOD: found a valid frame size (stored in the handle). * <0: error codes, possibly from feeder buffer (NEED_MORE) - * 0: cannot get the framesize for some reason and shall silentry try the next possible header (if this is no free format stream after all...) + * PARSE_BAD: cannot get the framesize for some reason and shall silentry try the next possible header (if this is no free format stream after all...) */ static int guess_freeformat_framesize(mpg123_handle *fr) { @@ -829,48 +636,26 @@ static int guess_freeformat_framesize(mpg123_handle *fr) { if(NOQUIET) error("Cannot look for freeformat frame size with non-seekable and non-buffered stream!"); - return 0; + return PARSE_BAD; } if((ret=fr->rd->head_read(fr,&head))<=0) return ret; /* We are already 4 bytes into it */ -/* fix that limit to be absolute for the first header search! */ - for(i=4;i<65536;i++) { - if((ret=fr->rd->head_shift(fr,&head))<=0) + for(i=4;ird->head_shift(fr,&head))<=0) return ret; + + /* No head_check needed, the mask contains all relevant bits. */ + if((head & HDR_SAMEMASK) == (fr->oldhead & HDR_SAMEMASK)) { - return ret; - } - if(head_check(head)) - { - int sampling_frequency,mpeg25,lsf; - - if(head & (1<<20)) - { - lsf = (head & (1<<19)) ? 0x0 : 0x1; - mpeg25 = 0; - } - else - { - lsf = 1; - mpeg25 = 1; - } - - if(mpeg25) - sampling_frequency = 6 + ((head>>10)&0x3); - else - sampling_frequency = ((head>>10)&0x3) + (lsf*3); - - if((lsf==fr->lsf) && (mpeg25==fr->mpeg25) && (sampling_frequency == fr->sampling_frequency)) - { - fr->rd->back_bytes(fr,i+1); - fr->framesize = i-3; - return 1; /* Success! */ - } + fr->rd->back_bytes(fr,i+1); + fr->framesize = i-3; + return PARSE_GOOD; /* Success! */ } } fr->rd->back_bytes(fr,i); - return 0; + return PARSE_BAD; } @@ -881,18 +666,19 @@ static int guess_freeformat_framesize(mpg123_handle *fr) * 1: success * 0: no valid header * <0: some error + * You are required to do a head_check() before calling! */ -static int decode_header(mpg123_handle *fr,unsigned long newhead) +static int decode_header(mpg123_handle *fr,unsigned long newhead, int *freeformat_count) { +#ifdef DEBUG /* Do not waste cycles checking the header twice all the time. */ if(!head_check(newhead)) { - if(NOQUIET) error("tried to decode obviously invalid header"); - - return 0; + error1("trying to decode obviously invalid header 0x%08lx", newhead); } - if( newhead & (1<<20) ) +#endif + if(HDR_VERSION_VAL(newhead) & 0x2) { - fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1; + fr->lsf = (HDR_VERSION_VAL(newhead) & 0x1) ? 0 : 1; fr->mpeg25 = 0; } else @@ -902,43 +688,36 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead) } if( (fr->p.flags & MPG123_NO_RESYNC) || !fr->oldhead - || (((fr->oldhead>>19)&0x3) ^ ((newhead>>19)&0x3)) ) + || (HDR_VERSION_VAL(fr->oldhead) != HDR_VERSION_VAL(newhead)) ) { /* If "tryresync" is false, assume that certain parameters do not change within the stream! Force an update if lsf or mpeg25 settings have changed. */ - fr->lay = 4-((newhead>>17)&3); - if( ((newhead>>10)&0x3) == 0x3) - { - if(NOQUIET) error("Stream error"); - - return 0; /* exit() here really is too much, isn't it? */ - } + fr->lay = 4 - HDR_LAYER_VAL(newhead); if(fr->mpeg25) - fr->sampling_frequency = 6 + ((newhead>>10)&0x3); + fr->sampling_frequency = 6 + HDR_SAMPLERATE_VAL(newhead); else - fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3); + fr->sampling_frequency = HDR_SAMPLERATE_VAL(newhead) + (fr->lsf*3); } #ifdef DEBUG - if((((newhead>>16)&0x1)^0x1) != fr->error_protection) debug("changed crc bit!"); + /* seen a file where this varies (old lame tag without crc, track with crc) */ + if((HDR_CRC_VAL(newhead)^0x1) != fr->error_protection) debug("changed crc bit!"); #endif - fr->error_protection = ((newhead>>16)&0x1)^0x1; /* seen a file where this varies (old lame tag without crc, track with crc) */ - fr->bitrate_index = ((newhead>>12)&0xf); - fr->padding = ((newhead>>9)&0x1); - fr->extension = ((newhead>>8)&0x1); - fr->mode = ((newhead>>6)&0x3); - fr->mode_ext = ((newhead>>4)&0x3); - fr->copyright = ((newhead>>3)&0x1); - fr->original = ((newhead>>2)&0x1); - fr->emphasis = newhead & 0x3; - fr->freeformat = free_format_header(newhead); + fr->error_protection = HDR_CRC_VAL(newhead)^0x1; + fr->bitrate_index = HDR_BITRATE_VAL(newhead); + fr->padding = HDR_PADDING_VAL(newhead); + fr->extension = HDR_PRIVATE_VAL(newhead); + fr->mode = HDR_CHANNEL_VAL(newhead); + fr->mode_ext = HDR_CHANEX_VAL(newhead); + fr->copyright = HDR_COPYRIGHT_VAL(newhead); + fr->original = HDR_ORIGINAL_VAL(newhead); + fr->emphasis = HDR_EMPHASIS_VAL(newhead); + fr->freeformat = !(newhead & HDR_BITRATE); - fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2; + fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2; - fr->oldhead = newhead; - /* we can't use tabsel_123 for freeformat, so trying to guess framesize... */ if(fr->freeformat) { @@ -946,8 +725,14 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead) if(fr->freeformat_framesize < 0) { int ret; + *freeformat_count += 1; + if(*freeformat_count > 5) + { + if(VERBOSE3) error("You fooled me too often. Refusing to guess free format frame size _again_."); + return PARSE_BAD; + } ret = guess_freeformat_framesize(fr); - if(ret>0) + if(ret == PARSE_GOOD) { fr->freeformat_framesize = fr->framesize - fr->padding; if(VERBOSE2) @@ -957,8 +742,9 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead) { if(ret == MPG123_NEED_MORE) debug("Need more data to guess free format frame size."); - else + else if(VERBOSE3) error("Encountered free format header, but failed to guess frame size."); + return ret; } } @@ -1016,15 +802,15 @@ static int decode_header(mpg123_handle *fr,unsigned long newhead) default: if(NOQUIET) error1("Layer type %i not supported in this build!", fr->lay); - return 0; + return PARSE_BAD; } if (fr->framesize > MAXFRAMESIZE) { if(NOQUIET) error1("Frame size too big: %d", fr->framesize+4-fr->padding); - return (0); + return PARSE_BAD; } - return 1; + return PARSE_GOOD; } void set_pointer(mpg123_handle *fr, long backstep) @@ -1062,6 +848,13 @@ double compute_bpf(mpg123_handle *fr) return bpf; } +int attribute_align_arg mpg123_spf(mpg123_handle *mh) +{ + if(mh == NULL) return MPG123_ERR; + + return spf(mh); +} + double attribute_align_arg mpg123_tpf(mpg123_handle *fr) { static int bs[4] = { 0,384,1152,1152 }; @@ -1155,3 +948,236 @@ int get_songlen(mpg123_handle *fr,int no) tpf = mpg123_tpf(fr); return (int) (no*tpf); } + +/* first attempt of read ahead check to find the real first header; cannot believe what junk is out there! */ +static int do_readahead(mpg123_handle *fr, unsigned long newhead) +{ + unsigned long nexthead = 0; + int hd = 0; + off_t start, oret; + int ret; + + if( ! (!fr->firsthead && fr->rdat.flags & (READER_SEEKABLE|READER_BUFFERED)) ) + return PARSE_GOOD; + + start = fr->rd->tell(fr); + + debug2("doing ahead check with BPF %d at %"OFF_P, fr->framesize+4, (off_p)start); + /* step framesize bytes forward and read next possible header*/ + if((oret=fr->rd->skip_bytes(fr, fr->framesize))<0) + { + if(oret==READER_ERROR && NOQUIET) error("cannot seek!"); + + return oret == MPG123_NEED_MORE ? PARSE_MORE : PARSE_ERR; + } + + /* Read header, seek back. */ + hd = fr->rd->head_read(fr,&nexthead); + if( fr->rd->back_bytes(fr, fr->rd->tell(fr)-start) < 0 ) + { + if(NOQUIET) error("Cannot seek back!"); + + return PARSE_ERR; + } + if(hd == MPG123_NEED_MORE) return PARSE_MORE; + + debug1("After fetching next header, at %"OFF_P, (off_p)fr->rd->tell(fr)); + if(!hd) + { + if(NOQUIET) warning("Cannot read next header, a one-frame stream? Duh..."); + return PARSE_END; + } + + debug2("does next header 0x%08lx match first 0x%08lx?", nexthead, newhead); + if(!head_check(nexthead) || !head_compatible(newhead, nexthead)) + { + debug("No, the header was not valid, start from beginning..."); + fr->oldhead = 0; /* start over */ + /* try next byte for valid header */ + if((ret=fr->rd->back_bytes(fr, 3))<0) + { + if(NOQUIET) error("Cannot seek 3 bytes back!"); + + return PARSE_ERR; + } + return PARSE_AGAIN; + } + else return PARSE_GOOD; +} + +static int handle_id3v2(mpg123_handle *fr, unsigned long newhead) +{ + int ret; + fr->oldhead = 0; /* Think about that. Used to be present only for skipping of junk, not resync-style wetwork. */ + ret = parse_new_id3(fr, newhead); + if (ret < 0) return ret; +#ifndef NO_ID3V2 + else if(ret > 0){ debug("got ID3v2"); fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; } + else debug("no useful ID3v2"); +#endif + return PARSE_AGAIN; +} + +/* watch out for junk/tags on beginning of stream by invalid header */ +static int skip_junk(mpg123_handle *fr, unsigned long *newheadp, long *headcount) +{ + int ret; + int freeformat_count = 0; + long limit = 65536; + unsigned long newhead = *newheadp; + /* check for id3v2; first three bytes (of 4) are "ID3" */ + if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300) + { + return handle_id3v2(fr, newhead); + } + else if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Junk at the beginning (0x%08lx)\n",newhead); + + /* I even saw RIFF headers at the beginning of MPEG streams ;( */ + if(newhead == ('R'<<24)+('I'<<16)+('F'<<8)+'F') + { + if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr, "Note: Looks like a RIFF header.\n"); + + if((ret=fr->rd->head_read(fr,&newhead))<=0) return ret; + + while(newhead != ('d'<<24)+('a'<<16)+('t'<<8)+'a') + { + if((ret=fr->rd->head_shift(fr,&newhead))<=0) return ret; + } + if((ret=fr->rd->head_read(fr,&newhead))<=0) return ret; + + if(VERBOSE2 && fr->silent_resync == 0) fprintf(stderr,"Note: Skipped RIFF header!\n"); + + fr->oldhead = 0; + *newheadp = newhead; + return PARSE_AGAIN; + } + + /* + Unhandled junk... just continue search for a header, stepping in single bytes through next 64K. + This is rather identical to the resync loop. + */ + debug("searching for header..."); + *newheadp = 0; /* Invalidate the external value. */ + ret = 0; /* We will check the value after the loop. */ + + /* We prepare for at least the 64K bytes as usual, unless + user explicitly wanted more (even infinity). Never less. */ + if(fr->p.resync_limit < 0 || fr->p.resync_limit > limit) + limit = fr->p.resync_limit; + + do + { + ++(*headcount); + if(limit >= 0 && *headcount >= limit) break; + + if((ret=fr->rd->head_shift(fr,&newhead))<=0) return ret; + + if(head_check(newhead) && (ret=decode_header(fr, newhead, &freeformat_count))) break; + } while(1); + if(ret<0) return ret; + + if(limit >= 0 && *headcount >= limit) + { + if(NOQUIET) error1("Giving up searching valid MPEG header after %li bytes of junk.", *headcount); + return PARSE_END; + } + else debug1("hopefully found one at %"OFF_P, (off_p)fr->rd->tell(fr)); + + /* If the new header ist good, it is already decoded. */ + *newheadp = newhead; + return PARSE_GOOD; +} + +/* The newhead is bad, so let's check if it is something special, otherwise just resync. */ +static int wetwork(mpg123_handle *fr, unsigned long *newheadp) +{ + int ret = PARSE_ERR; + unsigned long newhead = *newheadp; + *newheadp = 0; + + /* Classic ID3 tags. Read, then start parsing again. */ + if((newhead & 0xffffff00) == ('T'<<24)+('A'<<16)+('G'<<8)) + { + fr->id3buf[0] = (unsigned char) ((newhead >> 24) & 0xff); + fr->id3buf[1] = (unsigned char) ((newhead >> 16) & 0xff); + fr->id3buf[2] = (unsigned char) ((newhead >> 8) & 0xff); + fr->id3buf[3] = (unsigned char) ( newhead & 0xff); + + if((ret=fr->rd->fullread(fr,fr->id3buf+4,124)) < 0) return ret; + + fr->metaflags |= MPG123_NEW_ID3|MPG123_ID3; + fr->rdat.flags |= READER_ID3TAG; /* that marks id3v1 */ + if(VERBOSE3) fprintf(stderr,"Note: Skipped ID3v1 tag.\n"); + + return PARSE_AGAIN; + } + /* This is similar to initial junk skipping code... */ + /* Check for id3v2; first three bytes (of 4) are "ID3" */ + if((newhead & (unsigned long) 0xffffff00) == (unsigned long) 0x49443300) + { + return handle_id3v2(fr, newhead); + } + else if(NOQUIET && fr->silent_resync == 0) + { + fprintf(stderr,"Note: Illegal Audio-MPEG-Header 0x%08lx at offset %"OFF_P".\n", + newhead, (off_p)fr->rd->tell(fr)-4); + } + + /* Now we got something bad at hand, try to recover. */ + + if(NOQUIET && (newhead & 0xffffff00) == ('b'<<24)+('m'<<16)+('p'<<8)) fprintf(stderr,"Note: Could be a BMP album art.\n"); + + if( !(fr->p.flags & MPG123_NO_RESYNC) ) + { + long try = 0; + long limit = fr->p.resync_limit; + + /* If a resync is needed the bitreservoir of previous frames is no longer valid */ + fr->bitreservoir = 0; + + if(NOQUIET && fr->silent_resync == 0) fprintf(stderr, "Note: Trying to resync...\n"); + + do /* ... shift the header with additional single bytes until be found something that could be a header. */ + { + ++try; + if(limit >= 0 && try >= limit) break; + + if((ret=fr->rd->head_shift(fr,&newhead)) <= 0) + { + *newheadp = newhead; + if(NOQUIET) fprintf (stderr, "Note: Hit end of (available) data during resync.\n"); + + return ret ? ret : PARSE_END; + } + if(VERBOSE3) debug3("resync try %li at %"OFF_P", got newhead 0x%08lx", try, (off_p)fr->rd->tell(fr), newhead); + } while(!head_check(newhead)); + + *newheadp = newhead; + if(NOQUIET && fr->silent_resync == 0) fprintf (stderr, "Note: Skipped %li bytes in input.\n", try); + + /* Now we either got something that could be a header, or we gave up. */ + if(limit >= 0 && try >= limit) + { + if(NOQUIET) + error1("Giving up resync after %li bytes - your stream is not nice... (maybe increasing resync limit could help).", try); + + fr->err = MPG123_RESYNC_FAIL; + return PARSE_ERR; + } + else + { + debug1("Found possibly valid header 0x%lx... unsetting firsthead to reinit stream.", newhead); + fr->firsthead = 0; + fr->oldhead = 0; + return PARSE_RESYNC; + } + } + else + { + if(NOQUIET) error("not attempting to resync..."); + + fr->err = MPG123_OUT_OF_SYNC; + return PARSE_ERR; + } + /* Control never goes here... we return before that. */ +} diff --git a/jni/mpg123-1.13.4/src/libmpg123/parse.h b/jni/mpg123-1.17.0/src/libmpg123/parse.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/parse.h rename to jni/mpg123-1.17.0/src/libmpg123/parse.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/parse.lo b/jni/mpg123-1.17.0/src/libmpg123/parse.lo new file mode 100644 index 00000000..78f8beb4 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/parse.lo @@ -0,0 +1,12 @@ +# parse.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/parse.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/reader.h b/jni/mpg123-1.17.0/src/libmpg123/reader.h similarity index 83% rename from jni/mpg123-1.13.4/src/libmpg123/reader.h rename to jni/mpg123-1.17.0/src/libmpg123/reader.h index bcc4ce68..40a0ae83 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/reader.h +++ b/jni/mpg123-1.17.0/src/libmpg123/reader.h @@ -12,6 +12,7 @@ #include "config.h" #include "mpg123.h" +#ifndef NO_FEEDER struct buffy { unsigned char *data; @@ -20,6 +21,7 @@ struct buffy struct buffy *next; }; + struct bufferchain { struct buffy* first; /* The beginning of the chain. */ @@ -30,8 +32,24 @@ struct bufferchain ssize_t firstpos; /* The point of return on non-forget() */ /* The "real" filepos is fileoff + pos. */ off_t fileoff; /* Beginning of chain is at this file offset. */ + size_t bufblock; /* Default (minimal) size of buffers. */ + size_t pool_size; /* Keep that many buffers in storage. */ + size_t pool_fill; /* That many buffers are there. */ + /* A pool of buffers to re-use, if activated. It's a linked list that is worked on from the front. */ + struct buffy *pool; }; +/* Call this before any buffer chain use (even bc_init()). */ +void bc_prepare(struct bufferchain *, size_t pool_size, size_t bufblock); +/* Free persistent data in the buffer chain, after bc_reset(). */ +void bc_cleanup(struct bufferchain *); +/* Change pool size. This does not actually allocate/free anything on itself, just instructs later operations to free less / allocate more buffers. */ +void bc_poolsize(struct bufferchain *, size_t pool_size, size_t bufblock); +/* Return available byte count in the buffer. */ +size_t bc_fill(struct bufferchain *bc); + +#endif + struct reader_data { off_t filelen; /* total file length or total buffer size */ @@ -56,7 +74,9 @@ struct reader_data off_t (*lseek)(int fd, off_t offset, int whence); /* Buffered readers want that abstracted, set internally. */ ssize_t (*fullread)(mpg123_handle *, unsigned char *, ssize_t); +#ifndef NO_FEEDER struct bufferchain buffer; /* Not dynamically allocated, these few struct bytes aren't worth the trouble. */ +#endif }; /* start to use off_t to properly do LFS in future ... used to be long */ diff --git a/jni/mpg123-1.13.4/src/libmpg123/readers.c b/jni/mpg123-1.17.0/src/libmpg123/readers.c similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/readers.c rename to jni/mpg123-1.17.0/src/libmpg123/readers.c index ff480dc5..88c0fed2 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/readers.c +++ b/jni/mpg123-1.17.0/src/libmpg123/readers.c @@ -51,9 +51,6 @@ static ssize_t bc_give(struct bufferchain *bc, unsigned char *out, ssize_t size) static ssize_t bc_skip(struct bufferchain *bc, ssize_t count); static ssize_t bc_seekback(struct bufferchain *bc, ssize_t count); static void bc_forget(struct bufferchain *bc); -#else -#define bc_init(a) -#define bc_reset(a) #endif /* A normal read and a read with timeout. */ @@ -155,6 +152,7 @@ static ssize_t icy_fullread(mpg123_handle *fr, unsigned char *buf, ssize_t count { /* we have got some metadata */ char *meta_buff; + /* TODO: Get rid of this malloc ... perhaps hooking into the reader buffer pool? */ meta_buff = malloc(meta_size+1); if(meta_buff != NULL) { @@ -204,6 +202,9 @@ static ssize_t plain_fullread(mpg123_handle *fr,unsigned char *buf, ssize_t coun { ssize_t ret,cnt=0; +#ifdef EXTRA_DEBUG + debug1("plain fullread of %"SSIZE_P, (size_p)count); +#endif /* There used to be a check for expected file end here (length value or ID3 flag). This is not needed: @@ -241,7 +242,9 @@ static void stream_close(mpg123_handle *fr) fr->rdat.filept = 0; +#ifndef NO_FEEDER if(fr->rdat.flags & READER_BUFFERED) bc_reset(&fr->rdat.buffer); +#endif if(fr->rdat.flags & READER_HANDLEIO) { if(fr->rdat.cleanup_handle != NULL) fr->rdat.cleanup_handle(fr->rdat.iohandle); @@ -347,6 +350,7 @@ static off_t stream_skip_bytes(mpg123_handle *fr,off_t len) } return fr->rd->tell(fr); } +#ifndef NO_FEEDER else if(fr->rdat.flags & READER_BUFFERED) { /* Perhaps we _can_ go a bit back. */ if(fr->rdat.buffer.pos >= -len) @@ -360,6 +364,7 @@ static off_t stream_skip_bytes(mpg123_handle *fr,off_t len) return READER_ERROR; } } +#endif else { fr->err = MPG123_NO_SEEK; @@ -394,8 +399,10 @@ static int generic_read_frame_body(mpg123_handle *fr,unsigned char *buf, int siz static off_t generic_tell(mpg123_handle *fr) { +#ifndef NO_FEEDER if(fr->rdat.flags & READER_BUFFERED) fr->rdat.filepos = fr->rdat.buffer.fileoff+fr->rdat.buffer.pos; +#endif return fr->rdat.filepos; } @@ -404,13 +411,20 @@ static off_t generic_tell(mpg123_handle *fr) static void stream_rewind(mpg123_handle *fr) { if(fr->rdat.flags & READER_SEEKABLE) - fr->rdat.buffer.fileoff = fr->rdat.filepos = stream_lseek(fr,0,SEEK_SET); + { + fr->rdat.filepos = stream_lseek(fr,0,SEEK_SET); +#ifndef NO_FEEDER + fr->rdat.buffer.fileoff = fr->rdat.filepos; +#endif + } +#ifndef NO_FEEDER if(fr->rdat.flags & READER_BUFFERED) { fr->rdat.buffer.pos = 0; fr->rdat.buffer.firstpos = 0; fr->rdat.filepos = fr->rdat.buffer.fileoff; } +#endif } /* @@ -437,12 +451,136 @@ static off_t get_fileinfo(mpg123_handle *fr) return len; } -/* Let's work in nice 4K blocks, that may be nicely reusable (by malloc(), even). */ -#define BUFFBLOCK 4096 - #ifndef NO_FEEDER /* Methods for the buffer chain, mainly used for feed reader, but not just that. */ + +static struct buffy* buffy_new(size_t size, size_t minsize) +{ + struct buffy *newbuf; + newbuf = malloc(sizeof(struct buffy)); + if(newbuf == NULL) return NULL; + + newbuf->realsize = size > minsize ? size : minsize; + newbuf->data = malloc(newbuf->realsize); + if(newbuf->data == NULL) + { + free(newbuf); + return NULL; + } + newbuf->size = 0; + newbuf->next = NULL; + return newbuf; +} + +static void buffy_del(struct buffy* buf) +{ + if(buf) + { + free(buf->data); + free(buf); + } +} + +/* Delete this buffy and all following buffies. */ +static void buffy_del_chain(struct buffy* buf) +{ + while(buf) + { + struct buffy* next = buf->next; + buffy_del(buf); + buf = next; + } +} + +void bc_prepare(struct bufferchain *bc, size_t pool_size, size_t bufblock) +{ + bc_poolsize(bc, pool_size, bufblock); + bc->pool = NULL; + bc->pool_fill = 0; + bc_init(bc); /* Ensure that members are zeroed for read-only use. */ +} + +size_t bc_fill(struct bufferchain *bc) +{ + return (size_t)(bc->size - bc->pos); +} + +void bc_poolsize(struct bufferchain *bc, size_t pool_size, size_t bufblock) +{ + bc->pool_size = pool_size; + bc->bufblock = bufblock; +} + +void bc_cleanup(struct bufferchain *bc) +{ + buffy_del_chain(bc->pool); + bc->pool = NULL; + bc->pool_fill = 0; +} + +/* Fetch a buffer from the pool (if possible) or create one. */ +static struct buffy* bc_alloc(struct bufferchain *bc, size_t size) +{ + /* Easy route: Just try the first available buffer. + Size does not matter, it's only a hint for creation of new buffers. */ + if(bc->pool) + { + struct buffy *buf = bc->pool; + bc->pool = buf->next; + buf->next = NULL; /* That shall be set to a sensible value later. */ + buf->size = 0; + --bc->pool_fill; + debug2("bc_alloc: picked %p from pool (fill now %"SIZE_P")", (void*)buf, (size_p)bc->pool_fill); + return buf; + } + else return buffy_new(size, bc->bufblock); +} + +/* Either stuff the buffer back into the pool or free it for good. */ +static void bc_free(struct bufferchain *bc, struct buffy* buf) +{ + if(!buf) return; + + if(bc->pool_fill < bc->pool_size) + { + buf->next = bc->pool; + bc->pool = buf; + ++bc->pool_fill; + } + else buffy_del(buf); +} + +/* Make the buffer count in the pool match the pool size. */ +static int bc_fill_pool(struct bufferchain *bc) +{ + /* Remove superfluous ones. */ + while(bc->pool_fill > bc->pool_size) + { + /* Lazyness: Just work on the front. */ + struct buffy* buf = bc->pool; + bc->pool = buf->next; + buffy_del(buf); + --bc->pool_fill; + } + + /* Add missing ones. */ + while(bc->pool_fill < bc->pool_size) + { + /* Again, just work on the front. */ + struct buffy* buf; + buf = buffy_new(0, bc->bufblock); /* Use default block size. */ + if(!buf) return -1; + + buf->next = bc->pool; + bc->pool = buf; + ++bc->pool_fill; + } + + return 0; +} + + static void bc_init(struct bufferchain *bc) { bc->first = NULL; @@ -455,15 +593,14 @@ static void bc_init(struct bufferchain *bc) static void bc_reset(struct bufferchain *bc) { - /* free the buffer chain */ - struct buffy *b = bc->first; - while(b != NULL) + /* Free current chain, possibly stuffing back into the pool. */ + while(bc->first) { - struct buffy *n = b->next; - free(b->data); - free(b); - b = n; + struct buffy* buf = bc->first; + bc->first = buf->next; + bc_free(bc, buf); } + bc_fill_pool(bc); /* Ignoring an error here... */ bc_init(bc); } @@ -473,53 +610,17 @@ static int bc_append(struct bufferchain *bc, ssize_t size) struct buffy *newbuf; if(size < 1) return -1; - newbuf = malloc(sizeof(struct buffy)); + newbuf = bc_alloc(bc, size); if(newbuf == NULL) return -2; - newbuf->realsize = size > BUFFBLOCK ? size : BUFFBLOCK; - newbuf->data = malloc(newbuf->realsize); - if(newbuf->data == NULL) - { - free(newbuf); - return -3; - } - newbuf->size = size; - newbuf->next = NULL; if(bc->last != NULL) bc->last->next = newbuf; else if(bc->first == NULL) bc->first = newbuf; bc->last = newbuf; - bc->size += size; + debug3("bc_append: new last buffer %p with %"SSIZE_P" B (really %"SSIZE_P")", (void*)bc->last, (ssize_p)bc->last->size, (ssize_p)bc->last->realsize); return 0; } -#if 0 -/* Drop the last one (again). - This is not optimal but should happen on error situations only, anyway. */ -static void bc_drop(struct bufferchain *bc) -{ - struct buffy *cur = bc->first; - if(bc->first == NULL || bc->last == NULL) return; - /* Special case: only one buffer there. */ - if(cur->next == NULL) - { - free(cur->data); - free(cur); - bc->first = bc->last = NULL; - bc->size = 0; - return; - } - /* Find the pre-last buffy. If chain is consistent, this _will_ succeed. */ - while(cur->next != bc->last){ cur = cur->next; } - - bc->size -= bc->last->size; - free(bc->last->data); - free(bc->last); - cur->next = NULL; - bc->last = cur; -} -#endif - /* Append a new buffer and copy content to it. */ static int bc_add(struct bufferchain *bc, const unsigned char *data, ssize_t size) { @@ -528,23 +629,27 @@ static int bc_add(struct bufferchain *bc, const unsigned char *data, ssize_t siz debug2("bc_add: adding %"SSIZE_P" bytes at %"OFF_P, (ssize_p)size, (off_p)(bc->fileoff+bc->size)); if(size >=4) debug4("first bytes: %02x %02x %02x %02x", data[0], data[1], data[2], data[3]); - /* Try to fill up the last buffer block. */ - if(bc->last != NULL && bc->last->size < bc->last->realsize) + while(size > 0) { - part = bc->last->realsize - bc->last->size; - if(part > size) part = size; + /* Try to fill up the last buffer block. */ + if(bc->last != NULL && bc->last->size < bc->last->realsize) + { + part = bc->last->realsize - bc->last->size; + if(part > size) part = size; - memcpy(bc->last->data+bc->last->size, data, part); - bc->last->size += part; - size -= part; - bc->size += part; + debug2("bc_add: adding %"SSIZE_P" B to existing block %p", (ssize_p)part, (void*)bc->last); + memcpy(bc->last->data+bc->last->size, data, part); + bc->last->size += part; + size -= part; + bc->size += part; + data += part; + } + + /* If there is still data left, put it into a new buffer block. */ + if(size > 0 && (ret = bc_append(bc, size)) != 0) + break; } - - /* If there is still data left, put it into a new buffer block. */ - if(size > 0 && (ret = bc_append(bc, size)) == 0) - memcpy(bc->last->data, data+part, size); - return ret; } @@ -632,8 +737,7 @@ static void bc_forget(struct bufferchain *bc) debug5("bc_forget: forgot %p with %lu, pos=%li, size=%li, fileoff=%li", (void*)b->data, (long)b->size, (long)bc->pos, (long)bc->size, (long)bc->fileoff); - free(b->data); - free(b); + bc_free(bc, b); b = n; } bc->first = b; @@ -645,6 +749,7 @@ static void bc_forget(struct bufferchain *bc) static int feed_init(mpg123_handle *fr) { bc_init(&fr->rdat.buffer); + bc_fill_pool(&fr->rdat.buffer); fr->rdat.filelen = 0; fr->rdat.filepos = 0; fr->rdat.flags |= READER_BUFFERED; @@ -728,12 +833,12 @@ static ssize_t buffered_fullread(mpg123_handle *fr, unsigned char *out, ssize_t ssize_t gotcount; if(bc->size - bc->pos < count) { /* Add more stuff to buffer. If hitting end of file, adjust count. */ - unsigned char readbuf[BUFFBLOCK]; + unsigned char readbuf[4096]; ssize_t need = count - (bc->size-bc->pos); while(need>0) { int ret; - ssize_t got = fr->rdat.fullread(fr, readbuf, BUFFBLOCK); + ssize_t got = fr->rdat.fullread(fr, readbuf, sizeof(readbuf)); if(got < 0) { if(NOQUIET) error("buffer reading"); @@ -748,7 +853,7 @@ static ssize_t buffered_fullread(mpg123_handle *fr, unsigned char *out, ssize_t } need -= got; /* May underflow here... */ - if(got < BUFFBLOCK) /* That naturally catches got == 0, too. */ + if(got < sizeof(readbuf)) /* That naturally catches got == 0, too. */ { if(VERBOSE3) fprintf(stderr, "Note: Input data end.\n"); break; /* End. */ @@ -939,8 +1044,10 @@ static int default_init(mpg123_handle *fr) fr->rdat.read = fr->rdat.r_read != NULL ? fr->rdat.r_read : posix_read; fr->rdat.lseek = fr->rdat.r_lseek != NULL ? fr->rdat.r_lseek : posix_lseek; +#ifndef NO_ICY /* ICY streams of any sort shall not be seekable. */ if(fr->p.icy_interval > 0) fr->rdat.lseek = nix_lseek; +#endif fr->rdat.filelen = get_fileinfo(fr); fr->rdat.filepos = 0; @@ -994,12 +1101,16 @@ static int default_init(mpg123_handle *fr) void open_bad(mpg123_handle *mh) { + debug("open_bad"); #ifndef NO_ICY clear_icy(&mh->icy); #endif mh->rd = &bad_reader; mh->rdat.flags = 0; +#ifndef NO_FEEDER bc_init(&mh->rdat.buffer); +#endif + mh->rdat.filelen = -1; } int open_feed(mpg123_handle *fr) @@ -1022,6 +1133,8 @@ int open_feed(mpg123_handle *fr) fr->rd = &readers[READER_FEED]; fr->rdat.flags = 0; if(fr->rd->init(fr) < 0) return -1; + + debug("feed reader init successful"); return 0; #endif /* NO_FEEDER */ } diff --git a/jni/mpg123-1.17.0/src/libmpg123/readers.lo b/jni/mpg123-1.17.0/src/libmpg123/readers.lo new file mode 100644 index 00000000..eecc0d4a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/readers.lo @@ -0,0 +1,12 @@ +# readers.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/readers.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/sample.h b/jni/mpg123-1.17.0/src/libmpg123/sample.h similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/sample.h rename to jni/mpg123-1.17.0/src/libmpg123/sample.h index 08df28b1..d021b896 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/sample.h +++ b/jni/mpg123-1.17.0/src/libmpg123/sample.h @@ -88,12 +88,32 @@ static inline short ftoi16(float x) /* The actual storage of a decoded sample is separated in the following macros. We can handle different types, we could also handle dithering here. */ +#ifdef NEWOLD_WRITE_SAMPLE + +/* This is the old new mpg123 WRITE_SAMPLE, fixed for newer GCC by MPlayer folks. + Makes a huge difference on old machines. */ +#if WORDS_BIGENDIAN +#define MANTISSA_OFFSET 1 +#else +#define MANTISSA_OFFSET 0 +#endif +#define WRITE_SHORT_SAMPLE(samples,sum,clip) { \ + union { double dtemp; int itemp[2]; } u; int v; \ + u.dtemp = ((((65536.0 * 65536.0 * 16)+(65536.0 * 0.5))* 65536.0)) + (sum);\ + v = u.itemp[MANTISSA_OFFSET] - 0x80000000; \ + if( v > 32767) { *(samples) = 0x7fff; (clip)++; } \ + else if( v < -32768) { *(samples) = -0x8000; (clip)++; } \ + else { *(samples) = v; } \ +} + +#else /* Macro to produce a short (signed 16bit) output sample from internal representation, which may be float, double or indeed some integer for fixed point handling. */ #define WRITE_SHORT_SAMPLE(samples,sum,clip) \ if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \ else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \ else { *(samples) = REAL_TO_SHORT(sum); } +#endif /* Same as above, but always using accurate rounding. Would we want softer clipping here, too? */ #define WRITE_SHORT_SAMPLE_ACCURATE(samples,sum,clip) \ diff --git a/jni/mpg123-1.13.4/src/libmpg123/stringbuf.c b/jni/mpg123-1.17.0/src/libmpg123/stringbuf.c similarity index 87% rename from jni/mpg123-1.13.4/src/libmpg123/stringbuf.c rename to jni/mpg123-1.17.0/src/libmpg123/stringbuf.c index 40d0d4e2..8aeaa43f 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/stringbuf.c +++ b/jni/mpg123-1.17.0/src/libmpg123/stringbuf.c @@ -161,3 +161,26 @@ size_t attribute_align_arg mpg123_strlen(mpg123_string *sb, int utf8) return len; } } + +int attribute_align_arg mpg123_chomp_string(mpg123_string *sb) +{ + ssize_t i; + if(!sb || !sb->fill) return 0; + + /* Ensure that it is zero-terminated. */ + sb->p[sb->fill-1] = 0; + for(i=sb->fill-2; i>=0; --i) + { + char *c = sb->p+i; + /* Stop at the first proper character. */ + if(*c && *c != '\r' && *c != '\n') break; + else *c = 0; + } + /* initial fill at least 1, so i at least -1, + +2 means nothing happened for fill=1 . + With i=0, we got one non-null character, fill shall be 2 + to accomodate the trailing zero. */ + sb->fill = (size_t)i+2; + + return 1; +} diff --git a/jni/mpg123-1.17.0/src/libmpg123/stringbuf.lo b/jni/mpg123-1.17.0/src/libmpg123/stringbuf.lo new file mode 100644 index 00000000..332e8fad --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/stringbuf.lo @@ -0,0 +1,12 @@ +# stringbuf.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/stringbuf.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth.c b/jni/mpg123-1.17.0/src/libmpg123/synth.c similarity index 82% rename from jni/mpg123-1.13.4/src/libmpg123/synth.c rename to jni/mpg123-1.17.0/src/libmpg123/synth.c index 582e0995..411dc82f 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth.c +++ b/jni/mpg123-1.17.0/src/libmpg123/synth.c @@ -105,7 +105,7 @@ int synth_1to1_i586_dither(real *bandPtr, int channel, mpg123_handle *fr, int fi } #endif -#ifdef OPT_3DNOW +#if defined(OPT_3DNOW) || defined(OPT_3DNOW_VINTAGE) /* Those are defined in assembler. */ void do_equalizer_3dnow(real *bandPtr,int channel, real equalizer[2][32]); int synth_1to1_3dnow_asm(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin); @@ -139,7 +139,7 @@ int synth_1to1_mmx(real *bandPtr, int channel, mpg123_handle *fr, int final) } #endif -#ifdef OPT_SSE +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) #ifdef ACCURATE_ROUNDING /* This is defined in assembler. */ int synth_1to1_sse_accurate_asm(real *window, real *b0, short *samples, int bo1); @@ -244,7 +244,7 @@ int synth_1to1_sse(real *bandPtr, int channel, mpg123_handle *fr, int final) #endif #endif -#ifdef OPT_3DNOWEXT +#if defined(OPT_3DNOWEXT) || defined(OPT_3DNOWEXT_VINTAGE) /* This is defined in assembler. */ void synth_1to1_3dnowext_asm(real *bandPtr, int channel, short *samples, short *buffs, int *bo, real *decwin); /* This is just a hull to use the mpg123 handle. */ @@ -440,6 +440,192 @@ int synth_1to1_stereo_x86_64(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) #endif #endif +#ifdef OPT_AVX +#ifdef ACCURATE_ROUNDING +/* Assembler routines. */ +#ifndef OPT_X86_64 +int synth_1to1_x86_64_accurate_asm(real *window, real *b0, short *samples, int bo1); +#endif +int synth_1to1_s_avx_accurate_asm(real *window, real *b0l, real *b0r, short *samples, int bo1); +void dct64_real_avx(real *out0, real *out1, real *samples); +/* Hull for C mpg123 API */ +int synth_1to1_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) +{ + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + + real *b0, **buf; + int bo1; + int clip; + + if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); + + if(!channel) + { + fr->bo--; + fr->bo &= 0xf; + buf = fr->real_buffs[0]; + } + else + { + samples++; + buf = fr->real_buffs[1]; + } + + if(fr->bo & 0x1) + { + b0 = buf[0]; + bo1 = fr->bo; + dct64_real_avx(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr); + } + else + { + b0 = buf[1]; + bo1 = fr->bo+1; + dct64_real_avx(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); + } + + clip = synth_1to1_x86_64_accurate_asm(fr->decwin, b0, samples, bo1); + + if(final) fr->buffer.fill += 128; + + return clip; +} + +int synth_1to1_stereo_avx(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) +{ + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + + real *b0l, *b0r, **bufl, **bufr; + int bo1; + int clip; + + if(fr->have_eq_settings) + { + do_equalizer(bandPtr_l,0,fr->equalizer); + do_equalizer(bandPtr_r,1,fr->equalizer); + } + + fr->bo--; + fr->bo &= 0xf; + bufl = fr->real_buffs[0]; + bufr = fr->real_buffs[1]; + + if(fr->bo & 0x1) + { + b0l = bufl[0]; + b0r = bufr[0]; + bo1 = fr->bo; + dct64_real_avx(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l); + dct64_real_avx(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r); + } + else + { + b0l = bufl[1]; + b0r = bufr[1]; + bo1 = fr->bo+1; + dct64_real_avx(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); + dct64_real_avx(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); + } + + clip = synth_1to1_s_avx_accurate_asm(fr->decwin, b0l, b0r, samples, bo1); + + fr->buffer.fill += 128; + + return clip; +} +#else +/* This is defined in assembler. */ +#ifndef OPT_X86_64 +int synth_1to1_x86_64_asm(short *window, short *b0, short *samples, int bo1); +#endif +int synth_1to1_s_avx_asm(short *window, short *b0l, short *b0r, short *samples, int bo1); +void dct64_avx(short *out0, short *out1, real *samples); +/* This is just a hull to use the mpg123 handle. */ +int synth_1to1_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) +{ + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *b0, **buf; + int clip; + int bo1; + + if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); + + if(!channel) + { + fr->bo--; + fr->bo &= 0xf; + buf = fr->short_buffs[0]; + } + else + { + samples++; + buf = fr->short_buffs[1]; + } + + if(fr->bo & 0x1) + { + b0 = buf[0]; + bo1 = fr->bo; + dct64_avx(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr); + } + else + { + b0 = buf[1]; + bo1 = fr->bo+1; + dct64_avx(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); + } + + clip = synth_1to1_x86_64_asm((short *)fr->decwins, b0, samples, bo1); + + if(final) fr->buffer.fill += 128; + + return clip; +} + +int synth_1to1_stereo_avx(real *bandPtr_l,real *bandPtr_r, mpg123_handle *fr) +{ + short *samples = (short *) (fr->buffer.data+fr->buffer.fill); + short *b0l, *b0r, **bufl, **bufr; + int clip; + int bo1; + + if(fr->have_eq_settings) + { + do_equalizer(bandPtr_l,0,fr->equalizer); + do_equalizer(bandPtr_r,1,fr->equalizer); + } + + fr->bo--; + fr->bo &= 0xf; + bufl = fr->short_buffs[0]; + bufr = fr->short_buffs[1]; + + if(fr->bo & 0x1) + { + b0l = bufl[0]; + b0r = bufr[0]; + bo1 = fr->bo; + dct64_avx(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l); + dct64_avx(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r); + } + else + { + b0l = bufl[1]; + b0r = bufr[1]; + bo1 = fr->bo+1; + dct64_avx(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); + dct64_avx(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); + } + + clip = synth_1to1_s_avx_asm((short *)fr->decwins, b0l, b0r, samples, bo1); + + fr->buffer.fill += 128; + + return clip; +} +#endif +#endif + #ifdef OPT_ARM #ifdef ACCURATE_ROUNDING /* Assembler routines. */ diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth.h b/jni/mpg123-1.17.0/src/libmpg123/synth.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth.h rename to jni/mpg123-1.17.0/src/libmpg123/synth.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth.lo b/jni/mpg123-1.17.0/src/libmpg123/synth.lo new file mode 100644 index 00000000..6ccef730 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth.lo @@ -0,0 +1,12 @@ +# synth.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/synth.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_3dnow.S b/jni/mpg123-1.17.0/src/libmpg123/synth_3dnow.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_3dnow.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_3dnow.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_3dnowext.S b/jni/mpg123-1.17.0/src/libmpg123/synth_3dnowext.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_3dnowext.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_3dnowext.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_8bit.c b/jni/mpg123-1.17.0/src/libmpg123/synth_8bit.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_8bit.c rename to jni/mpg123-1.17.0/src/libmpg123/synth_8bit.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_8bit.h b/jni/mpg123-1.17.0/src/libmpg123/synth_8bit.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_8bit.h rename to jni/mpg123-1.17.0/src/libmpg123/synth_8bit.h diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_8bit.lo b/jni/mpg123-1.17.0/src/libmpg123/synth_8bit.lo new file mode 100644 index 00000000..c62dc141 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_8bit.lo @@ -0,0 +1,12 @@ +# synth_8bit.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/synth_8bit.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_altivec.c b/jni/mpg123-1.17.0/src/libmpg123/synth_altivec.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_altivec.c rename to jni/mpg123-1.17.0/src/libmpg123/synth_altivec.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_arm.S b/jni/mpg123-1.17.0/src/libmpg123/synth_arm.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_arm.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_arm.S index e6d9e2e3..cdb37548 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_arm.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_arm.S @@ -35,7 +35,7 @@ ASM_NAME(synth_1to1_arm_asm): ldr r5, [WINDOW], #4 ldr r6, [B0], #4 -.Loop_start_1: +1: ldr r8, [WINDOW], #4 ldr r9, [B0], #4 mul r7, r5, r6 @@ -98,7 +98,7 @@ ASM_NAME(synth_1to1_arm_asm): strh r7, [SAMPLES], #4 subs r3, r3, #1 - bne .Loop_start_1 + bne 1b add WINDOW, WINDOW, #4 add B0, B0, #4 @@ -142,7 +142,7 @@ ASM_NAME(synth_1to1_arm_asm): mov r3, #14 -.Loop_start_2: +1: ldr r8, [WINDOW], #4 ldr r9, [B0], #4 mul r7, r5, r6 @@ -205,7 +205,7 @@ ASM_NAME(synth_1to1_arm_asm): strh r7, [SAMPLES], #4 subs r3, r3, #1 - bne .Loop_start_2 + bne 1b ldr r8, [WINDOW], #4 ldr r9, [B0], #4 diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_arm.lo b/jni/mpg123-1.17.0/src/libmpg123/synth_arm.lo new file mode 100644 index 00000000..be257178 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_arm.lo @@ -0,0 +1,12 @@ +# synth_arm.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/synth_arm.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_arm_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_arm_accurate.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_arm_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_arm_accurate.S index 073f778c..4dde5405 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_arm_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_arm_accurate.S @@ -35,7 +35,7 @@ ASM_NAME(synth_1to1_arm_accurate_asm): ldr r5, [WINDOW], #4 ldr r6, [B0], #4 -.Loop_start_1: +1: ldr r9, [WINDOW], #4 ldr r10, [B0], #4 smull r8, r7, r5, r6 @@ -102,7 +102,7 @@ ASM_NAME(synth_1to1_arm_accurate_asm): strh r8, [SAMPLES], #4 subs r3, r3, #1 - bne .Loop_start_1 + bne 1b add WINDOW, WINDOW, #4 add B0, B0, #4 @@ -150,7 +150,7 @@ ASM_NAME(synth_1to1_arm_accurate_asm): mov r3, #14 -.Loop_start_2: +1: ldr r9, [WINDOW], #4 ldr r10, [B0], #4 smull r8, r7, r5, r6 @@ -217,7 +217,7 @@ ASM_NAME(synth_1to1_arm_accurate_asm): strh r8, [SAMPLES], #4 subs r3, r3, #1 - bne .Loop_start_2 + bne 1b ldr r9, [WINDOW], #4 ldr r10, [B0], #4 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_i486.c b/jni/mpg123-1.17.0/src/libmpg123/synth_i486.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_i486.c rename to jni/mpg123-1.17.0/src/libmpg123/synth_i486.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_i586.S b/jni/mpg123-1.17.0/src/libmpg123/synth_i586.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_i586.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_i586.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_i586_dither.S b/jni/mpg123-1.17.0/src/libmpg123/synth_i586_dither.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_i586_dither.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_i586_dither.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_mmx.S b/jni/mpg123-1.17.0/src/libmpg123/synth_mmx.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_mmx.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_mmx.S index fda44649..b3ace8bc 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_mmx.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_mmx.S @@ -31,12 +31,12 @@ ASM_NAME(synth_1to1_MMX): decl %ecx movl 32(%esp),%esi movl (%edx),%eax - jecxz .L1 + jecxz 1f decl %eax andl %ebx,%eax leal 1088(%esi),%esi movl %eax,(%edx) -.L1: +1: leal (%esi,%eax,2),%edx movl %eax,%ebp incl %eax @@ -45,11 +45,11 @@ ASM_NAME(synth_1to1_MMX): leal 544(%esi,%eax,2),%ecx incl %ebx testl $1, %eax - jnz .L2 + jnz 2f xchgl %edx,%ecx incl %ebp leal 544(%esi),%esi -.L2: +2: pushl %edx pushl %ecx call ASM_NAME(dct64_MMX) @@ -61,7 +61,7 @@ ASM_NAME(synth_1to1_MMX): movl 44(%esp),%eax /* decwins */ leal (%eax,%ebx,2), %edx popl %eax -.L3: +3: movq (%edx),%mm0 pmaddwd (%esi),%mm0 movq 8(%edx),%mm1 @@ -84,12 +84,12 @@ ASM_NAME(synth_1to1_MMX): leal 32(%esi),%esi leal 64(%edx),%edx leal 4(%edi),%edi - loop .L3 + loop 3b subl $64,%esi movl $15,%ecx -.L4: +4: movq (%edx),%mm0 pmaddwd (%esi),%mm0 movq 8(%edx),%mm1 @@ -114,7 +114,7 @@ ASM_NAME(synth_1to1_MMX): subl $32,%esi addl $64,%edx leal 4(%edi),%edi - loop .L4 + loop 4b emms popl %ebx popl %esi diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_mono.h b/jni/mpg123-1.17.0/src/libmpg123/synth_mono.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_mono.h rename to jni/mpg123-1.17.0/src/libmpg123/synth_mono.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_neon.S b/jni/mpg123-1.17.0/src/libmpg123/synth_neon.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_neon.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_neon.S index d37db7c0..6b188525 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_neon.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_neon.S @@ -19,6 +19,7 @@ .text .globl ASM_NAME(synth_1to1_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_neon_asm): push {r4-r5, lr} vpush {q4-q7} @@ -28,7 +29,7 @@ ASM_NAME(synth_1to1_neon_asm): mov r3, #4 mov r4, #64 -.Loop_start_1: +1: vld1.16 {d0-d3}, [WINDOW], r4 vld1.16 {d4-d7}, [B0, :128]! vld1.16 {d8-d11}, [WINDOW], r4 @@ -69,11 +70,11 @@ ASM_NAME(synth_1to1_neon_asm): vst2.16 {d1,d3}, [SAMPLES]! subs r3, r3, #1 - bne .Loop_start_1 + bne 1b mov r3, #4 mov r5, #-32 -.Loop_start_2: +1: vld1.16 {d0-d3}, [WINDOW], r4 vld1.16 {d4-d7}, [B0, :128], r5 vld1.16 {d8-d11}, [WINDOW], r4 @@ -114,7 +115,7 @@ ASM_NAME(synth_1to1_neon_asm): vst2.16 {d1,d3}, [SAMPLES]! subs r3, r3, #1 - bne .Loop_start_2 + bne 1b mov r0, #0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_accurate.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_neon_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_neon_accurate.S index 5fd3b554..5e31b805 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_accurate.S @@ -32,7 +32,7 @@ ASM_NAME(synth_1to1_neon_accurate_asm): mov r3, #4 mov r4, #128 mov r5, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -94,11 +94,11 @@ ASM_NAME(synth_1to1_neon_accurate_asm): vst1.32 {q5}, [sp, :128] subs r3, r3, #1 - bne .Loop_start_1 + bne 1b mov r3, #4 mov r5, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -161,7 +161,7 @@ ASM_NAME(synth_1to1_neon_accurate_asm): vst1.32 {q5}, [sp, :128] subs r3, r3, #1 - bne .Loop_start_2 + bne 1b vld1.32 {q0}, [sp, :128] vpadd.i32 d0, d0, d1 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_float.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_neon_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_neon_float.S index fb43d9b6..27182db1 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_float.S @@ -19,6 +19,7 @@ .text .globl ASM_NAME(synth_1to1_real_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_real_neon_asm): push {r4-r5, lr} vpush {q4-q7} @@ -29,7 +30,7 @@ ASM_NAME(synth_1to1_real_neon_asm): mov r3, #4 mov r4, #128 mov r5, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -82,11 +83,11 @@ ASM_NAME(synth_1to1_real_neon_asm): vst2.32 {q4,q5}, [SAMPLES]! subs r3, r3, #1 - bne .Loop_start_1 + bne 1b mov r3, #4 mov r5, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -140,7 +141,7 @@ ASM_NAME(synth_1to1_real_neon_asm): vst2.32 {q4,q5}, [SAMPLES]! subs r3, r3, #1 - bne .Loop_start_2 + bne 1b mov r0, #0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_s32.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_neon_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_neon_s32.S index bd88b614..57eb4e6d 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_neon_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_neon_s32.S @@ -19,6 +19,7 @@ .text .globl ASM_NAME(synth_1to1_s32_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_s32_neon_asm): push {r4-r6, lr} vpush {q4-q7} @@ -32,7 +33,7 @@ ASM_NAME(synth_1to1_s32_neon_asm): mov r3, #4 mov r4, #128 mov r5, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -91,11 +92,11 @@ ASM_NAME(synth_1to1_s32_neon_asm): vst1.32 {q5}, [sp, :128] subs r3, r3, #1 - bne .Loop_start_1 + bne 1b mov r3, #4 mov r5, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r4 vld1.32 {q2,q3}, [WINDOW], r4 vld1.32 {q4,q5}, [WINDOW], r4 @@ -155,7 +156,7 @@ ASM_NAME(synth_1to1_s32_neon_asm): vst1.32 {q5}, [sp, :128] subs r3, r3, #1 - bne .Loop_start_2 + bne 1b vld1.32 {q0}, [sp, :128] vpadd.i32 d0, d0, d1 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_ntom.h b/jni/mpg123-1.17.0/src/libmpg123/synth_ntom.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_ntom.h rename to jni/mpg123-1.17.0/src/libmpg123/synth_ntom.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_real.c b/jni/mpg123-1.17.0/src/libmpg123/synth_real.c similarity index 82% rename from jni/mpg123-1.13.4/src/libmpg123/synth_real.c rename to jni/mpg123-1.17.0/src/libmpg123/synth_real.c index 3d73bc1d..d20b0f0f 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_real.c +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_real.c @@ -140,7 +140,99 @@ int synth_1to1_real_stereo_x86_64(real *bandPtr_l, real *bandPtr_r, mpg123_handl } #endif -#ifdef OPT_SSE +#ifdef OPT_AVX +/* Assembler routines. */ +#ifndef OPT_X86_64 +int synth_1to1_real_x86_64_asm(real *window, real *b0, real *samples, int bo1); +#endif +int synth_1to1_real_s_avx_asm(real *window, real *b0l, real *b0r, real *samples, int bo1); +void dct64_real_avx(real *out0, real *out1, real *samples); +/* Hull for C mpg123 API */ +int synth_1to1_real_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) +{ + real *samples = (real *) (fr->buffer.data+fr->buffer.fill); + + real *b0, **buf; + int bo1; + + if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); + + if(!channel) + { + fr->bo--; + fr->bo &= 0xf; + buf = fr->real_buffs[0]; + } + else + { + samples++; + buf = fr->real_buffs[1]; + } + + if(fr->bo & 0x1) + { + b0 = buf[0]; + bo1 = fr->bo; + dct64_real_avx(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr); + } + else + { + b0 = buf[1]; + bo1 = fr->bo+1; + dct64_real_avx(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); + } + + synth_1to1_real_x86_64_asm(fr->decwin, b0, samples, bo1); + + if(final) fr->buffer.fill += 256; + + return 0; +} + +int synth_1to1_real_stereo_avx(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) +{ + real *samples = (real *) (fr->buffer.data+fr->buffer.fill); + + real *b0l, *b0r, **bufl, **bufr; + int bo1; + + if(fr->have_eq_settings) + { + do_equalizer(bandPtr_l,0,fr->equalizer); + do_equalizer(bandPtr_r,1,fr->equalizer); + } + + fr->bo--; + fr->bo &= 0xf; + bufl = fr->real_buffs[0]; + bufr = fr->real_buffs[1]; + + if(fr->bo & 0x1) + { + b0l = bufl[0]; + b0r = bufr[0]; + bo1 = fr->bo; + dct64_real_avx(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l); + dct64_real_avx(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r); + } + else + { + b0l = bufl[1]; + b0r = bufr[1]; + bo1 = fr->bo+1; + dct64_real_avx(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); + dct64_real_avx(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); + } + + synth_1to1_real_s_avx_asm(fr->decwin, b0l, b0r, samples, bo1); + + fr->buffer.fill += 256; + + return 0; +} +#endif + +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) /* Assembler routines. */ int synth_1to1_real_sse_asm(real *window, real *b0, real *samples, int bo1); int synth_1to1_real_s_sse_asm(real *window, real *b0l, real *b0r, real *samples, int bo1); diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_s32.c b/jni/mpg123-1.17.0/src/libmpg123/synth_s32.c similarity index 82% rename from jni/mpg123-1.13.4/src/libmpg123/synth_s32.c rename to jni/mpg123-1.17.0/src/libmpg123/synth_s32.c index 93f41059..36b286ba 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_s32.c +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_s32.c @@ -139,7 +139,102 @@ int synth_1to1_s32_stereo_x86_64(real *bandPtr_l, real *bandPtr_r, mpg123_handle } #endif -#ifdef OPT_SSE +#ifdef OPT_AVX +/* Assembler routines. */ +#ifndef OPT_x86_64 +int synth_1to1_s32_x86_64_asm(real *window, real *b0, int32_t *samples, int bo1); +#endif +int synth_1to1_s32_s_avx_asm(real *window, real *b0l, real *b0r, int32_t *samples, int bo1); +void dct64_real_avx(real *out0, real *out1, real *samples); +/* Hull for C mpg123 API */ +int synth_1to1_s32_avx(real *bandPtr,int channel, mpg123_handle *fr, int final) +{ + int32_t *samples = (int32_t *) (fr->buffer.data+fr->buffer.fill); + + real *b0, **buf; + int bo1; + int clip; + + if(fr->have_eq_settings) do_equalizer(bandPtr,channel,fr->equalizer); + + if(!channel) + { + fr->bo--; + fr->bo &= 0xf; + buf = fr->real_buffs[0]; + } + else + { + samples++; + buf = fr->real_buffs[1]; + } + + if(fr->bo & 0x1) + { + b0 = buf[0]; + bo1 = fr->bo; + dct64_real_avx(buf[1]+((fr->bo+1)&0xf),buf[0]+fr->bo,bandPtr); + } + else + { + b0 = buf[1]; + bo1 = fr->bo+1; + dct64_real_avx(buf[0]+fr->bo,buf[1]+fr->bo+1,bandPtr); + } + + clip = synth_1to1_s32_x86_64_asm(fr->decwin, b0, samples, bo1); + + if(final) fr->buffer.fill += 256; + + return clip; +} + + +int synth_1to1_s32_stereo_avx(real *bandPtr_l, real *bandPtr_r, mpg123_handle *fr) +{ + int32_t *samples = (int32_t *) (fr->buffer.data+fr->buffer.fill); + + real *b0l, *b0r, **bufl, **bufr; + int bo1; + int clip; + + if(fr->have_eq_settings) + { + do_equalizer(bandPtr_l,0,fr->equalizer); + do_equalizer(bandPtr_r,1,fr->equalizer); + } + + fr->bo--; + fr->bo &= 0xf; + bufl = fr->real_buffs[0]; + bufr = fr->real_buffs[1]; + + if(fr->bo & 0x1) + { + b0l = bufl[0]; + b0r = bufr[0]; + bo1 = fr->bo; + dct64_real_avx(bufl[1]+((fr->bo+1)&0xf),bufl[0]+fr->bo,bandPtr_l); + dct64_real_avx(bufr[1]+((fr->bo+1)&0xf),bufr[0]+fr->bo,bandPtr_r); + } + else + { + b0l = bufl[1]; + b0r = bufr[1]; + bo1 = fr->bo+1; + dct64_real_avx(bufl[0]+fr->bo,bufl[1]+fr->bo+1,bandPtr_l); + dct64_real_avx(bufr[0]+fr->bo,bufr[1]+fr->bo+1,bandPtr_r); + } + + clip = synth_1to1_s32_s_avx_asm(fr->decwin, b0l, b0r, samples, bo1); + + fr->buffer.fill += 256; + + return clip; +} +#endif + +#if defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) /* Assembler routines. */ int synth_1to1_s32_sse_asm(real *window, real *b0, int32_t *samples, int bo1); int synth_1to1_s32_s_sse_asm(real *window, real *b0l, real *b0r, int32_t *samples, int bo1); diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_sse.S b/jni/mpg123-1.17.0/src/libmpg123/synth_sse.S similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synth_sse.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_sse.S diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_sse3d.h b/jni/mpg123-1.17.0/src/libmpg123/synth_sse3d.h similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_sse3d.h rename to jni/mpg123-1.17.0/src/libmpg123/synth_sse3d.h index 47a1ba9c..36c89490 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_sse3d.h +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_sse3d.h @@ -63,12 +63,12 @@ SYNTH_NAME: decl %ecx movl 20(%ebp),%esi movl (%edx),%eax - jecxz .L01 + jecxz 1f decl %eax andl %ebx,%eax leal 1088(%esi),%esi movl %eax,(%edx) - .L01: +1: leal (%esi,%eax,2),%edx movl %eax,TEMP incl %eax @@ -76,11 +76,11 @@ SYNTH_NAME: leal 544(%esi,%eax,2),%ecx incl %ebx testl $1, %eax - jnz .L02 + jnz 2f xchgl %edx,%ecx incl TEMP leal 544(%esi),%esi - .L02: +2: pushl 8(%ebp) pushl %edx pushl %ecx @@ -95,7 +95,7 @@ SYNTH_NAME: movl (%esp),%ecx /* restore, but leave value on stack */ shrl $1, %ecx ALIGN16 - .L03: +3: movq (%edx),%mm0 movq 64(%edx),%mm4 pmaddwd (%esi),%mm0 @@ -138,10 +138,10 @@ SYNTH_NAME: leal 128(%edx),%edx leal 8(%edi),%edi decl %ecx - jnz .L03 + jnz 3b popl %ecx andl $1, %ecx - jecxz .next_loop + jecxz 4f movq (%edx),%mm0 pmaddwd (%esi),%mm0 movq 8(%edx),%mm1 @@ -163,11 +163,11 @@ SYNTH_NAME: leal 32(%esi),%esi leal 64(%edx),%edx leal 4(%edi),%edi - .next_loop: +4: subl $64,%esi movl $7,%ecx ALIGN16 - .L04: +5: movq (%edx),%mm0 movq 64(%edx),%mm4 pmaddwd (%esi),%mm0 @@ -214,7 +214,7 @@ SYNTH_NAME: addl $128,%edx leal 8(%edi),%edi decl %ecx - jnz .L04 + jnz 5b movq (%edx),%mm0 pmaddwd (%esi),%mm0 movq 8(%edx),%mm1 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_accurate.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_sse_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_sse_accurate.S index 43ad9b9d..61c745a6 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_accurate.S @@ -60,7 +60,7 @@ ASM_NAME(synth_1to1_sse_accurate_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -164,12 +164,12 @@ Loop_start_1: leal 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -273,7 +273,7 @@ Loop_start_2: leal 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b pshufw $0xee, MMREG_CLIP, %mm0 paddw MMREG_CLIP, %mm0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_float.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_sse_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_sse_float.S index c1068b32..2e70613f 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_float.S @@ -52,7 +52,7 @@ ASM_NAME(synth_1to1_real_sse_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -137,12 +137,12 @@ Loop_start_1: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -227,7 +227,7 @@ Loop_start_2: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b xorl %eax, %eax diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_s32.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_sse_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_sse_s32.S index 5fe3dd9f..4103e88e 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_sse_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_sse_s32.S @@ -66,7 +66,7 @@ ASM_NAME(synth_1to1_s32_sse_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -173,12 +173,12 @@ Loop_start_1: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -285,7 +285,7 @@ Loop_start_2: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b pshufw $0xee, MMREG_CLIP, %mm0 paddw MMREG_CLIP, %mm0 diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx.S new file mode 100644 index 00000000..79fb6702 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx.S @@ -0,0 +1,256 @@ +/* + synth_stereo_avx: AVX optimized synth for x86-64 (stereo specific version) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +/* short *window; */ +#define WINDOW %r10 +/* short *b0l; */ +#define B0L %rdx +/* short *b0r; */ +#define B0R %r8 +/* short *samples; */ +#define SAMPLES %r9 +#else +/* short *window; */ +#define WINDOW %rdi +/* short *b0l; */ +#define B0L %rsi +/* short *b0r; */ +#define B0R %rdx +/* short *samples; */ +#define SAMPLES %r9 +#endif + +/* + int synth_1to1_s_avx_asm(short *window, short *b0l, short *b0r, short *samples, int bo1); + return value: number of clipped samples +*/ + + ALIGN16 +.globl ASM_NAME(synth_1to1_s_avx_asm) +ASM_NAME(synth_1to1_s_avx_asm): +#ifdef IS_MSABI /* should save xmm6-15 */ + push %rbp + mov %rsp, %rbp + sub $144, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movl 48(%rbp), %eax /* 5th argument; placed after 32-byte shadow space */ +#endif + +#ifdef IS_MSABI + shl $1, %eax + mov %rcx, WINDOW +#else + mov %r8d, %eax + shl $1, %eax + movq %rcx, SAMPLES +#endif + add $32, WINDOW + sub %rax, WINDOW + + mov $64, %rax + movl $4, %ecx + vpxor %xmm14, %xmm14, %xmm14 + + ALIGN16 +1: + movups (WINDOW), %xmm8 + movups 16(WINDOW), %xmm9 + movups (WINDOW,%rax), %xmm10 + movups 16(WINDOW,%rax), %xmm11 + vpmaddwd (B0L), %xmm8, %xmm0 + vpmaddwd 16(B0L), %xmm9, %xmm1 + vpmaddwd (B0R), %xmm8, %xmm2 + vpmaddwd 16(B0R), %xmm9, %xmm3 + vpmaddwd 32(B0L), %xmm10, %xmm4 + vpmaddwd 48(B0L), %xmm11, %xmm5 + vpmaddwd 32(B0R), %xmm10, %xmm6 + vpmaddwd 48(B0R), %xmm11, %xmm7 + vpaddd %xmm1, %xmm0, %xmm8 + vpaddd %xmm3, %xmm2, %xmm0 + vpaddd %xmm5, %xmm4, %xmm9 + vpaddd %xmm7, %xmm6, %xmm1 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + movups (WINDOW), %xmm10 + movups 16(WINDOW), %xmm11 + movups (WINDOW,%rax), %xmm12 + movups 16(WINDOW,%rax), %xmm13 + vpmaddwd (B0L), %xmm10, %xmm2 + vpmaddwd 16(B0L), %xmm11, %xmm3 + vpmaddwd (B0R), %xmm10, %xmm4 + vpmaddwd 16(B0R), %xmm11, %xmm5 + vpmaddwd 32(B0L), %xmm12, %xmm6 + vpmaddwd 48(B0L), %xmm13, %xmm10 + vpmaddwd 32(B0R), %xmm12, %xmm7 + vpmaddwd 48(B0R), %xmm13, %xmm11 + vpaddd %xmm3, %xmm2, %xmm2 + vpaddd %xmm5, %xmm4, %xmm3 + vpaddd %xmm6, %xmm10, %xmm4 + vpaddd %xmm7, %xmm11, %xmm5 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vpunpckldq %xmm0, %xmm8, %xmm6 + vpunpckhdq %xmm0, %xmm8, %xmm0 + vpunpckldq %xmm1, %xmm9, %xmm7 + vpunpckhdq %xmm1, %xmm9, %xmm1 + vpaddd %xmm6, %xmm0, %xmm0 + vpaddd %xmm7, %xmm1, %xmm1 + vpunpckldq %xmm3, %xmm2, %xmm6 + vpunpckhdq %xmm3, %xmm2, %xmm2 + vpunpckldq %xmm5, %xmm4, %xmm7 + vpunpckhdq %xmm5, %xmm4, %xmm3 + vpaddd %xmm6, %xmm2, %xmm2 + vpaddd %xmm7, %xmm3, %xmm3 + + vpunpcklqdq %xmm1, %xmm0, %xmm4 + vpunpckhqdq %xmm1, %xmm0, %xmm0 + vpunpcklqdq %xmm3, %xmm2, %xmm5 + vpunpckhqdq %xmm3, %xmm2, %xmm1 + vpaddd %xmm0, %xmm4, %xmm0 + vpaddd %xmm1, %xmm5, %xmm1 + vpsrad $13, %xmm0, %xmm0 + vpsrad $13, %xmm1, %xmm1 + vpackssdw %xmm1, %xmm0, %xmm2 + vpcmpeqd %xmm3, %xmm3, %xmm3 + vpslld $16, %xmm0, %xmm0 + vpslld $16, %xmm1, %xmm1 + vpsrld $16, %xmm0, %xmm0 + vpsrld $16, %xmm1, %xmm1 + vpackusdw %xmm1, %xmm0, %xmm0 + vpcmpeqw %xmm2, %xmm0, %xmm0 + vpxor %xmm3, %xmm0, %xmm0 + vpaddw %xmm0, %xmm14, %xmm14 + + movups %xmm2, (SAMPLES) + add $16, SAMPLES + dec %ecx + jnz 1b + + movl $4, %ecx + + ALIGN16 +1: + movups (WINDOW), %xmm8 + movups 16(WINDOW), %xmm9 + movups (WINDOW,%rax), %xmm10 + movups 16(WINDOW,%rax), %xmm11 + vpmaddwd (B0L), %xmm8, %xmm0 + vpmaddwd 16(B0L), %xmm9, %xmm1 + vpmaddwd (B0R), %xmm8, %xmm2 + vpmaddwd 16(B0R), %xmm9, %xmm3 + vpmaddwd -32(B0L), %xmm10, %xmm4 + vpmaddwd -16(B0L), %xmm11, %xmm5 + vpmaddwd -32(B0R), %xmm10, %xmm6 + vpmaddwd -16(B0R), %xmm11, %xmm7 + vpaddd %xmm1, %xmm0, %xmm8 + vpaddd %xmm3, %xmm2, %xmm0 + vpaddd %xmm5, %xmm4, %xmm9 + vpaddd %xmm7, %xmm6, %xmm1 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + movups (WINDOW), %xmm10 + movups 16(WINDOW), %xmm11 + movups (WINDOW,%rax), %xmm12 + movups 16(WINDOW,%rax), %xmm13 + vpmaddwd (B0L), %xmm10, %xmm2 + vpmaddwd 16(B0L), %xmm11, %xmm3 + vpmaddwd (B0R), %xmm10, %xmm4 + vpmaddwd 16(B0R), %xmm11, %xmm5 + vpmaddwd -32(B0L), %xmm12, %xmm6 + vpmaddwd -16(B0L), %xmm13, %xmm10 + vpmaddwd -32(B0R), %xmm12, %xmm7 + vpmaddwd -16(B0R), %xmm13, %xmm11 + vpaddd %xmm3, %xmm2, %xmm2 + vpaddd %xmm5, %xmm4, %xmm3 + vpaddd %xmm6, %xmm10, %xmm4 + vpaddd %xmm7, %xmm11, %xmm5 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vpunpckldq %xmm0, %xmm8, %xmm6 + vpunpckhdq %xmm0, %xmm8, %xmm0 + vpunpckldq %xmm1, %xmm9, %xmm7 + vpunpckhdq %xmm1, %xmm9, %xmm1 + vpaddd %xmm6, %xmm0, %xmm0 + vpaddd %xmm7, %xmm1, %xmm1 + vpunpckldq %xmm3, %xmm2, %xmm6 + vpunpckhdq %xmm3, %xmm2, %xmm2 + vpunpckldq %xmm5, %xmm4, %xmm7 + vpunpckhdq %xmm5, %xmm4, %xmm3 + vpaddd %xmm6, %xmm2, %xmm2 + vpaddd %xmm7, %xmm3, %xmm3 + + vpunpcklqdq %xmm1, %xmm0, %xmm4 + vpunpckhqdq %xmm1, %xmm0, %xmm0 + vpunpcklqdq %xmm3, %xmm2, %xmm5 + vpunpckhqdq %xmm3, %xmm2, %xmm1 + vpaddd %xmm0, %xmm4, %xmm0 + vpaddd %xmm1, %xmm5, %xmm1 + vpsrad $13, %xmm0, %xmm0 + vpsrad $13, %xmm1, %xmm1 + vpackssdw %xmm1, %xmm0, %xmm2 + vpcmpeqd %xmm3, %xmm3, %xmm3 + vpslld $16, %xmm0, %xmm0 + vpslld $16, %xmm1, %xmm1 + vpsrld $16, %xmm0, %xmm0 + vpsrld $16, %xmm1, %xmm1 + vpackusdw %xmm1, %xmm0, %xmm0 + vpcmpeqw %xmm2, %xmm0, %xmm0 + vpxor %xmm3, %xmm0, %xmm0 + vpaddw %xmm0, %xmm14, %xmm14 + + movups %xmm2, (SAMPLES) + add $16, SAMPLES + dec %ecx + jnz 1b + + pxor %xmm1, %xmm1 + psubw %xmm14, %xmm1 + pshufd $0x4e, %xmm1, %xmm0 + paddw %xmm1, %xmm0 + pshuflw $0x4e, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + pshuflw $0x11, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + movd %xmm0, %eax + and $0x7f, %eax + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_accurate.S new file mode 100644 index 00000000..6ba02516 --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_accurate.S @@ -0,0 +1,286 @@ +/* + synth_stereo_avx_accurate: AVX optimized synth for x86-64 (stereo specific, MPEG-compliant 16bit output version) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +/* real *window; */ +#define WINDOW %r10 +/* real *b0l; */ +#define B0L %rdx +/* real *b0r; */ +#define B0R %r8 +/* real *samples; */ +#define SAMPLES %r9 +#else +/* real *window; */ +#define WINDOW %rdi +/* real *b0l; */ +#define B0L %rsi +/* real *b0r; */ +#define B0R %rdx +/* real *samples; */ +#define SAMPLES %r9 +#endif + +/* + int synth_1to1_s_avx_accurate_asm(real *window, real *b0l, real *b0r, real *samples, int bo1); + return value: number of clipped samples +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN32 +maxmin_avx: + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .text + ALIGN16 + .globl ASM_NAME(synth_1to1_s_avx_accurate_asm) +ASM_NAME(synth_1to1_s_avx_accurate_asm): +#ifdef IS_MSABI /* should save xmm6-15 */ + push %rbp + mov %rsp, %rbp + sub $144, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movl 48(%rbp), %eax /* 5th argument; placed after 32-byte shadow space */ +#endif + +#ifdef IS_MSABI + shl $2, %eax + mov %rcx, WINDOW +#else + mov %r8d, %eax + shl $2, %eax + mov %rcx, SAMPLES +#endif + add $64, WINDOW + sub %rax, WINDOW + + mov $128, %rax + mov $4, %ecx + vpxor %xmm14, %xmm14, %xmm14 + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps 64(B0L), %ymm10, %ymm4 + vmulps 96(B0L), %ymm11, %ymm5 + vmulps 64(B0R), %ymm10, %ymm6 + vmulps 96(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps 64(B0L), %ymm12, %ymm6 + vmulps 96(B0L), %ymm13, %ymm10 + vmulps 64(B0R), %ymm12, %ymm7 + vmulps 96(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vsubps %ymm0, %ymm4, %ymm0 + vsubps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vcmpnleps maxmin_avx(%rip), %ymm0, %ymm1 + vcmpltps 32+maxmin_avx(%rip), %ymm0, %ymm2 + vextractf128 $0x1, %ymm1, %xmm3 + vextractf128 $0x1, %ymm2, %xmm4 + vpackssdw %xmm2, %xmm1, %xmm1 + vpackssdw %xmm4, %xmm3, %xmm3 + vpaddw %xmm3, %xmm1, %xmm1 + vpaddw %xmm1, %xmm14, %xmm14 + vcvtps2dq %ymm0, %ymm0 + vextractf128 $0x1, %ymm0, %xmm1 + vpackssdw %xmm1, %xmm0, %xmm0 + + vmovups %xmm0, (SAMPLES) + add $16, SAMPLES + dec %ecx + jnz 1b + + mov $4, %ecx + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps -64(B0L), %ymm10, %ymm4 + vmulps -32(B0L), %ymm11, %ymm5 + vmulps -64(B0R), %ymm10, %ymm6 + vmulps -32(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps -64(B0L), %ymm12, %ymm6 + vmulps -32(B0L), %ymm13, %ymm10 + vmulps -64(B0R), %ymm12, %ymm7 + vmulps -32(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vaddps %ymm0, %ymm4, %ymm0 + vaddps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vcmpnleps maxmin_avx(%rip), %ymm0, %ymm1 + vcmpltps 32+maxmin_avx(%rip), %ymm0, %ymm2 + vextractf128 $0x1, %ymm1, %xmm3 + vextractf128 $0x1, %ymm2, %xmm4 + vpackssdw %xmm2, %xmm1, %xmm1 + vpackssdw %xmm4, %xmm3, %xmm3 + vpaddw %xmm3, %xmm1, %xmm1 + vpaddw %xmm1, %xmm14, %xmm14 + vcvtps2dq %ymm0, %ymm0 + vextractf128 $0x1, %ymm0, %xmm1 + vpackssdw %xmm1, %xmm0, %xmm0 + + vmovups %xmm0, (SAMPLES) + add $16, SAMPLES + dec %ecx + jnz 1b + + vzeroupper + + pxor %xmm1, %xmm1 + psubw %xmm14, %xmm1 + pshufd $0x4e, %xmm1, %xmm0 + paddw %xmm1, %xmm0 + pshuflw $0x4e, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + pshuflw $0x11, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + movd %xmm0, %eax + and $0x7f, %eax + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_float.S new file mode 100644 index 00000000..955ec71d --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_float.S @@ -0,0 +1,243 @@ +/* + synth_stereo_avx_float: AVX optimized synth for x86-64 (stereo specific, float output version) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +/* real *window; */ +#define WINDOW %r10 +/* real *b0l; */ +#define B0L %rdx +/* real *b0r; */ +#define B0R %r8 +/* real *samples; */ +#define SAMPLES %r9 +#else +/* real *window; */ +#define WINDOW %rdi +/* real *b0l; */ +#define B0L %rsi +/* real *b0r; */ +#define B0R %rdx +/* real *samples; */ +#define SAMPLES %r9 +#endif + +/* + int synth_1to1_real_s_avx_asm(real *window, real *b0l, real *b0r, real *samples, int bo1); + return value: number of clipped samples (0) +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN16 +scale_avx: + .long 939524096 + .text + ALIGN16 + .globl ASM_NAME(synth_1to1_real_s_avx_asm) +ASM_NAME(synth_1to1_real_s_avx_asm): +#ifdef IS_MSABI /* should save xmm6-15 */ + push %rbp + mov %rsp, %rbp + sub $144, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movl 48(%rbp), %eax /* 5th argument; placed after 32-byte shadow space */ +#endif + + vbroadcastss scale_avx(%rip), %ymm14 + +#ifdef IS_MSABI + shl $2, %eax + mov %rcx, WINDOW +#else + mov %r8d, %eax + shl $2, %eax + mov %rcx, SAMPLES +#endif + add $64, WINDOW + sub %rax, WINDOW + + mov $128, %rax + mov $4, %ecx + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps 64(B0L), %ymm10, %ymm4 + vmulps 96(B0L), %ymm11, %ymm5 + vmulps 64(B0R), %ymm10, %ymm6 + vmulps 96(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps 64(B0L), %ymm12, %ymm6 + vmulps 96(B0L), %ymm13, %ymm10 + vmulps 64(B0R), %ymm12, %ymm7 + vmulps 96(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vsubps %ymm0, %ymm4, %ymm0 + vsubps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vmulps %ymm14, %ymm0, %ymm0 + + vmovups %ymm0, (SAMPLES) + add $32, SAMPLES + dec %ecx + jnz 1b + + mov $4, %ecx + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps -64(B0L), %ymm10, %ymm4 + vmulps -32(B0L), %ymm11, %ymm5 + vmulps -64(B0R), %ymm10, %ymm6 + vmulps -32(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps -64(B0L), %ymm12, %ymm6 + vmulps -32(B0L), %ymm13, %ymm10 + vmulps -64(B0R), %ymm12, %ymm7 + vmulps -32(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vaddps %ymm0, %ymm4, %ymm0 + vaddps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vmulps %ymm14, %ymm0, %ymm0 + + vmovups %ymm0, (SAMPLES) + add $32, SAMPLES + dec %ecx + jnz 1b + + vzeroupper + + xor %eax, %eax + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_s32.S new file mode 100644 index 00000000..8f1e9a6a --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_avx_s32.S @@ -0,0 +1,292 @@ +/* + synth_stereo_avx_s32: AVX optimized synth for x86-64 (stereo specific, s32 output version) + + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Taihei Monma +*/ + +#include "mangle.h" + +#ifdef IS_MSABI +/* real *window; */ +#define WINDOW %r10 +/* real *b0l; */ +#define B0L %rdx +/* real *b0r; */ +#define B0R %r8 +/* real *samples; */ +#define SAMPLES %r9 +#else +/* real *window; */ +#define WINDOW %rdi +/* real *b0l; */ +#define B0L %rsi +/* real *b0r; */ +#define B0R %rdx +/* real *samples; */ +#define SAMPLES %r9 +#endif + +/* + int synth_1to1_s32_s_avx_asm(real *window, real *b0l, real *b0r, real *samples, int bo1); + return value: number of clipped samples +*/ + +#ifndef __APPLE__ + .section .rodata +#else + .data +#endif + ALIGN32 +maxmin_avx: + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long 1191182335 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 + .long -956301312 +scale_avx: + .long 1199570944 + .text + ALIGN16 + .globl ASM_NAME(synth_1to1_s32_s_avx_asm) +ASM_NAME(synth_1to1_s32_s_avx_asm): +#ifdef IS_MSABI /* should save xmm6-15 */ + push %rbp + mov %rsp, %rbp + sub $160, %rsp + movaps %xmm6, (%rsp) + movaps %xmm7, 16(%rsp) + movaps %xmm8, 32(%rsp) + movaps %xmm9, 48(%rsp) + movaps %xmm10, 64(%rsp) + movaps %xmm11, 80(%rsp) + movaps %xmm12, 96(%rsp) + movaps %xmm13, 112(%rsp) + movaps %xmm14, 128(%rsp) + movaps %xmm15, 144(%rsp) + movl 48(%rbp), %eax /* 5th argument; placed after 32-byte shadow space */ +#endif + + vbroadcastss scale_avx(%rip), %ymm14 + +#ifdef IS_MSABI + shl $2, %eax + mov %rcx, WINDOW +#else + mov %r8d, %eax + shl $2, %eax + mov %rcx, SAMPLES +#endif + add $64, WINDOW + sub %rax, WINDOW + + mov $128, %rax + mov $4, %ecx + vpxor %xmm15, %xmm15, %xmm15 + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps 64(B0L), %ymm10, %ymm4 + vmulps 96(B0L), %ymm11, %ymm5 + vmulps 64(B0R), %ymm10, %ymm6 + vmulps 96(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps 64(B0L), %ymm12, %ymm6 + vmulps 96(B0L), %ymm13, %ymm10 + vmulps 64(B0R), %ymm12, %ymm7 + vmulps 96(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + add %rax, B0L + add %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vsubps %ymm0, %ymm4, %ymm0 + vsubps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vcmpnleps maxmin_avx(%rip), %ymm0, %ymm1 + vcmpltps 32+maxmin_avx(%rip), %ymm0, %ymm2 + vmulps %ymm14, %ymm0, %ymm0 + vextractf128 $0x1, %ymm1, %xmm3 + vextractf128 $0x1, %ymm2, %xmm4 + vpackssdw %xmm2, %xmm1, %xmm5 + vpackssdw %xmm4, %xmm3, %xmm3 + vcvtps2dq %ymm0, %ymm0 + vpaddw %xmm3, %xmm5, %xmm5 + vpaddw %xmm5, %xmm15, %xmm15 + vxorps %ymm1, %ymm0, %ymm0 + + vmovups %ymm0, (SAMPLES) + add $32, SAMPLES + dec %ecx + jnz 1b + + mov $4, %ecx + + ALIGN16 +1: + vmovups (WINDOW), %ymm8 + vmovups 32(WINDOW), %ymm9 + vmovups (WINDOW,%rax), %ymm10 + vmovups 32(WINDOW,%rax), %ymm11 + vmulps (B0L), %ymm8, %ymm0 + vmulps 32(B0L), %ymm9, %ymm1 + vmulps (B0R), %ymm8, %ymm2 + vmulps 32(B0R), %ymm9, %ymm3 + vmulps -64(B0L), %ymm10, %ymm4 + vmulps -32(B0L), %ymm11, %ymm5 + vmulps -64(B0R), %ymm10, %ymm6 + vmulps -32(B0R), %ymm11, %ymm7 + vaddps %ymm1, %ymm0, %ymm8 + vaddps %ymm3, %ymm2, %ymm0 + vaddps %ymm5, %ymm4, %ymm9 + vaddps %ymm7, %ymm6, %ymm1 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vmovups (WINDOW), %ymm10 + vmovups 32(WINDOW), %ymm11 + vmovups (WINDOW,%rax), %ymm12 + vmovups 32(WINDOW,%rax), %ymm13 + vmulps (B0L), %ymm10, %ymm2 + vmulps 32(B0L), %ymm11, %ymm3 + vmulps (B0R), %ymm10, %ymm4 + vmulps 32(B0R), %ymm11, %ymm5 + vmulps -64(B0L), %ymm12, %ymm6 + vmulps -32(B0L), %ymm13, %ymm10 + vmulps -64(B0R), %ymm12, %ymm7 + vmulps -32(B0R), %ymm13, %ymm11 + vaddps %ymm3, %ymm2, %ymm2 + vaddps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm10, %ymm4 + vaddps %ymm7, %ymm11, %ymm5 + lea (WINDOW,%rax,2), WINDOW + sub %rax, B0L + sub %rax, B0R + + vunpcklps %ymm0, %ymm8, %ymm6 + vunpckhps %ymm0, %ymm8, %ymm0 + vunpcklps %ymm1, %ymm9, %ymm7 + vunpckhps %ymm1, %ymm9, %ymm1 + vaddps %ymm6, %ymm0, %ymm0 + vaddps %ymm7, %ymm1, %ymm1 + vunpcklps %ymm3, %ymm2, %ymm6 + vunpckhps %ymm3, %ymm2, %ymm2 + vunpcklps %ymm5, %ymm4, %ymm7 + vunpckhps %ymm5, %ymm4, %ymm3 + vaddps %ymm6, %ymm2, %ymm2 + vaddps %ymm7, %ymm3, %ymm3 + + vunpcklpd %ymm1, %ymm0, %ymm4 + vunpckhpd %ymm1, %ymm0, %ymm0 + vunpcklpd %ymm3, %ymm2, %ymm5 + vunpckhpd %ymm3, %ymm2, %ymm1 + vaddps %ymm0, %ymm4, %ymm0 + vaddps %ymm1, %ymm5, %ymm1 + vperm2f128 $0x20, %ymm1, %ymm0, %ymm2 + vperm2f128 $0x31, %ymm1, %ymm0, %ymm3 + vaddps %ymm3, %ymm2, %ymm0 + vcmpnleps maxmin_avx(%rip), %ymm0, %ymm1 + vcmpltps 32+maxmin_avx(%rip), %ymm0, %ymm2 + vmulps %ymm14, %ymm0, %ymm0 + vextractf128 $0x1, %ymm1, %xmm3 + vextractf128 $0x1, %ymm2, %xmm4 + vpackssdw %xmm2, %xmm1, %xmm5 + vpackssdw %xmm4, %xmm3, %xmm3 + vcvtps2dq %ymm0, %ymm0 + vpaddw %xmm3, %xmm5, %xmm5 + vpaddw %xmm5, %xmm15, %xmm15 + vxorps %ymm1, %ymm0, %ymm0 + + vmovups %ymm0, (SAMPLES) + add $32, SAMPLES + dec %ecx + jnz 1b + + vzeroupper + + pxor %xmm1, %xmm1 + psubw %xmm15, %xmm1 + pshufd $0x4e, %xmm1, %xmm0 + paddw %xmm1, %xmm0 + pshuflw $0x4e, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + pshuflw $0x11, %xmm0, %xmm1 + paddw %xmm1, %xmm0 + movd %xmm0, %eax + and $0x7f, %eax + +#ifdef IS_MSABI + movaps (%rsp), %xmm6 + movaps 16(%rsp), %xmm7 + movaps 32(%rsp), %xmm8 + movaps 48(%rsp), %xmm9 + movaps 64(%rsp), %xmm10 + movaps 80(%rsp), %xmm11 + movaps 96(%rsp), %xmm12 + movaps 112(%rsp), %xmm13 + movaps 128(%rsp), %xmm14 + movaps 144(%rsp), %xmm15 + mov %rbp, %rsp + pop %rbp +#endif + ret + +NONEXEC_STACK diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon.S index 96938d9a..b8f3e738 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon.S @@ -20,6 +20,7 @@ .text .globl ASM_NAME(synth_1to1_s_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_s_neon_asm): push {r4-r6, lr} vpush {q4-q7} @@ -30,7 +31,7 @@ ASM_NAME(synth_1to1_s_neon_asm): mov r4, #4 mov r5, #64 -.Loop_start_1: +1: vld1.16 {d0-d3}, [WINDOW], r5 vld1.16 {d4-d7}, [WINDOW], r5 vld1.16 {d8-d11}, [B0L, :128]! @@ -96,11 +97,11 @@ ASM_NAME(synth_1to1_s_neon_asm): vst1.16 {d0}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_1 + bne 1b mov r4, #4 mov r6, #-32 -.Loop_start_2: +1: vld1.16 {d0-d3}, [WINDOW], r5 vld1.16 {d4-d7}, [WINDOW], r5 vld1.16 {d8-d11}, [B0L, :128], r6 @@ -166,7 +167,7 @@ ASM_NAME(synth_1to1_s_neon_asm): vst1.16 {d0}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_2 + bne 1b mov r0, #0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_accurate.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_accurate.S index b14f9f4a..c2175d03 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_accurate.S @@ -34,7 +34,7 @@ ASM_NAME(synth_1to1_s_neon_accurate_asm): mov r4, #4 mov r5, #128 mov r6, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -138,11 +138,11 @@ ASM_NAME(synth_1to1_s_neon_accurate_asm): vst1.16 {d26}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_1 + bne 1b mov r4, #4 mov r6, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -250,7 +250,7 @@ ASM_NAME(synth_1to1_s_neon_accurate_asm): vst1.16 {d26}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_2 + bne 1b vld1.32 {q0}, [sp, :128] vpadd.i32 d0, d0, d1 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_float.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_float.S index 63dbde7a..c2fc5dde 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_float.S @@ -20,6 +20,7 @@ .text .globl ASM_NAME(synth_1to1_real_s_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_real_s_neon_asm): push {r4-r6, lr} vpush {q4-q7} @@ -31,7 +32,7 @@ ASM_NAME(synth_1to1_real_s_neon_asm): mov r4, #4 mov r5, #128 mov r6, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -117,11 +118,11 @@ ASM_NAME(synth_1to1_real_s_neon_asm): vst1.32 {q12}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_1 + bne 1b mov r4, #4 mov r6, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -211,7 +212,7 @@ ASM_NAME(synth_1to1_real_s_neon_asm): vst1.32 {q12}, [SAMPLES]! subs r4, r4, #1 - bne .Loop_start_2 + bne 1b mov r0, #0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_s32.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_s32.S index 98a2c011..2c8a8ab6 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_neon_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_neon_s32.S @@ -20,6 +20,7 @@ .text .globl ASM_NAME(synth_1to1_s32_s_neon_asm) + ALIGN4 ASM_NAME(synth_1to1_s32_s_neon_asm): push {r4-r7, lr} vpush {q4-q7} @@ -34,7 +35,7 @@ ASM_NAME(synth_1to1_s32_s_neon_asm): mov r4, #4 mov r5, #128 mov r6, #64 -.Loop_start_1: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -130,11 +131,11 @@ ASM_NAME(synth_1to1_s32_s_neon_asm): vst1.32 {q14}, [sp, :128] subs r4, r4, #1 - bne .Loop_start_1 + bne 1b mov r4, #4 mov r6, #-64 -.Loop_start_2: +1: vld1.32 {q0,q1}, [WINDOW], r5 vld1.32 {q2,q3}, [WINDOW] vld1.32 {q4,q5}, [B0L, :128], r6 @@ -234,7 +235,7 @@ ASM_NAME(synth_1to1_s32_s_neon_asm): vst1.32 {q14}, [sp, :128] subs r4, r4, #1 - bne .Loop_start_2 + bne 1b vld1.32 {q0}, [sp, :128] vpadd.i32 d0, d0, d1 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_accurate.S similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_accurate.S index 617fbe90..e496bac5 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_accurate.S @@ -67,7 +67,7 @@ ASM_NAME(synth_1to1_s_sse_accurate_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -274,12 +274,12 @@ Loop_start_1: leal 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -486,7 +486,7 @@ Loop_start_2: leal 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b pshufw $0xee, MMREG_CLIP, %mm0 paddw MMREG_CLIP, %mm0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_float.S similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_float.S index f63aede9..f81edc70 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_float.S @@ -60,7 +60,7 @@ ASM_NAME(synth_1to1_real_s_sse_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -228,12 +228,12 @@ Loop_start_1: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -401,7 +401,7 @@ Loop_start_2: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b xorl %eax, %eax diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_s32.S similarity index 99% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_s32.S index 664e70a3..ffe09266 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_sse_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_sse_s32.S @@ -73,7 +73,7 @@ ASM_NAME(synth_1to1_s32_s_sse_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -293,12 +293,12 @@ Loop_start_1: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -518,7 +518,7 @@ Loop_start_2: leal 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b pshufw $0xee, MMREG_CLIP, %mm0 paddw MMREG_CLIP, %mm0 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64.S index c959b02d..3aa4dfe0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define WINDOW %r10 /* short *b0l; */ @@ -57,7 +57,7 @@ ASM_NAME(maxmin_x86_64): ALIGN16 .globl ASM_NAME(synth_1to1_s_x86_64_asm) ASM_NAME(synth_1to1_s_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ subq $168, %rsp /* stack alignment + 10 xmm registers */ movaps %xmm6, (%rsp) @@ -72,7 +72,7 @@ ASM_NAME(synth_1to1_s_x86_64_asm): movaps %xmm15, 144(%rsp) #endif -#ifdef _WIN64 +#ifdef IS_MSABI shlq $32, %rax shrq $31, %rax movq %rcx, %r10 @@ -94,7 +94,7 @@ ASM_NAME(synth_1to1_s_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 64(WINDOW), %xmm2 @@ -196,12 +196,12 @@ Loop_start_1: leaq 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm0 movups 16(WINDOW), %xmm1 movups 64(WINDOW), %xmm2 @@ -303,7 +303,7 @@ Loop_start_2: leaq 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b movhlps XMMREG_CLIP, %xmm0 paddw XMMREG_CLIP, %xmm0 @@ -317,7 +317,7 @@ Loop_start_2: movd %xmm0, %eax andl $0xffff, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_accurate.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_accurate.S index c55143b1..7e35bffa 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_accurate.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define WINDOW %rsi /* short *b0l; */ @@ -56,7 +56,7 @@ ASM_NAME(maxmin_s16): ALIGN16 .globl ASM_NAME(synth_1to1_s_x86_64_accurate_asm) ASM_NAME(synth_1to1_s_x86_64_accurate_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ pushq %rsi subq $176, %rsp /* 10 xmm registers + temp */ @@ -79,7 +79,7 @@ ASM_NAME(synth_1to1_s_x86_64_accurate_asm): xorps %xmm0, %xmm0 movaps %xmm0, TEMP_CLIP -#ifdef _WIN64 +#ifdef IS_MSABI shlq $32, %rax shrq $30, %rax movq %rcx, %rbx @@ -95,7 +95,7 @@ ASM_NAME(synth_1to1_s_x86_64_accurate_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -254,12 +254,12 @@ Loop_start_1: leaq 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -418,7 +418,7 @@ Loop_start_2: leaq 16(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b movaps TEMP_CLIP, %xmm4 movhlps %xmm4, %xmm0 @@ -433,7 +433,7 @@ Loop_start_2: movd %xmm0, %eax andl $0xffff, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_float.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_float.S index b19cccb5..a1b381a3 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_float.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define WINDOW %r10 /* short *b0l; */ @@ -50,7 +50,7 @@ ASM_NAME(scale_x86_64): ALIGN16 .globl ASM_NAME(synth_1to1_real_s_x86_64_asm) ASM_NAME(synth_1to1_real_s_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ subq $168, %rsp /* stack alignment + 10 xmm registers */ movaps %xmm6, (%rsp) @@ -67,7 +67,7 @@ ASM_NAME(synth_1to1_real_s_x86_64_asm): leaq ASM_NAME(scale_x86_64)(%rip), %r11 -#ifdef _WIN64 +#ifdef IS_MSABI shlq $32, %rax shrq $30, %rax movq %rcx, %r10 @@ -83,7 +83,7 @@ ASM_NAME(synth_1to1_real_s_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -226,12 +226,12 @@ Loop_start_1: leaq 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -374,11 +374,11 @@ Loop_start_2: leaq 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b xorl %eax, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_s32.S similarity index 98% rename from jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_s32.S index 8ffcc042..c48b1b43 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_stereo_x86_64_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_stereo_x86_64_s32.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define WINDOW %rsi /* short *b0l; */ @@ -63,7 +63,7 @@ ASM_NAME(maxmin_s32): ALIGN16 .globl ASM_NAME(synth_1to1_s32_s_x86_64_asm) ASM_NAME(synth_1to1_s32_s_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ pushq %rsi pushq %rdi @@ -82,7 +82,7 @@ ASM_NAME(synth_1to1_s32_s_x86_64_asm): subq $24, %rsp /* stack alignment + temp */ #endif -#ifdef _WIN64 +#ifdef IS_MSABI shlq $32, %rax shrq $30, %rax movq %rcx, %rsi @@ -105,7 +105,7 @@ ASM_NAME(synth_1to1_s32_s_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -268,12 +268,12 @@ Loop_start_1: leaq 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (WINDOW), %xmm8 movups 16(WINDOW), %xmm1 movups 32(WINDOW), %xmm2 @@ -436,7 +436,7 @@ Loop_start_2: leaq 32(SAMPLES), SAMPLES decl %ecx - jnz Loop_start_2 + jnz 1b movaps TEMP_CLIP, %xmm4 movhlps %xmm4, %xmm0 @@ -451,7 +451,7 @@ Loop_start_2: movd %xmm0, %eax andl $0xffff, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64.S b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_x86_64.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_x86_64.S index 94931dff..eac72374 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define ARG0 %r10 /* short *b0; */ @@ -57,7 +57,7 @@ ASM_NAME(maxmin_x86_64): ALIGN16 .globl ASM_NAME(synth_1to1_x86_64_asm) ASM_NAME(synth_1to1_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $104, %rsp /* stack alignment + 6 xmm registers */ movaps %xmm6, (%rsp) @@ -82,7 +82,7 @@ ASM_NAME(synth_1to1_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (ARG0), %xmm0 movups 16(ARG0), %xmm1 movups 64(ARG0), %xmm2 @@ -148,12 +148,12 @@ Loop_start_1: leaq 16(ARG2), ARG2 decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (ARG0), %xmm0 movups 16(ARG0), %xmm1 movups 64(ARG0), %xmm2 @@ -219,7 +219,7 @@ Loop_start_2: leaq 16(ARG2), ARG2 decl %ecx - jnz Loop_start_2 + jnz 1b pshuflw $0xee, XMMREG_CLIP, %xmm0 movhlps XMMREG_CLIP, %xmm1 @@ -230,7 +230,7 @@ Loop_start_2: movd XMMREG_CLIP, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm12 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_accurate.S b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_accurate.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_accurate.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_accurate.S index 50c5b178..d841e8e0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_accurate.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_accurate.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define ARG0 %r10 /* short *b0; */ @@ -56,7 +56,7 @@ ASM_NAME(maxmin_s16): ALIGN16 .globl ASM_NAME(synth_1to1_x86_64_accurate_asm) ASM_NAME(synth_1to1_x86_64_accurate_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $152, %rsp /* stack alignment + 9 xmm registers */ movaps %xmm6, (%rsp) @@ -84,7 +84,7 @@ ASM_NAME(synth_1to1_x86_64_accurate_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -176,12 +176,12 @@ Loop_start_1: leaq 16(ARG2), ARG2 decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -273,7 +273,7 @@ Loop_start_2: leaq 16(ARG2), ARG2 decl %ecx - jnz Loop_start_2 + jnz 1b pshuflw $0xee, XMMREG_CLIP, %xmm0 movhlps XMMREG_CLIP, %xmm1 @@ -284,7 +284,7 @@ Loop_start_2: movd XMMREG_CLIP, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_float.S b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_float.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_float.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_float.S index 36f2e32c..a26ee6b0 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_float.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_float.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define ARG0 %r10 /* short *b0; */ @@ -50,7 +50,7 @@ ASM_NAME(scale_x86_64): ALIGN16 .globl ASM_NAME(synth_1to1_real_x86_64_asm) ASM_NAME(synth_1to1_real_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $120, %rsp /* stack alignment + 7 xmm registers */ movaps %xmm6, (%rsp) @@ -73,7 +73,7 @@ ASM_NAME(synth_1to1_real_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -154,12 +154,12 @@ Loop_start_1: leaq 32(ARG2), ARG2 decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -240,11 +240,11 @@ Loop_start_2: leaq 32(ARG2), ARG2 decl %ecx - jnz Loop_start_2 + jnz 1b xorl %eax, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_s32.S b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_s32.S similarity index 97% rename from jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_s32.S rename to jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_s32.S index c445c9d5..7f964a84 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/synth_x86_64_s32.S +++ b/jni/mpg123-1.17.0/src/libmpg123/synth_x86_64_s32.S @@ -8,7 +8,7 @@ #include "mangle.h" -#ifdef _WIN64 +#ifdef IS_MSABI /* short *window; */ #define ARG0 %r10 /* short *b0; */ @@ -63,7 +63,7 @@ ASM_NAME(maxmin_s32): ALIGN16 .globl ASM_NAME(synth_1to1_s32_x86_64_asm) ASM_NAME(synth_1to1_s32_x86_64_asm): -#ifdef _WIN64 /* should save xmm6-15 */ +#ifdef IS_MSABI /* should save xmm6-15 */ movq %rcx, ARG0 subq $168, %rsp /* stack alignment + 10 xmm registers */ movaps %xmm6, (%rsp) @@ -94,7 +94,7 @@ ASM_NAME(synth_1to1_s32_x86_64_asm): movl $4, %ecx ALIGN16 -Loop_start_1: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -186,12 +186,12 @@ Loop_start_1: leaq 32(ARG2), ARG2 decl %ecx - jnz Loop_start_1 + jnz 1b movl $4, %ecx ALIGN16 -Loop_start_2: +1: movups (ARG0), %xmm8 movups 16(ARG0), %xmm1 movups 32(ARG0), %xmm2 @@ -283,7 +283,7 @@ Loop_start_2: leaq 32(ARG2), ARG2 decl %ecx - jnz Loop_start_2 + jnz 1b pshuflw $0xee, XMMREG_CLIP, %xmm0 movhlps XMMREG_CLIP, %xmm1 @@ -294,7 +294,7 @@ Loop_start_2: movd XMMREG_CLIP, %eax -#ifdef _WIN64 +#ifdef IS_MSABI movaps (%rsp), %xmm6 movaps 16(%rsp), %xmm7 movaps 32(%rsp), %xmm8 diff --git a/jni/mpg123-1.13.4/src/libmpg123/synths.h b/jni/mpg123-1.17.0/src/libmpg123/synths.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/synths.h rename to jni/mpg123-1.17.0/src/libmpg123/synths.h diff --git a/jni/mpg123-1.13.4/src/libmpg123/tabinit.c b/jni/mpg123-1.17.0/src/libmpg123/tabinit.c similarity index 95% rename from jni/mpg123-1.13.4/src/libmpg123/tabinit.c rename to jni/mpg123-1.17.0/src/libmpg123/tabinit.c index 548da5cc..c40dcceb 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/tabinit.c +++ b/jni/mpg123-1.17.0/src/libmpg123/tabinit.c @@ -90,7 +90,7 @@ void prepare_decode_tables() } #ifdef OPT_MMXORSSE -#if !defined(OPT_X86_64) && !defined(OPT_NEON) +#if !defined(OPT_X86_64) && !defined(OPT_NEON) && !defined(OPT_AVX) void make_decode_tables_mmx_asm(long scaleval, float* decwin_mmx, float *decwins); void make_decode_tables_mmx(mpg123_handle *fr) { @@ -210,8 +210,14 @@ void make_decode_tables(mpg123_handle *fr) scaleval = - scaleval; #endif } -#if defined(OPT_X86_64) || defined(OPT_ALTIVEC) || defined(OPT_SSE) || defined(OPT_ARM) || defined(OPT_NEON) - if(fr->cpu_opts.type == x86_64 || fr->cpu_opts.type == altivec || fr->cpu_opts.type == sse || fr->cpu_opts.type == arm || fr->cpu_opts.type == neon) +#if defined(OPT_X86_64) || defined(OPT_ALTIVEC) || defined(OPT_SSE) || defined(OPT_SSE_VINTAGE) || defined(OPT_ARM) || defined(OPT_NEON) || defined(OPT_AVX) + if( fr->cpu_opts.type == x86_64 + || fr->cpu_opts.type == altivec + || fr->cpu_opts.type == sse + || fr->cpu_opts.type == sse_vintage + || fr->cpu_opts.type == arm + || fr->cpu_opts.type == neon + || fr->cpu_opts.type == avx ) { /* for float SSE / AltiVec / ARM decoder */ for(i=512; i<512+32; i++) { diff --git a/jni/mpg123-1.17.0/src/libmpg123/tabinit.lo b/jni/mpg123-1.17.0/src/libmpg123/tabinit.lo new file mode 100644 index 00000000..18828bda --- /dev/null +++ b/jni/mpg123-1.17.0/src/libmpg123/tabinit.lo @@ -0,0 +1,12 @@ +# tabinit.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/tabinit.o' + +# Name of the non-PIC object +non_pic_object=none + diff --git a/jni/mpg123-1.13.4/src/libmpg123/tabinit_mmx.S b/jni/mpg123-1.17.0/src/libmpg123/tabinit_mmx.S similarity index 58% rename from jni/mpg123-1.13.4/src/libmpg123/tabinit_mmx.S rename to jni/mpg123-1.17.0/src/libmpg123/tabinit_mmx.S index 2e996830..9ebab87c 100644 --- a/jni/mpg123-1.13.4/src/libmpg123/tabinit_mmx.S +++ b/jni/mpg123-1.17.0/src/libmpg123/tabinit_mmx.S @@ -45,39 +45,39 @@ ASM_NAME(costab_mmxsse): .long 1060439283 ALIGN32 intwinbase: - .value 0, -1, -1, -1, -1, -1, -1, -2 - .value -2, -2, -2, -3, -3, -4, -4, -5 - .value -5, -6, -7, -7, -8, -9, -10, -11 - .value -13, -14, -16, -17, -19, -21, -24, -26 - .value -29, -31, -35, -38, -41, -45, -49, -53 - .value -58, -63, -68, -73, -79, -85, -91, -97 - .value -104, -111, -117, -125, -132, -139, -147, -154 - .value -161, -169, -176, -183, -190, -196, -202, -208 - .value -213, -218, -222, -225, -227, -228, -228, -227 - .value -224, -221, -215, -208, -200, -189, -177, -163 - .value -146, -127, -106, -83, -57, -29, 2, 36 - .value 72, 111, 153, 197, 244, 294, 347, 401 - .value 459, 519, 581, 645, 711, 779, 848, 919 - .value 991, 1064, 1137, 1210, 1283, 1356, 1428, 1498 - .value 1567, 1634, 1698, 1759, 1817, 1870, 1919, 1962 - .value 2001, 2032, 2057, 2075, 2085, 2087, 2080, 2063 - .value 2037, 2000, 1952, 1893, 1822, 1739, 1644, 1535 - .value 1414, 1280, 1131, 970, 794, 605, 402, 185 - .value -45, -288, -545, -814, -1095, -1388, -1692, -2006 - .value -2330, -2663, -3004, -3351, -3705, -4063, -4425, -4788 - .value -5153, -5517, -5879, -6237, -6589, -6935, -7271, -7597 - .value -7910, -8209, -8491, -8755, -8998, -9219, -9416, -9585 - .value -9727, -9838, -9916, -9959, -9966, -9935, -9863, -9750 - .value -9592, -9389, -9139, -8840, -8492, -8092, -7640, -7134 - .value -6574, -5959, -5288, -4561, -3776, -2935, -2037, -1082 - .value -70, 998, 2122, 3300, 4533, 5818, 7154, 8540 - .value 9975, 11455, 12980, 14548, 16155, 17799, 19478, 21189 - .value 22929, 24694, 26482, 28289, 30112, 31947,-26209,-24360 - .value -22511,-20664,-18824,-16994,-15179,-13383,-11610, -9863 - .value -8147, -6466, -4822, -3222, -1667, -162, 1289, 2684 - .value 4019, 5290, 6494, 7629, 8692, 9679, 10590, 11420 - .value 12169, 12835, 13415, 13908, 14313, 14630, 14856, 14992 - .value 15038 + .short 0, -1, -1, -1, -1, -1, -1, -2 + .short -2, -2, -2, -3, -3, -4, -4, -5 + .short -5, -6, -7, -7, -8, -9, -10, -11 + .short -13, -14, -16, -17, -19, -21, -24, -26 + .short -29, -31, -35, -38, -41, -45, -49, -53 + .short -58, -63, -68, -73, -79, -85, -91, -97 + .short -104, -111, -117, -125, -132, -139, -147, -154 + .short -161, -169, -176, -183, -190, -196, -202, -208 + .short -213, -218, -222, -225, -227, -228, -228, -227 + .short -224, -221, -215, -208, -200, -189, -177, -163 + .short -146, -127, -106, -83, -57, -29, 2, 36 + .short 72, 111, 153, 197, 244, 294, 347, 401 + .short 459, 519, 581, 645, 711, 779, 848, 919 + .short 991, 1064, 1137, 1210, 1283, 1356, 1428, 1498 + .short 1567, 1634, 1698, 1759, 1817, 1870, 1919, 1962 + .short 2001, 2032, 2057, 2075, 2085, 2087, 2080, 2063 + .short 2037, 2000, 1952, 1893, 1822, 1739, 1644, 1535 + .short 1414, 1280, 1131, 970, 794, 605, 402, 185 + .short -45, -288, -545, -814, -1095, -1388, -1692, -2006 + .short -2330, -2663, -3004, -3351, -3705, -4063, -4425, -4788 + .short -5153, -5517, -5879, -6237, -6589, -6935, -7271, -7597 + .short -7910, -8209, -8491, -8755, -8998, -9219, -9416, -9585 + .short -9727, -9838, -9916, -9959, -9966, -9935, -9863, -9750 + .short -9592, -9389, -9139, -8840, -8492, -8092, -7640, -7134 + .short -6574, -5959, -5288, -4561, -3776, -2935, -2037, -1082 + .short -70, 998, 2122, 3300, 4533, 5818, 7154, 8540 + .short 9975, 11455, 12980, 14548, 16155, 17799, 19478, 21189 + .short 22929, 24694, 26482, 28289, 30112, 31947,-26209,-24360 + .short -22511,-20664,-18824,-16994,-15179,-13383,-11610, -9863 + .short -8147, -6466, -4822, -3222, -1667, -162, 1289, 2684 + .short 4019, 5290, 6494, 7629, 8692, 9679, 10590, 11420 + .short 12169, 12835, 13415, 13908, 14313, 14630, 14856, 14992 + .short 15038 intwindiv: .long 0x47800000 # 65536.0 @@ -119,11 +119,11 @@ ASM_NAME(make_decode_tables_mmx_asm): /* stack: 20=scaleval 24=decwin_mmx, 28=decwins */ .L02: leal -1(%esi),%edx - and %ebx,%edx - cmp $31,%edx + andl %ebx,%edx + cmpl $31,%edx jnz .L03 addl $-1023,%ecx - test %esi,%ebx + testl %esi,%ebx jz .L03 negl 20(%esp) .L03: @@ -132,7 +132,7 @@ ASM_NAME(make_decode_tables_mmx_asm): incl %ebx cmpl $intwinbase,%edi jz .L04 - cmp $256,%ebx + cmpl $256,%ebx jnz .L00 negl (%esp) jmp .L00 @@ -182,11 +182,11 @@ ASM_NAME(make_decode_tables_mmx_asm): popl %ebx /* that has to match the pushl before */ .L11: leal -1(%esi),%edx - and %ebx,%edx - cmp $31,%edx + andl %ebx,%edx + cmpl $31,%edx jnz .L12 addl $-1023,%ecx - test %esi,%ebx + testl %esi,%ebx jz .L12 negl 20(%esp) .L12: @@ -195,7 +195,7 @@ ASM_NAME(make_decode_tables_mmx_asm): incl %ebx cmpl $intwinbase,%edi jz .L13 - cmp $256,%ebx + cmpl $256,%ebx jnz .L05 negl (%esp) jmp .L05 diff --git a/jni/mpg123-1.13.4/src/libmpg123/testcpu.c b/jni/mpg123-1.17.0/src/libmpg123/testcpu.c similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/testcpu.c rename to jni/mpg123-1.17.0/src/libmpg123/testcpu.c diff --git a/jni/mpg123-1.13.4/src/libmpg123/true.h b/jni/mpg123-1.17.0/src/libmpg123/true.h similarity index 100% rename from jni/mpg123-1.13.4/src/libmpg123/true.h rename to jni/mpg123-1.17.0/src/libmpg123/true.h diff --git a/jni/mpg123-1.13.4/src/local.c b/jni/mpg123-1.17.0/src/local.c similarity index 100% rename from jni/mpg123-1.13.4/src/local.c rename to jni/mpg123-1.17.0/src/local.c diff --git a/jni/mpg123-1.13.4/src/local.h b/jni/mpg123-1.17.0/src/local.h similarity index 100% rename from jni/mpg123-1.13.4/src/local.h rename to jni/mpg123-1.17.0/src/local.h diff --git a/jni/mpg123-1.13.4/src/metaprint.c b/jni/mpg123-1.17.0/src/metaprint.c similarity index 87% rename from jni/mpg123-1.13.4/src/metaprint.c rename to jni/mpg123-1.17.0/src/metaprint.c index 1b2665b1..d8afda93 100644 --- a/jni/mpg123-1.13.4/src/metaprint.c +++ b/jni/mpg123-1.17.0/src/metaprint.c @@ -234,7 +234,7 @@ void print_id3_tag(mpg123_handle *mh, int long_id3, FILE *out) /* We are trying to be smart here and conserve vertical space. So we will skip tags not set, and try to show them in two parallel columns if they are short, which is by far the most common case. */ /* one _could_ circumvent the strlen calls... */ - if(tag[TITLE].fill && tag[ARTIST].fill && len[TITLE] <= 30 && len[TITLE] <= 30) + if(tag[TITLE].fill && tag[ARTIST].fill && len[TITLE] <= 30 && len[ARTIST] <= 30) { fprintf(out,"Title: %s%s Artist: %s\n",tag[TITLE].p, space+len[TITLE], tag[ARTIST].p); } @@ -267,6 +267,52 @@ void print_id3_tag(mpg123_handle *mh, int long_id3, FILE *out) } } for(ti=0; titexts; ++i) + { + if(!memcmp(v2->text[i].id, "USLT", 4)) + { + /* split into lines, ensure usage of proper local line end */ + size_t a=0; + size_t b=0; + char lang[4]; /* just a 3-letter ASCII code, no fancy encoding */ + mpg123_string innline; + mpg123_string outline; + mpg123_string *uslt = &v2->text[i].text; + + memcpy(lang, &v2->text[i].lang, 3); + lang[3] = 0; + printf("Lyrics begin, language: %s; %s\n\n", lang, v2->text[i].description.fill ? v2->text[i].description.p : ""); + + mpg123_init_string(&innline); + mpg123_init_string(&outline); + while(a < uslt->fill) + { + b = a; + while(b < uslt->fill && uslt->p[b] != '\n' && uslt->p[b] != '\r') ++b; + /* Either found end of a line or end of the string (null byte) */ + mpg123_set_substring(&innline, uslt->p, a, b-a); + transform(&outline, &innline); + printf(" %s\n", outline.p); + + if(uslt->p[b] == uslt->fill) break; /* nothing more */ + + /* Swallow CRLF */ + if(uslt->fill-b > 1 && uslt->p[b] == '\r' && uslt->p[b+1] == '\n') ++b; + + a = b + 1; /* next line beginning */ + } + mpg123_free_string(&innline); + mpg123_free_string(&outline); + + printf("\nLyrics end.\n"); + } + } + } } void print_icy(mpg123_handle *mh, FILE *outstream) diff --git a/jni/mpg123-1.13.4/src/metaprint.h b/jni/mpg123-1.17.0/src/metaprint.h similarity index 100% rename from jni/mpg123-1.13.4/src/metaprint.h rename to jni/mpg123-1.17.0/src/metaprint.h diff --git a/jni/mpg123-1.13.4/src/module.c b/jni/mpg123-1.17.0/src/module.c similarity index 82% rename from jni/mpg123-1.13.4/src/module.c rename to jni/mpg123-1.17.0/src/module.c index 94bffa5c..abf9adb0 100644 --- a/jni/mpg123-1.13.4/src/module.c +++ b/jni/mpg123-1.17.0/src/module.c @@ -80,9 +80,11 @@ static char *get_module_dir() if(param.verbose > 1) fprintf(stderr, "Looking for module dir: %s\n", moddir); dir = opendir(moddir); - closedir(dir); - - if(dir != NULL) break; /* found it! */ + if(dir != NULL) + { + closedir(dir); + break; /* found it! */ + } else{ free(moddir); moddir=NULL; } } } @@ -91,9 +93,8 @@ static char *get_module_dir() return moddir; } -/* Open a module */ -mpg123_module_t* -open_module( const char* type, const char* name ) +/* Open a module in current directory. */ +mpg123_module_t* open_module_here(const char* type, const char* name) { lt_dlhandle handle = NULL; mpg123_module_t *module = NULL; @@ -101,33 +102,21 @@ open_module( const char* type, const char* name ) size_t module_path_len = 0; char* module_symbol = NULL; size_t module_symbol_len = 0; - char *workdir = NULL; - char *moddir = NULL; - workdir = get_the_cwd(); - moddir = get_module_dir(); - if(workdir == NULL || moddir == NULL) + + /* Initialize libltdl */ + if(lt_dlinit()) { - error("Failure getting workdir or moddir!"); - if(workdir != NULL) free(workdir); - if(moddir != NULL) free(moddir); + error("Failed to initialise libltdl"); return NULL; } - /* Initialize libltdl */ - if (lt_dlinit()) error( "Failed to initialise libltdl" ); - - if(chdir(moddir) != 0) - { - error2("Failed to enter module directory %s: %s", moddir, strerror(errno)); - goto om_bad; - } /* Work out the path of the module to open */ /* Note that we need to open ./file, not just file! */ module_path_len = 2 + strlen(type) + 1 + strlen(name) + strlen(MODULE_FILE_SUFFIX) + 1; module_path = malloc( module_path_len ); if (module_path == NULL) { error1( "Failed to allocate memory for module name: %s", strerror(errno) ); - goto om_bad; + return NULL; } snprintf( module_path, module_path_len, "./%s_%s%s", type, name, MODULE_FILE_SUFFIX ); /* Display the path of the module created */ @@ -141,7 +130,7 @@ open_module( const char* type, const char* name ) if(param.verbose > 1) fprintf(stderr, "Note: This could be because of braindead path in the .la file...\n"); - goto om_bad; + return NULL; } /* Work out the symbol name */ @@ -149,6 +138,10 @@ open_module( const char* type, const char* name ) strlen( type ) + strlen( MODULE_SYMBOL_SUFFIX ) + 1; module_symbol = malloc(module_symbol_len); + if (module_symbol == NULL) { + error1( "Failed to allocate memory for module symbol: %s", strerror(errno) ); + return NULL; + } snprintf( module_symbol, module_symbol_len, "%s%s%s", MODULE_SYMBOL_PREFIX, type, MODULE_SYMBOL_SUFFIX ); debug1( "Module symbol: %s", module_symbol ); @@ -157,34 +150,51 @@ open_module( const char* type, const char* name ) free( module_symbol ); if (module==NULL) { error1( "Failed to get module symbol: %s", lt_dlerror() ); - goto om_latebad; + return NULL; } /* Check the API version */ - if (MPG123_MODULE_API_VERSION > module->api_version) { - error( "API version of module is too old" ); - goto om_latebad; - } else if (MPG123_MODULE_API_VERSION > module->api_version) { - error( "API version of module is too new" ); - goto om_latebad; + if (MPG123_MODULE_API_VERSION != module->api_version) + { + error2( "API version of module does not match (got %i, expected %i).", module->api_version, MPG123_MODULE_API_VERSION); + lt_dlclose(handle); + return NULL; } /* Store handle in the data structure */ module->handle = handle; + return module; +} + + +/* Open a module, including directory search. */ +mpg123_module_t* open_module(const char* type, const char* name) +{ + mpg123_module_t *module = NULL; + char *workdir = NULL; + char *moddir = NULL; + + workdir = get_the_cwd(); + moddir = get_module_dir(); + if(workdir == NULL || moddir == NULL) + { + error("Failure getting workdir or moddir! (Perhaps set MPG123_MODDIR?)"); + if(workdir == NULL) fprintf(stderr, "Hint: I need to know the current working directory to be able to come back after hunting modules. I will not leave because I do not know where I am.\n"); + + if(workdir != NULL) free(workdir); + if(moddir != NULL) free(moddir); + return NULL; + } + + if(chdir(moddir) == 0) module = open_module_here(type, name); + else error2("Failed to enter module directory %s: %s", moddir, strerror(errno)); - goto om_end; -om_latebad: - lt_dlclose( handle ); -om_bad: - module = NULL; -om_end: chdir(workdir); free(moddir); free(workdir); return module; } - void close_module( mpg123_module_t* module ) { lt_dlhandle handle = module->handle; @@ -199,9 +209,16 @@ static char *get_the_cwd() { size_t bs = PATH_STEP; char *buf = malloc(bs); + errno = 0; while((buf != NULL) && getcwd(buf, bs) == NULL) { char *buf2; + if(errno != ERANGE) + { + error1("getcwd returned unexpected error: %s", strerror(errno)); + free(buf); + return NULL; + } buf2 = realloc(buf, bs+=PATH_STEP); if(buf2 == NULL){ free(buf); buf = NULL; } else debug1("pwd: increased buffer to %lu", (unsigned long)bs); @@ -271,16 +288,14 @@ void list_modules() /* Extract the short name of the module */ module_name = strdup( dp->d_name + strlen( module_type ) + 1 ); module_name[ strlen( module_name ) - strlen( MODULE_FILE_SUFFIX ) ] = '\0'; - /* Open the module */ - module = open_module( module_type, module_name ); + module = open_module_here(module_type, module_name); if (module) { printf("%-15s%s %s\n", module->name, module_type, module->description ); /* Close the module again */ close_module( module ); } - free( module_name ); free( module_type ); } diff --git a/jni/mpg123-1.13.4/src/module.h b/jni/mpg123-1.17.0/src/module.h similarity index 100% rename from jni/mpg123-1.13.4/src/module.h rename to jni/mpg123-1.17.0/src/module.h diff --git a/jni/mpg123-1.17.0/src/mpg123-id3dump.c b/jni/mpg123-1.17.0/src/mpg123-id3dump.c new file mode 100644 index 00000000..74cbd7a9 --- /dev/null +++ b/jni/mpg123-1.17.0/src/mpg123-id3dump.c @@ -0,0 +1,418 @@ +/* + id3dump: Print ID3 tags of files, scanned using libmpg123. + + copyright 2007 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Thomas Orgis +*/ + +#include "config.h" +#include "compat.h" +#include "mpg123.h" +#include "getlopt.h" +#include +#include +#include "debug.h" +#include "win32_support.h" + +static int errors = 0; + +static struct +{ + int store_pics; + int do_scan; +} param = +{ + FALSE + , TRUE +}; + +static const char* progname; + +static void usage(int err) +{ + FILE* o = stdout; + if(err) + { + o = stderr; + fprintf(o, "You made some mistake in program usage... let me briefly remind you:\n\n"); + } + fprintf(o, "Tool to dump ID3 meta data from MPEG audio files using libmpg123\n"); + fprintf(o, "\tversion %s; written and copyright by Thomas Orgis and the mpg123 project\n", PACKAGE_VERSION); + fprintf(o,"\nusage: %s [option(s)] file(s)\n", progname); + fprintf(o,"\noptions:\n"); + fprintf(o," -h --help give usage help\n"); + fprintf(o," -n --no-scan do not scan entire file (just beginning)\n"); + fprintf(o," -p --store-pics write APIC frames (album art pictures) to files\n"); + fprintf(o," file names using whole input file name as prefix\n"); + fprintf(o,"\nNote that text output will always be in UTF-8, regardless of locale.\n"); + exit(err); +} +static void want_usage(char* bla) +{ + usage(0); +} + +static topt opts[] = +{ + {'h', "help", 0, want_usage, 0, 0} + ,{'n', "no-scan", GLO_INT, 0, ¶m.do_scan, FALSE} + ,{'p', "store-pics", GLO_INT, 0, ¶m.store_pics, TRUE} + ,{0, 0, 0, 0, 0, 0} +}; + +/* Helper for v1 printing, get these strings their zero byte. */ +void safe_print(char* name, char *data, size_t size) +{ + char safe[31]; + if(size>30) return; + + memcpy(safe, data, size); + safe[size] = 0; + printf("%s: %s\n", name, safe); +} + +/* Print out ID3v1 info. */ +void print_v1(mpg123_id3v1 *v1) +{ + safe_print("Title", v1->title, sizeof(v1->title)); + safe_print("Artist", v1->artist, sizeof(v1->artist)); + safe_print("Album", v1->album, sizeof(v1->album)); + safe_print("Year", v1->year, sizeof(v1->year)); + safe_print("Comment", v1->comment, sizeof(v1->comment)); + printf("Genre: %i", v1->genre); +} + +/* Split up a number of lines separated by \n, \r, both or just zero byte + and print out each line with specified prefix. */ +void print_lines(const char* prefix, mpg123_string *inlines) +{ + size_t i; + int hadcr = 0, hadlf = 0; + char *lines = NULL; + char *line = NULL; + size_t len = 0; + + if(inlines != NULL && inlines->fill) + { + lines = inlines->p; + len = inlines->fill; + } + else return; + + line = lines; + for(i=0; ititle); + print_lines("Artist: ", v2->artist); + print_lines("Album: ", v2->album); + print_lines("Year: ", v2->year); + print_lines("Comment: ", v2->comment); + print_lines("Genre: ", v2->genre); +} + +/* Easy conversion to string via lookup. */ +const char* pic_types[] = +{ + "other" + ,"icon" + ,"other icon" + ,"front cover" + ,"back cover" + ,"leaflet" + ,"media" + ,"lead" + ,"artist" + ,"conductor" + ,"orchestra" + ,"composer" + ,"lyricist" + ,"location" + ,"recording" + ,"performance" + ,"video" + ,"fish" + ,"illustration" + ,"artist logo" + ,"publisher logo" +}; +static const char* pic_type(int id) +{ + return (id >= 0 && id < (sizeof(pic_types)/sizeof(char*))) + ? pic_types[id] + : "invalid type"; +} + +/* Print out all stored ID3v2 fields with their 4-character IDs. */ +void print_raw_v2(mpg123_id3v2 *v2) +{ + size_t i; + for(i=0; itexts; ++i) + { + char id[5]; + char lang[4]; + memcpy(id, v2->text[i].id, 4); + id[4] = 0; + memcpy(lang, v2->text[i].lang, 3); + lang[3] = 0; + if(v2->text[i].description.fill) + printf("%s language(%s) description(%s)\n", id, lang, v2->text[i].description.p); + else printf("%s language(%s)\n", id, lang); + + print_lines(" ", &v2->text[i].text); + } + for(i=0; iextras; ++i) + { + char id[5]; + memcpy(id, v2->extra[i].id, 4); + id[4] = 0; + printf( "%s description(%s)\n", + id, + v2->extra[i].description.fill ? v2->extra[i].description.p : "" ); + print_lines(" ", &v2->extra[i].text); + } + for(i=0; icomments; ++i) + { + char id[5]; + char lang[4]; + memcpy(id, v2->comment_list[i].id, 4); + id[4] = 0; + memcpy(lang, v2->comment_list[i].lang, 3); + lang[3] = 0; + printf( "%s description(%s) language(%s):\n", + id, + v2->comment_list[i].description.fill ? v2->comment_list[i].description.p : "", + lang ); + print_lines(" ", &v2->comment_list[i].text); + } + for(i=0; ipictures; ++i) + { + mpg123_picture* pic; + + pic = &v2->picture[i]; + fprintf(stderr, "APIC type(%i, %s) mime(%s) size(%"SIZE_P")\n", + pic->type, pic_type(pic->type), pic->mime_type.p, (size_p)pic->size); + print_lines(" ", &pic->description); + } +} + +const char* unknown_end = "picture"; + +static char* mime2end(mpg123_string* mime) +{ + size_t len; + char* end; + if(strncasecmp("image/",mime->p,6)) + { + end = malloc(sizeof(unknown_end)); + memcpy(end, unknown_end, sizeof(unknown_end)); + return end; + } + + /* Else, use fmt out of image/fmt ... but make sure that usage stops at + non-alphabetic character, as MIME can have funny stuff following a ";". */ + for(len=1; lenfill-6; ++len) + { + if(!isalnum(mime->p[len-1+6])) break; + } + /* len now containing the number of bytes after the "/" up to the next + invalid char or null */ + if(len < 1) return "picture"; + + end = malloc(len); + if(!end) exit(11); /* Come on, is it worth wasting lines for a message? + If we're so broke, fprintf will also likely fail. */ + + memcpy(end, mime->p+6,len-1); + end[len-1] = 0; + return end; +} + +/* Construct a sane file name without introducing spaces, then open. + Example: /some/where/some.mp3.front_cover.jpeg + If multiple ones are there: some.mp3.front_cover2.jpeg */ +int open_picfile(const char* prefix, mpg123_picture* pic) +{ + char *end, *typestr, *pfn; + const char* pictype; + size_t i, len; + int fd; + unsigned long count = 1; + + pictype = pic_type(pic->type); + len = strlen(pictype); + if(!(typestr = malloc(len+1))) exit(11); + memcpy(typestr, pictype, len); + for(i=0; imime_type); + len = strlen(prefix)+1+strlen(typestr)+1+strlen(end); + if(!(pfn = malloc(len+1))) exit(11); + + sprintf(pfn, "%s.%s.%s", prefix, typestr, end); + pfn[len] = 0; + + errno = 0; + fd = compat_open(pfn, O_CREAT|O_WRONLY|O_EXCL); + while(fd < 0 && errno == EEXIST && ++count < ULONG_MAX) + { + char dum; + size_t digits; + + digits = snprintf(&dum, 1, "%lu", count); + if(!(pfn=safe_realloc(pfn, len+digits+1))) exit(11); + + sprintf(pfn, "%s.%s%lu.%s", prefix, typestr, count, end); + pfn[len+digits] = 0; + errno = 0; + fd = compat_open(pfn, O_CREAT|O_WRONLY|O_EXCL); + } + printf("writing %s\n", pfn); + if(fd < 0) + { + error("Cannot open for writing (counter exhaust? permissions?)."); + ++errors; + } + + free(end); + free(typestr); + free(pfn); + return fd; +} + +static void store_pictures(const char* prefix, mpg123_id3v2 *v2) +{ + int i; + + for(i=0; ipictures; ++i) + { + int fd; + mpg123_picture* pic; + + pic = &v2->picture[i]; + fd = open_picfile(prefix, pic); + if(fd >= 0) + { /* stream I/O for not having to care about interruptions */ + FILE* picfile = fdopen(fd, "w"); + if(picfile) + { + if(fwrite(pic->data, pic->size, 1, picfile) != 1) + { + error("Failure to write data."); + ++errors; + } + if(fclose(picfile)) + { + error("Failure to close (flush?)."); + ++errors; + } + } + else + { + error1("Unable to fdopen output: %s)", strerror(errno)); + ++errors; + } + } + } +} + +int main(int argc, char **argv) +{ + int i, result; + mpg123_handle* m; +#if defined(WANT_WIN32_UNICODE) + win32_cmdline_utf8(&argc,&argv); +#endif + progname = argv[0]; + + while ((result = getlopt(argc, argv, opts))) + switch (result) { + case GLO_UNKNOWN: + fprintf (stderr, "%s: Unknown option \"%s\".\n", + progname, loptarg); + usage(1); + case GLO_NOARG: + fprintf (stderr, "%s: Missing argument for option \"%s\".\n", + progname, loptarg); + usage(1); + } + +#ifdef WIN32 + fprintf(stderr, "WARNING: This tool is not yet adapted to run on Windows (file I/O, unicode arguments)!\n"); +#endif + if(loptind >= argc) usage(1); + + mpg123_init(); + m = mpg123_new(NULL, NULL); + mpg123_param(m, MPG123_ADD_FLAGS, MPG123_PICTURE, 0.); + + for(i=loptind; i < argc; ++i) + { + mpg123_id3v1 *v1; + mpg123_id3v2 *v2; + int meta; + if(mpg123_open(m, argv[i]) != MPG123_OK) + { + fprintf(stderr, "Cannot open %s: %s\n", argv[i], mpg123_strerror(m)); + continue; + } + if(param.do_scan) mpg123_scan(m); + mpg123_seek(m, 0, SEEK_SET); + meta = mpg123_meta_check(m); + if(meta & MPG123_ID3 && mpg123_id3(m, &v1, &v2) == MPG123_OK) + { + printf("FILE: %s\n", argv[i]); + printf("\n==== ID3v1 ====\n"); + if(v1 != NULL) print_v1(v1); + + printf("\n==== ID3v2 ====\n"); + if(v2 != NULL) print_v2(v2); + + printf("\n==== ID3v2 Raw frames ====\n"); + if(v2 != NULL) + { + print_raw_v2(v2); + if(param.store_pics) + store_pictures(argv[i], v2); + } + } + else printf("Nothing found for %s.\n", argv[i]); + + mpg123_close(m); + } + mpg123_delete(m); + mpg123_exit(); + + if(errors) error1("Encountered %i errors along the way.", errors); + return errors != 0; +#if defined(WANT_WIN32_UNICODE) + win32_cmdline_utf8_free(argc,argv); +#endif +} diff --git a/jni/mpg123-1.17.0/src/mpg123-strip.c b/jni/mpg123-1.17.0/src/mpg123-strip.c new file mode 100644 index 00000000..ad6ac3b3 --- /dev/null +++ b/jni/mpg123-1.17.0/src/mpg123-strip.c @@ -0,0 +1,158 @@ +/* + extract_frams: utlize the framebyframe API and mpg123_framedata to extract the MPEG frames out of a stream (strip off anything else). + + copyright 2011-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written by Thomas Orgis +*/ + +#include "config.h" +#include "compat.h" +#include + +#include "getlopt.h" + + +static struct +{ + int info; + long icy_interval; + int verbose; +} param = +{ + TRUE + ,0 + ,0 +}; + +static const char* progname; + +static void usage(int err) +{ + FILE* o = stdout; + if(err) + { + o = stderr; + fprintf(o, "You made some mistake in program usage... let me briefly remind you:\n\n"); + } + fprintf(o, "Extract only MPEG frames from a stream using libmpg123 (stdin to stdout)\n"); + fprintf(o, "\tversion %s; written and copyright by Thomas Orgis and the mpg123 project\n", PACKAGE_VERSION); + fprintf(o,"\nusage: %s [option(s)] < input > output\n", progname); + fprintf(o,"\noptions:\n"); + fprintf(o," -h --help give usage help\n"); + fprintf(o," -i --icy-interval stream has ICY metadata present with this interval\n"); + fprintf(o," -n --no-info also strip info frame at beginning\n"); + fprintf(o," -v[*] --verbose increase verbosity level\n"); + exit(err); +} + +static void want_usage(char* bla) +{ + usage(0); +} + +static void set_verbose (char *arg) +{ + param.verbose++; +} + +static topt opts[] = +{ + {'h', "help", 0, want_usage, 0, 0} + ,{'i', "icy-interval", GLO_ARG|GLO_LONG, 0, ¶m.icy_interval, 0} + ,{'n', "no-info", GLO_INT, 0, ¶m.info, FALSE} + ,{'v', "verbose", 0, set_verbose, 0, 0} + ,{0, 0, 0, 0, 0, 0} +}; + +int do_work(mpg123_handle *m); + +int main(int argc, char **argv) +{ + int ret = 0; + mpg123_handle *m; + + progname = argv[0]; + + while ((ret = getlopt(argc, argv, opts))) + switch (ret) { + case GLO_UNKNOWN: + fprintf (stderr, "%s: Unknown option \"%s\".\n", + progname, loptarg); + usage(1); + case GLO_NOARG: + fprintf (stderr, "%s: Missing argument for option \"%s\".\n", + progname, loptarg); + usage(1); + } + + mpg123_init(); + m = mpg123_new(NULL, &ret); + + if(m == NULL) + { + fprintf(stderr, "Cannot create handle: %s", mpg123_plain_strerror(ret)); + } + else + { + ret = mpg123_param(m, MPG123_VERBOSE, param.verbose, 0.); + if(ret == MPG123_OK) + { + if(param.verbose) + fprintf(stderr, "Info frame handling: %s\n", + param.info ? "pass-through" : "remove"); + ret = param.info /* If info frame is ignored, it is treated as MPEG data. */ + ? mpg123_param(m, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0.) + : mpg123_param(m, MPG123_REMOVE_FLAGS, MPG123_IGNORE_INFOFRAME, 0.); + } + if(ret == MPG123_OK && param.icy_interval > 0) + { + if(param.verbose) fprintf(stderr, "ICY interval: %li\n", param.icy_interval); + ret = mpg123_param(m, MPG123_ICY_INTERVAL, param.icy_interval, 0); + } + + if(ret == MPG123_OK) ret = do_work(m); + + if(ret != MPG123_OK) fprintf(stderr, "Some error occured: %s\n", mpg123_strerror(m)); + + mpg123_delete(m); /* Closes, too. */ + } + mpg123_exit(); + + return ret; +} + +int do_work(mpg123_handle *m) +{ + int ret; + size_t count = 0; + ret = mpg123_open_fd(m, STDIN_FILENO); + if(ret != MPG123_OK) return ret; + + while( (ret = mpg123_framebyframe_next(m)) == MPG123_OK || ret == MPG123_NEW_FORMAT ) + { + unsigned long header; + unsigned char *bodydata; + size_t bodybytes; + if(mpg123_framedata(m, &header, &bodydata, &bodybytes) == MPG123_OK) + { + /* Need to extract the 4 header bytes from the native storage in the correct order. */ + unsigned char hbuf[4]; + int i; + for(i=0; i<4; ++i) hbuf[i] = (unsigned char) ((header >> ((3-i)*8)) & 0xff); + + /* Now write out both header and data, fire and forget. */ + write(STDOUT_FILENO, hbuf, 4); + write(STDOUT_FILENO, bodydata, bodybytes); + if(param.verbose) + fprintf(stderr, "%zu: header 0x%08x, %zu body bytes\n", ++count, header, bodybytes); + } + } + + if(ret != MPG123_DONE) + fprintf(stderr, "Some error occured (non-fatal?): %s\n", mpg123_strerror(m)); + + if(param.verbose) fprintf(stderr, "Done with %zu MPEG frames.\n", count); + + return MPG123_OK; +} diff --git a/jni/mpg123-1.17.0/src/mpg123-with-modules b/jni/mpg123-1.17.0/src/mpg123-with-modules new file mode 100755 index 00000000..fd4af2eb --- /dev/null +++ b/jni/mpg123-1.17.0/src/mpg123-with-modules @@ -0,0 +1,5 @@ +#!/bin/sh +# wrapper script to set MPG123_MODDIR automatically so that one can run mpg123 +# from the source directory, even if modules are enabled +src=$(dirname $0) +MPG123_MODDIR="$src/output/.libs" exec "$src/mpg123" "$@" diff --git a/jni/mpg123-1.13.4/src/mpg123.c b/jni/mpg123-1.17.0/src/mpg123.c similarity index 91% rename from jni/mpg123-1.13.4/src/mpg123.c rename to jni/mpg123-1.17.0/src/mpg123.c index 9a3b6892..9fe68568 100644 --- a/jni/mpg123-1.13.4/src/mpg123.c +++ b/jni/mpg123-1.17.0/src/mpg123.c @@ -1,7 +1,7 @@ /* mpg123: main code of the program (not of the decoder...) - copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright 1995-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Michael Hipp */ @@ -20,7 +20,6 @@ #include #include -#include #include #ifdef HAVE_SCHED_H @@ -66,6 +65,8 @@ struct parameter param = { 0, /* destination (headphones, ...) */ #ifdef HAVE_TERMIOS FALSE , /* term control */ + MPG123_TERM_USR1, + MPG123_TERM_USR2, #endif FALSE , /* checkrange */ 0 , /* force_reopen, always (re)opens audio device for next song */ @@ -102,7 +103,7 @@ struct parameter param = { ,1024 /* resync_limit */ ,0 /* smooth */ ,0.0 /* pitch */ - ,0 /* ignore_mime */ + ,0 /* appflags */ ,NULL /* proxyurl */ ,0 /* keep_open */ ,0 /* force_utf8 */ @@ -126,6 +127,7 @@ char *equalfile = NULL; struct httpdata htd; int fresh = TRUE; int have_output = FALSE; /* If we are past the output init step. */ +FILE* aux_out = NULL; /* Output for interesting information, normally on stdout to be parseable. */ int buffer_fd[2]; int buffer_pid; @@ -195,7 +197,7 @@ void safe_exit(int code) httpdata_free(&htd); -#ifdef WIN32_WANT_UNICODE +#ifdef WANT_WIN32_UNICODE win32_cmdline_free(argc, argv); /* This handles the premature argv == NULL, too. */ #endif #if defined (WANT_WIN32_SOCKETS) @@ -295,10 +297,20 @@ static void set_out_file(char *arg) { param.outmode=DECODE_FILE; #ifdef WIN32 - OutputDescriptor=_open(arg,_O_CREAT|_O_WRONLY|_O_BINARY|_O_TRUNC,0666); + #ifdef WANT_WIN32_UNICODE + wchar_t *argw = NULL; + OutputDescriptor = win32_utf8_wide(arg, &argw, NULL); + if(argw != NULL) + { + OutputDescriptor=_wopen(argw,_O_CREAT|_O_WRONLY|_O_BINARY|_O_TRUNC,0666); + free(argw); + } #else + OutputDescriptor=_open(arg,_O_CREAT|_O_WRONLY|_O_BINARY|_O_TRUNC,0666); + #endif /*WANT_WIN32_UNICODE*/ + #else /*WIN32*/ OutputDescriptor=open(arg,O_CREAT|O_WRONLY|O_TRUNC,0666); - #endif + #endif /*WIN32*/ if(OutputDescriptor==-1) { error2("Can't open %s for writing (%s).\n",arg,strerror(errno)); @@ -310,6 +322,7 @@ static void set_out_stdout(char *arg) { param.outmode=DECODE_FILE; param.remote_err=TRUE; + aux_out = stderr; OutputDescriptor=STDOUT_FILENO; #ifdef WIN32 _setmode(STDOUT_FILENO, _O_BINARY); @@ -320,6 +333,7 @@ static void set_out_stdout1(char *arg) { param.outmode=DECODE_AUDIOFILE; param.remote_err=TRUE; + aux_out = stderr; OutputDescriptor=STDOUT_FILENO; #ifdef WIN32 _setmode(STDOUT_FILENO, _O_BINARY); @@ -344,6 +358,17 @@ static void unset_frameflag(char *arg) { param.flags &= ~frameflag; } + +static int appflag; /* still ugly, but works */ +static void set_appflag(char *arg) +{ + param.appflags |= appflag; +} +/* static void unset_appflag(char *arg) +{ + param.appflags &= ~appflag; +} */ + /* Please note: GLO_NUM expects point to LONG! */ /* ThOr: * Yeah, and despite that numerous addresses to int variables were @@ -392,6 +417,8 @@ topt opts[] = { {'n', "frames", GLO_ARG | GLO_LONG, 0, ¶m.frame_number, 0}, #ifdef HAVE_TERMIOS {'C', "control", GLO_INT, 0, ¶m.term_ctrl, TRUE}, + {0, "ctrlusr1", GLO_ARG | GLO_CHAR, 0, ¶m.term_usr1, 0}, + {0, "ctrlusr2", GLO_ARG | GLO_CHAR, 0, ¶m.term_usr2, 0}, #endif #ifndef NOXFERMEM {'b', "buffer", GLO_ARG | GLO_LONG, 0, ¶m.usebuffer, 0}, @@ -442,6 +469,7 @@ topt opts[] = { {0 , "longhelp" , 0, want_long_usage, 0, 0 }, {0 , "version" , 0, give_version, 0, 0 }, {'l', "listentry", GLO_ARG | GLO_LONG, 0, ¶m.listentry, 0 }, + {0, "continue", GLO_INT, set_appflag, &appflag, MPG123APP_CONTINUE }, {0, "rva-mix", GLO_INT, 0, ¶m.rva, 1 }, {0, "rva-radio", GLO_INT, 0, ¶m.rva, 1 }, {0, "rva-album", GLO_INT, 0, ¶m.rva, 2 }, @@ -457,7 +485,8 @@ topt opts[] = { {'D', "delay", GLO_ARG | GLO_INT, 0, ¶m.delay, 0}, {0, "resync-limit", GLO_ARG | GLO_LONG, 0, ¶m.resync_limit, 0}, {0, "pitch", GLO_ARG|GLO_DOUBLE, 0, ¶m.pitch, 0}, - {0, "ignore-mime", GLO_INT, 0, ¶m.ignore_mime, 1 }, + {0, "ignore-mime", GLO_INT, set_appflag, &appflag, MPG123APP_IGNORE_MIME }, + {0, "lyrics", GLO_INT, set_appflag, &appflag, MPG123APP_LYRICS}, {0, "keep-open", GLO_INT, 0, ¶m.keep_open, 1}, {0, "utf8", GLO_INT, 0, ¶m.force_utf8, 1}, {0, "fuzzy", GLO_INT, set_frameflag, &frameflag, MPG123_FUZZY}, @@ -469,6 +498,7 @@ topt opts[] = { {0, "skip-id3v2", GLO_INT, set_frameflag, &frameflag, MPG123_SKIP_ID3V2}, {0, "streamdump", GLO_ARG|GLO_CHAR, 0, ¶m.streamdump, 0}, {0, "icy-interval", GLO_ARG|GLO_LONG, 0, ¶m.icy_interval, 0}, + {0, "ignore-streamlength", GLO_INT, set_frameflag, &frameflag, MPG123_IGNORE_STREAMLENGTH}, {0, 0, 0, 0, 0, 0} }; @@ -568,7 +598,7 @@ int open_track(char *fname) /* now check if we got sth. and if we got sth. good */ if( (filept >= 0) && (htd.content_type.p != NULL) - && !param.ignore_mime && !(debunk_mime(htd.content_type.p) & IS_FILE) ) + && !APPFLAG(MPG123APP_IGNORE_MIME) && !(debunk_mime(htd.content_type.p) & IS_FILE) ) { error1("Unknown mpeg MIME type %s - is it perhaps a playlist (use -@)?", htd.content_type.p == NULL ? "" : htd.content_type.p); error("If you know the stream is mpeg1/2 audio, then please report this as "PACKAGE_NAME" bug"); @@ -639,11 +669,6 @@ int play_frame(void) if(fresh && framenum >= param.start_frame) { fresh = FALSE; - if(!param.quiet) - { - if(param.verbose) print_header(mh); - else print_header_compact(mh); - } } /* Normal flushing of data, includes buffer decoding. */ if(flush_output(ao, audio, bytes) < (int)bytes && !intflag) @@ -675,8 +700,14 @@ int play_frame(void) long rate; int channels, format; mpg123_getformat(mh, &rate, &channels, &format); - if(param.verbose > 2) fprintf(stderr, "Note: New output format %liHz %ich, format %i\n", rate, channels, format); + if(param.verbose > 2) fprintf(stderr, "\nNote: New output format %liHz %ich, format %i\n", rate, channels, format); + if(!param.quiet) + { + fprintf(stderr, "\n"); + if(param.verbose) print_header(mh); + else print_header_compact(mh); + } reset_audio(rate, channels, format); } } @@ -752,6 +783,7 @@ int skip_or_die(struct timeval *start_time) int main(int sys_argc, char ** sys_argv) { int result; + char end_of_files = FALSE; long parr; char *fname; int libpar = 0; @@ -759,7 +791,7 @@ int main(int sys_argc, char ** sys_argv) #if !defined(WIN32) && !defined(GENERIC) struct timeval start_time; #endif - + aux_out = stdout; /* Need to initialize here because stdout is not a constant?! */ #if defined (WANT_WIN32_UNICODE) if(win32_cmdline_utf8(&argc, &argv) != 0) { @@ -962,8 +994,9 @@ int main(int sys_argc, char ** sys_argv) } #endif -#if defined (HAVE_SCHED_SETSCHEDULER) && !defined (__CYGWIN__) +#if defined (HAVE_SCHED_SETSCHEDULER) && !defined (__CYGWIN__) && !defined (HAVE_WINDOWS_H) /* Cygwin --realtime seems to fail when accessing network, using win32 set priority instead */ +/* MinGW may have pthread installed, we prefer win32API */ if (param.realtime) { /* Get real-time priority */ struct sched_param sp; fprintf(stderr,"Getting real-time priority\n"); @@ -974,7 +1007,8 @@ int main(int sys_argc, char ** sys_argv) } #endif -#ifdef HAVE_WINDOWS_H +/* make sure not Cygwin, it doesn't need it */ +#if defined(WIN32) && defined(HAVE_WINDOWS_H) /* argument "3" is equivalent to realtime priority class */ win32_set_priority( param.realtime ? 3 : param.w32_priority); #endif @@ -998,9 +1032,12 @@ int main(int sys_argc, char ** sys_argv) if(param.term_ctrl) term_init(); #endif + if(APPFLAG(MPG123APP_CONTINUE)) frames_left = param.frame_number; + while ((fname = get_next_file())) { char *dirname, *filename; + int newdir; /* skip_tracks includes the previous one. */ if(skip_tracks) --skip_tracks; if(skip_tracks) @@ -1020,7 +1057,8 @@ int main(int sys_argc, char ** sys_argv) #endif output_unpause(ao); } - frames_left = param.frame_number; + if(!APPFLAG(MPG123APP_CONTINUE)) frames_left = param.frame_number; + debug1("Going to play %s", strcmp(fname, "-") ? fname : "standard input"); if(intflag || !open_track(fname)) @@ -1050,6 +1088,8 @@ int main(int sys_argc, char ** sys_argv) if(param.start_frame > 0) framenum = mpg123_seek_frame(mh, param.start_frame, SEEK_SET); + if(APPFLAG(MPG123APP_CONTINUE)) param.start_frame = 0; + if(framenum < 0) { error1("Initial seek failed: %s", mpg123_strerror(mh)); @@ -1063,11 +1103,12 @@ int main(int sys_argc, char ** sys_argv) continue; } + /* Prinout and xterm title need this, possibly independently. */ + newdir = split_dir_file(fname ? fname : "standard input", &dirname, &filename); + if (!param.quiet) { - if (split_dir_file(fname ? fname : "standard input", - &dirname, &filename)) - fprintf(stderr, "Directory: %s\n", dirname); + if(newdir) fprintf(stderr, "Directory: %s\n", dirname); #ifdef HAVE_TERMIOS /* Reminder about terminal usage. */ @@ -1078,20 +1119,25 @@ int main(int sys_argc, char ** sys_argv) fprintf(stderr, "Playing MPEG stream %lu of %lu: %s ...\n", (unsigned long)pl.pos, (unsigned long)pl.fill, filename); if(htd.icy_name.fill) fprintf(stderr, "ICY-NAME: %s\n", htd.icy_name.p); if(htd.icy_url.fill) fprintf(stderr, "ICY-URL: %s\n", htd.icy_url.p); - + } #if !defined(GENERIC) { const char *term_type; term_type = getenv("TERM"); - if (term_type && param.xterm_title && - (!strncmp(term_type,"xterm",5) || !strncmp(term_type,"rxvt",4))) + if(term_type && param.xterm_title) { + if(!strncmp(term_type,"xterm",5) || !strncmp(term_type,"rxvt",4)) fprintf(stderr, "\033]0;%s\007", filename); + else if(!strncmp(term_type,"screen",6)) + fprintf(stderr, "\033k%s\033\\", filename); + else if(!strncmp(term_type,"iris-ansi",9)) + fprintf(stderr, "\033P1.y %s\033\\\033P3.y%s\033\\", filename, filename); + + fflush(stderr); /* Paranoia: will the buffer buffer the escapes? */ } } #endif - } /* Rethink that SIGINT logic... */ #if !defined(WIN32) && !defined(GENERIC) #ifdef HAVE_TERMIOS @@ -1106,7 +1152,12 @@ int main(int sys_argc, char ** sys_argv) if(param.frame_number > -1) { debug1("frames left: %li", (long) frames_left); - if(!frames_left) break; + if(!frames_left) + { + if(APPFLAG(MPG123APP_CONTINUE)) end_of_files = TRUE; + + break; + } } if(!play_frame()) break; if(!param.quiet) @@ -1116,6 +1167,8 @@ int main(int sys_argc, char ** sys_argv) { if(meta & MPG123_NEW_ID3) print_id3_tag(mh, param.long_id3, stderr); if(meta & MPG123_NEW_ICY) print_icy(mh, stderr); + + mpg123_meta_free(mh); /* Do not waste memory after delivering. */ } } if(!fresh && param.verbose) @@ -1139,8 +1192,13 @@ int main(int sys_argc, char ** sys_argv) if(!param.quiet) { double secs; + long frank; + fprintf(stderr, "\n"); + if(mpg123_getstate(mh, MPG123_FRANKENSTEIN, &frank, NULL) == MPG123_OK && frank) + fprintf(stderr, "This was a Frankenstein track.\n"); + mpg123_position(mh, 0, 0, NULL, NULL, &secs, NULL); - fprintf(stderr,"\n[%d:%02d] Decoding of %s finished.\n", (int)(secs / 60), ((int)secs) % 60, filename); + fprintf(stderr,"[%d:%02d] Decoding of %s finished.\n", (int)(secs / 60), ((int)secs) % 60, filename); } else if(param.verbose) fprintf(stderr, "\n"); @@ -1155,14 +1213,23 @@ int main(int sys_argc, char ** sys_argv) #ifndef NOXFERMEM if(!param.smooth && param.usebuffer) buffer_resync(); #endif - } - } /* end of loop over input files */ + } + + if(end_of_files) break; + } /* end of loop over input files */ + /* Ensure we played everything. */ if(param.smooth && param.usebuffer) { buffer_drain(); buffer_resync(); } + + if(APPFLAG(MPG123APP_CONTINUE)) + { + continue_msg("CONTINUE"); + } + /* Free up memory used by playlist */ if(!param.remote) free_playlist(); @@ -1174,7 +1241,7 @@ static void print_title(FILE *o) { fprintf(o, "High Performance MPEG 1.0/2.0/2.5 Audio Player for Layers 1, 2 and 3\n"); fprintf(o, "\tversion %s; written and copyright by Michael Hipp and others\n", PACKAGE_VERSION); - fprintf(o, "\tfree software (LGPL/GPL) without any warranty but with best wishes\n"); + fprintf(o, "\tfree software (LGPL) without any warranty but with best wishes\n"); } static void usage(int err) /* print syntax & exit */ @@ -1214,7 +1281,11 @@ static void usage(int err) /* print syntax & exit */ #endif fprintf(o," -z shuffle play (with wildcards) -Z random play\n"); fprintf(o," -u a HTTP authentication string -E f Equalizer, data from file\n"); +#ifdef HAVE_TERMIOS fprintf(o," -C enable control keys --no-gapless not skip junk/padding in mp3s\n"); +#else + fprintf(o," --no-gapless not skip junk/padding in mp3s\n"); +#endif fprintf(o," -? this help --version print name + version\n"); fprintf(o,"See the manpage %s(1) or call %s with --longhelp for more parameters and information.\n", prgName,prgName); safe_exit(err); @@ -1246,8 +1317,10 @@ static void long_usage(int err) fprintf(o," -p --proxy set WWW proxy\n"); fprintf(o," -u --auth set auth values for HTTP access\n"); fprintf(o," --ignore-mime ignore HTTP MIME types (content-type)\n"); + fprintf(o," --no-seekbuffer disable seek buffer\n"); fprintf(o," -@ --list play songs in playlist (plain list, m3u, pls (shoutcast))\n"); fprintf(o," -l --listentry play nth title in playlist; show whole playlist for n < 0\n"); + fprintf(o," --continue playlist continuation mode (see man page)\n"); fprintf(o," --loop loop track(s) times, < 0 means infinite loop (not with --random!)\n"); fprintf(o," --keep-open (--remote mode only) keep loaded file open after reaching end\n"); fprintf(o," --timeout Timeout in seconds before declaring a stream dead (if <= 0, wait forever)\n"); @@ -1260,6 +1333,7 @@ static void long_usage(int err) fprintf(o," --resync-limit Set number of bytes to search for valid MPEG data; <0 means search whole stream.\n"); fprintf(o," --streamdump Dump a copy of input data (as read by libmpg123) to given file.\n"); fprintf(o," --icy-interval Enforce ICY interval in bytes (for playing a stream dump.\n"); + fprintf(o," --ignore-streamlength Ignore header info about length of MPEG streams."); fprintf(o,"\noutput/processing options\n\n"); fprintf(o," -o --output select audio output module\n"); fprintf(o," --list-modules list the available modules\n"); @@ -1272,7 +1346,7 @@ static void long_usage(int err) fprintf(o," --reopen force close/open on audiodevice\n"); #ifdef OPT_MULTI fprintf(o," --cpu set cpu optimization\n"); - fprintf(o," --test-cpu list optmizations possible with cpu and exit\n"); + fprintf(o," --test-cpu list optimizations possible with cpu and exit\n"); fprintf(o," --list-cpu list builtin optimizations and exit\n"); #endif #ifdef OPT_3DNOW @@ -1321,11 +1395,16 @@ static void long_usage(int err) fprintf(o," -q --quiet quiet mode\n"); #ifdef HAVE_TERMIOS fprintf(o," -C --control enable terminal control keys\n"); + fprintf(o," --ctrlusr1 control key (characer) to map to SIGUSR1\n"); + fprintf(o," (default is for stop/start)\n"); + fprintf(o," --ctrlusr2 control key (characer) to map to SIGUSR2\n"); + fprintf(o," (default is for next track)\n"); #endif #ifndef GENERIC - fprintf(o," --title set xterm/rxvt title to filename\n"); + fprintf(o," --title set terminal title to filename\n"); #endif fprintf(o," --long-tag spacy id3 display with every item on a separate line\n"); + fprintf(o," --lyrics show lyrics (from ID3v2 USLT frame)\n"); fprintf(o," --utf8 Regardless of environment, print metadata in UTF-8.\n"); fprintf(o," -R --remote generic remote interface\n"); fprintf(o," --remote-err force use of stderr for generic remote interface\n"); @@ -1361,3 +1440,8 @@ static void give_version(char* arg) fprintf(stdout, PACKAGE_NAME" "PACKAGE_VERSION"\n"); safe_exit(0); } + +void continue_msg(const char *name) +{ + fprintf(aux_out, "\n[%s] track %"SIZE_P" frame %"OFF_P"\n", name, (size_p)pl.pos, (off_p)framenum); +} diff --git a/jni/mpg123-1.13.4/src/mpg123app.h b/jni/mpg123-1.17.0/src/mpg123app.h similarity index 71% rename from jni/mpg123-1.13.4/src/mpg123app.h rename to jni/mpg123-1.17.0/src/mpg123app.h index 3e93633d..ba341ba8 100644 --- a/jni/mpg123-1.13.4/src/mpg123app.h +++ b/jni/mpg123-1.17.0/src/mpg123app.h @@ -19,7 +19,7 @@ #include "xfermem.h" #include "httpget.h" -#ifndef BUILDING_OUTPUT_MODULES +#if WIN32 #include "win32_support.h" #endif @@ -48,33 +48,36 @@ extern char* binpath; /* argv[0], actually... */ struct parameter { - int aggressive; /* renice to max. priority */ - int shuffle; /* shuffle/random play */ - int remote; /* remote operation */ - int remote_err; /* remote operation to stderr */ - int outmode; /* where to out the decoded sampels */ - int quiet; /* shut up! */ - int xterm_title; /* Change xterm title to song names? */ - long usebuffer; /* second level buffer size */ - int verbose; /* verbose level */ - char* output_module; /* audio output module to use */ - char* output_device; /* audio output device to use */ - int output_flags; /* legacy output destination for AIX/HP/Sun */ + int aggressive; /* renice to max. priority */ + int shuffle; /* shuffle/random play */ + int remote; /* remote operation */ + int remote_err; /* remote operation to stderr */ + int outmode; /* where to out the decoded sampels */ + int quiet; /* shut up! */ + int xterm_title; /* Change xterm title to song names? */ + long usebuffer; /* second level buffer size */ + int verbose; /* verbose level */ + char* output_module; /* audio output module to use */ + char* output_device; /* audio output device to use */ + int output_flags; /* legacy output destination for AIX/HP/Sun */ #ifdef HAVE_TERMIOS - int term_ctrl; + int term_ctrl; + /* Those are supposed to be single characters. */ + char* term_usr1; + char* term_usr2; #endif - int checkrange; - int force_reopen; - int test_cpu; - long realtime; + int checkrange; + int force_reopen; + int test_cpu; + long realtime; #ifdef HAVE_WINDOWS_H - int w32_priority; + int w32_priority; #endif - char *filename; - long listentry; /* possibility to choose playback of one entry in playlist (0: off, > 0 : select, < 0; just show list*/ - char* listname; /* name of playlist */ - int long_id3; - int list_cpu; + char *filename; + long listentry; /* possibility to choose playback of one entry in playlist (0: off, > 0 : select, < 0; just show list*/ + char* listname; /* name of playlist */ + int long_id3; + int list_cpu; char *cpu; #ifdef FIFO char* fifo; @@ -97,7 +100,7 @@ struct parameter long resync_limit; int smooth; double pitch; /* <0 or >0, 0.05 for 5% speedup. */ - int ignore_mime; /* An mpg123 app flag field in future? */ + unsigned long appflags; /* various switches for mpg123 application */ char *proxyurl; int keep_open; /* Whether to keep files open after end reached, for remote control mode, perhaps terminal control, too. */ int force_utf8; /* Regardless of environment, always print out verbatim UTF for metadata. */ @@ -110,6 +113,16 @@ struct parameter long icy_interval; }; +enum mpg123app_flags +{ + MPG123APP_IGNORE_MIME = 0x01 + ,MPG123APP_LYRICS = 0x02 + ,MPG123APP_CONTINUE = 0x04 +}; + +/* shortcut to check application flags */ +#define APPFLAG(a) (param.appflags & (a)) + extern char *equalfile; extern off_t framenum; extern struct httpdata htd; @@ -156,4 +169,6 @@ void set_intflag(void); /* equalizer... success is 0, failure -1 */ int load_equalizer(mpg123_handle *mh); +void continue_msg(const char *name); + #endif diff --git a/jni/mpg123-1.17.0/src/output/.deps/oss.Po b/jni/mpg123-1.17.0/src/output/.deps/oss.Po new file mode 100644 index 00000000..a54c2044 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/oss.Po @@ -0,0 +1,228 @@ +oss.o: oss.c \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/ioctl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctls.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termbits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl_compat.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h \ + ../../src/mpg123app.h ../../src/config.h ../../src/libmpg123/compat.h \ + ../../src/config.h ../../src/libmpg123/intsym.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h \ + ../../src/libmpg123/true.h ../../src/xfermem.h ../../src/httpget.h \ + ../../src/libmpg123/mpg123.h ../../src/audio.h ../../src/module.h \ + ../../src/local.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/soundcard.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h \ + /opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/patchkey.h \ + ../../src/libmpg123/debug.h + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/cdefs_elf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/android/api-level.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/ioctl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/ioctls.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/termbits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/ioctl_compat.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdint.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/stddef.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/compiler.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/posix_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/kernel.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysmacros.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/fcntl.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/unistd.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/select.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/time.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/internal_types.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/limits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/syslimits.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/page.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/string.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/malloc.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/signal.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/sigcontext.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/asm-generic/siginfo.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/sysconf.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/capability.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/pathconf.h: + +../../src/mpg123app.h: + +../../src/config.h: + +../../src/libmpg123/compat.h: + +../../src/config.h: + +../../src/libmpg123/intsym.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/stdlib.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/alloca.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/strings.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/memory.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include-fixed/stdio.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../lib/gcc/arm-linux-androideabi/4.6/include/stdarg.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/math.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/inttypes.h: + +../../src/libmpg123/true.h: + +../../src/xfermem.h: + +../../src/httpget.h: + +../../src/libmpg123/mpg123.h: + +../../src/audio.h: + +../../src/module.h: + +../../src/local.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/soundcard.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/sys/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/machine/endian.h: + +/opt/android-ndk-r8e/ndk-standalone/bin/../sysroot/usr/include/linux/patchkey.h: + +../../src/libmpg123/debug.h: diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_aix_la-aix.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_aix_la-aix.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_aix_la-aix.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_alib_la-alib.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_alib_la-alib.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_alib_la-alib.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_alsa_la-alsa.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_alsa_la-alsa.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_alsa_la-alsa.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_arts_la-arts.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_arts_la-arts.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_arts_la-arts.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_coreaudio_la-coreaudio.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_coreaudio_la-coreaudio.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_coreaudio_la-coreaudio.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_dummy_la-dummy.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_dummy_la-dummy.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_dummy_la-dummy.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_esd_la-esd.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_esd_la-esd.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_esd_la-esd.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_hp_la-hp.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_hp_la-hp.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_hp_la-hp.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_jack_la-jack.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_jack_la-jack.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_jack_la-jack.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_mint_la-mint.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_mint_la-mint.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_mint_la-mint.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_nas_la-nas.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_nas_la-nas.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_nas_la-nas.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_openal_la-openal.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_openal_la-openal.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_openal_la-openal.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_os2_la-os2.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_os2_la-os2.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_os2_la-os2.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_oss_la-oss.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_oss_la-oss.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_oss_la-oss.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_portaudio_la-portaudio.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_portaudio_la-portaudio.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_portaudio_la-portaudio.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_pulse_la-pulse.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_pulse_la-pulse.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_pulse_la-pulse.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_qsa_la-qsa.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_qsa_la-qsa.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_qsa_la-qsa.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_sdl_la-sdl.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_sdl_la-sdl.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_sdl_la-sdl.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_sgi_la-sgi.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_sgi_la-sgi.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_sgi_la-sgi.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_sndio_la-sndio.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_sndio_la-sndio.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_sndio_la-sndio.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_sun_la-sun.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_sun_la-sun.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_sun_la-sun.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_tinyalsa_la-tinyalsa.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_tinyalsa_la-tinyalsa.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_tinyalsa_la-tinyalsa.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_win32_la-win32.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_win32_la-win32.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_win32_la-win32.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/.deps/output_win32_wasapi_la-win32_wasapi.Plo b/jni/mpg123-1.17.0/src/output/.deps/output_win32_wasapi_la-win32_wasapi.Plo new file mode 100644 index 00000000..9ce06a81 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/.deps/output_win32_wasapi_la-win32_wasapi.Plo @@ -0,0 +1 @@ +# dummy diff --git a/jni/mpg123-1.17.0/src/output/Makefile b/jni/mpg123-1.17.0/src/output/Makefile new file mode 100644 index 00000000..aa8be9a3 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/Makefile @@ -0,0 +1,1424 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# src/output/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + + +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/mpg123 +pkgincludedir = $(includedir)/mpg123 +pkglibdir = $(libdir)/mpg123 +pkglibexecdir = $(libexecdir)/mpg123 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = 86_64-unknown-linux-gnu +host_triplet = arm-unknown-linux-androideabi + +# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint + +# Use that sh/perl script to generate the module entries: +#for i in tinyalsa alsa coreaudio esd jack nas oss portaudio pulse qsa sdl sndio sun win32 win32_wasapi aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | +#perl -ne 'chomp; $big = uc($_); print </dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14 +AIX_CFLAGS = +AIX_LDFLAGS = +AIX_LIBS = +ALIB_CFLAGS = +ALIB_LDFLAGS = +ALIB_LIBS = +ALSA_CFLAGS = +ALSA_LDFLAGS = +ALSA_LIBS = -lasound +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +API_VERSION = 38 +AR = arm-linux-androideabi-ar +ARTS_CFLAGS = +ARTS_LDFLAGS = +ARTS_LIBS = +AS = as +AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf +AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader +AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14 +AWK = mawk +CC = arm-linux-androideabi-gcc +CCAS = arm-linux-androideabi-gcc +CCASDEPMODE = depmode=gcc3 +CCASFLAGS = -g -O2 +CCDEPMODE = depmode=gcc3 +CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 +COREAUDIO_CFLAGS = +COREAUDIO_LDFLAGS = +COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices +CPP = arm-linux-androideabi-gcc -E +CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED +CYGPATH_W = echo +DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo +DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT) +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DLLTOOL = dlltool +DSYMUTIL = +DUMMY_CFLAGS = +DUMMY_LDFLAGS = +DUMMY_LIBS = +DUMPBIN = +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = /bin/grep -E +ESD_CFLAGS = +ESD_LDFLAGS = +ESD_LIBS = +EXEC_LT_LDFLAGS = +EXEEXT = +FGREP = /bin/grep -F +GREP = /bin/grep +HP_CFLAGS = +HP_LDFLAGS = +HP_LIBS = +INCLUDE_STDIO_H = #include +INCLUDE_STDLIB_H = #include +INCLUDE_SYS_TYPE_H = #include +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +JACK_CFLAGS = +JACK_LDFLAGS = +JACK_LIBS = +LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld +LDFLAGS = +LFS_LOBJ = lfs_alias.lo +LIBMPG123_VERSION = 38:4:38 +LIBOBJS = +LIBS = -lm +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIPO = +LN_S = ln -s +LTLIBOBJS = +LT_LDFLAGS = -export-dynamic +MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo +MANIFEST_TOOL = : +MINT_CFLAGS = +MINT_LDFLAGS = +MINT_LIBS = +MKDIR_P = /bin/mkdir -p +MODULE_OBJ = legacy_module.$(OBJEXT) +NAS_CFLAGS = +NAS_LDFLAGS = +NAS_LIBS = -laudio +NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B +NMEDIT = +OBJDUMP = objdump +OBJEXT = o +OPENAL_CFLAGS = +OPENAL_LDFLAGS = +OPENAL_LIBS = +OS2_CFLAGS = +OS2_LDFLAGS = +OS2_LIBS = -los2me -lmmpm2 -lsocket +OSS_CFLAGS = +OSS_LDFLAGS = +OSS_LIBS = +OTOOL = +OTOOL64 = +OUTPUT_CFLAGS = +OUTPUT_LDFLAGS = +OUTPUT_LIBS = +OUTPUT_MOD = oss +OUTPUT_OBJ = output/oss.$(OBJEXT) +PACKAGE = mpg123 +PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net +PACKAGE_NAME = mpg123 +PACKAGE_STRING = mpg123 1.17.0 +PACKAGE_TARNAME = mpg123 +PACKAGE_URL = +PACKAGE_VERSION = 1.17.0 +PATH_SEPARATOR = : +PKG_CONFIG = /usr/bin/pkg-config +PORTAUDIO_CFLAGS = +PORTAUDIO_LDFLAGS = +PORTAUDIO_LIBS = -lportaudio +PULSE_CFLAGS = -D_REENTRANT +PULSE_LDFLAGS = +PULSE_LIBS = -lpulse-simple -lpulse +QSA_CFLAGS = +QSA_LDFLAGS = +QSA_LIBS = +RANLIB = arm-linux-androideabi-ranlib +SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL +SDL_LDFLAGS = +SDL_LIBS = -lSDL +SED = /bin/sed +SET_MAKE = +SGI_CFLAGS = +SGI_LDFLAGS = +SGI_LIBS = +SHELL = /bin/bash +SNDIO_CFLAGS = +SNDIO_LDFLAGS = +SNDIO_LIBS = -lsndio +STRIP = arm-linux-androideabi-strip +SUN_CFLAGS = +SUN_LDFLAGS = +SUN_LIBS = +TINYALSA_CFLAGS = +TINYALSA_LDFLAGS = +TINYALSA_LIBS = -ltinyalsa +VERSION = 1.17.0 +WIN32_CFLAGS = +WIN32_LDFLAGS = +WIN32_LIBS = -lwinmm +WIN32_WASAPI_CFLAGS = +WIN32_WASAPI_LDFLAGS = +WIN32_WASAPI_LIBS = -lole32 -lavrt +YASM = yasm +YASMFLAGS = -pgas -rgas -mamd64 +YASM_FORMAT = +abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src/output +abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/src/output +abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0 +ac_ct_AR = +ac_ct_CC = +ac_ct_DUMPBIN = +am__include = include +am__leading_dot = . +am__quote = +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - +bindir = ${exec_prefix}/bin +build = 86_64-unknown-linux-gnu +build_alias = 86_64-unknown-linux-gnu +build_cpu = 86_64 +build_os = linux-gnu +build_vendor = unknown +builddir = . +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} +exec_prefix = ${prefix} +host = arm-unknown-linux-androideabi +host_alias = arm-linux-androideabi +host_cpu = arm +host_os = linux-androideabi +host_vendor = unknown +htmldir = ${docdir} +includedir = ${prefix}/include +infodir = ${datarootdir}/info +install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${datarootdir}/locale +localstatedir = ${prefix}/var +mandir = ${datarootdir}/man +mkdir_p = $(MKDIR_P) +oldincludedir = /usr/include +pdfdir = ${docdir} +prefix = /usr/local +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target_alias = arm-linux-androideabi +top_build_prefix = ../../ +top_builddir = ../.. +top_srcdir = ../.. + +#AM_CPPFLAGS = -I$(top_srcdir)/src/libmpg123 -I$(top_srcdir)/src + +#Do not include uneeded headers from mpg123app.h +AM_CPPFLAGS = $(LTDLINCL) -I$(top_builddir)/src \ + -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/libmpg123 -DBUILDING_OUTPUT_MODULES=1 +#pkglib_LTLIBRARIES = $(am__append_1) \ +# $(am__append_2) $(am__append_3) \ +# $(am__append_4) $(am__append_5) \ +# $(am__append_6) $(am__append_7) \ +# $(am__append_8) $(am__append_9) \ +# $(am__append_10) $(am__append_11) \ +# $(am__append_12) $(am__append_13) \ +# $(am__append_14) $(am__append_15) \ +# $(am__append_16) $(am__append_17) \ +# $(am__append_18) $(am__append_19) \ +# $(am__append_20) $(am__append_21) \ +# $(am__append_22) $(am__append_23) \ +# $(am__append_24) +##output_tinyalsa_la_SOURCES = tinyalsa.c +##output_tinyalsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_tinyalsa_la_CFLAGS = +##output_tinyalsa_la_LIBADD = -ltinyalsa +##output_alsa_la_SOURCES = alsa.c +##output_alsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_alsa_la_CFLAGS = +##output_alsa_la_LIBADD = -lasound +##output_coreaudio_la_SOURCES = coreaudio.c +##output_coreaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_coreaudio_la_CFLAGS = +##output_coreaudio_la_LIBADD = -framework AudioToolbox -framework AudioUnit -framework CoreServices +##output_esd_la_SOURCES = esd.c +##output_esd_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_esd_la_CFLAGS = +##output_esd_la_LIBADD = +##output_jack_la_SOURCES = jack.c +##output_jack_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_jack_la_CFLAGS = +##output_jack_la_LIBADD = +##output_nas_la_SOURCES = nas.c +##output_nas_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_nas_la_CFLAGS = +##output_nas_la_LIBADD = -laudio +#output_oss_la_SOURCES = oss.c +#output_oss_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +#output_oss_la_CFLAGS = +#output_oss_la_LIBADD = +##output_portaudio_la_SOURCES = portaudio.c +##output_portaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_portaudio_la_CFLAGS = +##output_portaudio_la_LIBADD = -lportaudio +#output_pulse_la_SOURCES = pulse.c +#output_pulse_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +#output_pulse_la_CFLAGS = -D_REENTRANT +#output_pulse_la_LIBADD = -lpulse-simple -lpulse +##output_qsa_la_SOURCES = qsa.c +##output_qsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_qsa_la_CFLAGS = +##output_qsa_la_LIBADD = +#output_sdl_la_SOURCES = sdl.c +#output_sdl_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +#output_sdl_la_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL +#output_sdl_la_LIBADD = -lSDL +##output_sndio_la_SOURCES = sndio.c +##output_sndio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_sndio_la_CFLAGS = +##output_sndio_la_LIBADD = -lsndio +##output_sun_la_SOURCES = sun.c +##output_sun_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_sun_la_CFLAGS = +##output_sun_la_LIBADD = +##output_win32_la_SOURCES = win32.c +##output_win32_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_win32_la_CFLAGS = +##output_win32_la_LIBADD = -lwinmm +##output_win32_wasapi_la_SOURCES = win32_wasapi.c +##output_win32_wasapi_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_win32_wasapi_la_CFLAGS = +##output_win32_wasapi_la_LIBADD = -lole32 -lavrt +##output_aix_la_SOURCES = aix.c +##output_aix_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_aix_la_CFLAGS = +##output_aix_la_LIBADD = +##output_alib_la_SOURCES = alib.c +##output_alib_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_alib_la_CFLAGS = +##output_alib_la_LIBADD = +##output_arts_la_SOURCES = arts.c +##output_arts_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_arts_la_CFLAGS = +##output_arts_la_LIBADD = +##output_hp_la_SOURCES = hp.c +##output_hp_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_hp_la_CFLAGS = +##output_hp_la_LIBADD = +##output_os2_la_SOURCES = os2.c +##output_os2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_os2_la_CFLAGS = +##output_os2_la_LIBADD = -los2me -lmmpm2 -lsocket +##output_sgi_la_SOURCES = sgi.c +##output_sgi_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_sgi_la_CFLAGS = +##output_sgi_la_LIBADD = +##output_mint_la_SOURCES = mint.c +##output_mint_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_mint_la_CFLAGS = +##output_mint_la_LIBADD = +##output_openal_la_SOURCES = openal.c +##output_openal_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +##output_openal_la_CFLAGS = +##output_openal_la_LIBADD = +#output_dummy_la_SOURCES = dummy.c +#output_dummy_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' +#output_dummy_la_CFLAGS = +#output_dummy_la_LIBADD = + +# Static build of one module only. +AM_CFLAGS = +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/output/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/output/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +output_aix.la: $(output_aix_la_OBJECTS) $(output_aix_la_DEPENDENCIES) $(EXTRA_output_aix_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_aix_la_LINK) $(am_output_aix_la_rpath) $(output_aix_la_OBJECTS) $(output_aix_la_LIBADD) $(LIBS) + +output_alib.la: $(output_alib_la_OBJECTS) $(output_alib_la_DEPENDENCIES) $(EXTRA_output_alib_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_alib_la_LINK) $(am_output_alib_la_rpath) $(output_alib_la_OBJECTS) $(output_alib_la_LIBADD) $(LIBS) + +output_alsa.la: $(output_alsa_la_OBJECTS) $(output_alsa_la_DEPENDENCIES) $(EXTRA_output_alsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_alsa_la_LINK) $(am_output_alsa_la_rpath) $(output_alsa_la_OBJECTS) $(output_alsa_la_LIBADD) $(LIBS) + +output_arts.la: $(output_arts_la_OBJECTS) $(output_arts_la_DEPENDENCIES) $(EXTRA_output_arts_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_arts_la_LINK) $(am_output_arts_la_rpath) $(output_arts_la_OBJECTS) $(output_arts_la_LIBADD) $(LIBS) + +output_coreaudio.la: $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_DEPENDENCIES) $(EXTRA_output_coreaudio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_coreaudio_la_LINK) $(am_output_coreaudio_la_rpath) $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_LIBADD) $(LIBS) + +output_dummy.la: $(output_dummy_la_OBJECTS) $(output_dummy_la_DEPENDENCIES) $(EXTRA_output_dummy_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_dummy_la_LINK) $(am_output_dummy_la_rpath) $(output_dummy_la_OBJECTS) $(output_dummy_la_LIBADD) $(LIBS) + +output_esd.la: $(output_esd_la_OBJECTS) $(output_esd_la_DEPENDENCIES) $(EXTRA_output_esd_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_esd_la_LINK) $(am_output_esd_la_rpath) $(output_esd_la_OBJECTS) $(output_esd_la_LIBADD) $(LIBS) + +output_hp.la: $(output_hp_la_OBJECTS) $(output_hp_la_DEPENDENCIES) $(EXTRA_output_hp_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_hp_la_LINK) $(am_output_hp_la_rpath) $(output_hp_la_OBJECTS) $(output_hp_la_LIBADD) $(LIBS) + +output_jack.la: $(output_jack_la_OBJECTS) $(output_jack_la_DEPENDENCIES) $(EXTRA_output_jack_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_jack_la_LINK) $(am_output_jack_la_rpath) $(output_jack_la_OBJECTS) $(output_jack_la_LIBADD) $(LIBS) + +output_mint.la: $(output_mint_la_OBJECTS) $(output_mint_la_DEPENDENCIES) $(EXTRA_output_mint_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_mint_la_LINK) $(am_output_mint_la_rpath) $(output_mint_la_OBJECTS) $(output_mint_la_LIBADD) $(LIBS) + +output_nas.la: $(output_nas_la_OBJECTS) $(output_nas_la_DEPENDENCIES) $(EXTRA_output_nas_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_nas_la_LINK) $(am_output_nas_la_rpath) $(output_nas_la_OBJECTS) $(output_nas_la_LIBADD) $(LIBS) + +output_openal.la: $(output_openal_la_OBJECTS) $(output_openal_la_DEPENDENCIES) $(EXTRA_output_openal_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_openal_la_LINK) $(am_output_openal_la_rpath) $(output_openal_la_OBJECTS) $(output_openal_la_LIBADD) $(LIBS) + +output_os2.la: $(output_os2_la_OBJECTS) $(output_os2_la_DEPENDENCIES) $(EXTRA_output_os2_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_os2_la_LINK) $(am_output_os2_la_rpath) $(output_os2_la_OBJECTS) $(output_os2_la_LIBADD) $(LIBS) + +output_oss.la: $(output_oss_la_OBJECTS) $(output_oss_la_DEPENDENCIES) $(EXTRA_output_oss_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_oss_la_LINK) $(am_output_oss_la_rpath) $(output_oss_la_OBJECTS) $(output_oss_la_LIBADD) $(LIBS) + +output_portaudio.la: $(output_portaudio_la_OBJECTS) $(output_portaudio_la_DEPENDENCIES) $(EXTRA_output_portaudio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_portaudio_la_LINK) $(am_output_portaudio_la_rpath) $(output_portaudio_la_OBJECTS) $(output_portaudio_la_LIBADD) $(LIBS) + +output_pulse.la: $(output_pulse_la_OBJECTS) $(output_pulse_la_DEPENDENCIES) $(EXTRA_output_pulse_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_pulse_la_LINK) $(am_output_pulse_la_rpath) $(output_pulse_la_OBJECTS) $(output_pulse_la_LIBADD) $(LIBS) + +output_qsa.la: $(output_qsa_la_OBJECTS) $(output_qsa_la_DEPENDENCIES) $(EXTRA_output_qsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_qsa_la_LINK) $(am_output_qsa_la_rpath) $(output_qsa_la_OBJECTS) $(output_qsa_la_LIBADD) $(LIBS) + +output_sdl.la: $(output_sdl_la_OBJECTS) $(output_sdl_la_DEPENDENCIES) $(EXTRA_output_sdl_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sdl_la_LINK) $(am_output_sdl_la_rpath) $(output_sdl_la_OBJECTS) $(output_sdl_la_LIBADD) $(LIBS) + +output_sgi.la: $(output_sgi_la_OBJECTS) $(output_sgi_la_DEPENDENCIES) $(EXTRA_output_sgi_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sgi_la_LINK) $(am_output_sgi_la_rpath) $(output_sgi_la_OBJECTS) $(output_sgi_la_LIBADD) $(LIBS) + +output_sndio.la: $(output_sndio_la_OBJECTS) $(output_sndio_la_DEPENDENCIES) $(EXTRA_output_sndio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sndio_la_LINK) $(am_output_sndio_la_rpath) $(output_sndio_la_OBJECTS) $(output_sndio_la_LIBADD) $(LIBS) + +output_sun.la: $(output_sun_la_OBJECTS) $(output_sun_la_DEPENDENCIES) $(EXTRA_output_sun_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sun_la_LINK) $(am_output_sun_la_rpath) $(output_sun_la_OBJECTS) $(output_sun_la_LIBADD) $(LIBS) + +output_tinyalsa.la: $(output_tinyalsa_la_OBJECTS) $(output_tinyalsa_la_DEPENDENCIES) $(EXTRA_output_tinyalsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_tinyalsa_la_LINK) $(am_output_tinyalsa_la_rpath) $(output_tinyalsa_la_OBJECTS) $(output_tinyalsa_la_LIBADD) $(LIBS) + +output_win32.la: $(output_win32_la_OBJECTS) $(output_win32_la_DEPENDENCIES) $(EXTRA_output_win32_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_win32_la_LINK) $(am_output_win32_la_rpath) $(output_win32_la_OBJECTS) $(output_win32_la_LIBADD) $(LIBS) + +output_win32_wasapi.la: $(output_win32_wasapi_la_OBJECTS) $(output_win32_wasapi_la_DEPENDENCIES) $(EXTRA_output_win32_wasapi_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_win32_wasapi_la_LINK) $(am_output_win32_wasapi_la_rpath) $(output_win32_wasapi_la_OBJECTS) $(output_win32_wasapi_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/output_aix_la-aix.Plo +include ./$(DEPDIR)/output_alib_la-alib.Plo +include ./$(DEPDIR)/output_alsa_la-alsa.Plo +include ./$(DEPDIR)/output_arts_la-arts.Plo +include ./$(DEPDIR)/output_coreaudio_la-coreaudio.Plo +include ./$(DEPDIR)/output_dummy_la-dummy.Plo +include ./$(DEPDIR)/output_esd_la-esd.Plo +include ./$(DEPDIR)/output_hp_la-hp.Plo +include ./$(DEPDIR)/output_jack_la-jack.Plo +include ./$(DEPDIR)/output_mint_la-mint.Plo +include ./$(DEPDIR)/output_nas_la-nas.Plo +include ./$(DEPDIR)/output_openal_la-openal.Plo +include ./$(DEPDIR)/output_os2_la-os2.Plo +include ./$(DEPDIR)/output_oss_la-oss.Plo +include ./$(DEPDIR)/output_portaudio_la-portaudio.Plo +include ./$(DEPDIR)/output_pulse_la-pulse.Plo +include ./$(DEPDIR)/output_qsa_la-qsa.Plo +include ./$(DEPDIR)/output_sdl_la-sdl.Plo +include ./$(DEPDIR)/output_sgi_la-sgi.Plo +include ./$(DEPDIR)/output_sndio_la-sndio.Plo +include ./$(DEPDIR)/output_sun_la-sun.Plo +include ./$(DEPDIR)/output_tinyalsa_la-tinyalsa.Plo +include ./$(DEPDIR)/output_win32_la-win32.Plo +include ./$(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Plo + +.c.o: + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CC)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: + $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CC)source='$<' object='$@' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $< + +output_aix_la-aix.lo: aix.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -MT output_aix_la-aix.lo -MD -MP -MF $(DEPDIR)/output_aix_la-aix.Tpo -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_aix_la-aix.Tpo $(DEPDIR)/output_aix_la-aix.Plo +# $(AM_V_CC)source='aix.c' object='output_aix_la-aix.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c + +output_alib_la-alib.lo: alib.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -MT output_alib_la-alib.lo -MD -MP -MF $(DEPDIR)/output_alib_la-alib.Tpo -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_alib_la-alib.Tpo $(DEPDIR)/output_alib_la-alib.Plo +# $(AM_V_CC)source='alib.c' object='output_alib_la-alib.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c + +output_alsa_la-alsa.lo: alsa.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -MT output_alsa_la-alsa.lo -MD -MP -MF $(DEPDIR)/output_alsa_la-alsa.Tpo -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_alsa_la-alsa.Tpo $(DEPDIR)/output_alsa_la-alsa.Plo +# $(AM_V_CC)source='alsa.c' object='output_alsa_la-alsa.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c + +output_arts_la-arts.lo: arts.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -MT output_arts_la-arts.lo -MD -MP -MF $(DEPDIR)/output_arts_la-arts.Tpo -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_arts_la-arts.Tpo $(DEPDIR)/output_arts_la-arts.Plo +# $(AM_V_CC)source='arts.c' object='output_arts_la-arts.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c + +output_coreaudio_la-coreaudio.lo: coreaudio.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -MT output_coreaudio_la-coreaudio.lo -MD -MP -MF $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo $(DEPDIR)/output_coreaudio_la-coreaudio.Plo +# $(AM_V_CC)source='coreaudio.c' object='output_coreaudio_la-coreaudio.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c + +output_dummy_la-dummy.lo: dummy.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -MT output_dummy_la-dummy.lo -MD -MP -MF $(DEPDIR)/output_dummy_la-dummy.Tpo -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_dummy_la-dummy.Tpo $(DEPDIR)/output_dummy_la-dummy.Plo +# $(AM_V_CC)source='dummy.c' object='output_dummy_la-dummy.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c + +output_esd_la-esd.lo: esd.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -MT output_esd_la-esd.lo -MD -MP -MF $(DEPDIR)/output_esd_la-esd.Tpo -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_esd_la-esd.Tpo $(DEPDIR)/output_esd_la-esd.Plo +# $(AM_V_CC)source='esd.c' object='output_esd_la-esd.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c + +output_hp_la-hp.lo: hp.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -MT output_hp_la-hp.lo -MD -MP -MF $(DEPDIR)/output_hp_la-hp.Tpo -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_hp_la-hp.Tpo $(DEPDIR)/output_hp_la-hp.Plo +# $(AM_V_CC)source='hp.c' object='output_hp_la-hp.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c + +output_jack_la-jack.lo: jack.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -MT output_jack_la-jack.lo -MD -MP -MF $(DEPDIR)/output_jack_la-jack.Tpo -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_jack_la-jack.Tpo $(DEPDIR)/output_jack_la-jack.Plo +# $(AM_V_CC)source='jack.c' object='output_jack_la-jack.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c + +output_mint_la-mint.lo: mint.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -MT output_mint_la-mint.lo -MD -MP -MF $(DEPDIR)/output_mint_la-mint.Tpo -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_mint_la-mint.Tpo $(DEPDIR)/output_mint_la-mint.Plo +# $(AM_V_CC)source='mint.c' object='output_mint_la-mint.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c + +output_nas_la-nas.lo: nas.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -MT output_nas_la-nas.lo -MD -MP -MF $(DEPDIR)/output_nas_la-nas.Tpo -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_nas_la-nas.Tpo $(DEPDIR)/output_nas_la-nas.Plo +# $(AM_V_CC)source='nas.c' object='output_nas_la-nas.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c + +output_openal_la-openal.lo: openal.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -MT output_openal_la-openal.lo -MD -MP -MF $(DEPDIR)/output_openal_la-openal.Tpo -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_openal_la-openal.Tpo $(DEPDIR)/output_openal_la-openal.Plo +# $(AM_V_CC)source='openal.c' object='output_openal_la-openal.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c + +output_os2_la-os2.lo: os2.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -MT output_os2_la-os2.lo -MD -MP -MF $(DEPDIR)/output_os2_la-os2.Tpo -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_os2_la-os2.Tpo $(DEPDIR)/output_os2_la-os2.Plo +# $(AM_V_CC)source='os2.c' object='output_os2_la-os2.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c + +output_oss_la-oss.lo: oss.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -MT output_oss_la-oss.lo -MD -MP -MF $(DEPDIR)/output_oss_la-oss.Tpo -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_oss_la-oss.Tpo $(DEPDIR)/output_oss_la-oss.Plo +# $(AM_V_CC)source='oss.c' object='output_oss_la-oss.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c + +output_portaudio_la-portaudio.lo: portaudio.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -MT output_portaudio_la-portaudio.lo -MD -MP -MF $(DEPDIR)/output_portaudio_la-portaudio.Tpo -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_portaudio_la-portaudio.Tpo $(DEPDIR)/output_portaudio_la-portaudio.Plo +# $(AM_V_CC)source='portaudio.c' object='output_portaudio_la-portaudio.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c + +output_pulse_la-pulse.lo: pulse.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -MT output_pulse_la-pulse.lo -MD -MP -MF $(DEPDIR)/output_pulse_la-pulse.Tpo -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_pulse_la-pulse.Tpo $(DEPDIR)/output_pulse_la-pulse.Plo +# $(AM_V_CC)source='pulse.c' object='output_pulse_la-pulse.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c + +output_qsa_la-qsa.lo: qsa.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_qsa_la_CFLAGS) $(CFLAGS) -MT output_qsa_la-qsa.lo -MD -MP -MF $(DEPDIR)/output_qsa_la-qsa.Tpo -c -o output_qsa_la-qsa.lo `test -f 'qsa.c' || echo '$(srcdir)/'`qsa.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_qsa_la-qsa.Tpo $(DEPDIR)/output_qsa_la-qsa.Plo +# $(AM_V_CC)source='qsa.c' object='output_qsa_la-qsa.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_qsa_la_CFLAGS) $(CFLAGS) -c -o output_qsa_la-qsa.lo `test -f 'qsa.c' || echo '$(srcdir)/'`qsa.c + +output_sdl_la-sdl.lo: sdl.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -MT output_sdl_la-sdl.lo -MD -MP -MF $(DEPDIR)/output_sdl_la-sdl.Tpo -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_sdl_la-sdl.Tpo $(DEPDIR)/output_sdl_la-sdl.Plo +# $(AM_V_CC)source='sdl.c' object='output_sdl_la-sdl.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c + +output_sgi_la-sgi.lo: sgi.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -MT output_sgi_la-sgi.lo -MD -MP -MF $(DEPDIR)/output_sgi_la-sgi.Tpo -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_sgi_la-sgi.Tpo $(DEPDIR)/output_sgi_la-sgi.Plo +# $(AM_V_CC)source='sgi.c' object='output_sgi_la-sgi.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c + +output_sndio_la-sndio.lo: sndio.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -MT output_sndio_la-sndio.lo -MD -MP -MF $(DEPDIR)/output_sndio_la-sndio.Tpo -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_sndio_la-sndio.Tpo $(DEPDIR)/output_sndio_la-sndio.Plo +# $(AM_V_CC)source='sndio.c' object='output_sndio_la-sndio.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c + +output_sun_la-sun.lo: sun.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -MT output_sun_la-sun.lo -MD -MP -MF $(DEPDIR)/output_sun_la-sun.Tpo -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_sun_la-sun.Tpo $(DEPDIR)/output_sun_la-sun.Plo +# $(AM_V_CC)source='sun.c' object='output_sun_la-sun.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c + +output_tinyalsa_la-tinyalsa.lo: tinyalsa.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_tinyalsa_la_CFLAGS) $(CFLAGS) -MT output_tinyalsa_la-tinyalsa.lo -MD -MP -MF $(DEPDIR)/output_tinyalsa_la-tinyalsa.Tpo -c -o output_tinyalsa_la-tinyalsa.lo `test -f 'tinyalsa.c' || echo '$(srcdir)/'`tinyalsa.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_tinyalsa_la-tinyalsa.Tpo $(DEPDIR)/output_tinyalsa_la-tinyalsa.Plo +# $(AM_V_CC)source='tinyalsa.c' object='output_tinyalsa_la-tinyalsa.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_tinyalsa_la_CFLAGS) $(CFLAGS) -c -o output_tinyalsa_la-tinyalsa.lo `test -f 'tinyalsa.c' || echo '$(srcdir)/'`tinyalsa.c + +output_win32_la-win32.lo: win32.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -MT output_win32_la-win32.lo -MD -MP -MF $(DEPDIR)/output_win32_la-win32.Tpo -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_win32_la-win32.Tpo $(DEPDIR)/output_win32_la-win32.Plo +# $(AM_V_CC)source='win32.c' object='output_win32_la-win32.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c + +output_win32_wasapi_la-win32_wasapi.lo: win32_wasapi.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_wasapi_la_CFLAGS) $(CFLAGS) -MT output_win32_wasapi_la-win32_wasapi.lo -MD -MP -MF $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Tpo -c -o output_win32_wasapi_la-win32_wasapi.lo `test -f 'win32_wasapi.c' || echo '$(srcdir)/'`win32_wasapi.c + $(AM_V_at)$(am__mv) $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Tpo $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Plo +# $(AM_V_CC)source='win32_wasapi.c' object='output_win32_wasapi_la-win32_wasapi.lo' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_wasapi_la_CFLAGS) $(CFLAGS) -c -o output_win32_wasapi_la-win32_wasapi.lo `test -f 'win32_wasapi.c' || echo '$(srcdir)/'`win32_wasapi.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +#install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +all: oss.$(OBJEXT) + +# No installation happening from here +install: all + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/jni/mpg123-1.13.4/src/output/Makefile.am b/jni/mpg123-1.17.0/src/output/Makefile.am similarity index 84% rename from jni/mpg123-1.13.4/src/output/Makefile.am rename to jni/mpg123-1.17.0/src/output/Makefile.am index afa89e71..f85992d3 100644 --- a/jni/mpg123-1.13.4/src/output/Makefile.am +++ b/jni/mpg123-1.17.0/src/output/Makefile.am @@ -5,10 +5,10 @@ ## initially written by Nicholas J. Humfrey #AM_CPPFLAGS = -I$(top_srcdir)/src/libmpg123 -I$(top_srcdir)/src -INCLUDES = $(LTDLINCL) -I$(top_builddir)/src -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 +AM_CPPFLAGS = $(LTDLINCL) -I$(top_builddir)/src -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src -I$(top_srcdir)/src/libmpg123 #Do not include uneeded headers from mpg123app.h -AM_CPPFLAGS = -DBUILDING_OUTPUT_MODULES=1 +AM_CPPFLAGS += -DBUILDING_OUTPUT_MODULES=1 if HAVE_MODULES @@ -17,7 +17,7 @@ pkglib_LTLIBRARIES = # These are not tested and _very_ likely need work: aix alib hp os2 sgi mint # Use that sh/perl script to generate the module entries: -#for i in alsa coreaudio esd jack nas oss portaudio pulse sdl sndio sun win32 aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | +#for i in tinyalsa alsa coreaudio esd jack nas oss portaudio pulse qsa sdl sndio sun win32 win32_wasapi aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | #perl -ne 'chomp; $big = uc($_); print <&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ + +# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint + +# Use that sh/perl script to generate the module entries: +#for i in tinyalsa alsa coreaudio esd jack nas oss portaudio pulse qsa sdl sndio sun win32 win32_wasapi aix alib arts hp os2 sgi mint openal dummy; do echo $i; done | +#perl -ne 'chomp; $big = uc($_); print </dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AIX_CFLAGS = @AIX_CFLAGS@ +AIX_LDFLAGS = @AIX_LDFLAGS@ +AIX_LIBS = @AIX_LIBS@ +ALIB_CFLAGS = @ALIB_CFLAGS@ +ALIB_LDFLAGS = @ALIB_LDFLAGS@ +ALIB_LIBS = @ALIB_LIBS@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LDFLAGS = @ALSA_LDFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +API_VERSION = @API_VERSION@ +AR = @AR@ +ARTS_CFLAGS = @ARTS_CFLAGS@ +ARTS_LDFLAGS = @ARTS_LDFLAGS@ +ARTS_LIBS = @ARTS_LIBS@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +COREAUDIO_CFLAGS = @COREAUDIO_CFLAGS@ +COREAUDIO_LDFLAGS = @COREAUDIO_LDFLAGS@ +COREAUDIO_LIBS = @COREAUDIO_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DECODER_LOBJ = @DECODER_LOBJ@ +DECODER_OBJ = @DECODER_OBJ@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMMY_CFLAGS = @DUMMY_CFLAGS@ +DUMMY_LDFLAGS = @DUMMY_LDFLAGS@ +DUMMY_LIBS = @DUMMY_LIBS@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LDFLAGS = @ESD_LDFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEC_LT_LDFLAGS = @EXEC_LT_LDFLAGS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +HP_CFLAGS = @HP_CFLAGS@ +HP_LDFLAGS = @HP_LDFLAGS@ +HP_LIBS = @HP_LIBS@ +INCLUDE_STDIO_H = @INCLUDE_STDIO_H@ +INCLUDE_STDLIB_H = @INCLUDE_STDLIB_H@ +INCLUDE_SYS_TYPE_H = @INCLUDE_SYS_TYPE_H@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LDFLAGS = @JACK_LDFLAGS@ +JACK_LIBS = @JACK_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LFS_LOBJ = @LFS_LOBJ@ +LIBMPG123_VERSION = @LIBMPG123_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_LDFLAGS = @LT_LDFLAGS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MINT_CFLAGS = @MINT_CFLAGS@ +MINT_LDFLAGS = @MINT_LDFLAGS@ +MINT_LIBS = @MINT_LIBS@ +MKDIR_P = @MKDIR_P@ +MODULE_OBJ = @MODULE_OBJ@ +NAS_CFLAGS = @NAS_CFLAGS@ +NAS_LDFLAGS = @NAS_LDFLAGS@ +NAS_LIBS = @NAS_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OPENAL_CFLAGS = @OPENAL_CFLAGS@ +OPENAL_LDFLAGS = @OPENAL_LDFLAGS@ +OPENAL_LIBS = @OPENAL_LIBS@ +OS2_CFLAGS = @OS2_CFLAGS@ +OS2_LDFLAGS = @OS2_LDFLAGS@ +OS2_LIBS = @OS2_LIBS@ +OSS_CFLAGS = @OSS_CFLAGS@ +OSS_LDFLAGS = @OSS_LDFLAGS@ +OSS_LIBS = @OSS_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +OUTPUT_CFLAGS = @OUTPUT_CFLAGS@ +OUTPUT_LDFLAGS = @OUTPUT_LDFLAGS@ +OUTPUT_LIBS = @OUTPUT_LIBS@ +OUTPUT_MOD = @OUTPUT_MOD@ +OUTPUT_OBJ = @OUTPUT_OBJ@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ +PORTAUDIO_LDFLAGS = @PORTAUDIO_LDFLAGS@ +PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ +PULSE_CFLAGS = @PULSE_CFLAGS@ +PULSE_LDFLAGS = @PULSE_LDFLAGS@ +PULSE_LIBS = @PULSE_LIBS@ +QSA_CFLAGS = @QSA_CFLAGS@ +QSA_LDFLAGS = @QSA_LDFLAGS@ +QSA_LIBS = @QSA_LIBS@ +RANLIB = @RANLIB@ +SDL_CFLAGS = @SDL_CFLAGS@ +SDL_LDFLAGS = @SDL_LDFLAGS@ +SDL_LIBS = @SDL_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SGI_CFLAGS = @SGI_CFLAGS@ +SGI_LDFLAGS = @SGI_LDFLAGS@ +SGI_LIBS = @SGI_LIBS@ +SHELL = @SHELL@ +SNDIO_CFLAGS = @SNDIO_CFLAGS@ +SNDIO_LDFLAGS = @SNDIO_LDFLAGS@ +SNDIO_LIBS = @SNDIO_LIBS@ +STRIP = @STRIP@ +SUN_CFLAGS = @SUN_CFLAGS@ +SUN_LDFLAGS = @SUN_LDFLAGS@ +SUN_LIBS = @SUN_LIBS@ +TINYALSA_CFLAGS = @TINYALSA_CFLAGS@ +TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@ +TINYALSA_LIBS = @TINYALSA_LIBS@ +VERSION = @VERSION@ +WIN32_CFLAGS = @WIN32_CFLAGS@ +WIN32_LDFLAGS = @WIN32_LDFLAGS@ +WIN32_LIBS = @WIN32_LIBS@ +WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@ +WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@ +WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@ +YASM = @YASM@ +YASMFLAGS = @YASMFLAGS@ +YASM_FORMAT = @YASM_FORMAT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +#AM_CPPFLAGS = -I$(top_srcdir)/src/libmpg123 -I$(top_srcdir)/src + +#Do not include uneeded headers from mpg123app.h +AM_CPPFLAGS = $(LTDLINCL) -I$(top_builddir)/src \ + -I$(top_builddir)/src/libmpg123 -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/libmpg123 -DBUILDING_OUTPUT_MODULES=1 +@HAVE_MODULES_TRUE@pkglib_LTLIBRARIES = $(am__append_1) \ +@HAVE_MODULES_TRUE@ $(am__append_2) $(am__append_3) \ +@HAVE_MODULES_TRUE@ $(am__append_4) $(am__append_5) \ +@HAVE_MODULES_TRUE@ $(am__append_6) $(am__append_7) \ +@HAVE_MODULES_TRUE@ $(am__append_8) $(am__append_9) \ +@HAVE_MODULES_TRUE@ $(am__append_10) $(am__append_11) \ +@HAVE_MODULES_TRUE@ $(am__append_12) $(am__append_13) \ +@HAVE_MODULES_TRUE@ $(am__append_14) $(am__append_15) \ +@HAVE_MODULES_TRUE@ $(am__append_16) $(am__append_17) \ +@HAVE_MODULES_TRUE@ $(am__append_18) $(am__append_19) \ +@HAVE_MODULES_TRUE@ $(am__append_20) $(am__append_21) \ +@HAVE_MODULES_TRUE@ $(am__append_22) $(am__append_23) \ +@HAVE_MODULES_TRUE@ $(am__append_24) +@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@output_tinyalsa_la_SOURCES = tinyalsa.c +@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@output_tinyalsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @TINYALSA_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@output_tinyalsa_la_CFLAGS = @TINYALSA_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@output_tinyalsa_la_LIBADD = @TINYALSA_LIBS@ +@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@output_alsa_la_SOURCES = alsa.c +@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@output_alsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @ALSA_LDFLAGS@ +@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@output_alsa_la_CFLAGS = @ALSA_CFLAGS@ +@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@output_alsa_la_LIBADD = @ALSA_LIBS@ +@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@output_coreaudio_la_SOURCES = coreaudio.c +@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@output_coreaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @COREAUDIO_LDFLAGS@ +@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@output_coreaudio_la_CFLAGS = @COREAUDIO_CFLAGS@ +@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@output_coreaudio_la_LIBADD = @COREAUDIO_LIBS@ +@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@output_esd_la_SOURCES = esd.c +@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@output_esd_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @ESD_LDFLAGS@ +@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@output_esd_la_CFLAGS = @ESD_CFLAGS@ +@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@output_esd_la_LIBADD = @ESD_LIBS@ +@HAVE_JACK_TRUE@@HAVE_MODULES_TRUE@output_jack_la_SOURCES = jack.c +@HAVE_JACK_TRUE@@HAVE_MODULES_TRUE@output_jack_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @JACK_LDFLAGS@ +@HAVE_JACK_TRUE@@HAVE_MODULES_TRUE@output_jack_la_CFLAGS = @JACK_CFLAGS@ +@HAVE_JACK_TRUE@@HAVE_MODULES_TRUE@output_jack_la_LIBADD = @JACK_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_NAS_TRUE@output_nas_la_SOURCES = nas.c +@HAVE_MODULES_TRUE@@HAVE_NAS_TRUE@output_nas_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @NAS_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_NAS_TRUE@output_nas_la_CFLAGS = @NAS_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_NAS_TRUE@output_nas_la_LIBADD = @NAS_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_OSS_TRUE@output_oss_la_SOURCES = oss.c +@HAVE_MODULES_TRUE@@HAVE_OSS_TRUE@output_oss_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @OSS_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OSS_TRUE@output_oss_la_CFLAGS = @OSS_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OSS_TRUE@output_oss_la_LIBADD = @OSS_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_PORTAUDIO_TRUE@output_portaudio_la_SOURCES = portaudio.c +@HAVE_MODULES_TRUE@@HAVE_PORTAUDIO_TRUE@output_portaudio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @PORTAUDIO_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_PORTAUDIO_TRUE@output_portaudio_la_CFLAGS = @PORTAUDIO_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_PORTAUDIO_TRUE@output_portaudio_la_LIBADD = @PORTAUDIO_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_PULSE_TRUE@output_pulse_la_SOURCES = pulse.c +@HAVE_MODULES_TRUE@@HAVE_PULSE_TRUE@output_pulse_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @PULSE_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_PULSE_TRUE@output_pulse_la_CFLAGS = @PULSE_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_PULSE_TRUE@output_pulse_la_LIBADD = @PULSE_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@output_qsa_la_SOURCES = qsa.c +@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@output_qsa_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @QSA_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@output_qsa_la_CFLAGS = @QSA_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@output_qsa_la_LIBADD = @QSA_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_SDL_TRUE@output_sdl_la_SOURCES = sdl.c +@HAVE_MODULES_TRUE@@HAVE_SDL_TRUE@output_sdl_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @SDL_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SDL_TRUE@output_sdl_la_CFLAGS = @SDL_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SDL_TRUE@output_sdl_la_LIBADD = @SDL_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_SNDIO_TRUE@output_sndio_la_SOURCES = sndio.c +@HAVE_MODULES_TRUE@@HAVE_SNDIO_TRUE@output_sndio_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @SNDIO_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SNDIO_TRUE@output_sndio_la_CFLAGS = @SNDIO_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SNDIO_TRUE@output_sndio_la_LIBADD = @SNDIO_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_SUN_TRUE@output_sun_la_SOURCES = sun.c +@HAVE_MODULES_TRUE@@HAVE_SUN_TRUE@output_sun_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @SUN_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SUN_TRUE@output_sun_la_CFLAGS = @SUN_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SUN_TRUE@output_sun_la_LIBADD = @SUN_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@output_win32_la_SOURCES = win32.c +@HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@output_win32_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @WIN32_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@output_win32_la_CFLAGS = @WIN32_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@output_win32_la_LIBADD = @WIN32_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@output_win32_wasapi_la_SOURCES = win32_wasapi.c +@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@output_win32_wasapi_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @WIN32_WASAPI_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@output_win32_wasapi_la_CFLAGS = @WIN32_WASAPI_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@output_win32_wasapi_la_LIBADD = @WIN32_WASAPI_LIBS@ +@HAVE_AIX_TRUE@@HAVE_MODULES_TRUE@output_aix_la_SOURCES = aix.c +@HAVE_AIX_TRUE@@HAVE_MODULES_TRUE@output_aix_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @AIX_LDFLAGS@ +@HAVE_AIX_TRUE@@HAVE_MODULES_TRUE@output_aix_la_CFLAGS = @AIX_CFLAGS@ +@HAVE_AIX_TRUE@@HAVE_MODULES_TRUE@output_aix_la_LIBADD = @AIX_LIBS@ +@HAVE_ALIB_TRUE@@HAVE_MODULES_TRUE@output_alib_la_SOURCES = alib.c +@HAVE_ALIB_TRUE@@HAVE_MODULES_TRUE@output_alib_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @ALIB_LDFLAGS@ +@HAVE_ALIB_TRUE@@HAVE_MODULES_TRUE@output_alib_la_CFLAGS = @ALIB_CFLAGS@ +@HAVE_ALIB_TRUE@@HAVE_MODULES_TRUE@output_alib_la_LIBADD = @ALIB_LIBS@ +@HAVE_ARTS_TRUE@@HAVE_MODULES_TRUE@output_arts_la_SOURCES = arts.c +@HAVE_ARTS_TRUE@@HAVE_MODULES_TRUE@output_arts_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @ARTS_LDFLAGS@ +@HAVE_ARTS_TRUE@@HAVE_MODULES_TRUE@output_arts_la_CFLAGS = @ARTS_CFLAGS@ +@HAVE_ARTS_TRUE@@HAVE_MODULES_TRUE@output_arts_la_LIBADD = @ARTS_LIBS@ +@HAVE_HP_TRUE@@HAVE_MODULES_TRUE@output_hp_la_SOURCES = hp.c +@HAVE_HP_TRUE@@HAVE_MODULES_TRUE@output_hp_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @HP_LDFLAGS@ +@HAVE_HP_TRUE@@HAVE_MODULES_TRUE@output_hp_la_CFLAGS = @HP_CFLAGS@ +@HAVE_HP_TRUE@@HAVE_MODULES_TRUE@output_hp_la_LIBADD = @HP_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_OS2_TRUE@output_os2_la_SOURCES = os2.c +@HAVE_MODULES_TRUE@@HAVE_OS2_TRUE@output_os2_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @OS2_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OS2_TRUE@output_os2_la_CFLAGS = @OS2_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OS2_TRUE@output_os2_la_LIBADD = @OS2_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_SGI_TRUE@output_sgi_la_SOURCES = sgi.c +@HAVE_MODULES_TRUE@@HAVE_SGI_TRUE@output_sgi_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @SGI_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SGI_TRUE@output_sgi_la_CFLAGS = @SGI_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_SGI_TRUE@output_sgi_la_LIBADD = @SGI_LIBS@ +@HAVE_MINT_TRUE@@HAVE_MODULES_TRUE@output_mint_la_SOURCES = mint.c +@HAVE_MINT_TRUE@@HAVE_MODULES_TRUE@output_mint_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @MINT_LDFLAGS@ +@HAVE_MINT_TRUE@@HAVE_MODULES_TRUE@output_mint_la_CFLAGS = @MINT_CFLAGS@ +@HAVE_MINT_TRUE@@HAVE_MODULES_TRUE@output_mint_la_LIBADD = @MINT_LIBS@ +@HAVE_MODULES_TRUE@@HAVE_OPENAL_TRUE@output_openal_la_SOURCES = openal.c +@HAVE_MODULES_TRUE@@HAVE_OPENAL_TRUE@output_openal_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @OPENAL_LDFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OPENAL_TRUE@output_openal_la_CFLAGS = @OPENAL_CFLAGS@ +@HAVE_MODULES_TRUE@@HAVE_OPENAL_TRUE@output_openal_la_LIBADD = @OPENAL_LIBS@ +@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@output_dummy_la_SOURCES = dummy.c +@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@output_dummy_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic -export-symbols-regex '^mpg123_' @DUMMY_LDFLAGS@ +@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@output_dummy_la_CFLAGS = @DUMMY_CFLAGS@ +@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@output_dummy_la_LIBADD = @DUMMY_LIBS@ + +# Static build of one module only. +@HAVE_MODULES_FALSE@AM_CFLAGS = @OUTPUT_CFLAGS@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/output/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/output/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +output_aix.la: $(output_aix_la_OBJECTS) $(output_aix_la_DEPENDENCIES) $(EXTRA_output_aix_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_aix_la_LINK) $(am_output_aix_la_rpath) $(output_aix_la_OBJECTS) $(output_aix_la_LIBADD) $(LIBS) + +output_alib.la: $(output_alib_la_OBJECTS) $(output_alib_la_DEPENDENCIES) $(EXTRA_output_alib_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_alib_la_LINK) $(am_output_alib_la_rpath) $(output_alib_la_OBJECTS) $(output_alib_la_LIBADD) $(LIBS) + +output_alsa.la: $(output_alsa_la_OBJECTS) $(output_alsa_la_DEPENDENCIES) $(EXTRA_output_alsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_alsa_la_LINK) $(am_output_alsa_la_rpath) $(output_alsa_la_OBJECTS) $(output_alsa_la_LIBADD) $(LIBS) + +output_arts.la: $(output_arts_la_OBJECTS) $(output_arts_la_DEPENDENCIES) $(EXTRA_output_arts_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_arts_la_LINK) $(am_output_arts_la_rpath) $(output_arts_la_OBJECTS) $(output_arts_la_LIBADD) $(LIBS) + +output_coreaudio.la: $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_DEPENDENCIES) $(EXTRA_output_coreaudio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_coreaudio_la_LINK) $(am_output_coreaudio_la_rpath) $(output_coreaudio_la_OBJECTS) $(output_coreaudio_la_LIBADD) $(LIBS) + +output_dummy.la: $(output_dummy_la_OBJECTS) $(output_dummy_la_DEPENDENCIES) $(EXTRA_output_dummy_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_dummy_la_LINK) $(am_output_dummy_la_rpath) $(output_dummy_la_OBJECTS) $(output_dummy_la_LIBADD) $(LIBS) + +output_esd.la: $(output_esd_la_OBJECTS) $(output_esd_la_DEPENDENCIES) $(EXTRA_output_esd_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_esd_la_LINK) $(am_output_esd_la_rpath) $(output_esd_la_OBJECTS) $(output_esd_la_LIBADD) $(LIBS) + +output_hp.la: $(output_hp_la_OBJECTS) $(output_hp_la_DEPENDENCIES) $(EXTRA_output_hp_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_hp_la_LINK) $(am_output_hp_la_rpath) $(output_hp_la_OBJECTS) $(output_hp_la_LIBADD) $(LIBS) + +output_jack.la: $(output_jack_la_OBJECTS) $(output_jack_la_DEPENDENCIES) $(EXTRA_output_jack_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_jack_la_LINK) $(am_output_jack_la_rpath) $(output_jack_la_OBJECTS) $(output_jack_la_LIBADD) $(LIBS) + +output_mint.la: $(output_mint_la_OBJECTS) $(output_mint_la_DEPENDENCIES) $(EXTRA_output_mint_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_mint_la_LINK) $(am_output_mint_la_rpath) $(output_mint_la_OBJECTS) $(output_mint_la_LIBADD) $(LIBS) + +output_nas.la: $(output_nas_la_OBJECTS) $(output_nas_la_DEPENDENCIES) $(EXTRA_output_nas_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_nas_la_LINK) $(am_output_nas_la_rpath) $(output_nas_la_OBJECTS) $(output_nas_la_LIBADD) $(LIBS) + +output_openal.la: $(output_openal_la_OBJECTS) $(output_openal_la_DEPENDENCIES) $(EXTRA_output_openal_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_openal_la_LINK) $(am_output_openal_la_rpath) $(output_openal_la_OBJECTS) $(output_openal_la_LIBADD) $(LIBS) + +output_os2.la: $(output_os2_la_OBJECTS) $(output_os2_la_DEPENDENCIES) $(EXTRA_output_os2_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_os2_la_LINK) $(am_output_os2_la_rpath) $(output_os2_la_OBJECTS) $(output_os2_la_LIBADD) $(LIBS) + +output_oss.la: $(output_oss_la_OBJECTS) $(output_oss_la_DEPENDENCIES) $(EXTRA_output_oss_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_oss_la_LINK) $(am_output_oss_la_rpath) $(output_oss_la_OBJECTS) $(output_oss_la_LIBADD) $(LIBS) + +output_portaudio.la: $(output_portaudio_la_OBJECTS) $(output_portaudio_la_DEPENDENCIES) $(EXTRA_output_portaudio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_portaudio_la_LINK) $(am_output_portaudio_la_rpath) $(output_portaudio_la_OBJECTS) $(output_portaudio_la_LIBADD) $(LIBS) + +output_pulse.la: $(output_pulse_la_OBJECTS) $(output_pulse_la_DEPENDENCIES) $(EXTRA_output_pulse_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_pulse_la_LINK) $(am_output_pulse_la_rpath) $(output_pulse_la_OBJECTS) $(output_pulse_la_LIBADD) $(LIBS) + +output_qsa.la: $(output_qsa_la_OBJECTS) $(output_qsa_la_DEPENDENCIES) $(EXTRA_output_qsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_qsa_la_LINK) $(am_output_qsa_la_rpath) $(output_qsa_la_OBJECTS) $(output_qsa_la_LIBADD) $(LIBS) + +output_sdl.la: $(output_sdl_la_OBJECTS) $(output_sdl_la_DEPENDENCIES) $(EXTRA_output_sdl_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sdl_la_LINK) $(am_output_sdl_la_rpath) $(output_sdl_la_OBJECTS) $(output_sdl_la_LIBADD) $(LIBS) + +output_sgi.la: $(output_sgi_la_OBJECTS) $(output_sgi_la_DEPENDENCIES) $(EXTRA_output_sgi_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sgi_la_LINK) $(am_output_sgi_la_rpath) $(output_sgi_la_OBJECTS) $(output_sgi_la_LIBADD) $(LIBS) + +output_sndio.la: $(output_sndio_la_OBJECTS) $(output_sndio_la_DEPENDENCIES) $(EXTRA_output_sndio_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sndio_la_LINK) $(am_output_sndio_la_rpath) $(output_sndio_la_OBJECTS) $(output_sndio_la_LIBADD) $(LIBS) + +output_sun.la: $(output_sun_la_OBJECTS) $(output_sun_la_DEPENDENCIES) $(EXTRA_output_sun_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_sun_la_LINK) $(am_output_sun_la_rpath) $(output_sun_la_OBJECTS) $(output_sun_la_LIBADD) $(LIBS) + +output_tinyalsa.la: $(output_tinyalsa_la_OBJECTS) $(output_tinyalsa_la_DEPENDENCIES) $(EXTRA_output_tinyalsa_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_tinyalsa_la_LINK) $(am_output_tinyalsa_la_rpath) $(output_tinyalsa_la_OBJECTS) $(output_tinyalsa_la_LIBADD) $(LIBS) + +output_win32.la: $(output_win32_la_OBJECTS) $(output_win32_la_DEPENDENCIES) $(EXTRA_output_win32_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_win32_la_LINK) $(am_output_win32_la_rpath) $(output_win32_la_OBJECTS) $(output_win32_la_LIBADD) $(LIBS) + +output_win32_wasapi.la: $(output_win32_wasapi_la_OBJECTS) $(output_win32_wasapi_la_DEPENDENCIES) $(EXTRA_output_win32_wasapi_la_DEPENDENCIES) + $(AM_V_CCLD)$(output_win32_wasapi_la_LINK) $(am_output_win32_wasapi_la_rpath) $(output_win32_wasapi_la_OBJECTS) $(output_win32_wasapi_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_aix_la-aix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_alib_la-alib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_alsa_la-alsa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_arts_la-arts.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_coreaudio_la-coreaudio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_dummy_la-dummy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_esd_la-esd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_hp_la-hp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_jack_la-jack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_mint_la-mint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_nas_la-nas.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_openal_la-openal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_os2_la-os2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_oss_la-oss.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_portaudio_la-portaudio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_pulse_la-pulse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_qsa_la-qsa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_sdl_la-sdl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_sgi_la-sgi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_sndio_la-sndio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_sun_la-sun.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_tinyalsa_la-tinyalsa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_win32_la-win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +output_aix_la-aix.lo: aix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -MT output_aix_la-aix.lo -MD -MP -MF $(DEPDIR)/output_aix_la-aix.Tpo -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_aix_la-aix.Tpo $(DEPDIR)/output_aix_la-aix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aix.c' object='output_aix_la-aix.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_aix_la_CFLAGS) $(CFLAGS) -c -o output_aix_la-aix.lo `test -f 'aix.c' || echo '$(srcdir)/'`aix.c + +output_alib_la-alib.lo: alib.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -MT output_alib_la-alib.lo -MD -MP -MF $(DEPDIR)/output_alib_la-alib.Tpo -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_alib_la-alib.Tpo $(DEPDIR)/output_alib_la-alib.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alib.c' object='output_alib_la-alib.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alib_la_CFLAGS) $(CFLAGS) -c -o output_alib_la-alib.lo `test -f 'alib.c' || echo '$(srcdir)/'`alib.c + +output_alsa_la-alsa.lo: alsa.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -MT output_alsa_la-alsa.lo -MD -MP -MF $(DEPDIR)/output_alsa_la-alsa.Tpo -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_alsa_la-alsa.Tpo $(DEPDIR)/output_alsa_la-alsa.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alsa.c' object='output_alsa_la-alsa.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_alsa_la_CFLAGS) $(CFLAGS) -c -o output_alsa_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c + +output_arts_la-arts.lo: arts.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -MT output_arts_la-arts.lo -MD -MP -MF $(DEPDIR)/output_arts_la-arts.Tpo -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_arts_la-arts.Tpo $(DEPDIR)/output_arts_la-arts.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arts.c' object='output_arts_la-arts.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_arts_la_CFLAGS) $(CFLAGS) -c -o output_arts_la-arts.lo `test -f 'arts.c' || echo '$(srcdir)/'`arts.c + +output_coreaudio_la-coreaudio.lo: coreaudio.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -MT output_coreaudio_la-coreaudio.lo -MD -MP -MF $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_coreaudio_la-coreaudio.Tpo $(DEPDIR)/output_coreaudio_la-coreaudio.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coreaudio.c' object='output_coreaudio_la-coreaudio.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_coreaudio_la_CFLAGS) $(CFLAGS) -c -o output_coreaudio_la-coreaudio.lo `test -f 'coreaudio.c' || echo '$(srcdir)/'`coreaudio.c + +output_dummy_la-dummy.lo: dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -MT output_dummy_la-dummy.lo -MD -MP -MF $(DEPDIR)/output_dummy_la-dummy.Tpo -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_dummy_la-dummy.Tpo $(DEPDIR)/output_dummy_la-dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy.c' object='output_dummy_la-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_dummy_la_CFLAGS) $(CFLAGS) -c -o output_dummy_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c + +output_esd_la-esd.lo: esd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -MT output_esd_la-esd.lo -MD -MP -MF $(DEPDIR)/output_esd_la-esd.Tpo -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_esd_la-esd.Tpo $(DEPDIR)/output_esd_la-esd.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='esd.c' object='output_esd_la-esd.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_esd_la_CFLAGS) $(CFLAGS) -c -o output_esd_la-esd.lo `test -f 'esd.c' || echo '$(srcdir)/'`esd.c + +output_hp_la-hp.lo: hp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -MT output_hp_la-hp.lo -MD -MP -MF $(DEPDIR)/output_hp_la-hp.Tpo -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_hp_la-hp.Tpo $(DEPDIR)/output_hp_la-hp.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hp.c' object='output_hp_la-hp.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_hp_la_CFLAGS) $(CFLAGS) -c -o output_hp_la-hp.lo `test -f 'hp.c' || echo '$(srcdir)/'`hp.c + +output_jack_la-jack.lo: jack.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -MT output_jack_la-jack.lo -MD -MP -MF $(DEPDIR)/output_jack_la-jack.Tpo -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_jack_la-jack.Tpo $(DEPDIR)/output_jack_la-jack.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='jack.c' object='output_jack_la-jack.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_jack_la_CFLAGS) $(CFLAGS) -c -o output_jack_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c + +output_mint_la-mint.lo: mint.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -MT output_mint_la-mint.lo -MD -MP -MF $(DEPDIR)/output_mint_la-mint.Tpo -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_mint_la-mint.Tpo $(DEPDIR)/output_mint_la-mint.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mint.c' object='output_mint_la-mint.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_mint_la_CFLAGS) $(CFLAGS) -c -o output_mint_la-mint.lo `test -f 'mint.c' || echo '$(srcdir)/'`mint.c + +output_nas_la-nas.lo: nas.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -MT output_nas_la-nas.lo -MD -MP -MF $(DEPDIR)/output_nas_la-nas.Tpo -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_nas_la-nas.Tpo $(DEPDIR)/output_nas_la-nas.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='nas.c' object='output_nas_la-nas.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_nas_la_CFLAGS) $(CFLAGS) -c -o output_nas_la-nas.lo `test -f 'nas.c' || echo '$(srcdir)/'`nas.c + +output_openal_la-openal.lo: openal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -MT output_openal_la-openal.lo -MD -MP -MF $(DEPDIR)/output_openal_la-openal.Tpo -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_openal_la-openal.Tpo $(DEPDIR)/output_openal_la-openal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='openal.c' object='output_openal_la-openal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_openal_la_CFLAGS) $(CFLAGS) -c -o output_openal_la-openal.lo `test -f 'openal.c' || echo '$(srcdir)/'`openal.c + +output_os2_la-os2.lo: os2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -MT output_os2_la-os2.lo -MD -MP -MF $(DEPDIR)/output_os2_la-os2.Tpo -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_os2_la-os2.Tpo $(DEPDIR)/output_os2_la-os2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='os2.c' object='output_os2_la-os2.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_os2_la_CFLAGS) $(CFLAGS) -c -o output_os2_la-os2.lo `test -f 'os2.c' || echo '$(srcdir)/'`os2.c + +output_oss_la-oss.lo: oss.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -MT output_oss_la-oss.lo -MD -MP -MF $(DEPDIR)/output_oss_la-oss.Tpo -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_oss_la-oss.Tpo $(DEPDIR)/output_oss_la-oss.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oss.c' object='output_oss_la-oss.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_oss_la_CFLAGS) $(CFLAGS) -c -o output_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c + +output_portaudio_la-portaudio.lo: portaudio.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -MT output_portaudio_la-portaudio.lo -MD -MP -MF $(DEPDIR)/output_portaudio_la-portaudio.Tpo -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_portaudio_la-portaudio.Tpo $(DEPDIR)/output_portaudio_la-portaudio.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='portaudio.c' object='output_portaudio_la-portaudio.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_portaudio_la_CFLAGS) $(CFLAGS) -c -o output_portaudio_la-portaudio.lo `test -f 'portaudio.c' || echo '$(srcdir)/'`portaudio.c + +output_pulse_la-pulse.lo: pulse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -MT output_pulse_la-pulse.lo -MD -MP -MF $(DEPDIR)/output_pulse_la-pulse.Tpo -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_pulse_la-pulse.Tpo $(DEPDIR)/output_pulse_la-pulse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pulse.c' object='output_pulse_la-pulse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_pulse_la_CFLAGS) $(CFLAGS) -c -o output_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c + +output_qsa_la-qsa.lo: qsa.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_qsa_la_CFLAGS) $(CFLAGS) -MT output_qsa_la-qsa.lo -MD -MP -MF $(DEPDIR)/output_qsa_la-qsa.Tpo -c -o output_qsa_la-qsa.lo `test -f 'qsa.c' || echo '$(srcdir)/'`qsa.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_qsa_la-qsa.Tpo $(DEPDIR)/output_qsa_la-qsa.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qsa.c' object='output_qsa_la-qsa.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_qsa_la_CFLAGS) $(CFLAGS) -c -o output_qsa_la-qsa.lo `test -f 'qsa.c' || echo '$(srcdir)/'`qsa.c + +output_sdl_la-sdl.lo: sdl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -MT output_sdl_la-sdl.lo -MD -MP -MF $(DEPDIR)/output_sdl_la-sdl.Tpo -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_sdl_la-sdl.Tpo $(DEPDIR)/output_sdl_la-sdl.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sdl.c' object='output_sdl_la-sdl.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sdl_la_CFLAGS) $(CFLAGS) -c -o output_sdl_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c + +output_sgi_la-sgi.lo: sgi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -MT output_sgi_la-sgi.lo -MD -MP -MF $(DEPDIR)/output_sgi_la-sgi.Tpo -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_sgi_la-sgi.Tpo $(DEPDIR)/output_sgi_la-sgi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sgi.c' object='output_sgi_la-sgi.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sgi_la_CFLAGS) $(CFLAGS) -c -o output_sgi_la-sgi.lo `test -f 'sgi.c' || echo '$(srcdir)/'`sgi.c + +output_sndio_la-sndio.lo: sndio.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -MT output_sndio_la-sndio.lo -MD -MP -MF $(DEPDIR)/output_sndio_la-sndio.Tpo -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_sndio_la-sndio.Tpo $(DEPDIR)/output_sndio_la-sndio.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sndio.c' object='output_sndio_la-sndio.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sndio_la_CFLAGS) $(CFLAGS) -c -o output_sndio_la-sndio.lo `test -f 'sndio.c' || echo '$(srcdir)/'`sndio.c + +output_sun_la-sun.lo: sun.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -MT output_sun_la-sun.lo -MD -MP -MF $(DEPDIR)/output_sun_la-sun.Tpo -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_sun_la-sun.Tpo $(DEPDIR)/output_sun_la-sun.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sun.c' object='output_sun_la-sun.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_sun_la_CFLAGS) $(CFLAGS) -c -o output_sun_la-sun.lo `test -f 'sun.c' || echo '$(srcdir)/'`sun.c + +output_tinyalsa_la-tinyalsa.lo: tinyalsa.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_tinyalsa_la_CFLAGS) $(CFLAGS) -MT output_tinyalsa_la-tinyalsa.lo -MD -MP -MF $(DEPDIR)/output_tinyalsa_la-tinyalsa.Tpo -c -o output_tinyalsa_la-tinyalsa.lo `test -f 'tinyalsa.c' || echo '$(srcdir)/'`tinyalsa.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_tinyalsa_la-tinyalsa.Tpo $(DEPDIR)/output_tinyalsa_la-tinyalsa.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tinyalsa.c' object='output_tinyalsa_la-tinyalsa.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_tinyalsa_la_CFLAGS) $(CFLAGS) -c -o output_tinyalsa_la-tinyalsa.lo `test -f 'tinyalsa.c' || echo '$(srcdir)/'`tinyalsa.c + +output_win32_la-win32.lo: win32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -MT output_win32_la-win32.lo -MD -MP -MF $(DEPDIR)/output_win32_la-win32.Tpo -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_win32_la-win32.Tpo $(DEPDIR)/output_win32_la-win32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='win32.c' object='output_win32_la-win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_la_CFLAGS) $(CFLAGS) -c -o output_win32_la-win32.lo `test -f 'win32.c' || echo '$(srcdir)/'`win32.c + +output_win32_wasapi_la-win32_wasapi.lo: win32_wasapi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_wasapi_la_CFLAGS) $(CFLAGS) -MT output_win32_wasapi_la-win32_wasapi.lo -MD -MP -MF $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Tpo -c -o output_win32_wasapi_la-win32_wasapi.lo `test -f 'win32_wasapi.c' || echo '$(srcdir)/'`win32_wasapi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Tpo $(DEPDIR)/output_win32_wasapi_la-win32_wasapi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='win32_wasapi.c' object='output_win32_wasapi_la-win32_wasapi.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(output_win32_wasapi_la_CFLAGS) $(CFLAGS) -c -o output_win32_wasapi_la-win32_wasapi.lo `test -f 'win32_wasapi.c' || echo '$(srcdir)/'`win32_wasapi.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +@HAVE_MODULES_TRUE@install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkglibLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkglibLTLIBRARIES + + +@HAVE_MODULES_FALSE@all: @OUTPUT_MOD@.$(OBJEXT) + +# No installation happening from here +@HAVE_MODULES_FALSE@install: all + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/jni/mpg123-1.13.4/src/output/aix.c b/jni/mpg123-1.17.0/src/output/aix.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/aix.c rename to jni/mpg123-1.17.0/src/output/aix.c diff --git a/jni/mpg123-1.13.4/src/output/alib.c b/jni/mpg123-1.17.0/src/output/alib.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/alib.c rename to jni/mpg123-1.17.0/src/output/alib.c diff --git a/jni/mpg123-1.13.4/src/output/alsa.c b/jni/mpg123-1.17.0/src/output/alsa.c similarity index 91% rename from jni/mpg123-1.13.4/src/output/alsa.c rename to jni/mpg123-1.17.0/src/output/alsa.c index e77befb5..9b76b7bb 100644 --- a/jni/mpg123-1.13.4/src/output/alsa.c +++ b/jni/mpg123-1.17.0/src/output/alsa.c @@ -108,6 +108,7 @@ static int initialize_device(audio_output_t *ao) if(!AOQUIET) error("initialize_device(): cannot set buffer size"); return -1; } + debug1("buffer_size=%lu", (unsigned long)buffer_size); period_size = buffer_size / 4; if (snd_pcm_hw_params_set_period_size_near(pcm, hw, &period_size, NULL) < 0) { if(!AOQUIET) error("initialize_device(): cannot set period size"); @@ -123,7 +124,7 @@ static int initialize_device(audio_output_t *ao) if(!AOQUIET) error("initialize_device(): cannot get sw params"); return -1; } - /* start playing after the first write */ + /* start playing right away */ if (snd_pcm_sw_params_set_start_threshold(pcm, sw, 1) < 0) { if(!AOQUIET) error("initialize_device(): cannot set start threshold"); return -1; @@ -147,10 +148,12 @@ static int initialize_device(audio_output_t *ao) return 0; } +#ifndef DEBUG static void error_ignorer(const char *file, int line, const char *function, int err, const char *fmt,...) { /* I can make ALSA silent. */ } +#endif static int open_alsa(audio_output_t *ao) { @@ -158,7 +161,9 @@ static int open_alsa(audio_output_t *ao) snd_pcm_t *pcm=NULL; debug1("open_alsa with %p", ao->userptr); +#ifndef DEBUG if(AOQUIET) snd_lib_error_set_handler(error_ignorer); +#endif pcm_name = ao->device ? ao->device : "default"; if (snd_pcm_open(&pcm, pcm_name, SND_PCM_STREAM_PLAYBACK, 0) < 0) { @@ -212,29 +217,20 @@ static int write_alsa(audio_output_t *ao, unsigned char *buf, int bytes) snd_pcm_sframes_t written; frames = snd_pcm_bytes_to_frames(pcm, bytes); - written = snd_pcm_writei(pcm, buf, frames); - if (written == -EINTR) /* interrupted system call */ - written = 0; - else if (written == -EPIPE) { /* underrun */ - if (snd_pcm_prepare(pcm) >= 0) - written = snd_pcm_writei(pcm, buf, frames); - } - if (written >= 0) - return snd_pcm_frames_to_bytes(pcm, written); - else + while + ( /* Try to write, recover if error, try again if recovery successful. */ + (written = snd_pcm_writei(pcm, buf, frames)) < 0 + && snd_pcm_recover(pcm, (int)written, 0) == 0 + ) { - if(snd_pcm_state(pcm) == SND_PCM_STATE_SUSPENDED) - { - /* Iamnothappyabouthisnothappyreallynot. */ - snd_pcm_resume(pcm); - if(snd_pcm_state(pcm) == SND_PCM_STATE_SUSPENDED) - { - error("device still suspended after resume hackery... giving up"); - return -1; - } - } - return 0; + debug2("recovered from alsa issue %i while trying to write %lu frames", (int)written, (unsigned long)frames); } + if(written < 0) + { + error1("Fatal problem with alsa output, error %i.", (int)written); + return -1; + } + else return snd_pcm_frames_to_bytes(pcm, written); } static void flush_alsa(audio_output_t *ao) @@ -256,8 +252,7 @@ static int close_alsa(audio_output_t *ao) debug1("close_alsa with %p", ao->userptr); if(pcm != NULL) /* be really generous for being called without any device opening */ { - if (snd_pcm_state(pcm) == SND_PCM_STATE_RUNNING) - snd_pcm_drain(pcm); + snd_pcm_drain(pcm); /* If there is something, let it drain, always. */ ao->userptr = NULL; /* Should alsa do this or the module wrapper? */ return snd_pcm_close(pcm); } diff --git a/jni/mpg123-1.13.4/src/output/arts.c b/jni/mpg123-1.17.0/src/output/arts.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/arts.c rename to jni/mpg123-1.17.0/src/output/arts.c diff --git a/jni/mpg123-1.13.4/src/output/coreaudio.c b/jni/mpg123-1.17.0/src/output/coreaudio.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/coreaudio.c rename to jni/mpg123-1.17.0/src/output/coreaudio.c diff --git a/jni/mpg123-1.13.4/src/output/dummy.c b/jni/mpg123-1.17.0/src/output/dummy.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/dummy.c rename to jni/mpg123-1.17.0/src/output/dummy.c diff --git a/jni/mpg123-1.13.4/src/output/esd.c b/jni/mpg123-1.17.0/src/output/esd.c similarity index 98% rename from jni/mpg123-1.13.4/src/output/esd.c rename to jni/mpg123-1.17.0/src/output/esd.c index 44f870c1..651ebc70 100644 --- a/jni/mpg123-1.13.4/src/output/esd.c +++ b/jni/mpg123-1.17.0/src/output/esd.c @@ -160,7 +160,7 @@ mpg123_module_t mpg123_output_module_info = { /* api_version */ MPG123_MODULE_API_VERSION, /* name */ "esd", /* description */ "Output audio using ESounD (The Enlightened Sound Daemon).", - /* revision */ "$Rev: 2974 $", + /* revision */ "$Rev: 1698 $", /* handle */ NULL, /* init_output */ init_esound, diff --git a/jni/mpg123-1.13.4/src/output/hp.c b/jni/mpg123-1.17.0/src/output/hp.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/hp.c rename to jni/mpg123-1.17.0/src/output/hp.c diff --git a/jni/mpg123-1.13.4/src/output/jack.c b/jni/mpg123-1.17.0/src/output/jack.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/jack.c rename to jni/mpg123-1.17.0/src/output/jack.c diff --git a/jni/mpg123-1.13.4/src/output/mint.c b/jni/mpg123-1.17.0/src/output/mint.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/mint.c rename to jni/mpg123-1.17.0/src/output/mint.c diff --git a/jni/mpg123-1.13.4/src/output/nas.c b/jni/mpg123-1.17.0/src/output/nas.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/nas.c rename to jni/mpg123-1.17.0/src/output/nas.c diff --git a/jni/mpg123-1.13.4/src/output/openal.c b/jni/mpg123-1.17.0/src/output/openal.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/openal.c rename to jni/mpg123-1.17.0/src/output/openal.c diff --git a/jni/mpg123-1.13.4/src/output/os2.c b/jni/mpg123-1.17.0/src/output/os2.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/os2.c rename to jni/mpg123-1.17.0/src/output/os2.c diff --git a/jni/mpg123-1.13.4/src/output/oss.c b/jni/mpg123-1.17.0/src/output/oss.c similarity index 99% rename from jni/mpg123-1.13.4/src/output/oss.c rename to jni/mpg123-1.17.0/src/output/oss.c index caf7efcf..8805ac85 100644 --- a/jni/mpg123-1.13.4/src/output/oss.c +++ b/jni/mpg123-1.17.0/src/output/oss.c @@ -310,7 +310,7 @@ mpg123_module_t mpg123_output_module_info = { /* api_version */ MPG123_MODULE_API_VERSION, /* name */ "oss", /* description */ "Output audio using OSS", - /* revision */ "$Rev: 2974 $", + /* revision */ "$Rev: 2927 $", /* handle */ NULL, /* init_output */ init_oss, diff --git a/jni/mpg123-1.13.4/src/output/portaudio.c b/jni/mpg123-1.17.0/src/output/portaudio.c similarity index 100% rename from jni/mpg123-1.13.4/src/output/portaudio.c rename to jni/mpg123-1.17.0/src/output/portaudio.c diff --git a/jni/mpg123-1.13.4/src/output/pulse.c b/jni/mpg123-1.17.0/src/output/pulse.c similarity index 96% rename from jni/mpg123-1.13.4/src/output/pulse.c rename to jni/mpg123-1.17.0/src/output/pulse.c index 9e79dd60..40c52675 100644 --- a/jni/mpg123-1.13.4/src/output/pulse.c +++ b/jni/mpg123-1.17.0/src/output/pulse.c @@ -114,7 +114,9 @@ static int close_pulse(audio_output_t *ao) pa_simple *pas = (pa_simple*)ao->userptr; if (pas) { - pa_simple_free( pas ); + int err; /* Do we really want to handle errors here? End is the end. */ + pa_simple_drain(pas, &err); + pa_simple_free(pas); ao->userptr = NULL; } diff --git a/jni/mpg123-1.17.0/src/output/qsa.c b/jni/mpg123-1.17.0/src/output/qsa.c new file mode 100644 index 00000000..0303cc77 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/qsa.c @@ -0,0 +1,274 @@ +/* + qsa: sound output with QNX Sound Architecture 0.5.2 API + + copyright 2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + written by Mike Gorchak +*/ + +#include "mpg123app.h" +#include "audio.h" +#include "module.h" +#include + +#include +#include + +#include "debug.h" + +typedef struct _qsa_mp_map +{ + uint32_t qsa_format; + int mp_format; +} qsa_mp_map_t; + +/* in order best format first */ +qsa_mp_map_t format_map[]= +{ +#ifdef WORDS_BIGENDIAN + {SND_PCM_SFMT_FLOAT64_BE, MPG123_ENC_FLOAT_64 }, + {SND_PCM_SFMT_FLOAT_BE, MPG123_ENC_FLOAT_32 }, + {SND_PCM_SFMT_S32_BE, MPG123_ENC_SIGNED_32 }, + {SND_PCM_SFMT_U32_BE, MPG123_ENC_UNSIGNED_32 }, + {SND_PCM_SFMT_S24_BE, MPG123_ENC_SIGNED_24 }, + {SND_PCM_SFMT_U24_BE, MPG123_ENC_UNSIGNED_24 }, + {SND_PCM_SFMT_S16_BE, MPG123_ENC_SIGNED_16 }, + {SND_PCM_SFMT_U16_BE, MPG123_ENC_UNSIGNED_16 }, +#else + {SND_PCM_SFMT_FLOAT64_LE, MPG123_ENC_FLOAT_64 }, + {SND_PCM_SFMT_FLOAT_LE, MPG123_ENC_FLOAT_32 }, + {SND_PCM_SFMT_S32_LE, MPG123_ENC_SIGNED_32 }, + {SND_PCM_SFMT_U32_LE, MPG123_ENC_UNSIGNED_32 }, + {SND_PCM_SFMT_S24_LE, MPG123_ENC_SIGNED_24 }, + {SND_PCM_SFMT_U24_LE, MPG123_ENC_UNSIGNED_24 }, + {SND_PCM_SFMT_S16_LE, MPG123_ENC_SIGNED_16 }, + {SND_PCM_SFMT_U16_LE, MPG123_ENC_UNSIGNED_16 }, +#endif + {SND_PCM_SFMT_U8, MPG123_ENC_UNSIGNED_8 }, + {SND_PCM_SFMT_S8, MPG123_ENC_SIGNED_8 }, + {SND_PCM_SFMT_A_LAW, MPG123_ENC_ALAW_8 }, + {SND_PCM_SFMT_MU_LAW, MPG123_ENC_ULAW_8 }, + {0, 0 }, +}; + +typedef struct _qsa_internal +{ + int cardno; + int deviceno; + snd_pcm_t* audio_handle; + snd_pcm_channel_params_t cpars; +} qsa_internal_t; + +static int open_qsa(audio_output_t* ao) +{ + int status; + int cardno; + int deviceno; + int it; + snd_pcm_t* audio_handle; + qsa_internal_t* userptr; + + ao->userptr=NULL; + + status=snd_pcm_open_preferred(&audio_handle, &cardno, &deviceno, SND_PCM_OPEN_PLAYBACK); + if (status<0) + { + return FALSE; + } + + status=snd_pcm_plugin_set_disable(audio_handle, PLUGIN_DISABLE_MMAP); + if (status<0) + { + return FALSE; + } + + userptr=calloc(1, sizeof(qsa_internal_t)); + if (userptr==NULL) + { + return FALSE; + } + ao->userptr=userptr; + userptr->audio_handle=audio_handle; + userptr->cardno=cardno; + userptr->deviceno=deviceno; + + memset(&userptr->cpars, 0, sizeof(userptr->cpars)); + + userptr->cpars.channel=SND_PCM_CHANNEL_PLAYBACK; + userptr->cpars.mode=SND_PCM_MODE_BLOCK; + userptr->cpars.start_mode=SND_PCM_START_DATA; + userptr->cpars.stop_mode=SND_PCM_STOP_STOP; + userptr->cpars.format.format=0; + it=0; + do { + if ((format_map[it].qsa_format==0) && (format_map[it].mp_format==0)) + { + break; + } + if (ao->format==format_map[it].mp_format) + { + userptr->cpars.format.format=format_map[it].qsa_format; + break; + } + it++; + } while(1); + userptr->cpars.format.interleave=1; + userptr->cpars.format.rate=ao->rate; + userptr->cpars.format.voices=ao->channels; + userptr->cpars.buf.block.frag_size=4096; + userptr->cpars.buf.block.frags_min=8; + userptr->cpars.buf.block.frags_max=16; + + if ((ao->channels!=-1) && (ao->rate!=-1)) + { + status=snd_pcm_plugin_params(userptr->audio_handle, &userptr->cpars); + if (status<0) + { + return FALSE; + } + + status=snd_pcm_plugin_prepare(userptr->audio_handle, SND_PCM_CHANNEL_PLAYBACK); + if (status<0) + { + return FALSE; + } + } + + return TRUE; +} + +static int get_formats_qsa(audio_output_t* ao) +{ + qsa_internal_t* userptr; + int status; + int it=0; + + userptr=ao->userptr; + if (userptr!=NULL); + { + userptr->cpars.format.rate=ao->rate; + userptr->cpars.format.voices=ao->channels; + it=0; + do { + if ((format_map[it].qsa_format==0) && (format_map[it].mp_format==0)) + { + break; + } + userptr->cpars.format.format=format_map[it].qsa_format; + status=snd_pcm_plugin_params(userptr->audio_handle, &userptr->cpars); + if (status<0) + { + it++; + } + else + { + return format_map[it].mp_format; + } + } while(1); + } + + return 0; +} + +static int write_qsa(audio_output_t* ao, unsigned char* buf, int bytes) +{ + int written; + int status; + snd_pcm_channel_status_t cstatus; + qsa_internal_t* userptr; + + userptr=ao->userptr; + if (userptr!=NULL); + { + written=snd_pcm_plugin_write(userptr->audio_handle, buf, bytes); + if (written!=bytes) + { + /* Check if samples playback got stuck somewhere in hardware or in */ + /* the audio device driver */ + if ((errno==EAGAIN) && (written==0)) + { + return 0; + } + if ((errno==EINVAL) || (errno==EIO)) + { + memset(&cstatus, 0, sizeof(cstatus)); + cstatus.channel=SND_PCM_CHANNEL_PLAYBACK; + status=snd_pcm_plugin_status(userptr->audio_handle, &cstatus); + if (status>0) + { + return 0; + } + if ((cstatus.status == SND_PCM_STATUS_UNDERRUN) || + (cstatus.status == SND_PCM_STATUS_READY)) + { + status=snd_pcm_plugin_prepare(userptr->audio_handle, SND_PCM_CHANNEL_PLAYBACK); + if (status<0) + { + return 0; + } + } + } + } + } + + return written; +} + +static void flush_qsa(audio_output_t* ao) +{ + qsa_internal_t* userptr; + + userptr=ao->userptr; + if (userptr!=NULL); + { + snd_pcm_playback_flush(userptr->audio_handle); + } +} + +static int close_qsa(audio_output_t* ao) +{ + qsa_internal_t* userptr; + + userptr=ao->userptr; + if (userptr!=NULL); + { + snd_pcm_close(userptr->audio_handle); + free(ao->userptr); + } + + return TRUE; +} + +static int deinit_qsa(audio_output_t* ao) +{ + return TRUE; +} + +static int init_qsa(audio_output_t* ao) +{ + if (ao==NULL) return -1; + + /* Set callbacks */ + ao->open = open_qsa; + ao->flush = flush_qsa; + ao->write = write_qsa; + ao->get_formats = get_formats_qsa; + ao->close = close_qsa; + ao->deinit = deinit_qsa; + + /* Success */ + return 0; +} + +/* + Module information data structure +*/ +mpg123_module_t mpg123_output_module_info = { + /* api_version */ MPG123_MODULE_API_VERSION, + /* name */ "qsa", + /* description */ "Output audio using QNX Sound Architecture (QSA).", + /* revision */ "$Rev:$", + /* handle */ NULL, + /* init_output */ init_qsa, +}; diff --git a/jni/mpg123-1.13.4/src/output/sdl.c b/jni/mpg123-1.17.0/src/output/sdl.c similarity index 67% rename from jni/mpg123-1.13.4/src/output/sdl.c rename to jni/mpg123-1.17.0/src/output/sdl.c index cc65021e..1eb156a4 100644 --- a/jni/mpg123-1.13.4/src/output/sdl.c +++ b/jni/mpg123-1.17.0/src/output/sdl.c @@ -27,9 +27,6 @@ #define FRAMES_PER_BUFFER (256) #define FIFO_DURATION (0.5f) - - - /* The audio function callback takes the following parameters: stream: A pointer to the audio buffer to be filled len: The length (in bytes) of the audio buffer @@ -39,21 +36,17 @@ static void audio_callback_sdl(void *udata, Uint8 *stream, int len) audio_output_t *ao = (audio_output_t*)udata; sfifo_t *fifo = (sfifo_t*)ao->userptr; int bytes_read; + int bytes_avail; - /* Only play if we have data left */ - if ( sfifo_used( fifo ) < len ) { - warning("Didn't have any audio data for SDL (buffer underflow)"); - SDL_PauseAudio(1); - return; - } + bytes_avail = sfifo_used(fifo); + if(bytes_avail < len) len = bytes_avail; /* Read audio from FIFO to SDL's buffer */ bytes_read = sfifo_read( fifo, stream, len ); - - if (len!=bytes_read) - warning2("Error reading from the FIFO (wanted=%u, bytes_read=%u).\n", len, bytes_read); -} + if (len!=bytes_read) + warning2("Error reading from the FIFO (wanted=%u, bytes_read=%u).\n", len, bytes_read); +} static int open_sdl(audio_output_t *ao) { @@ -72,8 +65,13 @@ static int open_sdl(audio_output_t *ao) wanted.userdata = ao; wanted.channels = ao->channels; wanted.freq = ao->rate; - - /* Open the audio device, forcing the desired format */ + + /* Open the audio device, forcing the desired format + Actually, it is still subject to constraints by hardware. + Need to have sample rate checked beforehand! SDL will + happily play 22 kHz files with 44 kHz hardware rate! + Same with channel count. No conversion. The manual is a bit + misleading on that (only talking about sample format, I guess). */ if ( SDL_OpenAudio(&wanted, NULL) ) { error1("Couldn't open SDL audio: %s\n", SDL_GetError()); return -1; @@ -91,8 +89,37 @@ static int open_sdl(audio_output_t *ao) static int get_formats_sdl(audio_output_t *ao) { - /* Only implemented Signed 16-bit audio for now */ + /* Got no better idea than to just take 16 bit and run with it */ return MPG123_ENC_SIGNED_16; +#if 0 + /* + This code would "properly" test audio format support. + But thing is, SDL will always say yes and amen to everything, but it takes + an awful amount of time to get all the variants tested (about 2 seconds, + for example). I have seen SDL builds that do proper format conversion + behind your back, I have seen builds that do not. Every build seems to + claim that it does, though. Just hope you're lucky and your SDL works. + Otherwise, use a proper audio output API. + */ + SDL_AudioSpec wanted, got; + + /* Only implemented Signed 16-bit audio for now. + The SDL manual doesn't suggest more interesting formats + like S24 or S32 anyway. */ + wanted.format = AUDIO_S16SYS; + wanted.samples = 1024; + wanted.callback = audio_callback_sdl; + wanted.userdata = ao; + wanted.channels = ao->channels; + wanted.freq = ao->rate; + + if(SDL_OpenAudio(&wanted, &got)) return 0; + SDL_CloseAudio(); +fprintf(stderr, "wanted rate: %li got rate %li\n", (long)wanted.freq, (long)got.freq); + return (got.freq == ao->rate && got.channels == ao->channels) + ? MPG123_ENC_SIGNED_16 + : 0; +#endif } @@ -118,15 +145,29 @@ static int write_sdl(audio_output_t *ao, unsigned char *buf, int len) /* Unpause once the buffer is 50% full */ - if (sfifo_used(fifo) > (sfifo_size(fifo)*0.5) ) SDL_PauseAudio(0); + if (sfifo_used(fifo) > (sfifo_size(fifo)*0.5) ) + SDL_PauseAudio(0); return len; } static int close_sdl(audio_output_t *ao) { + int stuff; sfifo_t *fifo = (sfifo_t*)ao->userptr; + /* Wait at least until SDL emptied the FIFO. */ + while((stuff = sfifo_used(fifo))>0) + { + int msecs = stuff*1000/ao->rate; + debug1("still stuff for about %i ms there", msecs); +#ifdef WIN32 + Sleep(msecs/2); +#else + usleep(msecs*1000/2); +#endif + } + SDL_CloseAudio(); /* Free up the memory used by the FIFO */ diff --git a/jni/mpg123-1.17.0/src/output/sgi.c b/jni/mpg123-1.17.0/src/output/sgi.c new file mode 100644 index 00000000..84bb0f2d --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/sgi.c @@ -0,0 +1,271 @@ +/* + sgi: audio output on SGI boxen + + copyright ?-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + initially written (as it seems) by Thomas Woerner +*/ + +#include + +#include + +#include "mpg123app.h" +#include "errno.h" +#include "debug.h" + +static int set_rate(audio_output_t *ao, ALconfig config) +{ + int dev = alGetDevice(config); + ALpv params[1]; + + /* Make sure the device is OK */ + if(dev < 0) + { + error1("set_rate: %s", alGetErrorString(oserror())); + return -1; + } + if(ao->rate > 0) + { + params[0].param = AL_RATE; + params[0].value.ll = alDoubleToFixed((double)ao->rate); + if(alSetParams(dev, params, 1) < 0) + { + error1("set_rate: %s", alGetErrorString(oserror())); + return -1; + } + } + return 0; +} + + +static int set_channels(audio_output_t *ao, ALconfig config) +{ + int ret; + + if(ao->channels == 2) + ret = alSetChannels(config, AL_STEREO); + else + ret = alSetChannels(config, AL_MONO); + + if(ret < 0) + { + error1("set_channels : %s", alGetErrorString(oserror())); + return -1; + } + return 0; +} + +static int set_format(audio_output_t *ao, ALconfig config) +{ + if(ao->format == MPG123_ENC_FLOAT_32) + { + if(alSetSampFmt(config, AL_SAMPFMT_FLOAT) < 0) + { + error1("SetSampFmt: %s", alGetErrorString(oserror())); + return -1; + } + } else + { + if(alSetSampFmt(config, AL_SAMPFMT_TWOSCOMP) < 0) + { + error1("SetSampFmt: %s", alGetErrorString(oserror())); + return -1; + } + if(alSetWidth(config, AL_SAMPLE_16) < 0) + { + error1("SetWidth: %s", alGetErrorString(oserror())); + return -1; + } + } + return 0; +} + + +static int open_sgi(audio_output_t *ao) +{ + int current_dev; + ALport port = NULL; + ALconfig config = alNewConfig(); + + ao->userptr = NULL; + + /* Test for correct completion */ + if(config == 0) + { + error1("open_sgi: %s", alGetErrorString(oserror())); + return -1; + } + + /* Setup output device to specified device name. If there is no device name + specified in ao structure, use the default for output */ + if((ao->device) != NULL) + { + current_dev = alGetResourceByName(AL_SYSTEM, ao->device, AL_OUTPUT_DEVICE_TYPE); + + debug2("Dev: %s %i", ao->device, current_dev); + + if(!current_dev) + { + int i, numOut; + char devname[32]; + ALpv pv[1]; + ALvalue *alvalues; + + error2("Invalid audio resource: %s (%s)", ao->device, alGetErrorString(oserror())); + + if((numOut= alQueryValues(AL_SYSTEM,AL_DEFAULT_OUTPUT,0,0,0,0))>=0) + fprintf(stderr, "There are %d output devices on this system.\n", numOut); + else + { + fprintf(stderr, "Can't find output devices. alQueryValues failed: %s\n", alGetErrorString(oserror())); + goto open_sgi_bad; + } + + alvalues = malloc(sizeof(ALvalue) * numOut); + i = alQueryValues(AL_SYSTEM, AL_DEFAULT_OUTPUT, alvalues, numOut, pv, 0); + if(i == -1) + error1("alQueryValues: %s", alGetErrorString(oserror())); + else + { + for(i=0; i < numOut; i++) + { + pv[0].param = AL_NAME; + pv[0].value.ptr = devname; + pv[0].sizeIn = 32; + alGetParams(alvalues[i].i, pv, 1); + + fprintf(stderr, "%i: %s\n", i, devname); + } + } + free(alvalues); + + goto open_sgi_bad; + } + + if(alSetDevice(config, current_dev) < 0) + { + error1("open: alSetDevice : %s",alGetErrorString(oserror())); + goto open_sgi_bad; + } + } else + current_dev = AL_DEFAULT_OUTPUT; + + /* Set the device */ + if(alSetDevice(config, current_dev) < 0) + { + error1("open_sgi: %s", alGetErrorString(oserror())); + goto open_sgi_bad; + } + + /* Set port parameters */ + + if(alSetQueueSize(config, 131069) < 0) + { + error1("open_sgi: setting audio buffer failed: %s", alGetErrorString(oserror())); + goto open_sgi_bad; + } + + if( set_format(ao, config) < 0 + || set_rate(ao, config) < 0 + || set_channels(ao, config) < 0 ) + goto open_sgi_bad; + + /* Open the audio port */ + port = alOpenPort("mpg123-VSC", "w", config); + if(port == NULL) + { + error1("Unable to open audio channel: %s", alGetErrorString(oserror())); + goto open_sgi_bad; + } + + ao->userptr = (void*)port; + + alFreeConfig(config); + return 1; + +open_sgi_bad: + /* clean up and return error */ + alFreeConfig(config); + return -1; +} + + +static int get_formats_sgi(audio_output_t *ao) +{ + return MPG123_ENC_SIGNED_16|MPG123_ENC_FLOAT_32; +} + + +static int write_sgi(audio_output_t *ao, unsigned char *buf, int len) +{ + int length = len; + + if(!ao || !ao->userptr) return -1; + + ALport port = (ALport)ao->userptr; + + if(ao->channels == 2) length >>= 2; + else length >>= 1; + + if(ao->format == MPG123_ENC_FLOAT_32) length >>=1; + + /* Not much error checking ... */ + alWriteFrames(port, buf, length); + + return len; +} + + +static int close_sgi(audio_output_t *ao) +{ + if(!ao || !ao->userptr) return -1; + + ALport port = (ALport)ao->userptr; + + if(port) + { + /* play all remaining samples */ + while(alGetFilled(port) > 0) sginap(1); + + alClosePort(port); + ao->userptr=NULL; + } + return 0; +} + +static void flush_sgi(audio_output_t *ao) +{ + ALport port = (ALport)ao->userptr; + + if(port) alDiscardFrames(port, alGetFilled(port)); +} + +static int init_sgi(audio_output_t* ao) +{ + if(ao == NULL) return -1; + + /* Set callbacks */ + ao->open = open_sgi; + ao->flush = flush_sgi; + ao->write = write_sgi; + ao->get_formats = get_formats_sgi; + ao->close = close_sgi; + + /* Success */ + return 0; +} + +/* + Module information data structure +*/ +mpg123_module_t mpg123_output_module_info = +{ + /* api_version */ MPG123_MODULE_API_VERSION, + /* name */ "sgi", + /* description */ "Audio output for SGI.", + /* revision */ "$Rev:$", + /* handle */ NULL, + + /* init_output */ init_sgi, +}; diff --git a/jni/mpg123-1.13.4/src/output/sndio.c b/jni/mpg123-1.17.0/src/output/sndio.c similarity index 82% rename from jni/mpg123-1.13.4/src/output/sndio.c rename to jni/mpg123-1.17.0/src/output/sndio.c index 90068e95..8f8e26e5 100644 --- a/jni/mpg123-1.13.4/src/output/sndio.c +++ b/jni/mpg123-1.17.0/src/output/sndio.c @@ -37,6 +37,14 @@ static int open_sndio(audio_output_t *ao) par.pchan = ao->channels; par.le = SIO_LE_NATIVE; switch(ao->format) { + case MPG123_ENC_SIGNED_32: + par.sig = 1; + par.bits = 32; + break; + case MPG123_ENC_UNSIGNED_32: + par.sig = 0; + par.bits = 32; + break; case MPG123_ENC_SIGNED_16: case -1: /* query mode */ par.sig = 1; @@ -67,22 +75,35 @@ static int open_sndio(audio_output_t *ao) sio_close(hdl); return -1; } - if ((par.bits != 8 && par.bits != 16) || par.le != SIO_LE_NATIVE) { + if ((par.bits != 8 && par.bits != 16 && par.bits != 32) || + par.le != SIO_LE_NATIVE) { sio_close(hdl); return -1; } ao->rate = par.rate; ao->channels = par.pchan; - ao->format = (par.bits == 8) ? - (par.sig ? MPG123_ENC_SIGNED_8 : MPG123_ENC_UNSIGNED_8) : - (par.sig ? MPG123_ENC_SIGNED_16 : MPG123_ENC_UNSIGNED_16); + switch (par.bits) { + case 8: + ao->format = par.sig ? MPG123_ENC_SIGNED_8 : + MPG123_ENC_UNSIGNED_8; + break; + case 16: + ao->format = par.sig ? MPG123_ENC_SIGNED_16 : + MPG123_ENC_UNSIGNED_16; + break; + case 32: + ao->format = par.sig ? MPG123_ENC_SIGNED_32 : + MPG123_ENC_UNSIGNED_32; + break; + } ao->userptr = hdl; return 0; } static int get_formats_sndio(audio_output_t *ao) { - return (MPG123_ENC_SIGNED_16|MPG123_ENC_UNSIGNED_16| + return (MPG123_ENC_SIGNED_32|MPG123_ENC_UNSIGNED_32| + MPG123_ENC_SIGNED_16|MPG123_ENC_UNSIGNED_16| MPG123_ENC_UNSIGNED_8|MPG123_ENC_SIGNED_8); } diff --git a/jni/mpg123-1.13.4/src/output/sun.c b/jni/mpg123-1.17.0/src/output/sun.c similarity index 99% rename from jni/mpg123-1.13.4/src/output/sun.c rename to jni/mpg123-1.17.0/src/output/sun.c index 23d68699..75bd7a01 100644 --- a/jni/mpg123-1.13.4/src/output/sun.c +++ b/jni/mpg123-1.17.0/src/output/sun.c @@ -272,7 +272,7 @@ mpg123_module_t mpg123_output_module_info = { /* api_version */ MPG123_MODULE_API_VERSION, /* name */ "sun", /* description */ "Audio output for Sun Audio.", - /* revision */ "$Rev: 2974 $", + /* revision */ "$Rev: 1872 $", /* handle */ NULL, /* init_output */ init_sun, diff --git a/jni/mpg123-1.17.0/src/output/tinyalsa.c b/jni/mpg123-1.17.0/src/output/tinyalsa.c new file mode 100644 index 00000000..f9d16ea7 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/tinyalsa.c @@ -0,0 +1,210 @@ +/* + tinyalsa: sound output with TINY Advanced Linux Sound Architecture + + copyright 2006-8 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + initially written by Jarno Lehtinen +*/ + +#include "mpg123app.h" +#include "audio.h" +#include "module.h" +#include + +#include + +#include "debug.h" + + +typedef struct +{ + struct pcm *pcm; + struct pcm_params *params; + struct pcm_config config; + + unsigned int device; + unsigned int card; +} mpg123_tinyalsa_t; + + +static int initialize_device(audio_output_t *ao) +{ + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + ta->config.channels = ao->channels; + ta->config.rate = ao->rate; + ta->config.period_size = 1024; + ta->config.period_count = 4; + ta->config.format = PCM_FORMAT_S16_LE; + ta->config.start_threshold = 0; + ta->config.stop_threshold = 0; + ta->config.silence_threshold = 0; + + ta->pcm = pcm_open(ta->card, ta->device, PCM_OUT, &ta->config); + if (!ta->pcm || !pcm_is_ready(ta->pcm)) + { + error3("(open) Unable to open card %u PCM device %u (%s)\n", ta->card, ta->device, pcm_get_error(ta->pcm)); + return -1; + } + + return 0; +} + + +static int open_tinyalsa(audio_output_t *ao) +{ + debug("open_tinyalsa()"); + + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + if (ao->format != -1) + { + /* we're going to play: initalize sample format */ + return initialize_device(ao); + } + else + { + /* query mode; sample format will be set for each query */ + return 0; + } +} + + +static int get_formats_tinyalsa(audio_output_t *ao) +{ + debug("get_formats_tinyalsa()"); + + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + if ( ao->rate >= pcm_params_get_min(ta->params, PCM_PARAM_RATE) && ao->rate <= pcm_params_get_max(ta->params, PCM_PARAM_RATE) && ao->channels >= pcm_params_get_min(ta->params, PCM_PARAM_CHANNELS) && ao->channels <= pcm_params_get_max(ta->params, PCM_PARAM_CHANNELS) ) + { + return MPG123_ENC_SIGNED_16; + } + else + { + return 0; + } +} + + +static int write_tinyalsa(audio_output_t *ao, unsigned char *buf, int bytes) +{ + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + if (ta->pcm) + { + if (pcm_write(ta->pcm, buf, bytes)) + { + error("Error playing sample\n"); + return -1; + } + } + + return bytes; +} + + +static void flush_tinyalsa(audio_output_t *ao) +{ + debug("flush_tinyalsa()"); +} + + +static int close_tinyalsa(audio_output_t *ao) +{ + debug("close_tinyalsa()"); + + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + if (ta->pcm) + { + pcm_close(ta->pcm); + } + + return 0; +} + + +static int deinit_tinyalsa(audio_output_t* ao) +{ + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + /* Free up card/device parameters */ + pcm_params_free(ta->params); + + /* Free up memory */ + if(ao->userptr) + { + free( ao->userptr ); + ao->userptr = NULL; + } + + /* Success */ + return 0; +} + + +static int init_tinyalsa(audio_output_t* ao) +{ + if (ao==NULL) return -1; + + /* Set callbacks */ + ao->open = open_tinyalsa; + ao->flush = flush_tinyalsa; + ao->write = write_tinyalsa; + ao->get_formats = get_formats_tinyalsa; + ao->close = close_tinyalsa; + ao->deinit = deinit_tinyalsa; + + /* Allocate memory for data structure */ + ao->userptr = malloc( sizeof( mpg123_tinyalsa_t ) ); + if(ao->userptr==NULL) + { + error("failed to malloc memory for 'mpg123_tinyalsa_t'"); + return -1; + } + memset( ao->userptr, 0, sizeof(mpg123_tinyalsa_t) ); + + /* Set card and device */ + mpg123_tinyalsa_t* ta = (mpg123_tinyalsa_t*)ao->userptr; + + ta->card = 0; + ta->device = 0; + + if (ao->device) + { + char *ptr = ao->device; + ta->card = (unsigned int)strtol(ptr, &ptr, 10); + if (strlen(ptr) > 0) + { + ta->device = (unsigned int)strtol(++ptr, &ptr, 10); + } + } + + /* Get card/device parameters */ + ta->params = pcm_params_get(ta->card, ta->device, PCM_OUT); + if (ta->params == NULL) + { + error2("(params) Unable to open card %u PCM device %u.\n", ta->card, ta->device); + return -1; + } + + /* Success */ + return 0; +} + + +/* + Module information data structure +*/ +mpg123_module_t mpg123_output_module_info = { + /* api_version */ MPG123_MODULE_API_VERSION, + /* name */ "tinyalsa", + /* description */ "Output audio using TINY Advanced Linux Sound Architecture (TINYALSA).", + /* revision */ "$Rev:$", + /* handle */ NULL, + + /* init_output */ init_tinyalsa, +}; + diff --git a/jni/mpg123-1.17.0/src/output/win32.c b/jni/mpg123-1.17.0/src/output/win32.c new file mode 100644 index 00000000..7d8afffe --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/win32.c @@ -0,0 +1,306 @@ +/* + win32: audio output for Windows 32bit + + copyright ?-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + initially written (as it seems) by Tony Million + rewrite of basic functionality for callback-less and properly ringbuffered operation by ravenexp + Closing buffer playback fixed by David Wohlferd +*/ + +#include "mpg123app.h" +#include +#include "debug.h" + +/* + Buffer size and number of buffers in the playback ring + NOTE: This particular num/size combination performs best under heavy + loads for my system, however this may not be true for any hardware/OS out there. + Generally, BUFFER_SIZE < 8k || NUM_BUFFERS > 16 || NUM_BUFFERS < 4 are not recommended. +*/ +#define BUFFER_SIZE 0x10000 +#define NUM_BUFFERS 8 /* total 512k roughly 2.5 sec of CD quality sound */ + +static void wait_for_buffer(WAVEHDR* hdr, HANDLE hEvent); +static void drain_win32(struct audio_output_struct *ao); + +/* Buffer ring queue state */ +struct queue_state +{ + WAVEHDR buffer_headers[NUM_BUFFERS]; + /* The next buffer to be filled and put in playback */ + int next_buffer; + /* Buffer playback completion event */ + HANDLE play_done_event; + HWAVEOUT waveout; +}; + +static int open_win32(struct audio_output_struct *ao) +{ + struct queue_state* state; + int i; + MMRESULT res; + WAVEFORMATEX out_fmt; + UINT dev_id; + + if(!ao) return -1; + if(ao->rate == -1) return 0; + + /* Allocate queue state struct for this device */ + state = calloc(1, sizeof(struct queue_state)); + if(!state) return -1; + + ao->userptr = state; + + state->play_done_event = CreateEvent(0,FALSE,FALSE,0); + if(state->play_done_event == INVALID_HANDLE_VALUE) return -1; + + /* FIXME: real device enumeration by capabilities? */ + dev_id = WAVE_MAPPER; /* probably does the same thing */ + ao->device = "WaveMapper"; + /* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */ + out_fmt.wFormatTag = WAVE_FORMAT_PCM; + out_fmt.wBitsPerSample = 16; + out_fmt.nChannels = ao->channels; + out_fmt.nSamplesPerSec = ao->rate; + out_fmt.nBlockAlign = out_fmt.nChannels*out_fmt.wBitsPerSample/8; + out_fmt.nAvgBytesPerSec = out_fmt.nBlockAlign*out_fmt.nSamplesPerSec; + out_fmt.cbSize = 0; + + res = waveOutOpen(&state->waveout, dev_id, &out_fmt, + (DWORD_PTR)state->play_done_event, 0, CALLBACK_EVENT); + + switch(res) + { + case MMSYSERR_NOERROR: + break; + case MMSYSERR_ALLOCATED: + ereturn(-1, "Audio output device is already allocated."); + case MMSYSERR_NODRIVER: + ereturn(-1, "No device driver is present."); + case MMSYSERR_NOMEM: + ereturn(-1, "Unable to allocate or lock memory."); + case WAVERR_BADFORMAT: + ereturn(-1, "Unsupported waveform-audio format."); + default: + ereturn(-1, "Unable to open wave output device."); + } + + /* Reset event from the "device open" message */ + ResetEvent(state->play_done_event); + /* Allocate playback buffers */ + for(i = 0; i < NUM_BUFFERS; i++) + if(!(state->buffer_headers[i].lpData = (LPSTR)malloc(BUFFER_SIZE))) + { + ereturn(-1, "Out of memory for playback buffers."); + } + else + { + /* Tell waveOutPrepareHeader the maximum value of dwBufferLength + we will ever send */ + state->buffer_headers[i].dwBufferLength = BUFFER_SIZE; + state->buffer_headers[i].dwFlags = 0; + res = waveOutPrepareHeader(state->waveout, &state->buffer_headers[i], sizeof(WAVEHDR)); + if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device (prepare)."); + + /* set the current size of the buffer to 0 */ + state->buffer_headers[i].dwBufferLength = 0; + + /* set flags to unprepared - must reset this to WHDR_PREPARED before calling write */ + state->buffer_headers[i].dwFlags = 0; + } + + return 0; +} + +static void wait_for_buffer(WAVEHDR* hdr, HANDLE hEvent) +{ + /* At this point there are several possible states: + 1) Empty or partial buffer (unqueued) - dwFlags == 0 + 2) Buffer queued or being played - dwFlags == WHDR_PREPARED | WHDR_INQUEUE + 3) Buffer unqueued and finished being played - dwFlags == WHDR_PREPARED | WHDR_DONE + 4) Buffer removed from queue, but not yet marked as done - dwFlags == WHDR_PREPARED + */ + + /* Check buffer header and wait if it's being played. */ + if (hdr->dwFlags & WHDR_PREPARED) + { + while(!(hdr->dwFlags & WHDR_DONE)) + { + /*debug1("waiting for buffer %i...", state->next_buffer);*/ + /* Waits for *a* buffer to finish. May not be the one we + want, so check again */ + WaitForSingleObject(hEvent, INFINITE); + } + hdr->dwFlags = 0; + hdr->dwBufferLength = 0; + } +} + +static int get_formats_win32(struct audio_output_struct *ao) +{ + /* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */ + return MPG123_ENC_SIGNED_16; +} + +/* Stores audio data to the fixed size buffers and pushes them into the playback queue. + I have one grief with that: The last piece of a track may not reach the output, + only full buffers sent... But we don't get smooth audio otherwise. */ +static int write_win32(struct audio_output_struct *ao, unsigned char *buf, int len) +{ + struct queue_state* state; + MMRESULT res; + WAVEHDR* hdr; + + int rest_len; /* Input data bytes left for next recursion. */ + int bufill; /* Bytes we stuff into buffer now. */ + + if(!ao || !ao->userptr) return -1; + if(!buf || len <= 0) return 0; + + state = (struct queue_state*)ao->userptr; + hdr = &state->buffer_headers[state->next_buffer]; + + wait_for_buffer(hdr, state->play_done_event); + + /* Now see how much we want to stuff in and then stuff it in. */ + bufill = BUFFER_SIZE - hdr->dwBufferLength; + if(len < bufill) bufill = len; + + rest_len = len - bufill; + memcpy(hdr->lpData + hdr->dwBufferLength, buf, bufill); + hdr->dwBufferLength += bufill; + if(hdr->dwBufferLength == BUFFER_SIZE) + { /* Send the buffer out when it's full. */ + hdr->dwFlags |= WHDR_PREPARED; + + res = waveOutWrite(state->waveout, hdr, sizeof(WAVEHDR)); + if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device."); + + /* Cycle to the next buffer in the ring queue */ + state->next_buffer = (state->next_buffer + 1) % NUM_BUFFERS; + } + /* I'd like to propagate error codes or something... but there are no catchable surprises left. + Anyhow: Here is the recursion that makes ravenexp happy;-) */ + if(rest_len && write_win32(ao, buf + bufill, rest_len) < 0) /* Write the rest. */ + return -1; + else + return len; +} + + /* Flush means abort any pending playback */ +static void flush_win32(struct audio_output_struct *ao) +{ + struct queue_state* state; + WAVEHDR* hdr; + + if(!ao || !ao->userptr) return; + state = (struct queue_state*)ao->userptr; + + /* Cancel any buffers in queue. Ignore errors since we are void and + can't return them anyway */ + waveOutReset(state->waveout); + + /* Discard any partial buffer */ + hdr = &state->buffer_headers[state->next_buffer]; + + /* If WHDR_PREPARED is not set, this is (potentially) a partial buffer */ + if (!(hdr->dwFlags & WHDR_PREPARED)) + hdr->dwBufferLength = 0; + + /* Finish processing the buffers */ + drain_win32(ao); +} + +/* output final buffer (if any) */ +static void write_final_buffer(struct queue_state *state) +{ + WAVEHDR* hdr; + hdr = &state->buffer_headers[state->next_buffer]; + if((!(hdr->dwFlags & WHDR_PREPARED)) && (hdr->dwBufferLength != 0)) + { + hdr->dwFlags |= WHDR_PREPARED; + /* ignore any errors */ + waveOutWrite(state->waveout, hdr, sizeof(WAVEHDR)); + + /* Cycle to the next buffer in the ring queue */ + state->next_buffer = (state->next_buffer + 1) % NUM_BUFFERS; + } +} + +/* Note: I tried to fix this stuff without testing. + There were some obvious errors in the code. + Someone run this on a win32 machine! -- ThOr */ +static void drain_win32(struct audio_output_struct *ao) +{ + int i, z; + struct queue_state* state; + + if(!ao || !ao->userptr) return; + state = (struct queue_state*)ao->userptr; + + /* output final buffer (if any) */ + write_final_buffer(state); + + /* I _think_ I understood how this should work. -- ThOr */ + z = state->next_buffer; + for(i = 0; i < NUM_BUFFERS; i++) + { + wait_for_buffer(&state->buffer_headers[z], state->play_done_event); + z = (z + 1) % NUM_BUFFERS; + } +} + +static int close_win32(struct audio_output_struct *ao) +{ + int i; + struct queue_state* state; + + if(!ao || !ao->userptr) return -1; + state = (struct queue_state*)ao->userptr; + + /* wait for all active buffers to complete */ + drain_win32(ao); + CloseHandle(state->play_done_event); + + for(i = 0; i < NUM_BUFFERS; i++) + { + state->buffer_headers[i].dwFlags |= WHDR_PREPARED; + waveOutUnprepareHeader(state->waveout, &state->buffer_headers[i], sizeof(WAVEHDR)); + free(state->buffer_headers[i].lpData); + } + + waveOutClose(state->waveout); + free(ao->userptr); + ao->userptr = 0; + return 0; +} + +static int init_win32(audio_output_t* ao) +{ + if(!ao) return -1; + + /* Set callbacks */ + ao->open = open_win32; + ao->flush = flush_win32; + ao->write = write_win32; + ao->get_formats = get_formats_win32; + ao->close = close_win32; + + /* Success */ + return 0; +} + +/* + Module information data structure +*/ +mpg123_module_t mpg123_output_module_info = { + /* api_version */ MPG123_MODULE_API_VERSION, + /* name */ "win32", + /* description */ "Audio output for Windows (winmm).", + /* revision */ "$Rev:$", + /* handle */ NULL, + + /* init_output */ init_win32, +}; diff --git a/jni/mpg123-1.17.0/src/output/win32_wasapi.c b/jni/mpg123-1.17.0/src/output/win32_wasapi.c new file mode 100755 index 00000000..ec9b6459 --- /dev/null +++ b/jni/mpg123-1.17.0/src/output/win32_wasapi.c @@ -0,0 +1,464 @@ +/* + win32_wasapi: audio output for Windows wasapi exclusive mode audio + + copyright ?-2013 by the mpg123 project - free software under the terms of the LGPL 2.1 + see COPYING and AUTHORS files in distribution or http://mpg123.org + + based on win32.c +*/ +#define COBJMACROS 1 +#define _WIN32_WINNT 0x601 +#include +#include "mpg123app.h" +#include +#include +#include +#include "debug.h" + +/* Push mode does not work right yet, noisy audio, probably something to do with timing and buffers */ +#define WASAPI_EVENT_MODE 1 +#ifdef WASAPI_EVENT_MODE +#define Init_Flag AUDCLNT_STREAMFLAGS_EVENTCALLBACK +#define MOD_STRING "Experimental Audio output for Windows (wasapi event mode)." +#define BUFFER_TIME 20000000.0 +#else +#define Init_Flag 0 +#define MOD_STRING "Experimental Audio output for Windows (wasapi push mode)." +#define BUFFER_TIME 640000000.0 +#endif + +static int init_win32(audio_output_t* ao); +static void flush_win32(struct audio_output_struct *ao); +/* + Module information data structure +*/ +mpg123_module_t mpg123_output_module_info = { + /* api_version */ MPG123_MODULE_API_VERSION, + /* name */ "win32_wasapi", + /* description */ MOD_STRING, + /* revision */ "$Rev:$", + /* handle */ NULL, + + /* init_output */ init_win32, +}; + +// REFERENCE_TIME time units per second and per millisecond +#define REFTIMES_PER_SEC 10000000 +#define REFTIMES_PER_MILLISEC 10000 + +#define EXIT_ON_ERROR(hres) \ + if (FAILED(hres)) { goto Exit; } +#define SAFE_RELEASE(punk) \ + if ((punk) != NULL) \ + { (punk)->Release(); (punk) = NULL; } + +/* todo: move into handle struct */ +typedef struct _wasapi_state_struct { + IMMDeviceEnumerator *pEnumerator; + IMMDevice *pDevice; + IAudioClient *pAudioClient; + IAudioRenderClient *pRenderClient; + BYTE *pData; + UINT32 bufferFrameCount; + REFERENCE_TIME hnsRequestedDuration; + HANDLE hEvent; + HANDLE hTask; + size_t pData_off; + DWORD taskIndex; + char is_playing; + DWORD framesize; +} wasapi_state_struct; + +/* setup endpoints */ +static int open_win32(struct audio_output_struct *ao){ + HRESULT hr = 0; + wasapi_state_struct *state; + + debug1("%s",__FUNCTION__); + if(!ao || ao->userptr) return -1; /* userptr should really be null */ + state = calloc(sizeof(*state),1); + if(!state) return -1; + state->hnsRequestedDuration = REFTIMES_PER_SEC; + ao->userptr = (void *)state; + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator,NULL,CLSCTX_ALL, &IID_IMMDeviceEnumerator,(void**)&state->pEnumerator); + debug("CoCreateInstance"); + EXIT_ON_ERROR(hr) + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(state->pEnumerator,eRender, eConsole, &state->pDevice); + debug("IMMDeviceEnumerator_GetDefaultAudioEndpoint"); + EXIT_ON_ERROR(hr) + + hr = IMMDeviceActivator_Activate(state->pDevice, + &IID_IAudioClient, CLSCTX_ALL, + NULL, (void**)&state->pAudioClient); + debug("IMMDeviceActivator_Activate"); + EXIT_ON_ERROR(hr) + + return 0; + Exit: + debug2("%s failed with %lx", __FUNCTION__, hr); + return 1; +} + +/* + typedef struct tWAVEFORMATEX { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; + + } WAVEFORMATEX; +*/ + +static int formats_generator(const struct audio_output_struct * const ao, const int waveformat, WAVEFORMATEX *const format){ + DWORD bytes_per_sample = 0; + WORD tag = WAVE_FORMAT_PCM; + debug1("%s",__FUNCTION__); + int ret = waveformat; + switch(waveformat){ + case MPG123_ENC_SIGNED_8: + bytes_per_sample = 1; + break; + case MPG123_ENC_FLOAT_32: + tag = WAVE_FORMAT_IEEE_FLOAT; + case MPG123_ENC_SIGNED_32: + bytes_per_sample = 4; + break; + case MPG123_ENC_SIGNED_16: + bytes_per_sample = 2; + break; + case MPG123_ENC_SIGNED_24: + bytes_per_sample = 3; + break; + default: + debug1("uh oh unknown %d",waveformat); + ret = 0; + break; + } + format->wFormatTag = tag; + format->nChannels = ao->channels; + format->nSamplesPerSec = ao->rate; + format->nAvgBytesPerSec = ao->channels * bytes_per_sample * ao->rate; + format->nBlockAlign = ao->channels * bytes_per_sample; + format->wBitsPerSample = bytes_per_sample * 8; + format->cbSize = 0; + return ret; +} + +/* check supported formats */ +static int get_formats_win32(struct audio_output_struct *ao){ + /* PLEASE check with write_init and write_win32 buffer size calculation in case it is able to support something other than 16bit */ + HRESULT hr; + int ret = 0; + debug1("%s",__FUNCTION__); + + if(!ao || !ao->userptr) return -1; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; + debug2("channels %d, rate %ld",ao->channels, ao->rate); + + WAVEFORMATEX wf; + + if(ao->format & MPG123_ENC_SIGNED_8){ + formats_generator(ao,MPG123_ENC_SIGNED_8,&wf); + if((hr = IAudioClient_IsFormatSupported(state->pAudioClient,AUDCLNT_SHAREMODE_EXCLUSIVE, &wf, NULL)) == S_OK) + ret |= MPG123_ENC_SIGNED_8; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT) debug1("MPG123_ENC_SIGNED_8 %ld not supported", ao->rate); + } + + if(ao->format & MPG123_ENC_SIGNED_16){ + formats_generator(ao,MPG123_ENC_SIGNED_16,&wf); + if((hr = IAudioClient_IsFormatSupported(state->pAudioClient,AUDCLNT_SHAREMODE_EXCLUSIVE, &wf, NULL)) == S_OK) + ret |= MPG123_ENC_SIGNED_16; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT) debug1("MPG123_ENC_SIGNED_16 %ld not supported", ao->rate); + } + + if(ao->format & MPG123_ENC_SIGNED_32){ + formats_generator(ao,MPG123_ENC_SIGNED_32,&wf); + if((hr = IAudioClient_IsFormatSupported(state->pAudioClient,AUDCLNT_SHAREMODE_EXCLUSIVE, &wf, NULL)) == S_OK) + ret |= MPG123_ENC_SIGNED_32; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT) debug1("MPG123_ENC_SIGNED_32 %ld not supported", ao->rate); + } + + if(ao->format & MPG123_ENC_FLOAT_32){ + formats_generator(ao,MPG123_ENC_FLOAT_32,&wf); + if((hr = IAudioClient_IsFormatSupported(state->pAudioClient,AUDCLNT_SHAREMODE_EXCLUSIVE, &wf, NULL)) == S_OK) + ret |= MPG123_ENC_FLOAT_32; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT) debug1("MPG123_ENC_FLOAT_32 %ld not supported", ao->rate); + } + + if(ao->format & MPG123_ENC_SIGNED_24){ + formats_generator(ao,MPG123_ENC_SIGNED_24,&wf); + if((hr = IAudioClient_IsFormatSupported(state->pAudioClient,AUDCLNT_SHAREMODE_EXCLUSIVE, &wf, NULL)) == S_OK) + ret |= MPG123_ENC_SIGNED_24; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT) debug1("MPG123_ENC_SIGNED_24 %ld not supported", ao->rate); + } + + return ret; /* afaik only 16bit 44.1kHz/48kHz has been known to work */ +} + +/* setup with agreed on format, for now only MPG123_ENC_SIGNED_16 */ +static int write_init(struct audio_output_struct *ao){ + HRESULT hr; + double offset = 0.5; + + debug1("%s",__FUNCTION__); + if(!ao || !ao->userptr) return -1; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; + + WAVEFORMATEX s16; + formats_generator(ao,ao->format,&s16); + state->framesize = s16.nBlockAlign; + debug1("block size %ld", state->framesize); + /* cargo cult code */ + hr = IAudioClient_GetDevicePeriod(state->pAudioClient,NULL, &state->hnsRequestedDuration); + debug("IAudioClient_GetDevicePeriod OK"); + reinit: + hr = IAudioClient_Initialize(state->pAudioClient, + AUDCLNT_SHAREMODE_EXCLUSIVE, + Init_Flag, + state->hnsRequestedDuration, + state->hnsRequestedDuration, + &s16, + NULL); + debug("IAudioClient_Initialize OK"); + /* something about buffer sizes on Win7, fixme might loop forever */ + if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED){ + if (offset > 10.0) goto Exit; /* is 10 enough to break out of the loop?*/ + debug("AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED"); + IAudioClient_GetBufferSize(state->pAudioClient,&state->bufferFrameCount); + /* double buffered */ + state->hnsRequestedDuration = (REFERENCE_TIME)((BUFFER_TIME / s16.nSamplesPerSec * state->bufferFrameCount) + offset); + offset += 0.5; + IAudioClient_Release(state->pAudioClient); + state->pAudioClient = NULL; + hr = IMMDeviceActivator_Activate(state->pDevice, + &IID_IAudioClient, CLSCTX_ALL, + NULL, (void**)&state->pAudioClient); + debug("IMMDeviceActivator_Activate"); + goto reinit; + } + EXIT_ON_ERROR(hr) + EXIT_ON_ERROR(hr) + hr = IAudioClient_GetService(state->pAudioClient, + &IID_IAudioRenderClient, + (void**)&state->pRenderClient); + debug("IAudioClient_GetService OK"); + EXIT_ON_ERROR(hr) +#ifdef WASAPI_EVENT_MODE + state->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + debug("CreateEvent OK"); + if(!state->hEvent) goto Exit; + hr = IAudioClient_SetEventHandle(state->pAudioClient,state->hEvent); + EXIT_ON_ERROR(hr); +#endif + hr = IAudioClient_GetBufferSize(state->pAudioClient,&state->bufferFrameCount); + debug("IAudioClient_GetBufferSize OK"); + EXIT_ON_ERROR(hr) + return 0; +Exit: + debug2("%s failed with %lx", __FUNCTION__, hr); + return 1; +} + +/* Set play mode if unset, also raise thread priority */ +static HRESULT play_init(struct audio_output_struct *ao){ + HRESULT hr = S_OK; + if(!ao || !ao->userptr) return -1; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; + if(!state->is_playing){ + debug1("%s",__FUNCTION__); + state->hTask = AvSetMmThreadCharacteristicsW(L"Pro Audio", &state->taskIndex); + hr = IAudioClient_Start(state->pAudioClient); + state->is_playing = 1; + debug("IAudioClient_Start"); + EXIT_ON_ERROR(hr) + } + return hr; +Exit: + debug2("%s failed with %lx", __FUNCTION__, hr); + return hr; +} + +/* copy audio into IAudioRenderClient provided buffer */ +static int write_win32(struct audio_output_struct *ao, unsigned char *buf, int len){ + HRESULT hr; + size_t to_copy = 0; + debug1("%s",__FUNCTION__); + if(!ao || !ao->userptr) return -1; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; + if(!len) return 0; + if(!state->pRenderClient) write_init(ao); + size_t frames_in = len/state->framesize; /* Frames in buf, is framesize even correct? */ + debug("mode entered"); +#ifdef WASAPI_EVENT_MODE + /* Event mode WASAPI */ + DWORD retval = -1; + int flag = 0; /* Silence flag */ + feed_again: + if(!state->pData){ + /* Acquire buffer */ + hr = IAudioRenderClient_GetBuffer(state->pRenderClient,state->bufferFrameCount, &state->pData); + debug("IAudioRenderClient_GetBuffer"); + EXIT_ON_ERROR(hr) + } + if(frames_in){ /* Did we get half a frame?? non-zero len smaller than framesize? */ + /* We must put in exactly the amount of frames specified by IAudioRenderClient_GetBuffer */ + while(state->pData_off < state->bufferFrameCount){ + to_copy = state->bufferFrameCount - state->pData_off; + debug3("pData_off %I64d, bufferFrameCount %d, to_copy %I64d", state->pData_off, state->bufferFrameCount, to_copy); + if(to_copy > frames_in){ + /* buf can fit in provided buffer space */ + debug1("all buffers copied, %I64d", frames_in); + memcpy(state->pData+state->pData_off*state->framesize,buf,state->framesize*(frames_in)); + state->pData_off += frames_in; + frames_in = 0; + break; + } else { + /* buf too big, needs spliting */ + debug1("partial buffers %I64d", to_copy); + memcpy(state->pData+state->pData_off*state->framesize,buf,state->framesize*(to_copy)); + state->pData_off += to_copy; + buf+=(to_copy*state->framesize); + frames_in -= to_copy; + } + } + } else { + /* In case we ever get half a frame, is it possible? */ + flag = AUDCLNT_BUFFERFLAGS_SILENT; + } + debug2("Copied %I64d, left %I64d", state->pData_off, frames_in); + if(state->pData_off == state->bufferFrameCount) { + /* Tell IAudioRenderClient that buffer is filled and released */ + hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient,state->pData_off, flag); + state->pData_off = 0; + state->pData = NULL; + debug("IAudioRenderClient_ReleaseBuffer"); + EXIT_ON_ERROR(hr) + if(!state->is_playing){ + hr = play_init(ao); + EXIT_ON_ERROR(hr) + } + /* wait for next pull event */ + retval = WaitForSingleObject(state->hEvent, 2000); + if (retval != WAIT_OBJECT_0){ + /* Event handle timed out after a 2-second wait, something went very wrong */ + IAudioClient_Stop(state->pAudioClient); + hr = ERROR_TIMEOUT; + goto Exit; + } + } + if(frames_in > 0) + goto feed_again; +#else /* PUSH mode code */ + UINT32 numFramesAvailable, numFramesPadding; + debug1("block size %ld", state->framesize); +feed_again: + /* How much buffer do we get to use? */ + hr = IAudioClient_GetBufferSize(state->pAudioClient,&state->bufferFrameCount); + debug("IAudioRenderClient_GetBuffer"); + EXIT_ON_ERROR(hr) + hr = IAudioClient_GetCurrentPadding(state->pAudioClient,&numFramesPadding); + debug("IAudioClient_GetCurrentPadding"); + EXIT_ON_ERROR(hr) + /* How much buffer is writable at the moment? */ + numFramesAvailable = state->bufferFrameCount - numFramesPadding; + debug3("numFramesAvailable %d, bufferFrameCount %d, numFramesPadding %d", numFramesAvailable, state->bufferFrameCount, numFramesPadding); + if(numFramesAvailable > frames_in){ + /* can fit all frames now */ + state->pData_off = 0; + to_copy = frames_in; + } else { + /* copy whatever that fits in the buffer */ + state->pData_off = frames_in - numFramesAvailable; + to_copy = numFramesAvailable; + } + /* Acquire buffer */ + hr = IAudioRenderClient_GetBuffer(state->pRenderClient,to_copy,&state->pData); + debug("IAudioRenderClient_GetBuffer"); + EXIT_ON_ERROR(hr) + memcpy(state->pData,buf+state->pData_off * state->framesize,to_copy*state->framesize); + /* Release buffer */ + hr = IAudioRenderClient_ReleaseBuffer(state->pRenderClient,to_copy, 0); + debug("IAudioRenderClient_ReleaseBuffer"); + EXIT_ON_ERROR(hr) + if(!state->is_playing){ + hr = play_init(ao); + EXIT_ON_ERROR(hr) + } + frames_in -= to_copy; + /* Wait sometime for buffer to empty? */ + DWORD sleeptime = (DWORD)(state->hnsRequestedDuration/REFTIMES_PER_MILLISEC/ao->rate); + debug1("Sleeping %ld msec", sleeptime); + Sleep(sleeptime); + if (frames_in) + goto feed_again; +#endif + return len; + Exit: + debug2("%s failed with %lx", __FUNCTION__, hr); + return -1; +} + +static void flush_win32(struct audio_output_struct *ao){ + /* Wait for the last buffer to play before stopping. */ + debug1("%s",__FUNCTION__); + if(!ao || !ao->userptr) return; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; + HRESULT hr; + if(!state->pAudioClient) return; + state->pData = NULL; + hr = IAudioClient_Stop(state->pAudioClient); + EXIT_ON_ERROR(hr) + IAudioClient_Reset(state->pAudioClient); + EXIT_ON_ERROR(hr) + return; + Exit: + debug2("%s IAudioClient_Stop with %lx", __FUNCTION__, hr); +} + +static int close_win32(struct audio_output_struct *ao) +{ + debug1("%s",__FUNCTION__); + if(!ao || !ao->userptr) return -1; + wasapi_state_struct *state = (wasapi_state_struct *) ao->userptr; +#ifdef WASAPI_EVENT_MODE + if(state->pData){ + /* Play all in buffer before closing */ + debug("Flushing remaining buffers"); + IAudioRenderClient_ReleaseBuffer(state->pRenderClient,state->bufferFrameCount, 0); + WaitForSingleObject(state->hEvent, 2000); + state->pData = NULL; + } +#endif + if(state->pAudioClient) IAudioClient_Stop(state->pAudioClient); + if(state->pRenderClient) IAudioRenderClient_Release(state->pRenderClient); + if(state->pAudioClient) IAudioClient_Release(state->pAudioClient); + if(state->hTask) AvRevertMmThreadCharacteristics(state->hTask); + if(state->pEnumerator) IMMDeviceEnumerator_Release(state->pEnumerator); + if(state->pDevice) IMMDevice_Release(state->pDevice); + CoUninitialize(); + free(state); + ao->userptr = NULL; + return 0; +} + +static int init_win32(audio_output_t* ao){ + debug1("%s",__FUNCTION__); + if(!ao) return -1; + + /* Set callbacks */ + ao->open = open_win32; + ao->flush = flush_win32; + ao->write = write_win32; + ao->get_formats = get_formats_win32; + ao->close = close_win32; + ao->userptr = NULL; + + /* Success */ + return 0; +} diff --git a/jni/mpg123-1.13.4/src/playlist.c b/jni/mpg123-1.17.0/src/playlist.c similarity index 98% rename from jni/mpg123-1.13.4/src/playlist.c rename to jni/mpg123-1.17.0/src/playlist.c index 5a7e0e6e..76fcf25f 100644 --- a/jni/mpg123-1.13.4/src/playlist.c +++ b/jni/mpg123-1.17.0/src/playlist.c @@ -154,6 +154,9 @@ void init_playlist() pl.size = 0; pl.fill = 0; pl.pos = 0; + if(APPFLAG(MPG123APP_CONTINUE) && param.listentry > 0) + pl.pos = param.listentry - 1; + pl.list = NULL; pl.alloc_step = 10; mpg123_init_string(&pl.dir); @@ -225,7 +228,7 @@ int add_next_file (int argc, char *argv[]) fd = win32_net_http_open(param.listname, &htd); #endif debug1("htd.content_type.p: %p", (void*) htd.content_type.p); - if(!param.ignore_mime && htd.content_type.p != NULL) + if(!APPFLAG(MPG123APP_IGNORE_MIME) && htd.content_type.p != NULL) { int mimi; debug1("htd.content_type.p value: %s", htd.content_type.p); @@ -464,7 +467,7 @@ int add_next_file (int argc, char *argv[]) } ++pl.entry; if(param.listentry < 0) printf("#entry %lu\n%s\n", (unsigned long)pl.entry,pl.linebuf.p+line_offset); - else if((param.listentry == 0) || (param.listentry == pl.entry)) + else if((param.listentry == 0) || (param.listentry == pl.entry) || APPFLAG(MPG123APP_CONTINUE)) { add_copy_to_playlist(pl.linebuf.p+line_offset); return 1; diff --git a/jni/mpg123-1.13.4/src/playlist.h b/jni/mpg123-1.17.0/src/playlist.h similarity index 100% rename from jni/mpg123-1.13.4/src/playlist.h rename to jni/mpg123-1.17.0/src/playlist.h diff --git a/jni/mpg123-1.13.4/src/resolver.c b/jni/mpg123-1.17.0/src/resolver.c similarity index 97% rename from jni/mpg123-1.13.4/src/resolver.c rename to jni/mpg123-1.17.0/src/resolver.c index 2b2f7551..f5fd050c 100644 --- a/jni/mpg123-1.13.4/src/resolver.c +++ b/jni/mpg123-1.17.0/src/resolver.c @@ -22,7 +22,6 @@ #include #include #include -#include #endif #ifdef HAVE_SYS_SELECT_H #include @@ -128,8 +127,11 @@ debug4("hostname between %lu and %lu, %lu chars of %s", (unsigned long)pos, (uns return FALSE; } - /* Now only the path is left. */ - if(path) ret = mpg123_set_substring(path, url->p, pos, url->fill-1-pos); + /* Now only the path is left. + If there is no path at all, assume "/" */ + if(path) ret = url->p[pos] == 0 + ? mpg123_set_string(path, "/") + : mpg123_set_substring(path, url->p, pos, url->fill-1-pos); if(!ret) error("Cannot set path string (out of mem?)"); diff --git a/jni/mpg123-1.13.4/src/resolver.h b/jni/mpg123-1.17.0/src/resolver.h similarity index 93% rename from jni/mpg123-1.13.4/src/resolver.h rename to jni/mpg123-1.17.0/src/resolver.h index 04bed0e0..637df72a 100644 --- a/jni/mpg123-1.13.4/src/resolver.h +++ b/jni/mpg123-1.17.0/src/resolver.h @@ -13,6 +13,7 @@ /* Split an URL into parts of user:password, hostname, port, path on host. There is no name resolution going on here, also no numeric conversion. + The URL string is supposed to be stripped of all \r and \n. Return code 1 (TRUE) is fine, 0 (FALSE) is bad. */ int split_url(mpg123_string *url, mpg123_string *auth, mpg123_string *host, mpg123_string *port, mpg123_string *path); diff --git a/jni/mpg123-1.13.4/src/sfifo.c b/jni/mpg123-1.17.0/src/sfifo.c similarity index 100% rename from jni/mpg123-1.13.4/src/sfifo.c rename to jni/mpg123-1.17.0/src/sfifo.c diff --git a/jni/mpg123-1.13.4/src/sfifo.h b/jni/mpg123-1.17.0/src/sfifo.h similarity index 100% rename from jni/mpg123-1.13.4/src/sfifo.h rename to jni/mpg123-1.17.0/src/sfifo.h diff --git a/jni/mpg123-1.13.4/src/stamp-h1 b/jni/mpg123-1.17.0/src/stamp-h1 similarity index 100% rename from jni/mpg123-1.13.4/src/stamp-h1 rename to jni/mpg123-1.17.0/src/stamp-h1 diff --git a/jni/mpg123-1.13.4/src/streamdump.c b/jni/mpg123-1.17.0/src/streamdump.c similarity index 100% rename from jni/mpg123-1.13.4/src/streamdump.c rename to jni/mpg123-1.17.0/src/streamdump.c diff --git a/jni/mpg123-1.13.4/src/streamdump.h b/jni/mpg123-1.17.0/src/streamdump.h similarity index 100% rename from jni/mpg123-1.13.4/src/streamdump.h rename to jni/mpg123-1.17.0/src/streamdump.h diff --git a/jni/mpg123-1.13.4/src/term.c b/jni/mpg123-1.17.0/src/term.c similarity index 73% rename from jni/mpg123-1.13.4/src/term.c rename to jni/mpg123-1.17.0/src/term.c index 1d7ccad2..19ec908b 100644 --- a/jni/mpg123-1.13.4/src/term.c +++ b/jni/mpg123-1.17.0/src/term.c @@ -27,6 +27,10 @@ static int term_enable = 0; static struct termios old_tio; int seeking = FALSE; +/* Buffered key from a signal or whatnot. + We ignore the null character... */ +static char prekey = 0; + /* Hm, next step would be some system in this, plus configurability... Two keys for everything? It's just stop/pause for now... */ struct keydef { const char key; const char key2; const char* desc; }; @@ -36,7 +40,7 @@ struct keydef term_help[] = ,{ MPG123_NEXT_KEY, 0, "next track" } ,{ MPG123_PREV_KEY, 0, "previous track" } ,{ MPG123_BACK_KEY, 0, "back to beginning of track" } - ,{ MPG123_PAUSE_KEY, 0, "loop around current position (like a damaged audio CD;-)" } + ,{ MPG123_PAUSE_KEY, 0, "loop around current position (don't combine with output buffer)" } ,{ MPG123_FORWARD_KEY, 0, "forward" } ,{ MPG123_REWIND_KEY, 0, "rewind" } ,{ MPG123_FAST_FORWARD_KEY, 0, "fast forward" } @@ -55,52 +59,69 @@ struct keydef term_help[] = ,{ MPG123_PITCH_UP_KEY, MPG123_PITCH_BUP_KEY, "pitch up (small step, big step)" } ,{ MPG123_PITCH_DOWN_KEY, MPG123_PITCH_BDOWN_KEY, "pitch down (small step, big step)" } ,{ MPG123_PITCH_ZERO_KEY, 0, "reset pitch to zero" } + ,{ MPG123_BOOKMARK_KEY, 0, "print out current position in playlist and track, for the benefit of some external tool to store bookmarks" } }; void term_sigcont(int sig); +static void term_sigusr(int sig); /* This must call only functions safe inside a signal handler. */ int term_setup(struct termios *pattern) { - struct termios tio = *pattern; + struct termios tio = *pattern; - signal(SIGCONT, term_sigcont); + /* One might want to use sigaction instead. */ + signal(SIGCONT, term_sigcont); + signal(SIGUSR1, term_sigusr); + signal(SIGUSR2, term_sigusr); - tio.c_lflag &= ~(ICANON|ECHO); - tio.c_cc[VMIN] = 1; - tio.c_cc[VTIME] = 0; - return tcsetattr(0,TCSANOW,&tio); + tio.c_lflag &= ~(ICANON|ECHO); + tio.c_cc[VMIN] = 1; + tio.c_cc[VTIME] = 0; + return tcsetattr(0,TCSANOW,&tio); } void term_sigcont(int sig) { - term_enable = 0; + term_enable = 0; - if (term_setup(&old_tio) < 0) { - fprintf(stderr,"Can't set terminal attributes\n"); - return; - } + if (term_setup(&old_tio) < 0) + { + fprintf(stderr,"Can't set terminal attributes\n"); + return; + } - term_enable = 1; + term_enable = 1; +} + +static void term_sigusr(int sig) +{ + switch(sig) + { + case SIGUSR1: prekey=*param.term_usr1; break; + case SIGUSR2: prekey=*param.term_usr2; break; + } } /* initialze terminal */ void term_init(void) { - debug("term_init"); + debug("term_init"); - term_enable = 0; + term_enable = 0; - if(tcgetattr(0,&old_tio) < 0) { - fprintf(stderr,"Can't get terminal attributes\n"); - return; - } - if(term_setup(&old_tio) < 0) { - fprintf(stderr,"Can't set terminal attributes\n"); - return; - } + if(tcgetattr(0,&old_tio) < 0) + { + fprintf(stderr,"Can't get terminal attributes\n"); + return; + } + if(term_setup(&old_tio) < 0) + { + fprintf(stderr,"Can't set terminal attributes\n"); + return; + } - term_enable = 1; + term_enable = 1; } void term_hint(void) @@ -209,29 +230,43 @@ static void seekmode(void) } } -static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_delay) +/* Get the next pressed key, if any. + Returns 1 when there is a key, 0 if not. */ +static int get_key(int do_delay, char *val) { - int n = 1; - /* long offset = 0; */ - - while(n > 0) { - fd_set r; - struct timeval t; - char val; + fd_set r; + struct timeval t; - t.tv_sec=0; - t.tv_usec=(do_delay) ? 10*1000 : 0; - - FD_ZERO(&r); - FD_SET(0,&r); - n = select(1,&r,NULL,NULL,&t); - if(n > 0 && FD_ISSET(0,&r)) { - if(read(0,&val,1) <= 0) - break; + /* Shortcut: If some other means sent a key, use it. */ + if(prekey) + { + debug1("Got prekey: %c\n", prekey); + *val = prekey; + prekey = 0; + return 1; + } - switch(tolower(val)) { + t.tv_sec=0; + t.tv_usec=(do_delay) ? 10*1000 : 0; + + FD_ZERO(&r); + FD_SET(0,&r); + if(select(1,&r,NULL,NULL,&t) > 0 && FD_ISSET(0,&r)) + { + if(read(0,val,1) <= 0) + return 0; /* Well, we couldn't read the key, so there is none. */ + else + return 1; + } + else return 0; +} + +static void term_handle_key(mpg123_handle *fr, audio_output_t *ao, char val) +{ + switch(tolower(val)) + { case MPG123_BACK_KEY: - if(!param.usebuffer) ao->flush(ao); + if(!param.usebuffer) ao->flush(ao); else buffer_resync(); if(paused) pause_cycle=(int)(LOOP_CYCLES/mpg123_tpf(fr)); @@ -239,12 +274,12 @@ static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_dela error1("Seek to begin failed: %s", mpg123_strerror(fr)); framenum=0; - break; + break; case MPG123_NEXT_KEY: if(!param.usebuffer) ao->flush(ao); else buffer_resync(); /* was: plain_buffer_resync */ - next_track(); - break; + next_track(); + break; case MPG123_QUIT_KEY: debug("QUIT"); if(stopped) @@ -258,32 +293,32 @@ static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_dela } set_intflag(); offset = 0; - break; + break; case MPG123_PAUSE_KEY: - paused=1-paused; - if(paused) { + paused=1-paused; + if(paused) { /* Not really sure if that is what is wanted - This jumps in audio output, but has direct reaction to pausing loop. */ + This jumps in audio output, but has direct reaction to pausing loop. */ if(param.usebuffer) buffer_resync(); pause_recycle(fr); - } + } if(stopped) { stopped=0; if(param.usebuffer) buffer_start(); } - fprintf(stderr, "%s", (paused) ? MPG123_PAUSED_STRING : MPG123_EMPTY_STRING); - break; + fprintf(stderr, "%s", (paused) ? MPG123_PAUSED_STRING : MPG123_EMPTY_STRING); + break; case MPG123_STOP_KEY: case ' ': /* when seeking while stopped and then resuming, I want to prevent the chirp from the past */ if(!param.usebuffer) ao->flush(ao); - stopped=1-stopped; - if(paused) { - paused=0; - offset -= pause_cycle; - } + stopped=1-stopped; + if(paused) { + paused=0; + offset -= pause_cycle; + } if(param.usebuffer) { if(stopped) buffer_stop(); @@ -295,32 +330,32 @@ static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_dela buffer_start(); } } - fprintf(stderr, "%s", (stopped) ? MPG123_STOPPED_STRING : MPG123_EMPTY_STRING); - break; + fprintf(stderr, "%s", (stopped) ? MPG123_STOPPED_STRING : MPG123_EMPTY_STRING); + break; case MPG123_FINE_REWIND_KEY: - if(param.usebuffer) seekmode(); - offset--; - break; + if(param.usebuffer) seekmode(); + offset--; + break; case MPG123_FINE_FORWARD_KEY: - seekmode(); - offset++; - break; + seekmode(); + offset++; + break; case MPG123_REWIND_KEY: - seekmode(); - offset-=10; - break; + seekmode(); + offset-=10; + break; case MPG123_FORWARD_KEY: - seekmode(); - offset+=10; - break; + seekmode(); + offset+=10; + break; case MPG123_FAST_REWIND_KEY: - seekmode(); - offset-=50; - break; + seekmode(); + offset-=50; + break; case MPG123_FAST_FORWARD_KEY: - seekmode(); - offset+=50; - break; + seekmode(); + offset+=50; + break; case MPG123_VOL_UP_KEY: mpg123_volume_change(fr, 0.02); break; @@ -393,6 +428,7 @@ static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_dela fprintf(stderr, "\t%s\n", term_help[i].desc); } + fprintf(stderr, "\nAlso, the number row (starting at 1, ending at 0) gives you jump points into the current track at 10%% intervals.\n"); fprintf(stderr, "\n"); } break; @@ -419,20 +455,51 @@ static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_dela } } break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + off_t len; + int num; + num = val == '0' ? 10 : val - '0'; + --num; /* from 0 to 9 */ + + seekmode(); + len = mpg123_length(fr); + if(len > 0) mpg123_seek(fr, (off_t)( (num/10.)*len ), SEEK_SET); + + } + break; + case MPG123_BOOKMARK_KEY: + continue_msg("BOOKMARK"); + break; default: - ; - } - } - } + ; + } +} + +static void term_handle_input(mpg123_handle *fr, audio_output_t *ao, int do_delay) +{ + char val; + /* Do we really want that while loop? This means possibly handling multiple inputs that come very rapidly in one go. */ + while(get_key(do_delay, &val)) + { + term_handle_key(fr, ao, val); + } } void term_restore(void) { - - if(!term_enable) - return; + if(!term_enable) return; - tcsetattr(0,TCSAFLUSH,&old_tio); + tcsetattr(0,TCSAFLUSH,&old_tio); } #endif diff --git a/jni/mpg123-1.13.4/src/term.h b/jni/mpg123-1.17.0/src/term.h similarity index 92% rename from jni/mpg123-1.13.4/src/term.h rename to jni/mpg123-1.17.0/src/term.h index 61baa56a..d9e2cca5 100644 --- a/jni/mpg123-1.13.4/src/term.h +++ b/jni/mpg123-1.17.0/src/term.h @@ -56,6 +56,7 @@ #define MPG123_PITCH_DOWN_KEY 'x' #define MPG123_PITCH_BDOWN_KEY 'X' #define MPG123_PITCH_ZERO_KEY 'w' +#define MPG123_BOOKMARK_KEY 'k' /* This counts as "undocumented" and can disappear */ #define MPG123_FRAME_INDEX_KEY 'i' #define MPG123_VARIOUS_INFO_KEY 'I' @@ -67,6 +68,10 @@ #define MPG123_STOPPED_STRING "Stopped.\b\b\b\b\b\b\b\b" #define MPG123_EMPTY_STRING " \b\b\b\b\b\b\b\b" +/* Need it as string for the param struct, change according to the above. */ +#define MPG123_TERM_USR1 "s" +#define MPG123_TERM_USR2 "f" + void term_init(void); off_t term_control(mpg123_handle *mh, audio_output_t *ao); void term_restore(void); diff --git a/jni/mpg123-1.13.4/src/tests/noise.c b/jni/mpg123-1.17.0/src/tests/noise.c similarity index 100% rename from jni/mpg123-1.13.4/src/tests/noise.c rename to jni/mpg123-1.17.0/src/tests/noise.c diff --git a/jni/mpg123-1.13.4/src/tests/plain_id3.c b/jni/mpg123-1.17.0/src/tests/plain_id3.c similarity index 100% rename from jni/mpg123-1.13.4/src/tests/plain_id3.c rename to jni/mpg123-1.17.0/src/tests/plain_id3.c diff --git a/jni/mpg123-1.13.4/src/tests/seek_whence.c b/jni/mpg123-1.17.0/src/tests/seek_whence.c similarity index 100% rename from jni/mpg123-1.13.4/src/tests/seek_whence.c rename to jni/mpg123-1.17.0/src/tests/seek_whence.c diff --git a/jni/mpg123-1.13.4/src/tests/testtext.h b/jni/mpg123-1.17.0/src/tests/testtext.h similarity index 100% rename from jni/mpg123-1.13.4/src/tests/testtext.h rename to jni/mpg123-1.17.0/src/tests/testtext.h diff --git a/jni/mpg123-1.13.4/src/tests/text.c b/jni/mpg123-1.17.0/src/tests/text.c similarity index 100% rename from jni/mpg123-1.13.4/src/tests/text.c rename to jni/mpg123-1.17.0/src/tests/text.c diff --git a/jni/mpg123-1.13.4/src/wav.c b/jni/mpg123-1.17.0/src/wav.c similarity index 74% rename from jni/mpg123-1.13.4/src/wav.c rename to jni/mpg123-1.17.0/src/wav.c index aa85267e..7fb2a908 100644 --- a/jni/mpg123-1.13.4/src/wav.c +++ b/jni/mpg123-1.17.0/src/wav.c @@ -1,7 +1,7 @@ /* wav.c: write wav files - copyright ?-2008 by the mpg123 project - free software under the terms of the LGPL 2.1 + copyright ?-2012 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org initially written by Samuel Audet @@ -12,6 +12,11 @@ minor simplifications and ugly AU/CDR format stuff by MH It's not a very clean code ... Fix this! + + ThOr: The usage of stdio streams means we loose control over what data is actually written. On a full disk, fwrite() happily suceeds for ages, only a fflush fails. + Now: Do we want to fflush() after every write? That defeats the purpose of buffered I/O. So, switching to good old write() is an option (kernel doing disk buffering anyway). + + TODO: convert fully to tab indent */ #include "mpg123app.h" @@ -48,12 +53,18 @@ struct auhead { static FILE *wavfp; -static int header_written = 0; /* prevent writing multiple headers to stdout */ static long datalen = 0; static int flipendian=0; int bytes_per_sample = -1; int floatwav = 0; /* If we write a floating point WAV file. */ +/* Open routines only prepare a header, stored here and written on first actual + data write. If no data is written at all, proper files will still get a + header via the update at closing; non-seekable streams will just have no + no header if there is no data. */ +void *the_header = NULL; +size_t the_header_size = 0; + /* Convertfunctions: */ /* always little endian */ @@ -97,12 +108,13 @@ static int testEndian(void) if(a == b) ret = 1; else if(a != c) { - error3("Strange endianess?? %08lx %08lx %08lx\n",a,b,c); + error3("Strange endianness?? %08lx %08lx %08lx\n",a,b,c); ret = -1; } return ret; } +/* return: 0 is good, -1 is bad */ static int open_file(char *filename) { #if defined(HAVE_SETUID) && defined(HAVE_GETUID) @@ -110,33 +122,58 @@ static int open_file(char *filename) #endif if(!strcmp("-",filename)) { wavfp = stdout; + /* If stdout is redirected to a file, seeks suddenly can work. + Doing one here to ensure that such a file has the same output + it had when opening directly as such. */ + fseek(wavfp, 0L, SEEK_SET); + return 0; } else { +#ifdef WANT_WIN32_UNICODE + wchar_t *filenamew = NULL; + win32_utf8_wide(filename, &filenamew, NULL); + if(filenamew == NULL) { + wavfp = NULL; + } else { + wavfp = _wfopen(filenamew,L"wb"); + free(filenamew); + } +#else wavfp = fopen(filename,"wb"); +#endif if(!wavfp) - return -1; + return -1; + else + return 0; } - return 0; } -static void close_file(void) +/* return: 0 is good, -1 is bad */ +static int close_file() { if(wavfp != NULL && wavfp != stdout) - fclose(wavfp); + { + if(fclose(wavfp)) + { + error1("problem closing the audio file, probably because of flushing to disk: %s\n", strerror(errno)); + return -1; + } + else return 0; + } wavfp = NULL; + return 0; } -/* Wrapper over header writing; ensure that stdout doesn't get multiple headers. */ -static size_t write_header(const void*ptr, size_t size) +/* return: 0 is good, -1 is bad */ +static int write_header(const void*ptr, size_t size) { - if(wavfp == stdout) + if(size > 0 && (fwrite(ptr, size, 1, wavfp) != 1 || fflush(wavfp))) { - if(header_written) return 1; - - header_written = 1; + error1("cannot write header: %s", strerror(errno)); + return -1; } - return fwrite(ptr, size, 1, wavfp); + else return 0; } int au_open(audio_output_t *ao) @@ -180,10 +217,12 @@ int au_open(audio_output_t *ao) if(open_file(ao->device) < 0) return -1; - write_header(&auhead, sizeof(auhead)); datalen = 0; - return 0; + the_header = &auhead; + the_header_size = sizeof(auhead); + + return 0; } int cdr_open(audio_output_t *ao) @@ -206,6 +245,9 @@ int cdr_open(audio_output_t *ao) if(open_file(ao->device) < 0) return -1; + the_header = NULL; + the_header_size = 0; + return 0; } @@ -283,12 +325,15 @@ int wav_open(audio_output_t *ao) long2littleendian(datalen+sizeof(RIFF.WAVE),RIFF.WAVElen,sizeof(RIFF.WAVElen)); } - if(!( (floatwav && write_header(&RIFF_FLOAT, sizeof(RIFF_FLOAT)) == 1) - || write_header(&RIFF, sizeof(RIFF)) == 1) ) + if(floatwav) { - error1("cannot write header: %s", strerror(errno)); - close_file(); - return -1; + the_header = &RIFF_FLOAT; + the_header_size = sizeof(RIFF_FLOAT); + } + else + { + the_header = &RIFF; + the_header_size = sizeof(RIFF); } datalen = 0; @@ -305,6 +350,11 @@ int wav_write(unsigned char *buf,int len) if(!wavfp) return 0; + if(datalen == 0) + { + if(write_header(the_header, the_header_size) < 0) return -1; + } + if(flipendian) { if(bytes_per_sample == 4) /* 32 bit */ @@ -312,7 +362,7 @@ int wav_write(unsigned char *buf,int len) if(len & 3) { error("Number of bytes no multiple of 4 (32bit)!"); - return 0; + return -1; } for(i=0;i= 0) { if(floatwav) @@ -361,47 +424,49 @@ int wav_close(void) long2littleendian(datalen/(from_little(RIFF_FLOAT.WAVE.fmt.Channels,2)*from_little(RIFF_FLOAT.WAVE.fmt.BitsPerSample,2)/8), RIFF_FLOAT.WAVE.fact.samplelen,sizeof(RIFF_FLOAT.WAVE.fact.samplelen)); /* Always (over)writing the header here; also for stdout, when fseek worked, this overwrite works. */ - fwrite(&RIFF_FLOAT, sizeof(RIFF_FLOAT),1,wavfp); + write_header(&RIFF_FLOAT, sizeof(RIFF_FLOAT)); } else { long2littleendian(datalen,RIFF.WAVE.data.datalen,sizeof(RIFF.WAVE.data.datalen)); long2littleendian(datalen+sizeof(RIFF.WAVE),RIFF.WAVElen,sizeof(RIFF.WAVElen)); /* Always (over)writing the header here; also for stdout, when fseek worked, this overwrite works. */ - fwrite(&RIFF, sizeof(RIFF),1,wavfp); + write_header(&RIFF, sizeof(RIFF)); } } else warning("Cannot rewind WAV file. File-format isn't fully conform now."); - close_file(); - return 0; + return close_file(); } int au_close(void) { - if(!wavfp) - return 0; + if(!wavfp) return -1; + /* flush before seeking to catch out-of-disk explicitly at least at the end */ + if(fflush(wavfp)) + { + error1("cannot flush WAV stream: %s", strerror(errno)); + fclose(wavfp); + return -1; + } if(fseek(wavfp, 0L, SEEK_SET) >= 0) { long2bigendian(datalen,auhead.datalen,sizeof(auhead.datalen)); /* Always (over)writing the header here; also for stdout, when fseek worked, this overwrite works. */ - fwrite(&auhead, sizeof(auhead),1,wavfp); + write_header(&auhead, sizeof(auhead)); } else warning("Cannot rewind AU file. File-format isn't fully conform now."); - close_file(); - - return 0; + return close_file(); } int cdr_close(void) { - if(!wavfp) return 0; + if(!wavfp) return -1; - close_file(); - return 0; + return close_file(); } diff --git a/jni/mpg123-1.13.4/src/wavhead.h b/jni/mpg123-1.17.0/src/wavhead.h similarity index 100% rename from jni/mpg123-1.13.4/src/wavhead.h rename to jni/mpg123-1.17.0/src/wavhead.h diff --git a/jni/mpg123-1.13.4/src/win32_net.c b/jni/mpg123-1.17.0/src/win32_net.c similarity index 99% rename from jni/mpg123-1.13.4/src/win32_net.c rename to jni/mpg123-1.17.0/src/win32_net.c index a0aa8373..181514ac 100755 --- a/jni/mpg123-1.13.4/src/win32_net.c +++ b/jni/mpg123-1.17.0/src/win32_net.c @@ -197,7 +197,7 @@ static int win32_net_timeout_connect(int sockfd, const struct sockaddr *serv_add } else { - error1("connection error: %s", msgme(err)); + //error1("connection error: %s", msgme(err)); return -1; } } diff --git a/jni/mpg123-1.17.0/src/win32_support.c b/jni/mpg123-1.17.0/src/win32_support.c new file mode 100755 index 00000000..4d201917 --- /dev/null +++ b/jni/mpg123-1.17.0/src/win32_support.c @@ -0,0 +1,191 @@ +#include "config.h" +#include "mpg123app.h" +#include "debug.h" + +#ifdef WANT_WIN32_UNICODE + +/* Obscure and undocumented call from MS C Runtime "MSVCRT.DLL" */ +typedef struct +{ + int newmode; +} _startupinfo; + +/* XP and later has an int return though */ +void __cdecl __declspec(dllimport) __wgetmainargs ( + int *_Argc, + wchar_t ***_Argv, + wchar_t ***_Env, + int _DoWildCard, + _startupinfo * _StartInfo +); + +int win32_cmdline_utf8(int * argc, char *** argv) +{ + int argcounter; + wchar_t **argv_wide; + wchar_t **env; + char *argvptr; + _startupinfo startup; + + /* That's too lame. */ + if(argv == NULL || argc == NULL) return -1; + + startup.newmode = 0; + __wgetmainargs(argc, &argv_wide,&env,1, &startup); + *argv = (char **)calloc(sizeof (char *), *argc); + if(*argv == NULL){ error("Cannot allocate memory for command line."); return -1; } + + for(argcounter = 0; argcounter < *argc; argcounter++) + { + win32_wide_utf8(argv_wide[argcounter], &argvptr, NULL); + (*argv)[argcounter] = argvptr; + } + return 0; +} + +void win32_cmdline_free(int argc, char **argv) +{ + int i; + if(argv == NULL) return; + for(i=0; i available) ? available : nbyte; + debug("Starting ReadFileEx"); + check = ReadFileEx(fifohandle,buf,readbuff,&ov1,&ReadComplete); + WaitForSingleObjectEx(fifohandle,INFINITE,TRUE); + debug1("Read %ld bytes from pipe", readbuff); + return (!check) ? 0 : readbuff; +} + +/* function should be able to tell if bytes are + available and return immediately on overlapped + asynchrounous pipes, like unix select() */ +DWORD win32_fifo_read_peek(struct timeval *tv) +{ + DWORD ret = 0; + DWORD err, timer; + + timer = (tv) ? tv -> tv_sec * 1000 : INFINITE; + + debug1("Peeking on pipe handle %p", fifohandle); + + SetLastError(0); + if(!fifohandle) return 0; + PeekNamedPipe(fifohandle, NULL, 0, NULL, &ret, NULL); + err = GetLastError(); + debug1("Waiting %ld msec for pipe to be ready", timer); + debug1("GetLastError was %ld", err); + if(err == ERROR_BROKEN_PIPE) + { + debug("Broken pipe, disconnecting"); + DisconnectNamedPipe(fifohandle); + ConnectNamedPipe(fifohandle,&ov1); + WaitForSingleObjectEx(fifohandle,timer,TRUE); + } + else if(err == ERROR_BAD_PIPE) + { + debug("Bad pipe, Waiting for connect"); + DisconnectNamedPipe(fifohandle); + ConnectNamedPipe(fifohandle,&ov1); + WaitForSingleObjectEx(fifohandle,timer,TRUE); + } + debug2("peek %ld bytes, error %ld",ret, err); + return ret; +} + +void win32_fifo_close(void) +{ + debug1("Attempting to close handle %p", fifohandle); + if(fifohandle) + { + DisconnectNamedPipe(fifohandle); + CloseHandle(fifohandle); + } + fifohandle = NULL; +} + +int win32_fifo_mkfifo(const char *path) +{ + HANDLE ret; + win32_fifo_close(); +#ifdef WANT_WIN32_UNICODE + wchar_t *str; + if(win32_utf8_wide(path,&str,NULL) == 0) + { + fprintf(stderr,"Cannot get FIFO name, likely out of memory\n"); + return -1; + } +#if (DEBUG == 1) + fwprintf(stderr,L"CreateNamedPipeW %ws\n", str); +#endif + ret = CreateNamedPipeW(str,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); + free(str); +#else +#if (DEBUG == 1) + fprintf(stderr,"CreateNamedPipeA %s\n", path); +#endif + ret = CreateNamedPipeA(path,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL); +#endif /* WANT_WIN32_UNICODE */ + if(ret == INVALID_HANDLE_VALUE) return -1; + + fifohandle = ret; + /* Wait for client */ + ConnectNamedPipe(fifohandle,&ov1); + WaitForSingleObjectEx(fifohandle,INFINITE,TRUE); + return 0; +} +#endif /* WANT_WIN32_FIFO */ diff --git a/jni/mpg123-1.13.4/src/win32_support.h b/jni/mpg123-1.17.0/src/win32_support.h similarity index 75% rename from jni/mpg123-1.13.4/src/win32_support.h rename to jni/mpg123-1.17.0/src/win32_support.h index 41a72066..afe96518 100755 --- a/jni/mpg123-1.13.4/src/win32_support.h +++ b/jni/mpg123-1.17.0/src/win32_support.h @@ -9,6 +9,7 @@ #include "config.h" #include "mpg123.h" +#include "httpget.h" #ifdef HAVE_WINDOWS_H #define WIN32_LEAN_AND_MEAN 1 @@ -111,6 +112,42 @@ void win32_cmdline_free(int argc, char **argv); */ void win32_set_priority (const int arg); +#ifdef WANT_WIN32_FIFO +/** + * win32_fifo_mkfifo + * Creates a named pipe of path. + * Should be closed with win32_fifo_close. + * @param[in] path Path of pipe, should be in form of "\\.\pipe\pipename". + * @return -1 on failure, 0 otherwise. + * @see win32_fifo_close + */ +int win32_fifo_mkfifo(const char *path); + +/** + *win32_fifo_close + * Closes previously open pipe + */ +void win32_fifo_close(void); + +/** + * win32_fifo_read_peek + * Checks how many bytes in fifo is pending read operation + * Only the tv_sec member in timeval is evaluated! No microsecond precision. + * @param[in] tv contains information on block duration + * @return bytes available + */ +DWORD win32_fifo_read_peek(struct timeval *tv); + +/*** + * win32_fifo_read + * Read up to nbyte of data from open pipe into buf + * @param[in] buf Pointer to buffer. + * @param[in] nbyte Number of bytes to read up to. + * @return Number of bytes actually read. + */ +ssize_t win32_fifo_read(void *buf, size_t nbyte); +#endif /* #ifdef WANT_WIN32_FIFO */ + #endif /* HAVE_WINDOWS_H */ #endif /* MPG123_WIN32_SUPPORT_H */ diff --git a/jni/mpg123-1.13.4/src/xfermem.c b/jni/mpg123-1.17.0/src/xfermem.c similarity index 100% rename from jni/mpg123-1.13.4/src/xfermem.c rename to jni/mpg123-1.17.0/src/xfermem.c diff --git a/jni/mpg123-1.13.4/src/xfermem.h b/jni/mpg123-1.17.0/src/xfermem.h similarity index 100% rename from jni/mpg123-1.13.4/src/xfermem.h rename to jni/mpg123-1.17.0/src/xfermem.h diff --git a/jni/mpg123-1.13.4/windows-builds.sh b/jni/mpg123-1.17.0/windows-builds.sh similarity index 100% rename from jni/mpg123-1.13.4/windows-builds.sh rename to jni/mpg123-1.17.0/windows-builds.sh