Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Use libjpeg-turbo as a wxWidgets dependecy

Browse Source 
Turns out, libjpeg is downloaded over plain HTTP from the official IJG site. It is now replaced with libjpeg-turbo.
This commit is contained in:
Dmitry Vedenko 2021-05-29 00:32:01 +03:00 committed by Dmitry Vedenko
parent 68bd49da87
commit 7c1f843322
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake-proxies/CMakeLists.txt
View File

@ -19,14 +19,22 @@ add_conan_lib(
) )
set( wx_zlib "zlib" ) set( wx_zlib "zlib" )
set( wx_png "libpng" ) set( wx_png "libpng" )
set( wx_jpeg "libjpeg-turbo")
set( wx_tiff "off" )
set( id3tag_zlib "conan" ) set( id3tag_zlib "conan" )
if ( ${_OPT}use_zlib STREQUAL "system" ) if ( ${_OPT}use_zlib STREQUAL "system" )
set( wx_zlib "sys" ) set( wx_zlib "sys" )
# To prevent linking conflicts - we need to use system libpng as well. # To prevent linking conflicts - we need to use system libpng as well.
# wxWdigets will attempt to resolve it using find_package # wxWdigets will attempt to resolve it using find_package
find_required_package( PNG "libpng-dev" )
set( wx_png "sys" ) set( wx_png "sys" )
# And, for consistency
find_required_package( JPEG "libjpeg-turbo8-dev" )
set( wx_jpeg "sys" )
set( id3tag_zlib "system" ) set( id3tag_zlib "system" )
endif() endif()
@ -51,7 +59,8 @@ add_conan_lib(
wxwidgets:expat=${wx_expat} wxwidgets:expat=${wx_expat}
wxwidgets:compatibility=3.0 wxwidgets:compatibility=3.0
wxwidgets:png=${wx_png} wxwidgets:png=${wx_png}
wxwidgets:tiff=off wxwidgets:jpeg=${wx_jpeg}
wxwidgets:tiff=${wx_tiff}
wxwidgets:secretstore=False wxwidgets:secretstore=False
wxwidgets:opengl=False wxwidgets:opengl=False
wxwidgets:propgrid=False wxwidgets:propgrid=False
@ -63,6 +72,9 @@ add_conan_lib(
wxwidgets:html_help=False wxwidgets:html_help=False
wxwidgets:fs_inet=False wxwidgets:fs_inet=False
wxwidgets:protocol=False wxwidgets:protocol=False
# Building with SIMD requires a huge number of build dependencies
# Probably this will be enabled in the future
libjpeg-turbo:SIMD=False
) )
add_conan_lib( add_conan_lib(

12
cmake-proxies/cmake-modules/AudacityDependencies.cmake
View File

@ -267,3 +267,15 @@ macro( resolve_conan_dependencies )
include(${f}) include(${f})
endforeach() endforeach()
endmacro() endmacro()
macro ( find_required_package package_name system_package_name )
find_package ( ${package_name} QUIET ${ARGN} )
if ( NOT ${package_name}_FOUND )
if (CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
message( FATAL_ERROR "Error: ${package_name} is required")
else()
message( FATAL_ERROR "Error: ${package_name} is required.\nPlease install it with using command like:\n\t\$ sudo apt install ${system_package_name}" )
endif()
endif()
endmacro()

1
linux/build-environment/dependencies.sh
View File

@ -50,6 +50,7 @@ apt_packages_full_deps=(
libssl-dev libssl-dev
libcurl4-openssl-dev libcurl4-openssl-dev
libpng-dev libpng-dev
libjpeg-turbo8-dev
) )
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \