Module: wine Branch: master Commit: 36b0e7e0eaa1ebdc647427bb5dbab329d0e4b694 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b0e7e0eaa1ebdc647427bb5dbab32...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 6 16:44:26 2022 +0100
mpg123: Import upstream release 1.31.1.
---
libs/mpg123/config.h | 31 +++++++++++++++++++++++++------ libs/mpg123/src/intsym.h | 6 +----- libs/mpg123/src/libmpg123/mpg123.h | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 5e45528c423..f030455e464 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -20,6 +20,10 @@ /* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */ /* #undef ASMALIGN_EXP */
+/* No suffixed symbols for large file support (only alias for backwards + compat.) */ +#define BUILD_NO_LARGENAME 1 + /* Define if __attribute__((aligned(16))) shall be used */ #define CCALIGN 1
@@ -188,6 +192,9 @@ /* Define to 1 if you have the `sched_setscheduler' function. */ /* #undef HAVE_SCHED_SETSCHEDULER */
+/* Define to 1 if you have the `setenv' function. */ +/* #undef HAVE_SETENV */ + /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1
@@ -215,9 +222,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
@@ -290,6 +294,9 @@ /* 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. */ +/* #undef HAVE_UNSETENV */ + /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1
@@ -302,6 +309,9 @@ /* 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. */ +#define HAVE_WINCON_H 1 + /* Define to 1 if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1
@@ -339,6 +349,15 @@ /* Define to for new net123 network stack. */ /* #undef NET123 */
+/* Define for executable-based networking (for HTTPS). */ +/* #undef NET123_EXEC */ + +/* Define for winhttp networking (for HTTPS). */ +#define NET123_WINHTTP 1 + +/* Define for wininet networking (for HTTPS). */ +/* #undef NET123_WININET */ + /* Define if network support is enabled. */ /* #undef NETWORK */
@@ -410,7 +429,7 @@ #define PACKAGE_NAME "mpg123"
/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.30.2" +#define PACKAGE_STRING "mpg123 1.31.1"
/* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -419,7 +438,7 @@ #define PACKAGE_URL ""
/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.30.2" +#define PACKAGE_VERSION "1.31.1"
/* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -461,7 +480,7 @@ /* #undef USE_YASM_FOR_AVX */
/* Version number of package */ -#define VERSION "1.30.2" +#define VERSION "1.31.1"
/* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 diff --git a/libs/mpg123/src/intsym.h b/libs/mpg123/src/intsym.h index 7c817e3a755..cc975d41865 100644 --- a/libs/mpg123/src/intsym.h +++ b/libs/mpg123/src/intsym.h @@ -16,6 +16,7 @@ #define compat_fdopen INT123_compat_fdopen #define compat_close INT123_compat_close #define compat_fclose INT123_compat_fclose +#define compat_binmode INT123_compat_binmode #define win32_wide_utf8 INT123_win32_wide_utf8 #define win32_wide_utf7 INT123_win32_wide_utf7 #define win32_utf8_wide INT123_win32_utf8_wide @@ -277,9 +278,6 @@ #define buffer_drop INT123_buffer_drop #define buffer_write INT123_buffer_write #define buffer_fill INT123_buffer_fill -#define read_buf INT123_read_buf -#define xfer_write_string INT123_xfer_write_string -#define xfer_read_string INT123_xfer_read_string #define xfermem_init INT123_xfermem_init #define xfermem_init_writer INT123_xfermem_init_writer #define xfermem_init_reader INT123_xfermem_init_reader @@ -304,8 +302,6 @@ #define raw_formats INT123_raw_formats #define wav_formats INT123_wav_formats #define wav_drain INT123_wav_drain -#define write_parameters INT123_write_parameters -#define read_parameters INT123_read_parameters #define stringlists_add INT123_stringlists_add #define check_neon INT123_check_neon #define dct64_3dnow INT123_dct64_3dnow diff --git a/libs/mpg123/src/libmpg123/mpg123.h b/libs/mpg123/src/libmpg123/mpg123.h index 6b96e7a50b4..19eca55ec9e 100644 --- a/libs/mpg123/src/libmpg123/mpg123.h +++ b/libs/mpg123/src/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.30.2) + libmpg123: MPEG Audio Decoder library (version 1.31.1)
copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1