mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-27 22:22:02 +00:00
deps: update sndfile to 1.2.0
This commit is contained in:
parent
e6f153dd00
commit
6e80206bc2
6 changed files with 16 additions and 13 deletions
5
deps/sndfile/include/sndfile.h
vendored
5
deps/sndfile/include/sndfile.h
vendored
|
@ -220,8 +220,11 @@ enum
|
||||||
|
|
||||||
SFC_SET_VBR_ENCODING_QUALITY = 0x1300,
|
SFC_SET_VBR_ENCODING_QUALITY = 0x1300,
|
||||||
SFC_SET_COMPRESSION_LEVEL = 0x1301,
|
SFC_SET_COMPRESSION_LEVEL = 0x1301,
|
||||||
|
|
||||||
|
/* Ogg format commands */
|
||||||
SFC_SET_OGG_PAGE_LATENCY_MS = 0x1302,
|
SFC_SET_OGG_PAGE_LATENCY_MS = 0x1302,
|
||||||
SFC_SET_OGG_PAGE_LATENCY = 0x1303,
|
SFC_SET_OGG_PAGE_LATENCY = 0x1303,
|
||||||
|
SFC_GET_OGG_STREAM_SERIALNO = 0x1306,
|
||||||
|
|
||||||
SFC_GET_BITRATE_MODE = 0x1304,
|
SFC_GET_BITRATE_MODE = 0x1304,
|
||||||
SFC_SET_BITRATE_MODE = 0x1305,
|
SFC_SET_BITRATE_MODE = 0x1305,
|
||||||
|
@ -364,7 +367,7 @@ typedef struct sf_private_tag SNDFILE ;
|
||||||
|
|
||||||
typedef int64_t sf_count_t ;
|
typedef int64_t sf_count_t ;
|
||||||
#ifndef SF_COUNT_MAX
|
#ifndef SF_COUNT_MAX
|
||||||
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
|
#define SF_COUNT_MAX INT64_MAX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
set(SndFile_VERSION 1.1.0)
|
set(SndFile_VERSION 1.2.0)
|
||||||
set(SndFile_VERSION_MAJOR 1)
|
set(SndFile_VERSION_MAJOR 1)
|
||||||
set(SndFile_VERSION_MINOR 1)
|
set(SndFile_VERSION_MINOR 2)
|
||||||
set(SndFile_VERSION_PATCH 0)
|
set(SndFile_VERSION_PATCH 0)
|
||||||
|
|
||||||
set (SndFile_WITH_EXTERNAL_LIBS 1)
|
set (SndFile_WITH_EXTERNAL_LIBS 1)
|
||||||
set (SndFile_WITH_MPEG 0)
|
set (SndFile_WITH_MPEG 1)
|
||||||
|
|
||||||
|
|
||||||
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
|
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
|
||||||
|
@ -42,7 +42,7 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT NO)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (SndFile_WITH_MPEG AND NOT NO)
|
if (SndFile_WITH_MPEG AND NOT NO)
|
||||||
find_dependency (Lame)
|
find_dependency (mp3lame)
|
||||||
find_dependency (MPG123)
|
find_dependency (MPG123)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
|
@ -9,19 +9,19 @@
|
||||||
# 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.1.0")
|
set(PACKAGE_VERSION "1.2.0")
|
||||||
|
|
||||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if("1.1.0" MATCHES "^([0-9]+)\\.")
|
if("1.2.0" MATCHES "^([0-9]+)\\.")
|
||||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
set(CVF_VERSION_MAJOR "1.1.0")
|
set(CVF_VERSION_MAJOR "1.2.0")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(PACKAGE_FIND_VERSION_RANGE)
|
if(PACKAGE_FIND_VERSION_RANGE)
|
||||||
|
|
|
@ -55,7 +55,7 @@ add_library(SndFile::sndfile STATIC IMPORTED)
|
||||||
|
|
||||||
set_target_properties(SndFile::sndfile PROPERTIES
|
set_target_properties(SndFile::sndfile PROPERTIES
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:1>:m>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:Vorbis::vorbisenc>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:FLAC::FLAC>>;\$<LINK_ONLY:\$<\$<AND:\$<BOOL:OFF>,\$<BOOL:ON>,\$<BOOL:OFF>>:Speex::Speex>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:Opus::opus>>;\$<LINK_ONLY:\$<\$<BOOL:NO>:MPG123::libmpg123>>;\$<LINK_ONLY:\$<\$<BOOL:NO>:Lame::Lame>>"
|
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:1>:m>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:Vorbis::vorbisenc>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:FLAC::FLAC>>;\$<LINK_ONLY:\$<\$<AND:\$<BOOL:OFF>,\$<BOOL:ON>,\$<BOOL:OFF>>:Speex::Speex>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:Opus::opus>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:MPG123::libmpg123>>;\$<LINK_ONLY:\$<\$<BOOL:ON>:mp3lame::mp3lame>>"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||||
|
|
BIN
deps/sndfile/lib/libsndfile.a
vendored
BIN
deps/sndfile/lib/libsndfile.a
vendored
Binary file not shown.
6
deps/sndfile/lib/pkgconfig/sndfile.pc
vendored
6
deps/sndfile/lib/pkgconfig/sndfile.pc
vendored
|
@ -6,8 +6,8 @@ includedir=${prefix}/include
|
||||||
Name: sndfile
|
Name: sndfile
|
||||||
Description: A library for reading and writing audio files
|
Description: A library for reading and writing audio files
|
||||||
Requires:
|
Requires:
|
||||||
Requires.private: flac ogg vorbis vorbisenc opus
|
Requires.private: flac ogg vorbis vorbisenc opus libmpg123
|
||||||
Version: 1.1.0
|
Version: 1.2.0
|
||||||
Libs: -L${libdir} -lsndfile
|
Libs: -L${libdir} -lsndfile
|
||||||
Libs.private:
|
Libs.private: -lmp3lame
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in a new issue