[OMPT-svn-commit] OpenMPT r22491 - in branches/OpenMPT-1.31: . include/mpg123 include/mpg123/src include/mpg123/src/libmpg123

[<sv...@op...>]

Author: manx
Date: Mon Dec  9 13:18:17 2024
New Revision: 22491
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22491

Log:
Merged revision(s) 22490 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.10-dev+r5461 (2024-12-09).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c
   branches/OpenMPT-1.31/include/mpg123/src/version.h

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Mon Dec  9 13:18:17 2024	(r22491)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.9 (2024-11-02).
+libmpg123 library version 1.32.10-dev+r5461 (2024-12-09).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/format.c	Mon Dec  9 13:18:17 2024	(r22491)
@@ -688,7 +688,7 @@
 
 #include "../common/swap_bytes_impl.h"
 
-void swap_endian(struct outbuffer *buf, int block)
+static void swap_endian(struct outbuffer *buf, int block)
 {
 	size_t count;
 

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/id3.c	Mon Dec  9 13:18:17 2024	(r22491)
@@ -794,7 +794,7 @@
 
 #endif /* NO_ID3V2 */
 
-int store_id3v2( mpg123_handle *fr
+static int store_id3v2( mpg123_handle *fr
 ,	unsigned long first4bytes, unsigned char buf[6], unsigned long length )
 {
 	int ret = 1;

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/mpg123lib_intern.h	Mon Dec  9 13:18:17 2024	(r22491)
@@ -21,7 +21,10 @@
 
 // Only portable API plays a role in the library itself, outside of lfs_wrap.c.
 // Also, we need to ensure no suffix renaming for the primary implementations.
-#define MPG123_PORTABLE_API
+// But: The _definition_ of non-portable API needs to be present for those
+// primary implementations being exported for DLL builds. Just the largefile
+// renaming needs to be skipped!
+#define MPG123_NO_LARGENAME
 #define MPG123_ENUM_API
 #include "mpg123.h"
 

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/optimize.c	Mon Dec  9 13:18:17 2024	(r22491)
@@ -1027,7 +1027,7 @@
 	NULL
 };
 
-void check_decoders(void)
+static void check_decoders(void)
 {
 #ifndef OPT_MULTI
 	/* In non-multi mode, only the full list (one entry) is used. */

Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/version.h	Mon Dec  9 13:17:40 2024	(r22490)
+++ branches/OpenMPT-1.31/include/mpg123/src/version.h	Mon Dec  9 13:18:17 2024	(r22491)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 9
+#define MPG123_PATCH 10
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)