mpg123-1.32.7

NEWS

@@ -1,3 +1,9 @@
+1.32.7
+------
+- ports/cmake: Work around bug in CMake that does not detect FPU on
+  Apple ARM CPUs (github PR 14).
+- Fix some laziness (func() to func(void)) for standards conformance.
+
 1.32.6
 ------
 - build: Detect forced 64 bit offsets on a dual-mode system that used

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.32.6.
+# Generated by GNU Autoconf 2.71 for mpg123 1.32.7.
 #
 # Report bugs to <maintainer@mpg123.org>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mpg123'
 PACKAGE_TARNAME='mpg123'
-PACKAGE_VERSION='1.32.6'
-PACKAGE_STRING='mpg123 1.32.6'
+PACKAGE_VERSION='1.32.7'
+PACKAGE_STRING='mpg123 1.32.7'
 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.32.6 to adapt to many kinds of systems.
+\`configure' configures mpg123 1.32.7 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.32.6:";;
+     short | recursive ) echo "Configuration of mpg123 1.32.7:";;
    esac
   cat <<\_ACEOF
 
@@ -2076,7 +2076,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mpg123 configure 1.32.6
+mpg123 configure 1.32.7
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2621,7 +2621,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.32.6, which was
+It was created by mpg123 $as_me 1.32.7, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3991,7 +3991,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mpg123'
- VERSION='1.32.6'
+ VERSION='1.32.7'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22453,7 +22453,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.32.6, which was
+This file was extended by mpg123 $as_me 1.32.7, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22521,7 +22521,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.32.6
+mpg123 config.status 1.32.7
 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.32.6
+Version:	1.32.7
 Release:	1
 URL:		http://www.mpg123.org/
 License:	GPL

ports/cmake/src/CMakeLists.txt

@@ -180,7 +180,13 @@ if(NO_MESSAGES)
     set(NO_ERETURN ON)
 endif()
 
-if(WIN32)
+include(../cmake/CheckCPUArch.cmake)
+check_cpu_arch_x86(ARCH_IS_X86)
+check_cpu_arch_x64(ARCH_IS_X64)
+check_cpu_arch_arm32(ARCH_IS_ARM32)
+check_cpu_arch_arm64(ARCH_IS_ARM64)
+
+if(WIN32 OR (ARCH_IS_ARM64 AND APPLE))
     set(HAVE_FPU 1)
 else()
     cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU)

ports/cmake/src/libmpg123/CMakeLists.txt

@@ -7,8 +7,6 @@ endif()
 
 include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libmpg123/")
 
-include(../../cmake/CheckCPUArch.cmake)
-
 if(HAVE_STDLIB_H)
     set(INCLUDE_STDLIB_H "#include <stdlib.h>")
 else()
@@ -21,10 +19,6 @@ else()
 endif()
 
 
-check_cpu_arch_x86(ARCH_IS_X86)
-check_cpu_arch_x64(ARCH_IS_X64)
-check_cpu_arch_arm32(ARCH_IS_ARM32)
-check_cpu_arch_arm64(ARCH_IS_ARM64)
 
 # PPC with AltiVec is missing. But probably obsolete enough for CMake users.
 

src/common.c

@@ -451,7 +451,7 @@ void print_stat(mpg123_handle *fr, long offset, out123_handle *ao, int draw_bar
 		free(line);
 }
 
-void clear_stat()
+void clear_stat(void)
 {
 	int len = term_width(STDERR_FILENO);
 	if(len > 0)

src/common.h

@@ -26,7 +26,7 @@ void print_header_compact(mpg123_handle *);
 void print_stat(mpg123_handle *fr, long offset, out123_handle *ao, int draw_bar
 ,	struct parameter *param);
 void print_buf(const char* prefix, out123_handle *ao);
-void clear_stat();
+void clear_stat(void);
 // input: decoder and output handle, frame offset
 // output: frames, frames_remain, seconds, seconds_remain, seconds_buffered, seconds_total
 int position_info( mpg123_handle *, off_t, out123_handle *,  off_t *, off_t *, double *, double *, double *, double *);

src/httpget.c

@@ -291,7 +291,7 @@ int translate_url(const char *url, mpg123_string *purl)
 	 * 2000-10-21:
 	 * We would like spaces to be automatically converted to %20's when
 	 * fetching via HTTP.
-	 * -- Martin Sjögren <md9ms@mdstud.chalmers.se>
+	 * -- Martin Sjoegren <md9ms@mdstud.chalmers.se>
 	 * Hm, why only spaces? Maybe one should do this http stuff more properly...
 	 */
 	if ((sptr = strchr(url, ' ')) == NULL)

src/libmpg123/lfs_wrap.c

@@ -207,7 +207,7 @@ static struct wrap_data* wrap_get(mpg123_handle *mh, int force_alloc)
 
 /* 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

src/libmpg123/readers.c

@@ -732,7 +732,7 @@ static void bc_forget(struct bufferchain *bc)
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
-		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);
 
 		bc_free(bc, b);

src/mpg123.c

@@ -178,7 +178,7 @@ static size_t prebuffer_size = 0;
 static size_t prebuffer_fill = 0;
 static size_t minbytes = 0;
 
-void set_intflag()
+void set_intflag(void)
 {
 	debug("set_intflag TRUE");
 	intflag = TRUE;

src/mpg123app.h

@@ -148,7 +148,7 @@ extern int playlimit;
 #endif
 
 /* why extern? */
-void play_prebuffer();
+void play_prebuffer(void);
 extern int play_frame(void);
 
 extern int control_generic(mpg123_handle *fr);

src/playlist.c

@@ -300,7 +300,7 @@ static void init_playlist(void)
 	pl.stdin_used = FALSE;
 }
 
-int playlist_stdin()
+int playlist_stdin(void)
 {
 	return pl.stdin_used;
 }

src/playlist.h

@@ -13,7 +13,7 @@
 /* create playlist from argv including reading of playlist file */
 void prepare_playlist(int argc, char** argv, int args_utf8, int *is_utf8);
 /* Return TRUE if standard put is used up by the playlist. */
-int playlist_stdin();
+int playlist_stdin(void);
 /* returns the next url to play or NULL when there is none left */
 char *get_next_file(void);
 /* Get current track number, optionally the total count and loop counter. */

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