mirror of
https://github.com/cookiengineer/audacity
synced 2025-05-02 08:39:46 +02:00
Reduce requirements, so they match Ubuntu 20.04
For id3tag and mad - Ubuntu has broken package config, so this change is no-op.
This commit is contained in:
parent
583adc57d0
commit
dc92a7c59f
@ -94,7 +94,7 @@ add_conan_lib(
|
|||||||
libid3tag
|
libid3tag
|
||||||
libid3tag/0.15.2b@audacity/stable
|
libid3tag/0.15.2b@audacity/stable
|
||||||
OPTION_NAME libid3tag
|
OPTION_NAME libid3tag
|
||||||
PKG_CONFIG "id3tag >= 0.15.1b"
|
PKG_CONFIG "id3tag >= 0.15.0b" # Ubuntu has broken PC file
|
||||||
CONAN_OPTIONS
|
CONAN_OPTIONS
|
||||||
libid3tag:zlib=${id3tag_zlib}
|
libid3tag:zlib=${id3tag_zlib}
|
||||||
)
|
)
|
||||||
@ -103,7 +103,7 @@ add_conan_lib(
|
|||||||
libmad
|
libmad
|
||||||
libmad/0.15.2b@audacity/stable
|
libmad/0.15.2b@audacity/stable
|
||||||
OPTION_NAME libmad
|
OPTION_NAME libmad
|
||||||
PKG_CONFIG "mad >= 0.15.1b"
|
PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file
|
||||||
)
|
)
|
||||||
|
|
||||||
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
|
||||||
@ -164,7 +164,7 @@ set_conan_vars_to_parent()
|
|||||||
# directory option symbol req chk version
|
# directory option symbol req chk version
|
||||||
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
|
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
|
||||||
addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
|
addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
|
||||||
addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" )
|
addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.31.1" )
|
||||||
|
|
||||||
# Optional libraries
|
# Optional libraries
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user