From 3f73d2f809e38a7f0d7b7d724957e11951c4e6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= <ole.andre.rodlie@gmail.com>
Date: Thu, 26 Dec 2024 04:27:55 +0100
Subject: [PATCH] skia: Linux changes

---
 src/cmake/friction-common.cmake |  6 +++++-
 src/engine/CMakeLists.txt       | 10 ++++++++++
 src/engine/skia                 |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake
index 12c63d1c5..4f0f5dfc2 100644
--- a/src/cmake/friction-common.cmake
+++ b/src/cmake/friction-common.cmake
@@ -103,7 +103,11 @@ if(WIN32)
     add_definitions(-DSKIA_DLL)
     set(SKIA_LIBRARIES_DIRS ${CMAKE_SOURCE_DIR}/sdk/bin)
 else()
-    set(SKIA_LIBRARIES skia)
+    if(APPLE)
+        set(SKIA_LIBRARIES skia)
+    else()
+        set(SKIA_LIBRARIES skia.friction)
+    endif()
     if(UNIX AND NOT APPLE)
         pkg_check_modules(UNWIND REQUIRED libunwind)
         set(GPERF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../gperftools ${UNWIND_INCLUDE_DIRS})
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index ac774ad07..f9ffbd3cd 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -134,6 +134,16 @@ ExternalProject_Add(
     USES_TERMINAL_BUILD true
 )
 
+if(UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
+    install(
+        FILES
+        ${SKIA_BUILD_DIR}/libskia.friction.so
+        DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}
+    )
+endif()
+
 if(WIN32)
     add_custom_command(TARGET Engine POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SKIA_BUILD_DIR}/skia.dll.lib ${SKIA_BUILD_DIR}/skia.lib)
 endif()
diff --git a/src/engine/skia b/src/engine/skia
index d375e53b7..1858ae5f3 160000
--- a/src/engine/skia
+++ b/src/engine/skia
@@ -1 +1 @@
-Subproject commit d375e53b7c1fcd676c6a00e85dc4985b2979c12f
+Subproject commit 1858ae5f38348cfecbcd66b6d9f733ef302d9ab3