From 29194fc6b19fb9f69df88d477aea37a81286edb5 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Tue, 1 Nov 2022 14:56:56 +0300 Subject: [PATCH] mpg123-1.31.1 --- NEWS | 6 ++++++ configure | 23 +++++++++++++---------- configure.ac | 3 ++- mpg123.spec | 2 +- src/config.h.in | 4 ++++ src/libmpg123/lfs_alias.c | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 6228b81..8d6c815 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +1.31.1 +------ +- Fix largefile aliases for the case of a largefile-insensitive build + that still does define _FILE_OFFSET_BITS from the outside + (sys/feature_tests.h on Illumos). + 1.31.0 ------ diff --git a/configure b/configure index eca6fe5..2aa6734 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mpg123 1.31.0. +# Generated by GNU Autoconf 2.69 for mpg123 1.31.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mpg123' PACKAGE_TARNAME='mpg123' -PACKAGE_VERSION='1.31.0' -PACKAGE_STRING='mpg123 1.31.0' +PACKAGE_VERSION='1.31.1' +PACKAGE_STRING='mpg123 1.31.1' PACKAGE_BUGREPORT='maintainer@mpg123.org' PACKAGE_URL='' @@ -1687,7 +1687,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.31.0 to adapt to many kinds of systems. +\`configure' configures mpg123 1.31.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1758,7 +1758,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mpg123 1.31.0:";; + short | recursive ) echo "Configuration of mpg123 1.31.1:";; esac cat <<\_ACEOF @@ -1999,7 +1999,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mpg123 configure 1.31.0 +mpg123 configure 1.31.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2605,7 +2605,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.31.0, which was +It was created by mpg123 $as_me 1.31.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3564,7 +3564,7 @@ fi # Define the identity of the package. PACKAGE='mpg123' - VERSION='1.31.0' + VERSION='1.31.1' cat >>confdefs.h <<_ACEOF @@ -15606,6 +15606,9 @@ fi if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '[^0-9]' > /dev/null; then largefile_sensitive=no BUILD_NO_LARGENAME=1 + +$as_echo "#define BUILD_NO_LARGENAME 1" >>confdefs.h + else largefile_sensitive=yes BUILD_NO_LARGENAME=0 @@ -20751,7 +20754,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.31.0, which was +This file was extended by mpg123 $as_me 1.31.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20817,7 +20820,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mpg123 config.status 1.31.0 +mpg123 config.status 1.31.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4074711..6d76d50 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl 2.69 at least. AC_PREREQ([2.69]) dnl ############# Initialisation -AC_INIT([mpg123], [1.31.0], [maintainer@mpg123.org]) +AC_INIT([mpg123], [1.31.1], [maintainer@mpg123.org]) dnl Increment API_VERSION when the API gets changes (new functions). dnl libmpg123 @@ -1127,6 +1127,7 @@ if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" dnl if it has non-numeric chars or is empty... ignore... largefile_sensitive=no BUILD_NO_LARGENAME=1 + AC_DEFINE(BUILD_NO_LARGENAME, 1, [ No suffixed symbols for large file support (only alias for backwards compat.) ]) else largefile_sensitive=yes BUILD_NO_LARGENAME=0 diff --git a/mpg123.spec b/mpg123.spec index 1e231ae..3031dff 100644 --- a/mpg123.spec +++ b/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.31.0 +Version: 1.31.1 Release: 1 URL: http://www.mpg123.org/ License: GPL diff --git a/src/config.h.in b/src/config.h.in index f4c980d..6ffd2e6 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -19,6 +19,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.) */ +#undef BUILD_NO_LARGENAME + /* Define if __attribute__((aligned(16))) shall be used */ #undef CCALIGN diff --git a/src/libmpg123/lfs_alias.c b/src/libmpg123/lfs_alias.c index 982d7ca..6b0a8c6 100644 --- a/src/libmpg123/lfs_alias.c +++ b/src/libmpg123/lfs_alias.c @@ -45,7 +45,7 @@ /* This is wicked switchery: Decide which way the aliases are facing. */ -#if _FILE_OFFSET_BITS+0 == LFS_ALIAS_BITS +#if !(defined BUILD_NO_LARGENAME) && (_FILE_OFFSET_BITS+0 == LFS_ALIAS_BITS) /* The native functions have suffix, the aliases not. */ #define NATIVE_SUFFIX MACROCAT(_, _FILE_OFFSET_BITS)