mpg123-1.33.3

2025-10-06 12:01:02 +03:00
parent b4abae51e1
commit 69118bb8bf
47 changed files with 67 additions and 213 deletions
--- a/src/libmpg123/dct36_avx.S
+++ b/src/libmpg123/dct36_avx.S
@@ -30,11 +30,7 @@
 	void dct36_avx(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf);
 */
 	
-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 dct36_avx_COS9:
 	.long 0x3f5db3d7
--- a/src/libmpg123/dct36_neon64.S
+++ b/src/libmpg123/dct36_neon64.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 dct36_aarch64_COS9:
 	.word 0x3f5db3d7
--- a/src/libmpg123/dct36_sse.S
+++ b/src/libmpg123/dct36_sse.S
@@ -19,11 +19,7 @@
 	void dct36_sse(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf);
 */
 	
-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 dct36_sse_COS9:
 	.long 0x3f5db3d7
--- a/src/libmpg123/dct36_x86_64.S
+++ b/src/libmpg123/dct36_x86_64.S
@@ -30,11 +30,7 @@
 	void dct36_x86_64(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf);
 */
 	
-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 dct36_x86_64_COS9:
 	.long 0x3f5db3d7
--- a/src/libmpg123/dct64_3dnowext.S
+++ b/src/libmpg123/dct64_3dnowext.S
@@ -22,7 +22,7 @@

 #include "mangle.h"

-	.data
+	RODATA
 	ALIGN4
 	/* .type	plus_1f, @object
 	   .size	plus_1f, 4  */
--- a/src/libmpg123/dct64_avx.S
+++ b/src/libmpg123/dct64_avx.S
@@ -17,11 +17,7 @@
 	void dct64_avx(short *out0, short *out1, real *samples);
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 costab_avx:
 	.long 1056974725
--- a/src/libmpg123/dct64_avx_float.S
+++ b/src/libmpg123/dct64_avx_float.S
@@ -17,11 +17,7 @@
 	void dct64_real_avx(real *out0, real *out1, real *samples);
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 costab_avx:
 	.long 1056974725
--- a/src/libmpg123/dct64_neon64.S
+++ b/src/libmpg123/dct64_neon64.S
@@ -8,11 +8,7 @@

 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 costab_neon_aarch64:
 	.word 1056974725
--- a/src/libmpg123/dct64_neon64_float.S
+++ b/src/libmpg123/dct64_neon64_float.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 costab_neon_aarch64:
 	.word 1056974725
--- a/src/libmpg123/dct64_sse.S
+++ b/src/libmpg123/dct64_sse.S
@@ -16,11 +16,7 @@
 	void dct64_sse(short *out0, short *out1, real *samples);
 */

-#if !defined (__APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 pnpn:
 	.long	0
--- a/src/libmpg123/dct64_sse_float.S
+++ b/src/libmpg123/dct64_sse_float.S
@@ -16,11 +16,7 @@
 	void dct64_real_sse(real *out0, real *out1, real *samples);
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 pnpn:
 	.long	0
--- a/src/libmpg123/dct64_x86_64.S
+++ b/src/libmpg123/dct64_x86_64.S
@@ -28,11 +28,7 @@
 	void dct64_x86_64(short *out0, short *out1, real *samples);
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_costab_x86_64):
 	.long 1056974725
--- a/src/libmpg123/dct64_x86_64_float.S
+++ b/src/libmpg123/dct64_x86_64_float.S
@@ -28,11 +28,7 @@
 	void dct64_real_x86_64(real *out0, real *out1, real *samples);
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_costab_x86_64):
 	.long 1056974725
--- a/src/libmpg123/mangle.h
+++ b/src/libmpg123/mangle.h
@@ -84,6 +84,12 @@
 #define ASM_VALUE(a) MANGLE_MACROCAT($,a)
 #endif

+#if !defined(__APPLE__) && !defined (__OS2__)
+#define RODATA .section .rodata
+#else
+#define RODATA .data
+#endif
+
 /* Enable position-independent code for certain platforms. */

 #if defined(OPT_X86)
