diff --git a/deps/mpg123/include/mpg123.h b/deps/mpg123/include/mpg123.h index c7f8ecc8..9338d12c 100644 --- a/deps/mpg123/include/mpg123.h +++ b/deps/mpg123/include/mpg123.h @@ -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 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_MOREINFO /**< more info extraction (for frame analyzer) */ ,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 diff --git a/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake b/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake index 48a7a834..ba7215b2 100644 --- a/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake +++ b/deps/mpg123/lib/cmake/mpg123/mpg123-config-version.cmake @@ -7,14 +7,25 @@ # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. # 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) - set(PACKAGE_VERSION_COMPATIBLE FALSE) +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) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) + if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/deps/mpg123/lib/cmake/mpg123/targets.cmake b/deps/mpg123/lib/cmake/mpg123/targets.cmake index 7051daff..50f3dffa 100644 --- a/deps/mpg123/lib/cmake/mpg123/targets.cmake +++ b/deps/mpg123/lib/cmake/mpg123/targets.cmake @@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6...3.17) +cmake_policy(VERSION 2.6...3.19) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/deps/mpg123/lib/libmpg123.a b/deps/mpg123/lib/libmpg123.a index 1594b59b..e0dbf4e3 100644 Binary files a/deps/mpg123/lib/libmpg123.a and b/deps/mpg123/lib/libmpg123.a differ diff --git a/deps/mpg123/lib/pkgconfig/libmpg123.pc b/deps/mpg123/lib/pkgconfig/libmpg123.pc index 1c3591c0..9419788d 100644 --- a/deps/mpg123/lib/pkgconfig/libmpg123.pc +++ b/deps/mpg123/lib/pkgconfig/libmpg123.pc @@ -6,7 +6,7 @@ includedir=${prefix}/include Name: libmpg123 Description: An optimised MPEG Audio decoder Requires: -Version: 1.28.2 +Version: 1.29.0 Libs: -L${libdir} -lmpg123 Libs.private: Cflags: -I${includedir}