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

HumbleUI · Dec 11, 2023 · 0000839 · 0000839
1 parent e557c20
commit 0000839
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,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
           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

diff --git a/CHANGELOG.md b/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:

diff --git a/examples/jwm/script/run.py b/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',

diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
@@ -61,6 +61,7 @@ if(APPLE)
 
 elseif(UNIX)
     target_include_directories(skija PRIVATE $ENV{JAVA_HOME}/include $ENV{JAVA_HOME}/include/linux)
+    set(EGL_LIBRARY EGL)
 
 elseif(WIN32)
     set(CMAKE_C_COMPILER cl)
@@ -84,4 +85,4 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FindSkia)
-target_link_libraries(skija skottie sksg svg skparagraph skshaper skunicode skresources skia ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES})
+target_link_libraries(skija skottie sksg svg skparagraph skshaper skunicode skresources skia ${EGL_LIBRARY} ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES})
diff --git a/script/build.py b/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()
 

diff --git a/script/build_utils.py b/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])

diff --git a/script/common.py b/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)