@@ -139,7 +145,7 @@ Lpic_base: \
 #endif /* PIC variants */

 // Apple and Android NDK seem both not to like direct global access.
-#if defined(PIC) && (defined(__APPLE__) || defined(ANDROID))
+#if defined(PIC) && (defined(__APPLE__) || defined(__ANDROID__))
 #define PIC_GLOBAL_PTR
 #endif

--- a/src/libmpg123/synth_3dnow.S
+++ b/src/libmpg123/synth_3dnow.S
@@ -34,11 +34,7 @@
 #include "mangle.h"

 #ifdef ACCURATE_ROUNDING
-#if !defined (__APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN8
 max_s16:
 	.long   1191181824 /* 32767.0 */
--- a/src/libmpg123/synth_i586.S
+++ b/src/libmpg123/synth_i586.S
@@ -32,10 +32,7 @@

 #include "mangle.h"

-.data
-#if !defined (__APPLE__) && !defined (__OS2__)
-.section .rodata
-#endif
+	RODATA
 	ALIGN8
 .LC0:
 	.long 0x0,0x40dfffc0
--- a/src/libmpg123/synth_i586_dither.S
+++ b/src/libmpg123/synth_i586_dither.S
@@ -13,10 +13,7 @@

 #include "mangle.h"

-.data
-#if !defined (__APPLE__) && !defined (__OS2__)
-		.section	.rodata
-#endif
+	RODATA
 	ALIGN8
 .LC0:
 	.long 0x0,0x40dfffc0
--- a/src/libmpg123/synth_neon64.S
+++ b/src/libmpg123/synth_neon64.S
@@ -8,11 +8,7 @@

 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s16:
 	.word   32767
--- a/src/libmpg123/synth_neon64_accurate.S
+++ b/src/libmpg123/synth_neon64_accurate.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s16:
 	.word   1191181824
--- a/src/libmpg123/synth_neon64_float.S
+++ b/src/libmpg123/synth_neon64_float.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 scale:
 	.word   939524096
--- a/src/libmpg123/synth_neon64_s32.S
+++ b/src/libmpg123/synth_neon64_s32.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s32:
 	.word   1191182335
--- a/src/libmpg123/synth_sse_accurate.S
+++ b/src/libmpg123/synth_sse_accurate.S
@@ -22,11 +22,7 @@
 	return value: number of clipped samples
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 maxmin_s16:
 	.long   1191181824 /* 32767.0 */
--- a/src/libmpg123/synth_sse_float.S
+++ b/src/libmpg123/synth_sse_float.S
@@ -20,11 +20,7 @@
 	return value: number of clipped samples (0)
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 scale_sse:
 	.long   939524096
--- a/src/libmpg123/synth_sse_s32.S
+++ b/src/libmpg123/synth_sse_s32.S
@@ -22,11 +22,7 @@
 	return value: number of clipped samples
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 scale_s32:
 	.long   1199570944 /* 65536.0 */
--- a/src/libmpg123/synth_stereo_avx_accurate.S
+++ b/src/libmpg123/synth_stereo_avx_accurate.S
@@ -33,11 +33,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 maxmin_avx:
 	.long   1191182335
--- a/src/libmpg123/synth_stereo_avx_float.S
+++ b/src/libmpg123/synth_stereo_avx_float.S
@@ -33,11 +33,7 @@
 	return value: number of clipped samples (0)
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 scale_avx:
 	.long   939524096
--- a/src/libmpg123/synth_stereo_avx_s32.S
+++ b/src/libmpg123/synth_stereo_avx_s32.S
@@ -33,11 +33,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 maxmin_avx:
 	.long   1191182335
--- a/src/libmpg123/synth_stereo_neon64.S
+++ b/src/libmpg123/synth_stereo_neon64.S
@@ -8,11 +8,7 @@

 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s16:
 	.word   32767
