mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 05:11:49 +00:00
update mpg123 to 1.29.0
This commit is contained in:
parent
ce3814a21a
commit
41a7f8cac3
5 changed files with 21 additions and 10 deletions
4
deps/mpg123/include/mpg123.h
vendored
4
deps/mpg123/include/mpg123.h
vendored
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
libmpg123: MPEG Audio Decoder library (version 1.28.2)
|
libmpg123: MPEG Audio Decoder library (version 1.29.0)
|
||||||
|
|
||||||
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
|
||||||
|
@ -398,7 +398,7 @@ enum mpg123_feature_set
|
||||||
,MPG123_FEATURE_EQUALIZER /**< tunable equalizer */
|
,MPG123_FEATURE_EQUALIZER /**< tunable equalizer */
|
||||||
,MPG123_FEATURE_MOREINFO /**< more info extraction (for frame analyzer) */
|
,MPG123_FEATURE_MOREINFO /**< more info extraction (for frame analyzer) */
|
||||||
,MPG123_FEATURE_OUTPUT_FLOAT32 /**< 32 bit float output */
|
,MPG123_FEATURE_OUTPUT_FLOAT32 /**< 32 bit float output */
|
||||||
,MPG123_FEATURE_OUTPUT_FLOAT64 /**< 64 bit float output (usually never) */
|
,MPG123_FEATURE_OUTPUT_FLOAT64 /**< 64 bit float output (as of now: never!) */
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef MPG123_ENUM_API
|
#ifdef MPG123_ENUM_API
|
||||||
|
|
|
@ -7,15 +7,26 @@
|
||||||
# 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.28.2")
|
set(PACKAGE_VERSION "1.29.0")
|
||||||
|
|
||||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
if (PACKAGE_FIND_VERSION_RANGE)
|
||||||
|
# Package version must be in the requested version range
|
||||||
|
if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
|
||||||
|
OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
|
||||||
|
OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
|
else()
|
||||||
|
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
|
else()
|
||||||
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||||
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
|
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
|
||||||
set(PACKAGE_VERSION_EXACT TRUE)
|
set(PACKAGE_VERSION_EXACT TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
2
deps/mpg123/lib/cmake/mpg123/targets.cmake
vendored
2
deps/mpg123/lib/cmake/mpg123/targets.cmake
vendored
|
@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
|
||||||
message(FATAL_ERROR "CMake >= 2.6.0 required")
|
message(FATAL_ERROR "CMake >= 2.6.0 required")
|
||||||
endif()
|
endif()
|
||||||
cmake_policy(PUSH)
|
cmake_policy(PUSH)
|
||||||
cmake_policy(VERSION 2.6...3.17)
|
cmake_policy(VERSION 2.6...3.19)
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
# Generated CMake target import file.
|
# Generated CMake target import file.
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
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.28.2
|
Version: 1.29.0
|
||||||
Libs: -L${libdir} -lmpg123
|
Libs: -L${libdir} -lmpg123
|
||||||
Libs.private:
|
Libs.private:
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in a new issue