From 7b8f3d2900938fdb9171f3a484c23ec0635579dc Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 21 Oct 2022 16:57:21 +0200 Subject: [PATCH 1/5] Updating dependencies for Darwin-x86_64 --- cmake/importCairo.cmake | 6 +++--- cmake/importFreetype2.cmake | 3 ++- cmake/importSDL2.cmake | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake index a769f0a9b8..26fe8b4bce 100644 --- a/cmake/importCairo.cmake +++ b/cmake/importCairo.cmake @@ -18,9 +18,9 @@ if (BUILD_BUNDLE) add_third_party_dependency("cairo-1.16.0") add_third_party_dependency("libpng-1.6.37") else() - add_third_party_dependency("pixman-0.34.0") - add_third_party_dependency("cairo-1.15.4") - add_third_party_dependency("libpng-1.2.49") + add_third_party_dependency("pixman-0.40.0") + add_third_party_dependency("cairo-1.17.4") + add_third_party_dependency("libpng-1.6.37") endif() else() #Linux, only for arm If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake index 1a241962b6..3036e48662 100644 --- a/cmake/importFreetype2.cmake +++ b/cmake/importFreetype2.cmake @@ -17,7 +17,8 @@ function(download_Freetype) add_third_party_dependency("freetype-2.10.0") add_third_party_dependency("fontconfig-2.13.1") else() - add_third_party_dependency("freetype-2.9.1") + add_third_party_dependency("freetype-2.12.1") + add_third_party_dependency("fontconfig-2.13.1") endif() else() # linuxes, only for ARM If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake index 3d54addc8b..12af59b7a8 100644 --- a/cmake/importSDL2.cmake +++ b/cmake/importSDL2.cmake @@ -15,7 +15,7 @@ function(download_SDL2) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") add_third_party_dependency("SDL2-2.0.14") else() - add_third_party_dependency("SDL2-2.0.18") + add_third_party_dependency("SDL2-2.24.1") endif() else() #LINUX If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) From 0213f446e7139f94ba99a79e03463a6d50e3941b Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 28 Oct 2022 09:36:28 +0200 Subject: [PATCH 2/5] Adding Harfbuzz as a dependency --- cmake/importFreetype2.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake index 3036e48662..449f58e1d5 100644 --- a/cmake/importFreetype2.cmake +++ b/cmake/importFreetype2.cmake @@ -19,6 +19,7 @@ function(download_Freetype) else() add_third_party_dependency("freetype-2.12.1") add_third_party_dependency("fontconfig-2.13.1") + add_third_party_dependency("harfbuzz-5.3.1") endif() else() # linuxes, only for ARM If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) From d91fc4e7dd16c34f1135677119b36504f5e9688a Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 14 Nov 2022 11:39:22 +0100 Subject: [PATCH 3/5] Updating Win X86 thirdparty --- cmake/importCairo.cmake | 6 +++--- cmake/importFreetype2.cmake | 8 +++++++- cmake/importSDL2.cmake | 6 +++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake index 26fe8b4bce..52686457ef 100644 --- a/cmake/importCairo.cmake +++ b/cmake/importCairo.cmake @@ -8,9 +8,9 @@ if (BUILD_BUNDLE) add_third_party_dependency("libpng-1.6.37") else() # X86 and X86_64 - add_third_party_dependency("pixman-0.34.0") - add_third_party_dependency("cairo-1.15.4") - add_third_party_dependency("libpng-1.6.34") + add_third_party_dependency("pixman-0.40.0") + add_third_party_dependency("cairo-1.17.4") + add_third_party_dependency("libpng-1.6.37") endif() elseif(OSX) If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake index 449f58e1d5..22c2e8c92d 100644 --- a/cmake/importFreetype2.cmake +++ b/cmake/importFreetype2.cmake @@ -11,7 +11,13 @@ endfunction() function(download_Freetype) if (WIN) - add_third_party_dependency("freetype-2.9.1") + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64") + add_third_party_dependency("freetype-2.9.1") + else() + add_third_party_dependency("freetype-2.12.1") + add_third_party_dependency("fontconfig-2.13.1") + add_third_party_dependency("harfbuzz-5.3.1") + endif() elseif(OSX) If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") add_third_party_dependency("freetype-2.10.0") diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake index 12af59b7a8..bc5fdc84e4 100644 --- a/cmake/importSDL2.cmake +++ b/cmake/importSDL2.cmake @@ -10,7 +10,11 @@ endfunction() function(download_SDL2) message(STATUS "Downloading SDL2 binary") if(WIN) - add_third_party_dependency("SDL2-2.0.5") + if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64") + add_third_party_dependency("SDL2-2.0.5") + else() + add_third_party_dependency("SDL2-2.24.1") + endif() elseif(OSX) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") add_third_party_dependency("SDL2-2.0.14") From 5cdb7312caa3af5fdfb81b94529d087b371e33d3 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 14 Nov 2022 15:39:29 +0100 Subject: [PATCH 4/5] Adding dependencies of Darwin ARM --- cmake/importCairo.cmake | 2 +- cmake/importFreetype2.cmake | 3 ++- cmake/importSDL2.cmake | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake index 52686457ef..cf3364b4c6 100644 --- a/cmake/importCairo.cmake +++ b/cmake/importCairo.cmake @@ -15,7 +15,7 @@ if (BUILD_BUNDLE) elseif(OSX) If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") add_third_party_dependency("pixman-0.40.0") - add_third_party_dependency("cairo-1.16.0") + add_third_party_dependency("cairo-1.17.4") add_third_party_dependency("libpng-1.6.37") else() add_third_party_dependency("pixman-0.40.0") diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake index 22c2e8c92d..161ddea0e1 100644 --- a/cmake/importFreetype2.cmake +++ b/cmake/importFreetype2.cmake @@ -20,8 +20,9 @@ function(download_Freetype) endif() elseif(OSX) If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") - add_third_party_dependency("freetype-2.10.0") + add_third_party_dependency("freetype-2.12.1") add_third_party_dependency("fontconfig-2.13.1") + add_third_party_dependency("harfbuzz-5.3.1") else() add_third_party_dependency("freetype-2.12.1") add_third_party_dependency("fontconfig-2.13.1") diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake index bc5fdc84e4..f766e57341 100644 --- a/cmake/importSDL2.cmake +++ b/cmake/importSDL2.cmake @@ -17,7 +17,7 @@ function(download_SDL2) endif() elseif(OSX) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64") - add_third_party_dependency("SDL2-2.0.14") + add_third_party_dependency("SDL2-2.24.1") else() add_third_party_dependency("SDL2-2.24.1") endif() From 82d6d388b9210f244e9f95072af4f9d2ec22852c Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 28 Nov 2022 17:06:32 +0100 Subject: [PATCH 5/5] Libraries for Linux x86_64 --- cmake/importCairo.cmake | 8 ++++++-- cmake/importFreetype2.cmake | 6 +++++- cmake/importSDL2.cmake | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake index cf3364b4c6..b1cc53801d 100644 --- a/cmake/importCairo.cmake +++ b/cmake/importCairo.cmake @@ -22,11 +22,15 @@ if (BUILD_BUNDLE) add_third_party_dependency("cairo-1.17.4") add_third_party_dependency("libpng-1.6.37") endif() - else() #Linux, only for arm + else() #Linux If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) add_third_party_dependency("pixman-0.40.0") add_third_party_dependency("cairo-1.16.0") add_third_party_dependency("libpng-1.6.37") - endif() + else() + add_third_party_dependency("pixman-0.40.0") + add_third_party_dependency("cairo-1.17.4") + add_third_party_dependency("libpng-1.6.37") + endif() endif() endif() diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake index 161ddea0e1..e1f58f0b79 100644 --- a/cmake/importFreetype2.cmake +++ b/cmake/importFreetype2.cmake @@ -31,7 +31,11 @@ function(download_Freetype) else() # linuxes, only for ARM If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) add_third_party_dependency("freetype-2.10.0") - endif() + else() + add_third_party_dependency("freetype-2.12.1") + add_third_party_dependency("fontconfig-2.13.1") + add_third_party_dependency("harfbuzz-5.3.1") + endif() endif() endfunction() diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake index f766e57341..c4be4bc8cf 100644 --- a/cmake/importSDL2.cmake +++ b/cmake/importSDL2.cmake @@ -25,7 +25,7 @@ function(download_SDL2) If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) add_third_party_dependency("SDL2-2.0.14") else() - add_third_party_dependency("SDL2-2.0.7") + add_third_party_dependency("SDL2-2.24.1") endif() endif() endfunction()