--- a/src/libmpg123/synth_stereo_neon64_accurate.S
+++ b/src/libmpg123/synth_stereo_neon64_accurate.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s16:
 	.word   1191181824
--- a/src/libmpg123/synth_stereo_neon64_float.S
+++ b/src/libmpg123/synth_stereo_neon64_float.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 scale:
 	.word   939524096
--- a/src/libmpg123/synth_stereo_neon64_s32.S
+++ b/src/libmpg123/synth_stereo_neon64_s32.S
@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN16
 maxmin_s32:
 	.word   1191181824
--- a/src/libmpg123/synth_stereo_sse_accurate.S
+++ b/src/libmpg123/synth_stereo_sse_accurate.S
@@ -25,11 +25,7 @@
 	return value: number of clipped samples
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 maxmin_s16:
 	.long   1191181824 /* 32767.0 */
--- a/src/libmpg123/synth_stereo_sse_float.S
+++ b/src/libmpg123/synth_stereo_sse_float.S
@@ -24,11 +24,7 @@
 	return value: number of clipped samples (0)
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 scale_sse:
 	.long   939524096
--- a/src/libmpg123/synth_stereo_sse_s32.S
+++ b/src/libmpg123/synth_stereo_sse_s32.S
@@ -25,11 +25,7 @@
 	return value: number of clipped samples
 */

-#if !defined ( __APPLE__) && !defined (__OS2__)
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 scale_s32:
 	.long   1199570944 /* 65536.0 */
--- a/src/libmpg123/synth_stereo_x86_64.S
+++ b/src/libmpg123/synth_stereo_x86_64.S
@@ -38,11 +38,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_maxmin_x86_64):
 	.long   32767
--- a/src/libmpg123/synth_stereo_x86_64_accurate.S
+++ b/src/libmpg123/synth_stereo_x86_64_accurate.S
@@ -37,11 +37,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_maxmin_s16):
 	.long   1191181824
--- a/src/libmpg123/synth_stereo_x86_64_float.S
+++ b/src/libmpg123/synth_stereo_x86_64_float.S
@@ -35,11 +35,7 @@
 	return value: number of clipped samples (0)
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_scale_x86_64):
 	.long   939524096
--- a/src/libmpg123/synth_stereo_x86_64_s32.S
+++ b/src/libmpg123/synth_stereo_x86_64_s32.S
@@ -38,11 +38,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_scale_s32):
 	.long   1199570944
--- a/src/libmpg123/synth_x86_64.S
+++ b/src/libmpg123/synth_x86_64.S
@@ -38,11 +38,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_maxmin_x86_64):
 	.long   32767
--- a/src/libmpg123/synth_x86_64_accurate.S
+++ b/src/libmpg123/synth_x86_64_accurate.S
@@ -37,11 +37,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_maxmin_s16):
 	.long   1191181824
--- a/src/libmpg123/synth_x86_64_float.S
+++ b/src/libmpg123/synth_x86_64_float.S
@@ -35,11 +35,7 @@
 	return value: number of clipped samples (0)
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_scale_x86_64):
 	.long   939524096
--- a/src/libmpg123/synth_x86_64_s32.S
+++ b/src/libmpg123/synth_x86_64_s32.S
@@ -38,11 +38,7 @@
 	return value: number of clipped samples
 */

-#ifndef __APPLE__
-	.section	.rodata
-#else
-	.data
-#endif
+	RODATA
 	ALIGN32
 ASM_NAME(INT123_scale_s32):
 	.long   1199570944
--- a/src/libmpg123/tabinit_mmx.S
+++ b/src/libmpg123/tabinit_mmx.S
@@ -10,7 +10,7 @@

 #include "mangle.h"

-.data
+	RODATA
 	ALIGN32
 .globl ASM_NAME(INT123_costab_mmxsse)
 ASM_NAME(INT123_costab_mmxsse):
--- a/src/version.h
+++ b/src/version.h
@@ -16,7 +16,7 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 33
-#define MPG123_PATCH 2
+#define MPG123_PATCH 3
 // 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 ""