mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 05:11:49 +00:00
update mpg123 to 1.30.1
This commit is contained in:
parent
016056611f
commit
6c420498c0
6 changed files with 35 additions and 78 deletions
35
deps/mpg123/include/mpg123.h
vendored
35
deps/mpg123/include/mpg123.h
vendored
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
libmpg123: MPEG Audio Decoder library (version 1.29.3)
|
libmpg123: MPEG Audio Decoder library (version 1.30.1)
|
||||||
|
|
||||||
copyright 1995-2015 by the mpg123 project
|
copyright 1995-2015 by the mpg123 project
|
||||||
free software under the terms of the LGPL 2.1
|
free software under the terms of the LGPL 2.1
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
* to the header.
|
* to the header.
|
||||||
*/
|
*/
|
||||||
#ifndef MPG123_API_VERSION
|
#ifndef MPG123_API_VERSION
|
||||||
#define MPG123_API_VERSION 46
|
#define MPG123_API_VERSION 47
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MPG123_EXPORT
|
#ifndef MPG123_EXPORT
|
||||||
|
@ -1093,6 +1093,28 @@ MPG123_EXPORT int mpg123_eq( mpg123_handle *mh
|
||||||
MPG123_EXPORT int mpg123_eq2( mpg123_handle *mh
|
MPG123_EXPORT int mpg123_eq2( mpg123_handle *mh
|
||||||
, int channel, int band, double val );
|
, int channel, int band, double val );
|
||||||
|
|
||||||
|
/** Set a range of equalizer bands
|
||||||
|
* \param channel Can be #MPG123_LEFT, #MPG123_RIGHT or
|
||||||
|
* #MPG123_LEFT|#MPG123_RIGHT for both.
|
||||||
|
* \param a The first equalizer band to set (from 0 to 31)
|
||||||
|
* \param b The last equalizer band to set (from 0 to 31)
|
||||||
|
* \param factor The (linear) adjustment factor, 1 being neutral.
|
||||||
|
* \return MPG123_OK on success
|
||||||
|
*/
|
||||||
|
MPG123_EXPORT int mpg123_eq_bands( mpg123_handle *mh
|
||||||
|
, int channel, int a, int b, double factor );
|
||||||
|
|
||||||
|
/** Change a range of equalizer bands
|
||||||
|
* \param channel Can be #MPG123_LEFT, #MPG123_RIGHT or
|
||||||
|
* #MPG123_LEFT|#MPG123_RIGHT for both.
|
||||||
|
* \param a The first equalizer band to change (from 0 to 31)
|
||||||
|
* \param b The last equalizer band to change (from 0 to 31)
|
||||||
|
* \param db The adjustment in dB (limited to +/- 60 dB).
|
||||||
|
* \return MPG123_OK on success
|
||||||
|
*/
|
||||||
|
MPG123_EXPORT int mpg123_eq_change( mpg123_handle *mh
|
||||||
|
, int channel, int a, int b, double db );
|
||||||
|
|
||||||
#ifdef MPG123_ENUM_API
|
#ifdef MPG123_ENUM_API
|
||||||
/** Get the 32 Band Audio Equalizer settings.
|
/** Get the 32 Band Audio Equalizer settings.
|
||||||
*
|
*
|
||||||
|
@ -1141,6 +1163,13 @@ MPG123_EXPORT int mpg123_volume(mpg123_handle *mh, double vol);
|
||||||
*/
|
*/
|
||||||
MPG123_EXPORT int mpg123_volume_change(mpg123_handle *mh, double change);
|
MPG123_EXPORT int mpg123_volume_change(mpg123_handle *mh, double change);
|
||||||
|
|
||||||
|
/** Adjust output volume including the RVA setting by chosen amount
|
||||||
|
* \param mh handle
|
||||||
|
* \param change volume adjustment in decibels (limited to +/- 60 dB)
|
||||||
|
* \return MPG123_OK on success
|
||||||
|
*/
|
||||||
|
MPG123_EXPORT int mpg123_volume_change_db(mpg123_handle *mh, double db);
|
||||||
|
|
||||||
/** Return current volume setting, the actual value due to RVA, and the RVA
|
/** Return current volume setting, the actual value due to RVA, and the RVA
|
||||||
* adjustment itself. It's all as double float value to abstract the sample
|
* adjustment itself. It's all as double float value to abstract the sample
|
||||||
* format. The volume values are linear factors / amplitudes (not percent)
|
* format. The volume values are linear factors / amplitudes (not percent)
|
||||||
|
@ -1741,7 +1770,7 @@ MPG123_EXPORT int mpg123_id3( mpg123_handle *mh
|
||||||
, mpg123_id3v1 **v1, mpg123_id3v2 **v2 );
|
, mpg123_id3v1 **v1, mpg123_id3v2 **v2 );
|
||||||
|
|
||||||
/** Return pointers to and size of stored raw ID3 data if storage has
|
/** Return pointers to and size of stored raw ID3 data if storage has
|
||||||
* been configured with MPG123_RAW_ID3 and stream parsing passed the
|
* been configured with MPG123_STORE_RAW_ID3 and stream parsing passed the
|
||||||
* metadata already. Null value with zero size is a possibility!
|
* metadata already. Null value with zero size is a possibility!
|
||||||
* The storage can change at any next API call.
|
* The storage can change at any next API call.
|
||||||
*
|
*
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
set(PACKAGE_VERSION "1.29.3")
|
set(PACKAGE_VERSION "1.30.1")
|
||||||
|
|
||||||
if (PACKAGE_FIND_VERSION_RANGE)
|
if (PACKAGE_FIND_VERSION_RANGE)
|
||||||
# Package version must be in the requested version range
|
# Package version must be in the requested version range
|
||||||
|
|
|
@ -15,49 +15,5 @@ set_target_properties(MPG123::libmpg123 PROPERTIES
|
||||||
list(APPEND _IMPORT_CHECK_TARGETS MPG123::libmpg123 )
|
list(APPEND _IMPORT_CHECK_TARGETS MPG123::libmpg123 )
|
||||||
list(APPEND _IMPORT_CHECK_FILES_FOR_MPG123::libmpg123 "${_IMPORT_PREFIX}/lib/libmpg123.a" )
|
list(APPEND _IMPORT_CHECK_FILES_FOR_MPG123::libmpg123 "${_IMPORT_PREFIX}/lib/libmpg123.a" )
|
||||||
|
|
||||||
# Import target "MPG123::libout123" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::libout123 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::libout123 PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libout123.a"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Import target "MPG123::libsyn123" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::libsyn123 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::libsyn123 PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libsyn123.a"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Import target "MPG123::mpg123" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::mpg123 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::mpg123 PROPERTIES
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/mpg123"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Import target "MPG123::out123" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::out123 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::out123 PROPERTIES
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/out123"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Import target "MPG123::mpg123-id3dump" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::mpg123-id3dump APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::mpg123-id3dump PROPERTIES
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/mpg123-id3dump"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Import target "MPG123::mpg123-strip" for configuration "Release"
|
|
||||||
set_property(TARGET MPG123::mpg123-strip APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(MPG123::mpg123-strip PROPERTIES
|
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/mpg123-strip"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Commands beyond this point should not need to know the version.
|
# Commands beyond this point should not need to know the version.
|
||||||
set(CMAKE_IMPORT_FILE_VERSION)
|
set(CMAKE_IMPORT_FILE_VERSION)
|
||||||
|
|
30
deps/mpg123/lib/cmake/mpg123/targets.cmake
vendored
30
deps/mpg123/lib/cmake/mpg123/targets.cmake
vendored
|
@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||||
set(_targetsDefined)
|
set(_targetsDefined)
|
||||||
set(_targetsNotDefined)
|
set(_targetsNotDefined)
|
||||||
set(_expectedTargets)
|
set(_expectedTargets)
|
||||||
foreach(_expectedTarget MPG123::libmpg123 MPG123::libout123 MPG123::libsyn123 MPG123::mpg123 MPG123::out123 MPG123::mpg123-id3dump MPG123::mpg123-strip)
|
foreach(_expectedTarget MPG123::libmpg123)
|
||||||
list(APPEND _expectedTargets ${_expectedTarget})
|
list(APPEND _expectedTargets ${_expectedTarget})
|
||||||
if(NOT TARGET ${_expectedTarget})
|
if(NOT TARGET ${_expectedTarget})
|
||||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
list(APPEND _targetsNotDefined ${_expectedTarget})
|
||||||
|
@ -58,34 +58,6 @@ set_target_properties(MPG123::libmpg123 PROPERTIES
|
||||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:1>:m>>;\$<LINK_ONLY:\$<\$<BOOL:>:shlwapi>>"
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:1>:m>>;\$<LINK_ONLY:\$<\$<BOOL:>:shlwapi>>"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create imported target MPG123::libout123
|
|
||||||
add_library(MPG123::libout123 STATIC IMPORTED)
|
|
||||||
|
|
||||||
set_target_properties(MPG123::libout123 PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
||||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<TARGET_NAME_IF_EXISTS:defaultmodule>>;\$<LINK_ONLY:\$<\$<BOOL:1>:dl>>;\$<LINK_ONLY:\$<\$<BOOL:>:shlwapi>>"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create imported target MPG123::libsyn123
|
|
||||||
add_library(MPG123::libsyn123 STATIC IMPORTED)
|
|
||||||
|
|
||||||
set_target_properties(MPG123::libsyn123 PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
||||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:>:shlwapi>>"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create imported target MPG123::mpg123
|
|
||||||
add_executable(MPG123::mpg123 IMPORTED)
|
|
||||||
|
|
||||||
# Create imported target MPG123::out123
|
|
||||||
add_executable(MPG123::out123 IMPORTED)
|
|
||||||
|
|
||||||
# Create imported target MPG123::mpg123-id3dump
|
|
||||||
add_executable(MPG123::mpg123-id3dump IMPORTED)
|
|
||||||
|
|
||||||
# Create imported target MPG123::mpg123-strip
|
|
||||||
add_executable(MPG123::mpg123-strip IMPORTED)
|
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||||
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
|
||||||
endif()
|
endif()
|
||||||
|
|
BIN
deps/mpg123/lib/libmpg123.a
vendored
BIN
deps/mpg123/lib/libmpg123.a
vendored
Binary file not shown.
2
deps/mpg123/lib/pkgconfig/libmpg123.pc
vendored
2
deps/mpg123/lib/pkgconfig/libmpg123.pc
vendored
|
@ -6,7 +6,7 @@ includedir=${prefix}/include
|
||||||
Name: libmpg123
|
Name: libmpg123
|
||||||
Description: An optimised MPEG Audio decoder
|
Description: An optimised MPEG Audio decoder
|
||||||
Requires:
|
Requires:
|
||||||
Version: 1.29.3
|
Version: 1.30.1
|
||||||
Libs: -L${libdir} -lmpg123
|
Libs: -L${libdir} -lmpg123
|
||||||
Libs.private:
|
Libs.private:
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in a new issue