mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 14:41:43 +00:00
update flac to 1.3.4
This commit is contained in:
parent
bd0c8a7b02
commit
49fbddb861
8 changed files with 29 additions and 47 deletions
6
deps/flac/include/FLAC/all.h
vendored
6
deps/flac/include/FLAC/all.h
vendored
|
@ -147,7 +147,7 @@
|
|||
* library.
|
||||
*
|
||||
* Also, there are several places in the libFLAC code with comments marked
|
||||
* with "OPT:" where a #define can be changed to enable code that might be
|
||||
* with "OPT:" where a \#define can be changed to enable code that might be
|
||||
* faster on a specific platform. Experimenting with these can yield faster
|
||||
* binaries.
|
||||
*/
|
||||
|
@ -159,9 +159,9 @@
|
|||
* the libraries to newer versions of FLAC.
|
||||
*
|
||||
* One simple facility for making porting easier that has been added
|
||||
* in FLAC 1.1.3 is a set of \c #defines in \c export.h of each
|
||||
* in FLAC 1.1.3 is a set of \#defines in \c export.h of each
|
||||
* library's includes (e.g. \c include/FLAC/export.h). The
|
||||
* \c #defines mirror the libraries'
|
||||
* \#defines mirror the libraries'
|
||||
* <A HREF="http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning">libtool version numbers</A>,
|
||||
* e.g. in libFLAC there are \c FLAC_API_VERSION_CURRENT,
|
||||
* \c FLAC_API_VERSION_REVISION, and \c FLAC_API_VERSION_AGE.
|
||||
|
|
8
deps/flac/include/FLAC/export.h
vendored
8
deps/flac/include/FLAC/export.h
vendored
|
@ -36,7 +36,7 @@
|
|||
/** \file include/FLAC/export.h
|
||||
*
|
||||
* \brief
|
||||
* This module contains #defines and symbols for exporting function
|
||||
* This module contains \#defines and symbols for exporting function
|
||||
* calls, and providing version information and compiled-in features.
|
||||
*
|
||||
* See the \link flac_export export \endlink module.
|
||||
|
@ -46,7 +46,7 @@
|
|||
* \ingroup flac
|
||||
*
|
||||
* \brief
|
||||
* This module contains #defines and symbols for exporting function
|
||||
* This module contains \#defines and symbols for exporting function
|
||||
* calls, and providing version information and compiled-in features.
|
||||
*
|
||||
* If you are compiling with MSVC and will link to the static library
|
||||
|
@ -59,7 +59,7 @@
|
|||
#if defined(FLAC__NO_DLL)
|
||||
#define FLAC_API
|
||||
|
||||
#elif defined(_MSC_VER)
|
||||
#elif defined(_WIN32)
|
||||
#ifdef FLAC_API_EXPORTS
|
||||
#define FLAC_API __declspec(dllexport)
|
||||
#else
|
||||
|
@ -74,7 +74,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
/** These #defines will mirror the libtool-based library version number, see
|
||||
/** These \#defines will mirror the libtool-based library version number, see
|
||||
* http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
|
||||
*/
|
||||
#define FLAC_API_VERSION_CURRENT 11
|
||||
|
|
26
deps/flac/lib/cmake/FLAC/FindOGG.cmake
vendored
26
deps/flac/lib/cmake/FLAC/FindOGG.cmake
vendored
|
@ -1,26 +0,0 @@
|
|||
find_package(PkgConfig)
|
||||
pkg_check_modules(_OGG QUIET ogg)
|
||||
|
||||
find_path(OGG_INCLUDE_DIR
|
||||
NAMES "ogg/ogg.h"
|
||||
PATHS ${_OGG_INCLUDE_DIRS})
|
||||
|
||||
find_library(OGG_LIBRARY
|
||||
NAMES ogg libogg
|
||||
HINTS ${_OGG_LIBRARY_DIRS})
|
||||
|
||||
mark_as_advanced(
|
||||
OGG_INCLUDE_DIR
|
||||
OGG_LIBRARY)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(OGG
|
||||
REQUIRED_VARS OGG_INCLUDE_DIR OGG_LIBRARY
|
||||
VERSION_VAR _OGG_VERSION)
|
||||
|
||||
if(OGG_FOUND AND NOT TARGET Ogg::ogg)
|
||||
add_library(Ogg::ogg UNKNOWN IMPORTED)
|
||||
set_target_properties(Ogg::ogg PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIR}"
|
||||
IMPORTED_LOCATION "${OGG_LIBRARY}")
|
||||
endif()
|
|
@ -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.3.2")
|
||||
set(PACKAGE_VERSION "1.3.4")
|
||||
|
||||
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()
|
||||
|
||||
|
|
7
deps/flac/lib/cmake/FLAC/flac-config.cmake
vendored
7
deps/flac/lib/cmake/FLAC/flac-config.cmake
vendored
|
@ -24,11 +24,8 @@ endmacro()
|
|||
|
||||
####################################################################################
|
||||
|
||||
if(TRUE)
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(OGG)
|
||||
endif()
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(Ogg)
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
|
||||
|
||||
|
|
4
deps/flac/lib/cmake/FLAC/targets.cmake
vendored
4
deps/flac/lib/cmake/FLAC/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")
|
||||
endif()
|
||||
cmake_policy(PUSH)
|
||||
cmake_policy(VERSION 2.6...3.17)
|
||||
cmake_policy(VERSION 2.6...3.19)
|
||||
#----------------------------------------------------------------
|
||||
# Generated CMake target import file.
|
||||
#----------------------------------------------------------------
|
||||
|
@ -56,7 +56,7 @@ add_library(FLAC::FLAC STATIC IMPORTED)
|
|||
set_target_properties(FLAC::FLAC PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "\$<\$<NOT:\$<BOOL:NO>>:FLAC__NO_DLL>"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
||||
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<BOOL:1>:m>>;Ogg::ogg"
|
||||
INTERFACE_LINK_LIBRARIES "\$<\$<BOOL:1>:m>;Ogg::ogg"
|
||||
)
|
||||
|
||||
# Create imported target FLAC::flacapp
|
||||
|
|
BIN
deps/flac/lib/libFLAC.a
vendored
BIN
deps/flac/lib/libFLAC.a
vendored
Binary file not shown.
2
deps/flac/lib/pkgconfig/flac.pc
vendored
2
deps/flac/lib/pkgconfig/flac.pc
vendored
|
@ -5,7 +5,7 @@ includedir=${prefix}/include
|
|||
|
||||
Name: FLAC
|
||||
Description: Free Lossless Audio Codec Library
|
||||
Version: 1.3.3
|
||||
Version: 1.3.4
|
||||
Requires.private: ogg
|
||||
Libs: -L${libdir} -lFLAC
|
||||
Libs.private: -lm
|
||||
|
|
Loading…
Reference in a new issue