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

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

Author: manx
Date: Wed Aug  7 17:37:32 2024
New Revision: 21352
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21352

Log:
Merged revision(s) 21351 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.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	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:32 2024	(r21352)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 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.
@@ -6,7 +6,6 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
- *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:32 2024	(r21352)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:32 2024	(r21352)
@@ -732,13 +732,8 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
-#if 1  /* OpenMPT */
-		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
-		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
-#else  /* OpenMPT */
-		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/version.h	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/version.h	Wed Aug  7 17:37:32 2024	(r21352)
@@ -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 6
+#define MPG123_PATCH 7
 // 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)