Skip to content

Commit 6df25ca

Browse files
jwinarskejwinarske
committed
Filament v1.65.4
-remove macos-13 container for CI matrix; no longer supported Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
1 parent e1630a1 commit 6df25ca

2 files changed

Lines changed: 94 additions & 94 deletions

File tree

‎.github/workflows/macos.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
strategy:
2828
matrix:
29-
os: [ macos-13, macos-14, macos-15 ]
29+
os: [ macos-14, macos-15 ]
3030

3131
runs-on: ${{ matrix.os }}
3232

configs/filament-v1.65.2.json renamed to configs/filament_1.65.4.json

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
1-
{
2-
"id": "filament",
3-
"load": false,
4-
"supported_archs": [
5-
"aarch64",
6-
"arm64",
7-
"x86_64"
8-
],
9-
"supported_host_types": [
10-
"ubuntu",
11-
"rhel",
12-
"fedora"
13-
],
14-
"type": "dependency",
15-
"env": {
16-
"CC": "${LLVM_BINDIR}/clang",
17-
"CXX": "${LLVM_BINDIR}/clang++",
18-
"PATH": "${LLVM_BINDIR}:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-ninja:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/bin:$PATH",
19-
"LD_LIBRARY_PATH": "${LLVM_LIBDIR}:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/lib",
20-
"PATCH_FOLDER": "${FLUTTER_WORKSPACE}/patches",
21-
"FILAMENT_BUILD_TYPE": "${CMAKE_BUILD_TYPE}",
22-
"FILAMENT_SRC_DIR": "${FLUTTER_WORKSPACE}/app/filament",
23-
"FILAMENT_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/filament/build/${_BUILD_TYPE}",
24-
"FILAMENT_STAGING_DIR": "${FILAMENT_BUILD_DIR}/staging",
25-
"FILAMENT_INCLUDE_DIR": "${FILAMENT_STAGING_DIR}/include",
26-
"FILAMENT_LINK_LIBRARIES_DIR": "${FILAMENT_STAGING_DIR}/lib/${HOST_ARCH}",
27-
"FILAMENT_CMAKE_ARGS": "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DFILAMENT_SUPPORTS_VULKAN=ON -DFILAMENT_ENABLE_LTO=OFF -DFILAMENT_SUPPORTS_OPENGL=OFF -DFILAMENT_USE_EXTERNAL_GLES3=OFF -DFILAMENT_SUPPORTS_WAYLAND=ON -DFILAMENT_SUPPORTS_X11=OFF -DFILAMENT_SUPPORTS_XCB=OFF -DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF -DFILAMENT_SKIP_SDL2=ON -DFILAMENT_SKIP_SAMPLES=ON -DFILAMENT_USE_SWIFTSHADER=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_STAGING_PREFIX=${FILAMENT_STAGING_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
28-
},
29-
"src": [
30-
{
31-
"uri": "https://github.com/google/filament.git",
32-
"branch": "release",
33-
"rev": "v1.65.2"
34-
}
35-
],
36-
"runtime": {
37-
"pre-requisites": {
38-
"aarch64": {
39-
"ubuntu": {
40-
"cmds": [
41-
"pip3 install absl-py",
42-
"sudo apt-get update -y",
43-
"sudo apt-get install -yq libsdl2-dev libjpeg-dev file"
44-
]
45-
}
46-
},
47-
"x86_64": {
48-
"ubuntu": {
49-
"cmds": [
50-
"pip3 install absl-py",
51-
"sudo apt-get update -y",
52-
"sudo apt-get install -yq libsdl2-dev libjpeg-dev file"
53-
]
54-
},
55-
"fedora": {
56-
"cmds": [
57-
"pip3 install absl-py",
58-
"sudo dnf -y update",
59-
"sudo dnf -y install SDL2-devel libjpeg-devel file"
60-
]
61-
}
62-
}
63-
},
64-
"post_cmds": [
65-
{
66-
"cwd": "${FILAMENT_SRC_DIR}",
67-
"cmds": [
68-
"git reset --hard",
69-
"git apply ${PATCH_FOLDER}/filament/0001-disable-backend-tests-1.65.2.patch",
70-
"git apply ${PATCH_FOLDER}/filament/0002-install-required-files.patch",
71-
"git apply ${PATCH_FOLDER}/filament/0003-move-include-contents-to-include-filament.patch",
72-
"git apply ${PATCH_FOLDER}/filament/0004-move-libraries-so-they-install-1.65.2.patch",
73-
"git apply ${PATCH_FOLDER}/filament/0005-spirv-tools-threads.patch"
74-
]
75-
},
76-
{
77-
"cwd": "${FILAMENT_BUILD_DIR}",
78-
"cmds": [
79-
"bash -c \"rm -rf CMakeCache.txt CMakeFiles | true\"",
80-
"cmake -G Ninja -S ${FILAMENT_SRC_DIR} -B ${FILAMENT_BUILD_DIR} ${FILAMENT_CMAKE_ARGS}",
81-
"cmake --build . --config ${CMAKE_BUILD_TYPE} --target install"
82-
]
83-
}
84-
],
85-
"do_clean": [
86-
{
87-
"cwd": "${FILAMENT_BUILD_DIR}",
88-
"cmds": [
89-
"cmake --build . --config ${CMAKE_BUILD_TYPE} --target clean"
90-
]
91-
}
92-
]
93-
}
1+
{
2+
"id": "filament",
3+
"load": false,
4+
"supported_archs": [
5+
"aarch64",
6+
"arm64",
7+
"x86_64"
8+
],
9+
"supported_host_types": [
10+
"ubuntu",
11+
"rhel",
12+
"fedora"
13+
],
14+
"type": "dependency",
15+
"env": {
16+
"CC": "${LLVM_BINDIR}/clang",
17+
"CXX": "${LLVM_BINDIR}/clang++",
18+
"PATH": "${LLVM_BINDIR}:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-ninja:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/bin:$PATH",
19+
"LD_LIBRARY_PATH": "${LLVM_LIBDIR}:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/lib",
20+
"PATCH_FOLDER": "${FLUTTER_WORKSPACE}/patches",
21+
"FILAMENT_BUILD_TYPE": "${CMAKE_BUILD_TYPE}",
22+
"FILAMENT_SRC_DIR": "${FLUTTER_WORKSPACE}/app/filament",
23+
"FILAMENT_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/filament/build/${_BUILD_TYPE}",
24+
"FILAMENT_STAGING_DIR": "${FILAMENT_BUILD_DIR}/staging",
25+
"FILAMENT_INCLUDE_DIR": "${FILAMENT_STAGING_DIR}/include",
26+
"FILAMENT_LINK_LIBRARIES_DIR": "${FILAMENT_STAGING_DIR}/lib/${HOST_ARCH}",
27+
"FILAMENT_CMAKE_ARGS": "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DFILAMENT_SUPPORTS_VULKAN=ON -DFILAMENT_ENABLE_LTO=OFF -DFILAMENT_SUPPORTS_OPENGL=OFF -DFILAMENT_USE_EXTERNAL_GLES3=OFF -DFILAMENT_SUPPORTS_WAYLAND=ON -DFILAMENT_SUPPORTS_X11=OFF -DFILAMENT_SUPPORTS_XCB=OFF -DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF -DFILAMENT_SKIP_SDL2=ON -DFILAMENT_SKIP_SAMPLES=ON -DFILAMENT_USE_SWIFTSHADER=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_STAGING_PREFIX=${FILAMENT_STAGING_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
28+
},
29+
"src": [
30+
{
31+
"uri": "https://github.com/google/filament.git",
32+
"branch": "release",
33+
"rev": "v1.65.4"
34+
}
35+
],
36+
"runtime": {
37+
"pre-requisites": {
38+
"aarch64": {
39+
"ubuntu": {
40+
"cmds": [
41+
"pip3 install absl-py",
42+
"sudo apt-get update -y",
43+
"sudo apt-get install -yq libsdl2-dev libjpeg-dev file"
44+
]
45+
}
46+
},
47+
"x86_64": {
48+
"ubuntu": {
49+
"cmds": [
50+
"pip3 install absl-py",
51+
"sudo apt-get update -y",
52+
"sudo apt-get install -yq libsdl2-dev libjpeg-dev file"
53+
]
54+
},
55+
"fedora": {
56+
"cmds": [
57+
"pip3 install absl-py",
58+
"sudo dnf -y update",
59+
"sudo dnf -y install SDL2-devel libjpeg-devel file"
60+
]
61+
}
62+
}
63+
},
64+
"post_cmds": [
65+
{
66+
"cwd": "${FILAMENT_SRC_DIR}",
67+
"cmds": [
68+
"git reset --hard",
69+
"git apply ${PATCH_FOLDER}/filament/0001-disable-backend-tests-1.65.2.patch",
70+
"git apply ${PATCH_FOLDER}/filament/0002-install-required-files.patch",
71+
"git apply ${PATCH_FOLDER}/filament/0003-move-include-contents-to-include-filament.patch",
72+
"git apply ${PATCH_FOLDER}/filament/0004-move-libraries-so-they-install-1.65.2.patch",
73+
"git apply ${PATCH_FOLDER}/filament/0005-spirv-tools-threads.patch"
74+
]
75+
},
76+
{
77+
"cwd": "${FILAMENT_BUILD_DIR}",
78+
"cmds": [
79+
"bash -c \"rm -rf CMakeCache.txt CMakeFiles | true\"",
80+
"cmake -G Ninja -S ${FILAMENT_SRC_DIR} -B ${FILAMENT_BUILD_DIR} ${FILAMENT_CMAKE_ARGS}",
81+
"cmake --build . --config ${CMAKE_BUILD_TYPE} --target install"
82+
]
83+
}
84+
],
85+
"do_clean": [
86+
{
87+
"cwd": "${FILAMENT_BUILD_DIR}",
88+
"cmds": [
89+
"cmake --build . --config ${CMAKE_BUILD_TYPE} --target clean"
90+
]
91+
}
92+
]
93+
}
9494
}

0 commit comments

Comments
 (0)