Skip to content

Commit

Permalink
external libs: updated mpg123 to latest 1.25.13
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Nov 8, 2019
1 parent 3b002f3 commit 50432fd
Show file tree
Hide file tree
Showing 376 changed files with 45 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Expand Up @@ -12,7 +12,7 @@ VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1

# Enable this if you want to support loading MP3 music via MPG123
SUPPORT_MP3_MPG123 ?= true
MPG123_LIBRARY_PATH := external/mpg123-1.25.12
MPG123_LIBRARY_PATH := external/mpg123-1.25.13

# Enable this if you want to support loading MOD music via modplug
SUPPORT_MOD_MODPLUG ?= true
Expand Down
2 changes: 1 addition & 1 deletion VisualC/external/include/mpg123.h
@@ -1,5 +1,5 @@
/*
libmpg123: MPEG Audio Decoder library (version 1.25.12)
libmpg123: MPEG Audio Decoder library (version 1.25.13)
copyright 1995-2015 by the mpg123 project
free software under the terms of the LGPL 2.1
Expand Down
Binary file modified VisualC/external/lib/x64/libmpg123-0.dll
Binary file not shown.
Binary file modified VisualC/external/lib/x86/libmpg123-0.dll
Binary file not shown.
@@ -1,5 +1,5 @@
/*
libmpg123: MPEG Audio Decoder library (version 1.25.12)
libmpg123: MPEG Audio Decoder library (version 1.25.13)
copyright 1995-2015 by the mpg123 project
free software under the terms of the LGPL 2.1
Expand Down
Expand Up @@ -7,18 +7,18 @@
<key>CFBundleExecutable</key>
<string>mpg123</string>
<key>CFBundleGetInfoString</key>
<string>libmpg123 1.25.12</string>
<string>libmpg123 1.25.13</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>mpg123</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.25.12</string>
<string>1.25.13</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.25.12</string>
<string>1.25.13</string>
</dict>
</plist>
Binary file modified Xcode/Frameworks/mpg123.framework/Versions/A/mpg123
Binary file not shown.
20 changes: 10 additions & 10 deletions external/mpg123-1.25.12.patch → external/mpg123-1.25.13.patch
@@ -1,6 +1,6 @@
diff -u /dev/null mpg123-1.25.12/android/config.h
diff -u /dev/null mpg123-1.25.13/android/config.h
--- /dev/null
+++ mpg123-1.25.12/android/config.h
+++ mpg123-1.25.13/android/config.h
@@ -0,0 +1,478 @@
+/* src/config.h. Generated from config.h.in by configure. */
+/* src/config.h.in. Generated from configure.ac by autoheader. */
Expand Down Expand Up @@ -360,7 +360,7 @@ diff -u /dev/null mpg123-1.25.12/android/config.h
+#define PACKAGE_NAME "mpg123"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "mpg123 1.25.12"
+#define PACKAGE_STRING "mpg123 1.25.13"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "mpg123"
Expand All @@ -369,7 +369,7 @@ diff -u /dev/null mpg123-1.25.12/android/config.h
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.25.12"
+#define PACKAGE_VERSION "1.25.13"
+
+/* Define if portaudio v18 API is wanted. */
+/* #undef PORTAUDIO18 */
Expand Down Expand Up @@ -402,7 +402,7 @@ diff -u /dev/null mpg123-1.25.12/android/config.h
+/* #undef USE_YASM_FOR_AVX */
+
+/* Version number of package */
+#define VERSION "1.25.12"
+#define VERSION "1.25.13"
+
+/* Define to use Win32 named pipes */
+/* #undef WANT_WIN32_FIFO */
Expand Down Expand Up @@ -480,12 +480,12 @@ diff -u /dev/null mpg123-1.25.12/android/config.h
+
+/* Define to `unsigned long' if <sys/types.h> does not define. */
+/* #undef uintptr_t */
diff -u /dev/null mpg123-1.25.12/android/mpg123.h
diff -u /dev/null mpg123-1.25.13/android/mpg123.h
--- /dev/null
+++ mpg123-1.25.12/android/mpg123.h
+++ mpg123-1.25.13/android/mpg123.h
@@ -0,0 +1,1441 @@
+/*
+ libmpg123: MPEG Audio Decoder library (version 1.25.12)
+ libmpg123: MPEG Audio Decoder library (version 1.25.13)
+
+ copyright 1995-2015 by the mpg123 project
+ free software under the terms of the LGPL 2.1
Expand Down Expand Up @@ -1925,9 +1925,9 @@ diff -u /dev/null mpg123-1.25.12/android/mpg123.h
+#endif
+
+#endif
diff -u /dev/null mpg123-1.25.12/Android.mk
diff -u /dev/null mpg123-1.25.13/Android.mk
--- /dev/null
+++ mpg123-1.25.12/Android.mk
+++ mpg123-1.25.13/Android.mk
@@ -0,0 +1,225 @@
+LOCAL_PATH := $(call my-dir)
+
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions external/mpg123-1.25.12/NEWS → external/mpg123-1.25.13/NEWS
@@ -1,3 +1,14 @@
1.25.13
-------

This is a bugfix release solely for bug 280 in the parser:

- libmpg123
-- Reset the flag for having a frame to decode before trying to
parse a new one. This prevents very unkind behaviour (crashes)
when combinging mpg123_scan() with decoding later on for damaged
streams that have a mixture of different MPEG versions.

1.25.12
-------

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -356,7 +356,7 @@
#define PACKAGE_NAME "mpg123"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "mpg123 1.25.12"
#define PACKAGE_STRING "mpg123 1.25.13"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mpg123"
Expand All @@ -365,7 +365,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.25.12"
#define PACKAGE_VERSION "1.25.13"

/* Define if portaudio v18 API is wanted. */
/* #undef PORTAUDIO18 */
Expand Down Expand Up @@ -398,7 +398,7 @@
/* #undef USE_YASM_FOR_AVX */

