From bad2b1ee3c0a13ae11a0fa91b68cebaafe906fb5 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 11 May 2026 04:11:10 +0300
Subject: [PATCH] upgrade vendored libmpg123 to 1.33.4
Backport from commits e43810b, 7eb103e, ce5941b, 07dbd1a, and f2b3c28.
---
.gitmodules | 2 +-
Android.mk | 2 +-
Xcode/mpg123/arm64/config.h | 152 +-
Xcode/mpg123/armv7/config.h | 154 +-
Xcode/mpg123/config.xcconfig | 2 +-
Xcode/mpg123/mpg123.h | 2001 -----------------
Xcode/mpg123/mpg123.xcodeproj/project.pbxproj | 46 +-
Xcode/mpg123/x86_64/config.h | 152 +-
external/mpg123 | 2 +-
9 files changed, 263 insertions(+), 2250 deletions(-)
delete mode 100644 Xcode/mpg123/mpg123.h
diff --git a/.gitmodules b/.gitmodules
index 3e31df3da..359fad852 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,7 +25,7 @@
[submodule "external/mpg123"]
path = external/mpg123
url = https://github.com/libsdl-org/mpg123.git
- branch = v1.31.3-SDL
+ branch = v1.33.4-SDL
[submodule "external/libxmp"]
path = external/libxmp
url = https://github.com/libsdl-org/libxmp.git
diff --git a/Android.mk b/Android.mk
index fb6257d6c..ae553eb20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -134,7 +134,7 @@ endif
# This needs to be a shared library to comply with the LGPL license
ifeq ($(SUPPORT_MP3_MPG123),true)
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/android
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/src/include
LOCAL_CFLAGS += -DMUSIC_MP3_MPG123
LOCAL_SHARED_LIBRARIES += mpg123
endif
diff --git a/Xcode/mpg123/arm64/config.h b/Xcode/mpg123/arm64/config.h
index 7a6922166..ecb4375f4 100644
--- a/Xcode/mpg123/arm64/config.h
+++ b/Xcode/mpg123/arm64/config.h
@@ -12,16 +12,16 @@
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Define if .balign is present. */
-/* #undef ASMALIGN_BALIGN */
+#define ASMALIGN_BALIGN 1
/* Define if .align just takes byte count. */
-#define ASMALIGN_BYTE 1
+/* #undef ASMALIGN_BYTE */
/* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */
/* #undef ASMALIGN_EXP */
/* Define if __attribute__((aligned(16))) shall be used */
-/* #undef CCALIGN */
+#define CCALIGN 1
/* Define if debugging is enabled. */
/* #undef DEBUG */
@@ -38,6 +38,9 @@
/* Define if FIFO support is enabled. */
#define FIFO 1
+/* System setup enforces 64 bit offsets where 32 bit would be native. */
+/* #undef FORCED_OFF_64 */
+
/* Define if frame index should be used. */
#define FRAME_INDEX 1
@@ -80,9 +83,15 @@
/* Define to 1 if you have the <byteswap.h> header file. */
/* #undef HAVE_BYTESWAP_H */
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */
#define HAVE_CORESERVICES_CORESERVICES_H 1
+/* Define to 1 if you have the `ctermid' function. */
+#define HAVE_CTERMID 1
+
/* Define to 1 if you have the <CUlib.h> header file. */
/* #undef HAVE_CULIB_H */
@@ -101,6 +110,12 @@
/* Define to 1 if you have the `dlsym' function. */
#define HAVE_DLSYM 1
+/* Define to 1 if you have the `execvp' function. */
+#define HAVE_EXECVP 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
@@ -122,24 +137,21 @@
/* Define to 1 if you have the `mx' library (-lmx). */
#define HAVE_LIBMX 1
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
/* Define to 1 if you have the <linux/soundcard.h> header file. */
/* #undef HAVE_LINUX_SOUNDCARD_H */
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
+/* Define to 1 if you have the `lseek64' function. */
+/* #undef HAVE_LSEEK64 */
+
/* Define to 1 if you have the <machine/soundcard.h> header file. */
/* #undef HAVE_MACHINE_SOUNDCARD_H */
/* Define to 1 if you have the `mbstowcs' function. */
#define HAVE_MBSTOWCS 1
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
/* Define to 1 if you have the `mkfifo' function. */
#define HAVE_MKFIFO 1
@@ -170,6 +182,9 @@
/* Define to 1 if you have the <os2.h> header file. */
/* #undef HAVE_OS2_H */
+/* Define if O_LARGEFILE flag for open(2) exists. */
+/* #undef HAVE_O_LARGEFILE */
+
/* Define to 1 if you have the `random' function. */
#define HAVE_RANDOM 1
@@ -179,9 +194,15 @@
/* Define to 1 if you have the `sched_setscheduler' function. */
/* #undef HAVE_SCHED_SETSCHEDULER */
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
+/* for Win/DOS system with setmode() */
+/* #undef HAVE_SETMODE */
+
/* Define to 1 if you have the `setpriority' function. */
#define HAVE_SETPRIORITY 1
@@ -203,9 +224,6 @@
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
-/* Define to 1 if you have the <sndio.h> header file. */
-/* #undef HAVE_SNDIO_H */
-
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -218,12 +236,21 @@
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
+/* Define to 1 if you have the `strerror_l' function. */
+/* #undef HAVE_STRERROR_L */
+
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the `strtok_r' function. */
+#define HAVE_STRTOK_R 1
+
+/* Define to 1 if you have the `strtok_s' function. */
+/* #undef HAVE_STRTOK_S */
+
/* Define to 1 if you have the <sun/audioio.h> header file. */
/* #undef HAVE_SUN_AUDIOIO_H */
@@ -278,6 +305,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if you have the `uselocale' function. */
+#define HAVE_USELOCALE 1
+
/* Define to 1 if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
@@ -290,12 +323,18 @@
/* Define to 1 if you have the <wctype.h> header file. */
#define HAVE_WCTYPE_H 1
+/* Define to 1 if you have the <wincon.h> header file. */
+/* #undef HAVE_WINCON_H */
+
/* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */
/* Define to 1 if you have the <ws2tcpip.h> header file. */
/* #undef HAVE_WS2TCPIP_H */
+/* for Win/DOS system with _setmode() */
+/* #undef HAVE__SETMODE */
+
/* Define to indicate that float storage follows IEEE754. */
#define IEEE_FLOAT 1
@@ -305,9 +344,11 @@
/* Define if IPV6 support is enabled. */
#define IPV6 1
-/* Define this to the size of native offset type in bits, used for LFS alias
- functions. */
-#define LFS_ALIAS_BITS 64
+/* Define if we use _LARGEFILE64_SOURCE with off64_t and lseek64. */
+/* #undef LFS_LARGEFILE_64 */
+
+/* System redefines off_t when defining _FILE_OFFSET_BITS to 64. */
+/* #undef LFS_SENSITIVE */
/* Define to the extension used for runtime loadable modules, say, ".so". */
#define LT_MODULE_EXT ".so"
@@ -321,6 +362,18 @@
/* Define to the shared archive member specification, say "(shr.o)". */
/* #undef LT_SHARED_LIB_MEMBER */
+/* Define to for new net123 network stack. */
+#define NET123 1
+
+/* Define for executable-based networking (for HTTPS). */
+#define NET123_EXEC 1
+
+/* Define for winhttp networking (for HTTPS). */
+/* #undef NET123_WINHTTP */
+
+/* Define for wininet networking (for HTTPS). */
+/* #undef NET123_WININET */
+
/* Define if network support is enabled. */
#define NETWORK 1
@@ -392,7 +445,7 @@
#define PACKAGE_NAME "mpg123"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mpg123 1.29.3"
+#define PACKAGE_STRING "mpg123 1.33.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mpg123"
@@ -401,7 +454,10 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.29.3"
+#define PACKAGE_VERSION "1.33.4"
+
+/* Define to only include portable library API (no off_t, no internal I/O). */
+/* #undef PORTABLE_API */
/* Define if portaudio v18 API is wanted. */
/* #undef PORTAUDIO18 */
@@ -409,25 +465,12 @@
/* Define for calculating tables at runtime. */
/* #undef RUNTIME_TABLES */
-/* The size of `int32_t', as computed by sizeof. */
-#define SIZEOF_INT32_T 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `off64_t', as computed by sizeof. */
-#define SIZEOF_OFF64_T 0
-
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
-
-/* The size of `ssize_t', as computed by sizeof. */
-#define SIZEOF_SSIZE_T 8
-
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#define STDC_HEADERS 1
/* Define to not duplicate some code for likely cases in libsyn123. */
@@ -443,7 +486,7 @@
/* #undef USE_YASM_FOR_AVX */
/* Version number of package */
-#define VERSION "1.29.3"
+#define VERSION "1.33.4"
/* Define to use Win32 named pipes */
/* #undef WANT_WIN32_FIFO */
@@ -475,17 +518,6 @@
/* Define for extreme debugging. */
/* #undef XDEBUG */
-/* 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 */
-
/* Windows Vista and later APIs */
/* #undef _WIN32_WINNT */
@@ -497,33 +529,3 @@
#ifndef __cplusplus
/* #undef inline */
#endif
-
-/* Define to `short' if <sys/types.h> does not define. */
-/* #undef int16_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef int32_t */
-
-/* Define to `long long' if <sys/types.h> does not define. */
-/* #undef int64_t */
-
-/* Define to the native offset type (long or actually off_t). */
-#define lfs_alias_t off_t
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-/* #undef uint16_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef uint32_t */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef uintptr_t */
diff --git a/Xcode/mpg123/armv7/config.h b/Xcode/mpg123/armv7/config.h
index 6cce5b98c..aa55b8c4e 100644
--- a/Xcode/mpg123/armv7/config.h
+++ b/Xcode/mpg123/armv7/config.h
@@ -12,16 +12,16 @@
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Define if .balign is present. */
-/* #undef ASMALIGN_BALIGN */
+#define ASMALIGN_BALIGN 1
/* Define if .align just takes byte count. */
-#define ASMALIGN_BYTE 1
+/* #undef ASMALIGN_BYTE */
/* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */
/* #undef ASMALIGN_EXP */
/* Define if __attribute__((aligned(16))) shall be used */
-/* #undef CCALIGN */
+#define CCALIGN 1
/* Define if debugging is enabled. */
/* #undef DEBUG */
@@ -38,6 +38,9 @@
/* Define if FIFO support is enabled. */
#define FIFO 1
+/* System setup enforces 64 bit offsets where 32 bit would be native. */
+/* #undef FORCED_OFF_64 */
+
/* Define if frame index should be used. */
#define FRAME_INDEX 1
@@ -80,9 +83,15 @@
/* Define to 1 if you have the <byteswap.h> header file. */
/* #undef HAVE_BYTESWAP_H */
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */
#define HAVE_CORESERVICES_CORESERVICES_H 1
+/* Define to 1 if you have the `ctermid' function. */
+#define HAVE_CTERMID 1
+
/* Define to 1 if you have the <CUlib.h> header file. */
/* #undef HAVE_CULIB_H */
@@ -101,6 +110,12 @@
/* Define to 1 if you have the `dlsym' function. */
#define HAVE_DLSYM 1
+/* Define to 1 if you have the `execvp' function. */
+#define HAVE_EXECVP 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
@@ -122,24 +137,21 @@
/* Define to 1 if you have the `mx' library (-lmx). */
/* #undef HAVE_LIBMX */
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
/* Define to 1 if you have the <linux/soundcard.h> header file. */
/* #undef HAVE_LINUX_SOUNDCARD_H */
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
+/* Define to 1 if you have the `lseek64' function. */
+/* #undef HAVE_LSEEK64 */
+
/* Define to 1 if you have the <machine/soundcard.h> header file. */
/* #undef HAVE_MACHINE_SOUNDCARD_H */
/* Define to 1 if you have the `mbstowcs' function. */
#define HAVE_MBSTOWCS 1
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
/* Define to 1 if you have the `mkfifo' function. */
#define HAVE_MKFIFO 1
@@ -170,6 +182,9 @@
/* Define to 1 if you have the <os2.h> header file. */
/* #undef HAVE_OS2_H */
+/* Define if O_LARGEFILE flag for open(2) exists. */
+/* #undef HAVE_O_LARGEFILE */
+
/* Define to 1 if you have the `random' function. */
#define HAVE_RANDOM 1
@@ -179,9 +194,15 @@
/* Define to 1 if you have the `sched_setscheduler' function. */
/* #undef HAVE_SCHED_SETSCHEDULER */
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
+/* for Win/DOS system with setmode() */
+/* #undef HAVE_SETMODE */
+
/* Define to 1 if you have the `setpriority' function. */
#define HAVE_SETPRIORITY 1
@@ -203,9 +224,6 @@
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
-/* Define to 1 if you have the <sndio.h> header file. */
-/* #undef HAVE_SNDIO_H */
-
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -218,12 +236,21 @@
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
+/* Define to 1 if you have the `strerror_l' function. */
+/* #undef HAVE_STRERROR_L */
+
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the `strtok_r' function. */
+#define HAVE_STRTOK_R 1
+
+/* Define to 1 if you have the `strtok_s' function. */
+/* #undef HAVE_STRTOK_S */
+
/* Define to 1 if you have the <sun/audioio.h> header file. */
/* #undef HAVE_SUN_AUDIOIO_H */
@@ -278,6 +305,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if you have the `uselocale' function. */
+#define HAVE_USELOCALE 1
+
/* Define to 1 if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
@@ -290,12 +323,18 @@
/* Define to 1 if you have the <wctype.h> header file. */
#define HAVE_WCTYPE_H 1
+/* Define to 1 if you have the <wincon.h> header file. */
+/* #undef HAVE_WINCON_H */
+
/* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */
/* Define to 1 if you have the <ws2tcpip.h> header file. */
/* #undef HAVE_WS2TCPIP_H */
+/* for Win/DOS system with _setmode() */
+/* #undef HAVE__SETMODE */
+
/* Define to indicate that float storage follows IEEE754. */
#define IEEE_FLOAT 1
@@ -305,9 +344,11 @@
/* Define if IPV6 support is enabled. */
#define IPV6 1
-/* Define this to the size of native offset type in bits, used for LFS alias
- functions. */
-#define LFS_ALIAS_BITS 64
+/* Define if we use _LARGEFILE64_SOURCE with off64_t and lseek64. */
+/* #undef LFS_LARGEFILE_64 */
+
+/* System redefines off_t when defining _FILE_OFFSET_BITS to 64. */
+/* #undef LFS_SENSITIVE */
/* Define to the extension used for runtime loadable modules, say, ".so". */
#define LT_MODULE_EXT ".so"
@@ -321,6 +362,18 @@
/* Define to the shared archive member specification, say "(shr.o)". */
/* #undef LT_SHARED_LIB_MEMBER */
+/* Define to for new net123 network stack. */
+#define NET123 1
+
+/* Define for executable-based networking (for HTTPS). */
+#define NET123_EXEC 1
+
+/* Define for winhttp networking (for HTTPS). */
+/* #undef NET123_WINHTTP */
+
+/* Define for wininet networking (for HTTPS). */
+/* #undef NET123_WININET */
+
/* Define if network support is enabled. */
#define NETWORK 1
@@ -392,7 +445,7 @@
#define PACKAGE_NAME "mpg123"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mpg123 1.29.3"
+#define PACKAGE_STRING "mpg123 1.33.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mpg123"
@@ -401,7 +454,10 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.29.3"
+#define PACKAGE_VERSION "1.33.4"
+
+/* Define to only include portable library API (no off_t, no internal I/O). */
+/* #undef PORTABLE_API */
/* Define if portaudio v18 API is wanted. */
/* #undef PORTAUDIO18 */
@@ -409,25 +465,12 @@
/* Define for calculating tables at runtime. */
/* #undef RUNTIME_TABLES */
-/* The size of `int32_t', as computed by sizeof. */
-#define SIZEOF_INT32_T 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `off64_t', as computed by sizeof. */
-#define SIZEOF_OFF64_T 0
-
/* 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
-
-/* The size of `ssize_t', as computed by sizeof. */
-#define SIZEOF_SSIZE_T 4
-
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#define STDC_HEADERS 1
/* Define to not duplicate some code for likely cases in libsyn123. */
@@ -443,7 +486,7 @@
/* #undef USE_YASM_FOR_AVX */
/* Version number of package */
-#define VERSION "1.29.3"
+#define VERSION "1.33.4"
/* Define to use Win32 named pipes */
/* #undef WANT_WIN32_FIFO */
@@ -475,17 +518,6 @@
/* Define for extreme debugging. */
/* #undef XDEBUG */
-/* 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 */
-
/* Windows Vista and later APIs */
/* #undef _WIN32_WINNT */
@@ -497,33 +529,3 @@
#ifndef __cplusplus
/* #undef inline */
#endif
-
-/* Define to `short' if <sys/types.h> does not define. */
-/* #undef int16_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef int32_t */
-
-/* Define to `long long' if <sys/types.h> does not define. */
-/* #undef int64_t */
-
-/* Define to the native offset type (long or actually off_t). */
-#define lfs_alias_t off_t
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-/* #undef uint16_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef uint32_t */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef uintptr_t */
diff --git a/Xcode/mpg123/config.xcconfig b/Xcode/mpg123/config.xcconfig
index d4d2af844..010dc1aa9 100644
--- a/Xcode/mpg123/config.xcconfig
+++ b/Xcode/mpg123/config.xcconfig
@@ -16,7 +16,7 @@ DECODER_SRC_NEON64 = src/libmpg123/stringbuf.c src/libmpg123/icy.c src/libmpg123
DECODER_CFLAGS_X64 = OPT_MULTI OPT_X86_64 OPT_GENERIC OPT_GENERIC_DITHER REAL_IS_FLOAT OPT_AVX ASMALIGN_BALIGN
-DECODER_SRC_X64 = src/libmpg123/stringbuf.c src/libmpg123/icy.c src/libmpg123/icy.h src/libmpg123/icy2utf8.c src/libmpg123/icy2utf8.h src/libmpg123/ntom.c src/libmpg123/synth.c src/libmpg123/synth.h src/libmpg123/synth_8bit.c src/libmpg123/synth_8bit.h src/libmpg123/layer1.c src/libmpg123/layer2.c src/libmpg123/layer3.c src/libmpg123/synth_s32.c src/libmpg123/synth_real.c src/libmpg123/dct36_x86_64.S src/libmpg123/dct64_x86_64_float.S src/libmpg123/synth_x86_64_accurate.S src/libmpg123/synth_x86_64_float.S src/libmpg123/synth_x86_64_s32.S src/libmpg123/synth_stereo_x86_64_accurate.S src/libmpg123/synth_stereo_x86_64_float.S src/libmpg123/synth_stereo_x86_64_s32.S src/libmpg123/synth_x86_64.S src/libmpg123/dct64_x86_64.S src/libmpg123/synth_stereo_x86_64.S src/libmpg123/dither.c src/libmpg123/dither.h src/libmpg123/getcpuflags_x86_64.S src/libmpg123/dct36_avx.S src/libmpg123/dct64_avx_float.S src/libmpg123/synth_stereo_avx_float.S src/libmpg123/synth_stereo_avx_s32.S src/libmpg123/dct64_avx.S src/libmpg123/synth_stereo_avx.S src/libmpg123/feature.c
+DECODER_SRC_X64 = src/libmpg123/stringbuf.c src/libmpg123/icy.c src/libmpg123/icy.h src/libmpg123/icy2utf8.c src/libmpg123/icy2utf8.h src/libmpg123/ntom.c src/libmpg123/synth.c src/libmpg123/synth.h src/libmpg123/synth_8bit.c src/libmpg123/synth_8bit.h src/libmpg123/layer1.c src/libmpg123/layer2.c src/libmpg123/layer3.c src/libmpg123/synth_s32.c src/libmpg123/synth_real.c src/libmpg123/dct36_x86_64.S src/libmpg123/dct64_x86_64_float.S src/libmpg123/synth_x86_64_accurate.S src/libmpg123/synth_x86_64_float.S src/libmpg123/synth_x86_64_s32.S src/libmpg123/synth_stereo_x86_64_accurate.S src/libmpg123/synth_stereo_x86_64_float.S src/libmpg123/synth_stereo_x86_64_s32.S src/libmpg123/synth_x86_64.S src/libmpg123/dct64_x86_64.S src/libmpg123/synth_stereo_x86_64.S src/libmpg123/dither.c src/libmpg123/dither.h src/libmpg123/getcpuflags_x86_64.S src/libmpg123/dct36_avx.S src/libmpg123/dct64_avx_float.S src/libmpg123/synth_stereo_avx_accurate.S src/libmpg123/synth_stereo_avx_float.S src/libmpg123/synth_stereo_avx_s32.S src/libmpg123/dct64_avx.S src/libmpg123/synth_stereo_avx.S src/libmpg123/feature.c
EXCLUDED_SOURCE_FILE_NAMES = $(DECODER_SRC_NEON) $(DECODER_SRC_NEON64) $(DECODER_SRC_X64)
INCLUDED_SOURCE_FILE_NAMES =
diff --git a/Xcode/mpg123/mpg123.h b/Xcode/mpg123/mpg123.h
deleted file mode 100644
index 1473a0d59..000000000
--- a/Xcode/mpg123/mpg123.h
+++ /dev/null
@@ -1,2001 +0,0 @@
-/*
- libmpg123: MPEG Audio Decoder library (version 1.29.3)
-
- copyright 1995-2015 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
-*/
-
-#ifndef MPG123_LIB_H
-#define MPG123_LIB_H
-
-#include <mpg123/fmt123.h>
-
-/** \file mpg123.h The header file for the libmpg123 MPEG Audio decoder */
-
-/** 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.
- */
-#ifndef MPG123_API_VERSION
-#define MPG123_API_VERSION 46
-#endif
-
-#ifndef MPG123_EXPORT
-/** Defines needed for MS Visual Studio(tm) DLL builds.
- * Every public function must be prefixed with MPG123_EXPORT. When building
- * the DLL ensure to define BUILD_MPG123_DLL. This makes the function accessible
- * for clients and includes it in the import library which is created together
- * with the DLL. When consuming the DLL ensure to define LINK_MPG123_DLL which
- * imports the functions from the DLL.
- */
-#ifdef BUILD_MPG123_DLL
-/* The dll exports. */
-#define MPG123_EXPORT __declspec(dllexport)
-#else
-#ifdef LINK_MPG123_DLL
-/* The exe imports. */
-#define MPG123_EXPORT __declspec(dllimport)
-#else
-/* Nothing on normal/UNIX builds */
-#define MPG123_EXPORT
-#endif
-#endif
-#endif
-
-/** Earlier versions of libmpg123 put enums into public API calls,
- * thich is not exactly safe. There are ABI rules, but you can use
- * compiler switches to change the sizes of enums. It is safer not
- * to have them in API calls. Thus, the default is to remap calls and
- * structs to variants that use plain ints. Define MPG123_ENUM_API to
- * prevent that remapping.
- *
- * You might want to define this to increase the chance of your binary
- * working with an older version of the library. But if that is your goal,
- * you should better build with an older version to begin with.
- */
-#ifndef MPG123_ENUM_API
-
-#define mpg123_param mpg123_param2
-#define mpg123_getparam mpg123_getparam2
-#define mpg123_feature mpg123_feature2
-#define mpg123_eq mpg123_eq2
-#define mpg123_geteq mpg123_geteq2
-#define mpg123_frameinfo mpg123_frameinfo2
-#define mpg123_info mpg123_info2
-#define mpg123_getstate mpg123_getstate2
-#define mpg123_enc_from_id3 mpg123_enc_from_id3_2
-#define mpg123_store_utf8 mpg123_store_utf8_2
-#define mpg123_par mpg123_par2
-#define mpg123_getpar mpg123_getpar2
-
-#endif
-
-/* You can use this file directly, avoiding the autoconf replacements.
- Might have to set MPG123_NO_LARGENAME, too, in case you have
- _FILE_OFFSET_BITS defined where it does not make sense. */
-#ifndef MPG123_NO_CONFIGURE
-
-#include <stdlib.h>
-#include <sys/types.h>
-
-/* A little hack to help MSVC not having ssize_t. */
-#ifdef _MSC_VER
-#include <stddef.h>
-typedef ptrdiff_t mpg123_ssize_t;
-#else
-typedef ssize_t mpg123_ssize_t;
-#endif
-
-/* You can always enforce largefile hackery by setting MPG123_LARGESUFFIX. */
-/* Otherwise, this header disables it if the build system decided so. */
-#if !defined(MPG123_LARGESUFFIX) && 0
-#ifndef MPG123_NO_LARGENAME
-#define MPG123_NO_LARGENAME
-#endif
-#endif
-
-#endif /* MPG123_NO_CONFIGURE */
-
-/* Simplified large file handling.
- I used to have a check here that prevents building for a library with conflicting large file setup
- (application that uses 32 bit offsets with library that uses 64 bits).
- While that was perfectly fine in an environment where there is one incarnation of the library,
- it hurt GNU/Linux and Solaris systems with multilib where the distribution fails to provide the
- correct header matching the 32 bit library (where large files need explicit support) or
- the 64 bit library (where there is no distinction).
-
- New approach: When the app defines _FILE_OFFSET_BITS, it wants non-default large file support,
- and thus functions with added suffix (mpg123_open_64).
- Any mismatch will be caught at link time because of the _FILE_OFFSET_BITS setting used when
- building libmpg123. Plus, there's dual mode large file support in mpg123 since 1.12 now.
- Link failure is not the expected outcome of any half-sane usage anymore.
-
- More complication: What about client code defining _LARGEFILE64_SOURCE? It might want direct access to the _64 functions, along with the ones without suffix. Well, that's possible now via defining MPG123_NO_LARGENAME and MPG123_LARGESUFFIX, respectively, for disabling or enforcing the suffix names.
-*/
-
-/*
- Now, the renaming of large file aware functions.
- By default, it appends underscore _FILE_OFFSET_BITS (so, mpg123_seek_64 for mpg123_seek), if _FILE_OFFSET_BITS is defined. You can force a different suffix via MPG123_LARGESUFFIX (that must include the underscore), or you can just disable the whole mess by defining MPG123_NO_LARGENAME.
-*/
-#if (!defined MPG123_NO_LARGENAME) && ((defined _FILE_OFFSET_BITS) || (defined MPG123_LARGESUFFIX))
-
-/* Need some trickery to concatenate the value(s) of the given macro(s). */
-#define MPG123_MACROCAT_REALLY(a, b) a ## b
-#define MPG123_MACROCAT(a, b) MPG123_MACROCAT_REALLY(a, b)
-#ifndef MPG123_LARGESUFFIX
-#define MPG123_LARGESUFFIX MPG123_MACROCAT(_, _FILE_OFFSET_BITS)
-#endif
-#define MPG123_LARGENAME(func) MPG123_MACROCAT(func, MPG123_LARGESUFFIX)
-
-#define mpg123_open_fixed MPG123_LARGENAME(mpg123_open_fixed)
-#define mpg123_open MPG123_LARGENAME(mpg123_open)
-#define mpg123_open_fd MPG123_LARGENAME(mpg123_open_fd)
-#define mpg123_open_handle MPG123_LARGENAME(mpg123_open_handle)
-#define mpg123_framebyframe_decode MPG123_LARGENAME(mpg123_framebyframe_decode)
-#define mpg123_decode_frame MPG123_LARGENAME(mpg123_decode_frame)
-#define mpg123_tell MPG123_LARGENAME(mpg123_tell)
-#define mpg123_tellframe MPG123_LARGENAME(mpg123_tellframe)
-#define mpg123_tell_stream MPG123_LARGENAME(mpg123_tell_stream)
-#define mpg123_seek MPG123_LARGENAME(mpg123_seek)
-#define mpg123_feedseek MPG123_LARGENAME(mpg123_feedseek)
-#define mpg123_seek_frame MPG123_LARGENAME(mpg123_seek_frame)
-#define mpg123_timeframe MPG123_LARGENAME(mpg123_timeframe)
-#define mpg123_index MPG123_LARGENAME(mpg123_index)
-#define mpg123_set_index MPG123_LARGENAME(mpg123_set_index)
-#define mpg123_position MPG123_LARGENAME(mpg123_position)
-#define mpg123_length MPG123_LARGENAME(mpg123_length)
-#define mpg123_framelength MPG123_LARGENAME(mpg123_framelength)
-#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 */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \defgroup mpg123_init mpg123 library and handle setup
- *
- * Functions to initialise and shutdown the mpg123 library and handles.
- * The parameters of handles have workable defaults, you only have to tune them when you want to tune something;-)
- * Tip: Use a RVA setting...
- *
- * @{
- */
-
-/** Opaque structure for the libmpg123 decoder handle. */
-struct mpg123_handle_struct;
-
-/** Opaque structure for the libmpg123 decoder handle.
- * Most functions take a pointer to a mpg123_handle as first argument and operate on its data in an object-oriented manner.
- */
-typedef struct mpg123_handle_struct mpg123_handle;
-
-/** Useless no-op that used to do initialization work.
- *
- * For API version before 46 (mpg123 1.27.0), you had to ensure to have
- * this called once before creating a handle. To be pure, this had to
- * happen in a single-threaded context, too (while in practice, there was no
- * harm done possibly racing to compute the same numbers again).
- *
- * Now this function really does nothing anymore. The only reason to call
- * it is to be compatible with old versions of the library that still require
- * it.
- *
- * \return MPG123_OK if successful, otherwise an error number.
- */
-MPG123_EXPORT int mpg123_init(void);
-
-/** Superfluous Function to close down the mpg123 library.
- * This was created with the thought that there sometime will be cleanup code
- * to be run after library use. This never materialized. You can forget about
- * this funct
(Patch may be truncated, please check the link at the top of this post.)