From 426f60d4f4a685bdc542becb75e256feb49b2c99 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sat, 7 Jun 2025 10:51:56 +0300 Subject: [PATCH] mpg123 1.33.0-dev+20250607022201 --- NEWS | 14 +++++++++++--- configure | 20 ++++++++++---------- mpg123.spec | 2 +- ports/cmake/src/compat/CMakeLists.txt | 12 +++++++++--- src/compat/compat.c | 2 +- src/out123.c | 5 ++++- src/version.h | 2 +- 7 files changed, 37 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index 73c63dc..9943c70 100644 --- a/NEWS +++ b/NEWS @@ -6,12 +6,20 @@ -- Make --continue mode work with --random. -- Handle possible failure of __wgetmainargs on Windows (bug 375). - mpg123-id3dump: Fix up command line arg handling for Windows. +- out123 +-- Finally give zero exit code when generating sounds, not indicating + spurious failure. - build: -- Use CCASFLAGS for assembler tests, to enable builds that enable instruction sets that way (bug 377). -- compat: Map strtok use to strtok_r or strtok_s (MS platforms), if possible. - users only in control_generic and libout123 so far. Out123 itself uses mytok. - Shall fix bug 376 (build with MSVC again). +-- PIC for compat libs (convenience libs used during build) only if building + shared libs (github PR 17 by Wouter Wijsman). +- compat: +-- Map strtok use to strtok_r or strtok_s (MS platforms), if possible. + users only in control_generic and libout123 so far. Out123 itself uses mytok. + Shall fix bug 376 (build with MSVC again). +-- Enable build on PSP by merging in the hotfix of opmitting signal code + (github PR 18 by Wouter Wijsman). - libout123 -- modules/win32: Align waveOutGetDevCapsA to WAVEOUTCAPSA, in anticipation of some UNICODE change. diff --git a/configure b/configure index e4966a2..828c8e2 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.71 for mpg123 1.33.0-dev+20250525022201. +# Generated by GNU Autoconf 2.71 for mpg123 1.33.0-dev+20250607022201. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mpg123' PACKAGE_TARNAME='mpg123' -PACKAGE_VERSION='1.33.0-dev+20250525022201' -PACKAGE_STRING='mpg123 1.33.0-dev+20250525022201' +PACKAGE_VERSION='1.33.0-dev+20250607022201' +PACKAGE_STRING='mpg123 1.33.0-dev+20250607022201' 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.0-dev+20250525022201 to adapt to many kinds of systems. +\`configure' configures mpg123 1.33.0-dev+20250607022201 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.0-dev+20250525022201:";; + short | recursive ) echo "Configuration of mpg123 1.33.0-dev+20250607022201:";; 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.0-dev+20250525022201 +mpg123 configure 1.33.0-dev+20250607022201 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.0-dev+20250525022201, which was +It was created by mpg123 $as_me 1.33.0-dev+20250607022201, 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.0-dev+20250525022201' + VERSION='1.33.0-dev+20250607022201' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -22467,7 +22467,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.0-dev+20250525022201, which was +This file was extended by mpg123 $as_me 1.33.0-dev+20250607022201, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22535,7 +22535,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.0-dev+20250525022201 +mpg123 config.status 1.33.0-dev+20250607022201 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/mpg123.spec b/mpg123.spec index 523b52f..26195e1 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.33.0-dev+20250525022201 +Version: 1.33.0-dev+20250607022201 Release: 1 URL: http://www.mpg123.org/ License: GPL diff --git a/ports/cmake/src/compat/CMakeLists.txt b/ports/cmake/src/compat/CMakeLists.txt index a98eccc..c4b2ec1 100644 --- a/ports/cmake/src/compat/CMakeLists.txt +++ b/ports/cmake/src/compat/CMakeLists.txt @@ -2,12 +2,18 @@ set(TARGET compat) add_library(${TARGET} OBJECT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/compat/compat.c" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/compat/compat_str.c") -set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON) +if(BUILD_SHARED_LIBS) + set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON) +endif() add_library(${TARGET}_dl OBJECT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/compat/compat_dl.c") -set_target_properties(${TARGET}_dl PROPERTIES POSITION_INDEPENDENT_CODE ON) +if(BUILD_SHARED_LIBS) + set_target_properties(${TARGET}_dl PROPERTIES POSITION_INDEPENDENT_CODE ON) +endif() add_library(${TARGET}_str OBJECT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/compat/compat_str.c") -set_target_properties(${TARGET}_str PROPERTIES POSITION_INDEPENDENT_CODE ON) +if(BUILD_SHARED_LIBS) + set_target_properties(${TARGET}_str PROPERTIES POSITION_INDEPENDENT_CODE ON) +endif() diff --git a/src/compat/compat.c b/src/compat/compat.c index 09983ca..7890012 100644 --- a/src/compat/compat.c +++ b/src/compat/compat.c @@ -512,7 +512,7 @@ size_t INT123_unintr_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *st } #ifndef NO_CATCHSIGNAL -#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H) +#if (!defined(WIN32) || defined (__CYGWIN__)) && !defined(__PSP__) && defined(HAVE_SIGNAL_H) void (*INT123_catchsignal(int signum, void(*handler)(int)))(int) { struct sigaction new_sa; diff --git a/src/out123.c b/src/out123.c index d12b914..058df21 100644 --- a/src/out123.c +++ b/src/out123.c @@ -1,7 +1,7 @@ /* out123: stream data from libmpg123 or libsyn123 to an audio output device - copyright 1995-2023 by the mpg123 project, + copyright 1995-2025 by the mpg123 project, free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -1630,7 +1630,10 @@ int main(int sys_argc, char ** sys_argv) } if(strcmp(signal_source, "file")) + { + had_something = 1; generate = TRUE; + } else input = open_next_file(argc, argv, 1); diff --git a/src/version.h b/src/version.h index 3b6e01b..732ee33 100644 --- a/src/version.h +++ b/src/version.h @@ -19,7 +19,7 @@ #define MPG123_PATCH 0 // 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 "-dev+20250525022201" +#define MPG123_SUFFIX "-dev+20250607022201" #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)