0.116.2 m116-d2c211228d, link with EGL on Linux #63

.github/workflows/build.yml

@@ -1,4 +1,13 @@
 on:
+  pull_request:
+    branches:
+      - 'master'
+    paths:
+      - '.github'
+      - 'platform'
+      - 'script'
+      - 'shared'
+      - 'tests'
   push:
     branches:
       - '**'
@@ -48,7 +57,7 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
           sudo apt-get update
-          sudo apt-get --quiet --yes install ninja-build libglu1-mesa-dev g\+\+-9-aarch64-linux-gnu
+          sudo apt-get --quiet --yes install ninja-build libglu1-mesa-dev libegl-dev g\+\+-9-aarch64-linux-gnu libwayland-dev libglvnd-dev libegl1-mesa libegl1-mesa-dev
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
           sudo update-alternatives --config gcc
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.116.2 - Dec 8, 2023
+
+Changed:
+
+- Skia version m116-f44dbc40d8 -> m116-d2c211228d
+- Link with EGL on Linux
+
 # 0.116.1 - Aug 9, 2023
 
 Fixed:

examples/jwm/script/run.py

@@ -44,8 +44,7 @@ def main():
   # Java
   subprocess.check_call([
     'java',
-    '--class-path', build_utils.classpath_join(['target/classes'] + classpath)]
-    + (['-XstartOnFirstThread'] if 'macos' == build_utils.system else [])
+    '-classpath', build_utils.classpath_join(['target/classes'] + classpath)]
     + ['-Djava.awt.headless=true',
     '-enableassertions',
     '-enablesystemassertions',

platform/cc/impl/Managed.cc

@@ -1,5 +1,6 @@
 #include <iostream>
 #include <jni.h>
+#include <cstdint>
 
 typedef void (*FreeFunction)(void*);
 

platform/cmake/FindSkia.cmake

@@ -23,7 +23,9 @@ if(WIN32)
 elseif(APPLE)
   find_library(SKIA_OPENGL_LIBRARY OpenGL NAMES GL)
 else()
-  find_library(SKIA_OPENGL_LIBRARY opengl NAMES GL)
+    find_library(SKIA_GL_LIBRARY opengl NAMES GL)
+    find_library(SKIA_EGL_LIBRARY EGL NAMES EGL)
+    set(SKIA_OPENGL_LIBRARY ${SKIA_GL_LIBRARY} ${SKIA_EGL_LIBRARY})
 endif()
 
 # SkUnicode

script/build.py

@@ -6,7 +6,7 @@ def main():
   parser.add_argument('--debug', action='store_true')
   parser.add_argument('--arch', default=build_utils.arch)
   parser.add_argument('--skia-dir')
-  parser.add_argument('--skia-release', default='m116-f44dbc40d8')
+  parser.add_argument('--skia-release', default='m116-d2c211228d')
   parser.add_argument('--cmake-toolchain-file')
   (args, _) = parser.parse_known_args()
 

script/build_utils.py

@@ -125,7 +125,7 @@ def jar(target: str, *content: List[Tuple[str, str]], opts=[]) -> str:
 
 @functools.lru_cache(maxsize=1)
 def lombok():
-  return fetch_maven('org.projectlombok', 'lombok', '1.18.28')
+  return fetch_maven('org.projectlombok', 'lombok', '1.18.30')
 
 def delombok(dirs: List[str], target: str, classpath: List[str] = [], modulepath: List[str] = []):
   sources = files(*[dir + "/**/*.java" for dir in dirs])

script/common.py

@@ -12,7 +12,7 @@
 
 compile_deps = [
   {'group': 'org.jetbrains', 'name': 'annotations', 'version': '20.1.0'},
-  {'group': 'org.projectlombok', 'name': 'lombok', 'version': '1.18.28'},
+  {'group': 'org.projectlombok', 'name': 'lombok', 'version': '1.18.30'},
 ]
 
 @functools.lru_cache(maxsize=1)