mpg123-1.33.3

NEWS

@@ -1,3 +1,9 @@
+1.33.3
+------
+- libmpg123:
+-- Fix build with newer toolchain on Android by using __ANDROID__ macro (bug 380).
+-- Consolidate and more consistently use .rodata switch in macro.
+
 1.33.2
 ------
 - libmpg123:

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for mpg123 1.33.2.
+# Generated by GNU Autoconf 2.71 for mpg123 1.33.3.
 #
 # Report bugs to <maintainer@mpg123.org>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mpg123'
 PACKAGE_TARNAME='mpg123'
-PACKAGE_VERSION='1.33.2'
+PACKAGE_VERSION='1.33.3'
-PACKAGE_STRING='mpg123 1.33.2'
+PACKAGE_STRING='mpg123 1.33.3'
 PACKAGE_BUGREPORT='maintainer@mpg123.org'
 PACKAGE_URL=''
 
@@ -1727,7 +1727,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mpg123 1.33.2 to adapt to many kinds of systems.
+\`configure' configures mpg123 1.33.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1798,7 +1798,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mpg123 1.33.2:";;
+     short | recursive ) echo "Configuration of mpg123 1.33.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2077,7 +2077,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mpg123 configure 1.33.2
+mpg123 configure 1.33.3
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2622,7 +2622,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mpg123 $as_me 1.33.2, which was
+It was created by mpg123 $as_me 1.33.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3992,7 +3992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mpg123'
- VERSION='1.33.2'
+ VERSION='1.33.3'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22468,7 +22468,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mpg123 $as_me 1.33.2, which was
+This file was extended by mpg123 $as_me 1.33.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22536,7 +22536,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-mpg123 config.status 1.33.2
+mpg123 config.status 1.33.3
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

mpg123.spec

@@ -3,7 +3,7 @@
 # - devel packages for alsa, sdl, etc... to build the respective output modules.
 Summary:	The fast console mpeg audio decoder/player.
 Name:		mpg123
-Version:	1.33.2
+Version:	1.33.3
 Release:	1
 URL:		http://www.mpg123.org/
 License:	GPL

src/libmpg123/dct36_avx.S

@@ -30,11 +30,7 @@
 	void dct36_avx(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf);
 */
 	
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 dct36_avx_COS9:
 	.long 0x3f5db3d7

src/libmpg123/dct36_neon64.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 dct36_aarch64_COS9:
 	.word 0x3f5db3d7

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__)
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 dct36_sse_COS9:
 	.long 0x3f5db3d7

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__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 dct36_x86_64_COS9:
 	.long 0x3f5db3d7

src/libmpg123/dct64_3dnowext.S

@@ -22,7 +22,7 @@
 
 #include "mangle.h"
 
-	.data
+	RODATA
 	ALIGN4
 	/* .type	plus_1f, @object
 	   .size	plus_1f, 4  */

src/libmpg123/dct64_avx.S

@@ -17,11 +17,7 @@
 	void dct64_avx(short *out0, short *out1, real *samples);
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 costab_avx:
 	.long 1056974725

src/libmpg123/dct64_avx_float.S

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

src/libmpg123/dct64_neon64.S

@@ -8,11 +8,7 @@
 
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 costab_neon_aarch64:
 	.word 1056974725

src/libmpg123/dct64_neon64_float.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 costab_neon_aarch64:
 	.word 1056974725

src/libmpg123/dct64_sse.S

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

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__)
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 pnpn:
 	.long	0

src/libmpg123/dct64_x86_64.S

@@ -28,11 +28,7 @@
 	void dct64_x86_64(short *out0, short *out1, real *samples);
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 ASM_NAME(INT123_costab_x86_64):
 	.long 1056974725

src/libmpg123/dct64_x86_64_float.S

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

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
 

src/libmpg123/synth_3dnow.S

@@ -34,11 +34,7 @@
 #include "mangle.h"
 
 #ifdef ACCURATE_ROUNDING
-#if !defined (__APPLE__) && !defined (__OS2__)
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN8
 max_s16:
 	.long   1191181824 /* 32767.0 */

src/libmpg123/synth_i586.S

@@ -32,10 +32,7 @@
 
 #include "mangle.h"
 
-.data
+	RODATA
-#if !defined (__APPLE__) && !defined (__OS2__)
-.section .rodata
-#endif
 	ALIGN8
 .LC0:
 	.long 0x0,0x40dfffc0

src/libmpg123/synth_i586_dither.S

@@ -13,10 +13,7 @@
 
 #include "mangle.h"
 
-.data
+	RODATA
-#if !defined (__APPLE__) && !defined (__OS2__)
-		.section	.rodata
-#endif
 	ALIGN8
 .LC0:
 	.long 0x0,0x40dfffc0

src/libmpg123/synth_neon64.S

@@ -8,11 +8,7 @@
 
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s16:
 	.word   32767

src/libmpg123/synth_neon64_accurate.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s16:
 	.word   1191181824

src/libmpg123/synth_neon64_float.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 scale:
 	.word   939524096

src/libmpg123/synth_neon64_s32.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s32:
 	.word   1191182335

src/libmpg123/synth_sse_accurate.S

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

src/libmpg123/synth_sse_float.S

@@ -20,11 +20,7 @@
 	return value: number of clipped samples (0)
 */
 
-#if !defined ( __APPLE__) && !defined (__OS2__)
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 scale_sse:
 	.long   939524096

src/libmpg123/synth_sse_s32.S

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

src/libmpg123/synth_stereo_avx_accurate.S

@@ -33,11 +33,7 @@
 	return value: number of clipped samples
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 maxmin_avx:
 	.long   1191182335

src/libmpg123/synth_stereo_avx_float.S

@@ -33,11 +33,7 @@
 	return value: number of clipped samples (0)
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 scale_avx:
 	.long   939524096

src/libmpg123/synth_stereo_avx_s32.S

@@ -33,11 +33,7 @@
 	return value: number of clipped samples
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 maxmin_avx:
 	.long   1191182335

src/libmpg123/synth_stereo_neon64.S

@@ -8,11 +8,7 @@
 
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s16:
 	.word   32767

src/libmpg123/synth_stereo_neon64_accurate.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s16:
 	.word   1191181824

src/libmpg123/synth_stereo_neon64_float.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 scale:
 	.word   939524096

src/libmpg123/synth_stereo_neon64_s32.S

@@ -9,11 +9,7 @@
 #include "aarch64_defs.h"
 #include "mangle.h"
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN16
 maxmin_s32:
 	.word   1191181824

src/libmpg123/synth_stereo_sse_accurate.S

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

src/libmpg123/synth_stereo_sse_float.S

@@ -24,11 +24,7 @@
 	return value: number of clipped samples (0)
 */
 
-#if !defined ( __APPLE__) && !defined (__OS2__)
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 scale_sse:
 	.long   939524096

src/libmpg123/synth_stereo_sse_s32.S

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

src/libmpg123/synth_stereo_x86_64.S

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

src/libmpg123/synth_stereo_x86_64_accurate.S

@@ -37,11 +37,7 @@
 	return value: number of clipped samples
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 ASM_NAME(INT123_maxmin_s16):
 	.long   1191181824

src/libmpg123/synth_stereo_x86_64_float.S

@@ -35,11 +35,7 @@
 	return value: number of clipped samples (0)
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 ASM_NAME(INT123_scale_x86_64):
 	.long   939524096

src/libmpg123/synth_stereo_x86_64_s32.S

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

src/libmpg123/synth_x86_64.S

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

src/libmpg123/synth_x86_64_accurate.S

@@ -37,11 +37,7 @@
 	return value: number of clipped samples
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 ASM_NAME(INT123_maxmin_s16):
 	.long   1191181824

src/libmpg123/synth_x86_64_float.S

@@ -35,11 +35,7 @@
 	return value: number of clipped samples (0)
 */
 
-#ifndef __APPLE__
+	RODATA
-	.section	.rodata
-#else
-	.data
-#endif
 	ALIGN32
 ASM_NAME(INT123_scale_x86_64):
 	.long   939524096

src/libmpg123/synth_x86_64_s32.S

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

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):

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 ""