[skia] Update for Skia m136

.github/workflows/build.yml

@@ -86,6 +86,11 @@ jobs:
           -DLAF_BACKEND=$laf_backend \
           -DSKIA_DIR=$(realpath skia) \
           -DSKIA_LIBRARY_DIR=$(realpath skia/out/Release-$skia_arch)
+
+        if [[ "${{ matrix.ui }}" == cli ]] ; then
+          # Required to download external project libjpeg-turbo
+          cmake -B build
+        fi
     - name: Compiling
       shell: bash
       run: |

cmake/FindJpegTurbo.cmake

@@ -1,5 +1,5 @@
 # Get libjpeg-turbo package
-# Copyright (c) 2024  Igara Studio S.A.
+# Copyright (c) 2024-2025  Igara Studio S.A.
 #
 # This file is released under the terms of the MIT license.
 # Read LICENSE.txt for more information.
@@ -11,7 +11,7 @@ if(LAF_BACKEND STREQUAL "skia")
 
   find_library(LIBJPEG_TURBO_LIBRARY NAMES libjpeg jpeg
     HINTS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
-  set(LIBJPEG_TURBO_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/libjpeg-turbo")
+  set(LIBJPEG_TURBO_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/libjpeg-turbo/src")
 
   add_library(libjpeg-turbo STATIC IMPORTED)
   set_target_properties(libjpeg-turbo PROPERTIES
@@ -28,8 +28,8 @@ else()
 
   include(ExternalProject)
   ExternalProject_Add(libjpeg-turbo-project
-    URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.0.2.zip
-    URL_HASH SHA512=c048c041f0bf205a8a3c8b8928d7a44299466253789f533db91f6ae4209a9074d5baef2fbb8e0a4215b4e3d2ba30c784f51b6c79ce0d2b1ea75440b8ffb23859
+    URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip
+    URL_HASH SHA512=774a98dab81bef094e525687f0398efedd3f70d5e17ecbf68b4ff96cc1ffa36ba64b367c15a82c72101d02a7379a245e7102bfe757beabc3037e30fca5af42e7
     PREFIX "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo"
     INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo"
     BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jpeg${LIBJPEG_TURBO_STATIC_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"

laf

@@ -1 +1 @@
-Subproject commit 4f005f84a34cecc55600483e4403b238d5cba466
+Subproject commit 2a502b7783d5acd2402d840997c665ae20658e39

third_party/CMakeLists.txt

@@ -24,6 +24,7 @@ if(NOT USE_SHARED_LIBPNG)
   set(PNG_STATIC ON CACHE BOOL "Build static lib")
   set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
   add_subdirectory(libpng)
+  add_library(PNG::PNG ALIAS png_static)
 endif()
 
 if(NOT USE_SHARED_GIFLIB)
@@ -112,6 +113,7 @@ if(NOT USE_SHARED_HARFBUZZ AND NOT LAF_BACKEND STREQUAL "skia")
   set(HB_HAVE_UNISCRIBE OFF CACHE BOOL "Enable Uniscribe shaper backend on Windows")
   set(HB_HAVE_DIRECTWRITE OFF CACHE BOOL "Enable DirectWrite shaper backend on Windows")
   add_subdirectory(harfbuzz)
+  add_library(HarfBuzz::HarfBuzz ALIAS harfbuzz)
 endif()
 
 add_subdirectory(simpleini)

third_party/freetype2

@@ -1 +1 @@
-Subproject commit 66a04dd6f858e92766d77deda44a6d8d5dfee5bc
+Subproject commit 1604eebf3712d23a7eedddafb2a1e20d56760d8c

third_party/harfbuzz

@@ -1 +1 @@
-Subproject commit 8607be393dfd81614611897a6e3026fe94a3966c
+Subproject commit ca3cd48fa3e06fa81d7c8a3f716cca44ed2de26a

third_party/libwebp

@@ -1 +1 @@
-Subproject commit 9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf
+Subproject commit 845d5476a866141ba35ac133f856fa62f0b7445f