[mpg123] Upgrade to 1.29.2 (#21565)

* [mpg123] Upgrade to 1.29.2

* Upgrade 1.28.0 -> 1.29.2
* Avoid deprecated helper functions
* Remove unused patches

* Convert patch format

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
evpobr 2021-11-23 04:48:32 +05:00 committed by GitHub
parent 14303696a3
commit e48805d02b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 378 deletions

View File

@ -1,13 +0,0 @@
diff --git a/ports/cmake/cmake/CheckCPUArch.cmake b/ports/cmake/cmake/CheckCPUArch.cmake
index 84dab8a..925aa09 100644
--- a/ports/cmake/cmake/CheckCPUArch.cmake
+++ b/ports/cmake/cmake/CheckCPUArch.cmake
@@ -2,7 +2,7 @@ macro(_CHECK_CPU_ARCH ARCH ARCH_DEFINES VARIABLE)
if(NOT DEFINED HAVE_${VARIABLE})
message(STATUS "Check CPU architecture is ${ARCH}")
set(CHECK_CPU_ARCH_DEFINES ${ARCH_DEFINES})
- configure_file(${PROJECT_SOURCE_DIR}/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY)
+ configure_file(${PROJECT_SOURCE_DIR}/cmake/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY)
try_compile(HAVE_${VARIABLE} "${PROJECT_BINARY_DIR}"
"${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c")
if(HAVE_${VARIABLE})

View File

@ -1,21 +0,0 @@
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index b843152..b8ff89b 100644
--- a/ports/cmake/src/CMakeLists.txt
+++ b/ports/cmake/src/CMakeLists.txt
@@ -39,8 +39,6 @@ check_include_file("termios.h" HAVE_TERMIOS)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("windows.h" HAVE_WINDOWS_H)
-check_symbol_exists(strerror "string.h" HAVE_STRERROR)
-
function(check_m)
set(CMAKE_REQUIRED_LIBRARIES m)
check_function_exists(sin HAVE_M)
@@ -59,6 +57,7 @@ check_function_exists(shmget HAVE_SHMGET)
check_function_exists(shmat HAVE_SHMAT)
check_function_exists(shmdt HAVE_SHMDT)
check_function_exists(shmctl HAVE_SHMCTL)
+check_function_exists(strerror HAVE_STRERROR)
search_libs(gethostbyname GETHOSTBYNAME_LIB nsl socket network)
search_libs(socket SOCKET_LIB socket)

View File

@ -1,266 +0,0 @@
diff --git a/ports/cmake/CMakeLists.txt b/ports/cmake/CMakeLists.txt
index b5008da..8e6309a 100644
--- a/ports/cmake/CMakeLists.txt
+++ b/ports/cmake/CMakeLists.txt
@@ -5,6 +5,13 @@ read_api_version(MPG123_VERSION API_VERSION OUTAPI_VERSION SYNAPI_VERSION)
project(mpg123 VERSION ${MPG123_VERSION} LANGUAGES C ASM)
+option(BUILD_LIBOUT123 "build libout123" ON)
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ message(WARNING "Output module is not implemented for '${CMAKE_SYSTEM_NAME}' platform.")
+ message(WARNING "To prevent build errors 'BUILD_LIBOUT123' option is set to OFF.")
+ set(BUILD_LIBOUT123 OFF)
+endif()
+
include(cmake/search_libs.cmake)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
@@ -34,17 +41,28 @@ set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libmpg123.pc.in" libmpg123.pc @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY)
+if(BUILD_LIBOUT123)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY)
+endif()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libsyn123.pc.in" libsyn123.pc @ONLY)
install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/libmpg123.pc"
- "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc"
"${CMAKE_CURRENT_BINARY_DIR}/libsyn123.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
install(
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/../../man1/mpg123.1"
- "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1"
DESTINATION "${CMAKE_INSTALL_MANDIR}")
+
+if(BUILD_LIBOUT123)
+ install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(
+ FILES
+ "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1"
+ DESTINATION "${CMAKE_INSTALL_MANDIR}")
+endif()
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index b843152..3945c7e 100644
--- a/ports/cmake/src/CMakeLists.txt
+++ b/ports/cmake/src/CMakeLists.txt
@@ -194,112 +194,114 @@ endif()
# Modules
-if(CHECK_MODULES)
- list(FIND CHECK_MODULES alsa ALSA_REQUIRED)
- list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED)
- list(FIND CHECK_MODULES pulse PULSE_REQUIRED)
- list(FIND CHECK_MODULES jack JACK_REQUIRED)
- list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED)
- list(FIND CHECK_MODULES win32 WIN32_REQUIRED)
- list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED)
- set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found")
-endif()
-
-if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1)
- find_package(ALSA)
- if(TARGET ALSA::ALSA)
- list(APPEND OUTPUT_MODULES alsa)
- elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1)
- message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}")
+if(BUILD_LIBOUT123)
+ if(CHECK_MODULES)
+ list(FIND CHECK_MODULES alsa ALSA_REQUIRED)
+ list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED)
+ list(FIND CHECK_MODULES pulse PULSE_REQUIRED)
+ list(FIND CHECK_MODULES jack JACK_REQUIRED)
+ list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED)
+ list(FIND CHECK_MODULES win32 WIN32_REQUIRED)
+ list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED)
+ set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found")
endif()
-endif()
-if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1)
- if(APPLE)
- find_library(AUDIO_TOOLBOX AudioToolbox)
- list(APPEND OUTPUT_MODULES coreaudio)
- elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1)
- message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}")
+ if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1)
+ find_package(ALSA)
+ if(TARGET ALSA::ALSA)
+ list(APPEND OUTPUT_MODULES alsa)
+ elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
endif()
-endif()
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
- if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1)
- pkg_search_module(PULSE libpulse-simple)
- if(PULSE_FOUND)
- list(APPEND OUTPUT_MODULES pulse)
- elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1)
- message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}")
+ if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1)
+ if(APPLE)
+ find_library(AUDIO_TOOLBOX AudioToolbox)
+ list(APPEND OUTPUT_MODULES coreaudio)
+ elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}")
endif()
endif()
- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1)
- pkg_search_module(JACK jack)
- if(JACK_FOUND)
- list(APPEND OUTPUT_MODULES jack)
- elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1)
- message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}")
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+ if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1)
+ pkg_search_module(PULSE libpulse-simple)
+ if(PULSE_FOUND)
+ list(APPEND OUTPUT_MODULES pulse)
+ elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
+ endif()
+
+ if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1)
+ pkg_search_module(JACK jack)
+ if(JACK_FOUND)
+ list(APPEND OUTPUT_MODULES jack)
+ elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
endif()
- endif()
- if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1)
- pkg_search_module(TINYALSA tinyalsa)
- if(TINYALSA_FOUND)
- list(APPEND OUTPUT_MODULES tinyalsa)
- elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1)
- message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}")
+ if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1)
+ pkg_search_module(TINYALSA tinyalsa)
+ if(TINYALSA_FOUND)
+ list(APPEND OUTPUT_MODULES tinyalsa)
+ elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
endif()
endif()
-endif()
-if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1)
- if(HAVE_WINDOWS_H)
- set(WIN32_LIBRARIES winmm)
- list(APPEND OUTPUT_MODULES win32)
- elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1)
- message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}")
+ if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1)
+ if(HAVE_WINDOWS_H)
+ set(WIN32_LIBRARIES winmm)
+ list(APPEND OUTPUT_MODULES win32)
+ elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
endif()
-endif()
-if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1)
- set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h")
- check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI)
- if(HAVE_WASAPI)
- set(WIN32_WASAPI_LIBRARIES ole32 avrt)
- list(APPEND OUTPUT_MODULES win32_wasapi)
- elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1)
- message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}")
+ if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1)
+ set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h")
+ check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI)
+ if(HAVE_WASAPI)
+ set(WIN32_WASAPI_LIBRARIES ole32 avrt)
+ list(APPEND OUTPUT_MODULES win32_wasapi)
+ elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1)
+ message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}")
+ endif()
endif()
-endif()
-if(CHECK_MODULES)
- list(REMOVE_AT CHECK_MODULES
- ${ALSA_REQUIRED}
- ${COREAUDIO_REQUIRED}
- ${PULSE_REQUIRED}
- ${JACK_REQUIRED}
- ${TINYALSA_REQUIRED}
- ${WIN32_REQUIRED}
- ${WIN32_WASAPI_REQUIRED})
- list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH)
- if(NOT CHECK_MODULES_LENGTH EQUAL 0)
- message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}")
+ if(CHECK_MODULES)
+ list(REMOVE_AT CHECK_MODULES
+ ${ALSA_REQUIRED}
+ ${COREAUDIO_REQUIRED}
+ ${PULSE_REQUIRED}
+ ${JACK_REQUIRED}
+ ${TINYALSA_REQUIRED}
+ ${WIN32_REQUIRED}
+ ${WIN32_WASAPI_REQUIRED})
+ list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH)
+ if(NOT CHECK_MODULES_LENGTH EQUAL 0)
+ message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}")
+ endif()
endif()
-endif()
-if(NOT OUTPUT_MODULES)
- set(DEFAULT_OUTPUT_MODULE dummy)
- set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
-else()
- list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE)
- set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module")
- if(BUILD_SHARED_LIBS)
- string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}")
- else()
+ if(NOT OUTPUT_MODULES)
+ set(DEFAULT_OUTPUT_MODULE dummy)
set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
+ else()
+ list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE)
+ set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module")
+ if(BUILD_SHARED_LIBS)
+ string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}")
+ else()
+ set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
+ endif()
+ set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES})
endif()
- set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES})
endif()
option(ACCURATE_ROUNDING "use rounding instead of fast truncation for integer output, where possible" ON)
@@ -362,7 +364,9 @@ add_compile_options(
add_subdirectory("compat")
add_subdirectory("libmpg123")
-add_subdirectory("libout123")
+if(BUILD_LIBOUT123)
+ add_subdirectory("libout123")
+endif()
add_subdirectory("libsyn123")
if(0)

View File

@ -1,52 +0,0 @@
diff --git a/src/libmpg123/sample.h b/src/libmpg123/sample.h
index 4d244fe..ed3ef86 100644
--- a/src/libmpg123/sample.h
+++ b/src/libmpg123/sample.h
@@ -171,7 +171,7 @@ static inline int16_t ftoi16(float x)
( (u >= 2147483648UL) \
? (int32_t)((uint32_t)u - (uint32_t)2147483648UL) \
: ((u == 0) \
- ? (int32_t)-2147483648UL \
+ ? -(int32_t)2147483648UL \
: -(int32_t)((uint32_t)2147483648UL - u) ) \
)
diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c
index b92f7f2..3552ffa 100644
--- a/src/libsyn123/resample.c
+++ b/src/libsyn123/resample.c
@@ -2005,7 +2005,7 @@ syn123_resample_intotal_64(long inrate, long outrate, int64_t outs)
// First offset is -inrate.
// You may want to work it out for yourself. Or trust me;-)
int err;
- uint64_t vtot = muloffdiv64(outs, vinrate, -vinrate, voutrate, &err, NULL);
+ uint64_t vtot = muloffdiv64(outs, vinrate, -(int64_t)vinrate, voutrate, &err, NULL);
if(err)
return SYN123_OVERFLOW;
if(vtot == UINT64_MAX)
diff --git a/src/libsyn123/sampleconv.c b/src/libsyn123/sampleconv.c
index 6e8fb3f..7179957 100644
--- a/src/libsyn123/sampleconv.c
+++ b/src/libsyn123/sampleconv.c
@@ -21,6 +21,8 @@
#include "syn123_int.h"
#include "sample.h"
#include "debug.h"
+// Avoid conflict with pragmas in isnan() and friends.
+#undef warning
/* Conversions between native byte order encodings. */
diff --git a/src/libsyn123/volume.c b/src/libsyn123/volume.c
index de018a2..a80851d 100644
--- a/src/libsyn123/volume.c
+++ b/src/libsyn123/volume.c
@@ -12,6 +12,8 @@
#define NO_SMAX
#include "syn123_int.h"
#include "debug.h"
+// Avoid conflict with pragmas in isnan() and friends.
+#undef warning
static const double db_min = -SYN123_DB_LIMIT;
static const double db_max = SYN123_DB_LIMIT;

View File

@ -1,13 +1,13 @@
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index b843152..00f8012 100644
index c7ba36f..7147174 100644
--- a/ports/cmake/src/CMakeLists.txt
+++ b/ports/cmake/src/CMakeLists.txt
@@ -365,7 +365,7 @@ add_subdirectory("libmpg123")
add_subdirectory("libout123")
@@ -372,7 +372,7 @@ if(BUILD_LIBOUT123)
endif()
add_subdirectory("libsyn123")
-if(UNIX)
+if(0)
add_subdirectory("tests")
add_executable(${PROJECT_NAME}
if(BUILD_LIBOUT123)

View File

@ -1,14 +1,5 @@
set(MPG123_VERSION 1.28.0)
set(MPG123_HASH 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77)
set(PATCHES "")
if(VCPKG_TARGET_IS_UWP)
set(PATCHES
0002-fix-libmpg123-uwp-build.patch
0003-fix-libout123-uwp-build.patch
0004-fix-libsyn123-uwp-build.patch
)
endif()
set(MPG123_VERSION 1.29.2)
set(MPG123_HASH ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0)
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
@ -16,21 +7,18 @@ vcpkg_from_sourceforge(
REF ${MPG123_VERSION}
FILENAME "mpg123-${MPG123_VERSION}.tar.bz2"
SHA512 ${MPG123_HASH}
PATCHES
0001-fix-checkcpuarch-path.patch
no-executables.patch
${PATCHES}
PATCHES no-executables.patch
)
include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
yasm_tool_helper(APPEND_TO_PATH)
vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}/ports/cmake
OPTIONS -DUSE_MODULES=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

View File

@ -1,10 +1,17 @@
{
"name": "mpg123",
"version": "1.28.0",
"port-version": 1,
"version": "1.29.2",
"description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).",
"homepage": "https://sourceforge.net/projects/mpg123/",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"yasm-tool-helper"
]
}

View File

@ -4497,8 +4497,8 @@
"port-version": 1
},
"mpg123": {
"baseline": "1.28.0",
"port-version": 1
"baseline": "1.29.2",
"port-version": 0
},
"mpi": {
"baseline": "1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c",
"version": "1.29.2",
"port-version": 0
},
{
"git-tree": "fe2d74c3ff7d3dc66eaaf61d64a950c566798dcd",
"version": "1.28.0",