Merge pull request #516 from pharo-project/origin/feat/update-graphic…

…-deps Update & Unify Graphic Libraries Versions
pharo-project · Dec 7, 2022 · 77dd88d · 77dd88d
2 parents 5b46720 + 82d6d38
commit 77dd88d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake
@@ -8,25 +8,29 @@ 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")
       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.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
+  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
@@ -11,18 +11,31 @@ 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")
+      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.9.1")
+      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"))
       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
@@ -10,18 +10,22 @@ 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")
+      add_third_party_dependency("SDL2-2.24.1")
     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"))
       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()