/* Version number of package */
#define VERSION "1.25.12"
#define VERSION "1.25.13"

/* Define to use Win32 named pipes */
/* #undef WANT_WIN32_FIFO */
Expand Down
@@ -1,5 +1,5 @@
/*
libmpg123: MPEG Audio Decoder library (version 1.25.12)
libmpg123: MPEG Audio Decoder library (version 1.25.13)
copyright 1995-2015 by the mpg123 project
free software under the terms of the LGPL 2.1
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for mpg123 1.25.12.
# Generated by GNU Autoconf 2.69 for mpg123 1.25.13.
#
# Report bugs to <maintainer@mpg123.org>.
#
Expand Down Expand Up @@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpg123'
PACKAGE_TARNAME='mpg123'
PACKAGE_VERSION='1.25.12'
PACKAGE_STRING='mpg123 1.25.12'
PACKAGE_VERSION='1.25.13'
PACKAGE_STRING='mpg123 1.25.13'
PACKAGE_BUGREPORT='maintainer@mpg123.org'
PACKAGE_URL=''

Expand Down Expand Up @@ -1578,7 +1578,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.25.12 to adapt to many kinds of systems.
\`configure' configures mpg123 1.25.13 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1649,7 +1649,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of mpg123 1.25.12:";;
short | recursive ) echo "Configuration of mpg123 1.25.13:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1875,7 +1875,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
mpg123 configure 1.25.12
mpg123 configure 1.25.13
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2481,7 +2481,7 @@ 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.25.12, which was
It was created by mpg123 $as_me 1.25.13, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3437,7 +3437,7 @@ fi

# Define the identity of the package.
PACKAGE='mpg123'
VERSION='1.25.12'
VERSION='1.25.13'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -20391,7 +20391,7 @@ 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.25.12, which was
This file was extended by mpg123 $as_me 1.25.13, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -20457,7 +20457,7 @@ _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.25.12
mpg123 config.status 1.25.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
Expand Up @@ -8,7 +8,7 @@ dnl Require autoconf version >= 2.57
AC_PREREQ(2.57)

dnl ############# Initialisation
AC_INIT([mpg123], [1.25.12], [maintainer@mpg123.org])
AC_INIT([mpg123], [1.25.13], [maintainer@mpg123.org])
dnl Increment API_VERSION when the API gets changes (new functions).

dnl libmpg123
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -3,7 +3,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.25.12
Version: 1.25.13
Release: 1
URL: http://www.mpg123.org/
License: GPL
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -509,6 +509,8 @@ int read_frame(mpg123_handle *fr)

if(halfspeed_do(fr) == 1) return 1;

/* From now on, old frame data is tainted by parsing attempts. */
fr->to_decode = fr->to_ignore = FALSE;
read_again:
/* In case we are looping to find a valid frame, discard any buffered data before the current position.
This is essential to prevent endless looping, always going back to the beginning when feeder buffer is exhausted. */
Expand Down

0 comments on commit 50432fd

Please sign in to comment.