diff --git a/configs/_filament.json b/configs/_filament.json index 14235c9..9e96579 100644 --- a/configs/_filament.json +++ b/configs/_filament.json @@ -58,11 +58,11 @@ "cwd": "${FILAMENT_SRC_DIR}", "cmds": [ "git reset --hard", - "git apply ${PATCH_FOLDER}/filament/0001-error-ignoring-return-value-of-function-declared-wit.patch", - "git apply ${PATCH_FOLDER}/filament/0002-disable-backend-tests.patch", - "git apply ${PATCH_FOLDER}/filament/0003-install-required-files.patch", - "git apply ${PATCH_FOLDER}/filament/0004-move-include-contents-to-include-filament.patch", - "git apply ${PATCH_FOLDER}/filament/0005-move-libraries-so-they-install.patch" + "git apply ${PATCH_FOLDER}/filament/0001-disable-backend-tests.patch", + "git apply ${PATCH_FOLDER}/filament/0002-install-required-files.patch", + "git apply ${PATCH_FOLDER}/filament/0003-move-include-contents-to-include-filament.patch", + "git apply ${PATCH_FOLDER}/filament/0004-move-libraries-so-they-install.patch", + "git apply ${PATCH_FOLDER}/filament/0005-return-shader-type-mobile-for-linux-vulkan.patch" ] }, { diff --git a/configs/_repos.json b/configs/_repos.json index 5156b55..8c41fb4 100644 --- a/configs/_repos.json +++ b/configs/_repos.json @@ -26,7 +26,7 @@ { "uri": "https://github.com/google/filament.git", "branch": "release", - "rev": "v1.54.3" + "rev": "v1.56.1" }, { "uri": "https://git.libcamera.org/libcamera/libcamera.git", @@ -34,6 +34,7 @@ }, { "uri": "https://github.com/firebase/firebase-cpp-sdk.git", + "branch": "main", "rev": "v12.4.0" }, { diff --git a/patches/filament/0002-disable-backend-tests.patch b/patches/filament/0001-disable-backend-tests.patch similarity index 78% rename from patches/filament/0002-disable-backend-tests.patch rename to patches/filament/0001-disable-backend-tests.patch index 15aea9d..ec50d18 100644 --- a/patches/filament/0002-disable-backend-tests.patch +++ b/patches/filament/0001-disable-backend-tests.patch @@ -1,18 +1,18 @@ -From 6a920a7612cfea25bbea78600b16e3075a30a8f7 Mon Sep 17 00:00:00 2001 +From 2349c54c7f6bcff4b18c6257196cf06b27fb7be8 Mon Sep 17 00:00:00 2001 From: Joel Winarske -Date: Wed, 12 Jun 2024 06:41:19 -0700 -Subject: [PATCH 2/5] disable backend tests +Date: Fri, 22 Nov 2024 17:01:44 -0800 +Subject: [PATCH 1/4] disable backend tests Signed-off-by: Joel Winarske --- - filament/backend/CMakeLists.txt | 113 -------------------------------- - 1 file changed, 113 deletions(-) + filament/backend/CMakeLists.txt | 133 -------------------------------- + 1 file changed, 133 deletions(-) diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt -index 6a7f66cc2..378f45aed 100644 +index 0a07c8283..66f7b275e 100644 --- a/filament/backend/CMakeLists.txt +++ b/filament/backend/CMakeLists.txt -@@ -400,116 +400,3 @@ set(INSTALL_TYPE ARCHIVE) +@@ -428,136 +428,3 @@ set(INSTALL_TYPE ARCHIVE) install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) install(TARGETS vkshaders ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) install(DIRECTORY ${PUBLIC_HDR_DIR}/backend DESTINATION include) @@ -40,6 +40,7 @@ index 6a7f66cc2..378f45aed 100644 - test/test_StencilBuffer.cpp - test/test_Scissor.cpp - test/test_MipLevels.cpp +- test/test_Handles.cpp - ) - set(BACKEND_TEST_LIBS - backend @@ -111,24 +112,43 @@ index 6a7f66cc2..378f45aed 100644 - -# ================================================================================================== -# Compute tests +-# +-#if (NOT IOS AND NOT WEBGL) +-# +-#add_executable(compute_test +-# test/ComputeTest.cpp +-# test/Arguments.cpp +-# test/test_ComputeBasic.cpp +-# ) +-# +-#target_link_libraries(compute_test PRIVATE +-# backend +-# getopt +-# gtest +-# ) +-# +-#set_target_properties(compute_test PROPERTIES FOLDER Tests) +-# +-#endif() - --if (NOT IOS AND NOT WEBGL) +-# ================================================================================================== +-# Metal utils tests - --add_executable(compute_test -- test/ComputeTest.cpp -- test/Arguments.cpp -- test/test_ComputeBasic.cpp -- ) +-if (APPLE AND NOT IOS) +- +-add_executable(metal_utils_test test/MetalTest.mm) +- +-target_compile_options(metal_utils_test PRIVATE "-fobjc-arc") - --target_link_libraries(compute_test PRIVATE +-target_link_libraries(metal_utils_test PRIVATE - backend - getopt - gtest - ) - --set_target_properties(compute_test PROPERTIES FOLDER Tests) +-set_target_properties(metal_utils_test PROPERTIES FOLDER Tests) - -endif() -- -2.45.1 +2.25.1 diff --git a/patches/filament/0001-error-ignoring-return-value-of-function-declared-wit.patch b/patches/filament/0001-error-ignoring-return-value-of-function-declared-wit.patch deleted file mode 100644 index dd6b19a..0000000 --- a/patches/filament/0001-error-ignoring-return-value-of-function-declared-wit.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5b050dc0b7fb21fd5752ca98b434950791400df2 Mon Sep 17 00:00:00 2001 -From: Joel Winarske -Date: Wed, 12 Jun 2024 06:40:59 -0700 -Subject: [PATCH 1/5] error ignoring return value of function declared wit - -Signed-off-by: Joel Winarske ---- - libs/utils/include/utils/memalign.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/utils/include/utils/memalign.h b/libs/utils/include/utils/memalign.h -index 4c048bffd..a96a08a70 100644 ---- a/libs/utils/include/utils/memalign.h -+++ b/libs/utils/include/utils/memalign.h -@@ -40,7 +40,7 @@ inline void* aligned_alloc(size_t size, size_t align) noexcept { - #if defined(WIN32) - p = ::_aligned_malloc(size, align); - #else -- ::posix_memalign(&p, align, size); -+ (void)::posix_memalign(&p, align, size); - #endif - return p; - } --- -2.45.1 - diff --git a/patches/filament/0003-install-required-files.patch b/patches/filament/0002-install-required-files.patch similarity index 70% rename from patches/filament/0003-install-required-files.patch rename to patches/filament/0002-install-required-files.patch index b408a34..f982a1b 100644 --- a/patches/filament/0003-install-required-files.patch +++ b/patches/filament/0002-install-required-files.patch @@ -1,40 +1,31 @@ -From cc923cd0b88c587f0559fe2d6a830f3781154a69 Mon Sep 17 00:00:00 2001 +From d01a9fbeaee27ee800311c5dee7a54bba65dd69a Mon Sep 17 00:00:00 2001 From: Joel Winarske -Date: Wed, 12 Jun 2024 06:43:06 -0700 -Subject: [PATCH 3/5] install required files +Date: Fri, 22 Nov 2024 17:06:12 -0800 +Subject: [PATCH 2/4] install required files Signed-off-by: Joel Winarske --- - libs/imageio/CMakeLists.txt | 10 ++++++++-- - third_party/libpng/tnt/CMakeLists.txt | 2 ++ - third_party/stb/tnt/CMakeLists.txt | 1 + - third_party/tinyexr/tnt/CMakeLists.txt | 5 ++++- - 4 files changed, 15 insertions(+), 3 deletions(-) + libs/imageio/CMakeLists.txt | 6 ++++++ + third_party/libpng/tnt/CMakeLists.txt | 2 ++ + third_party/stb/tnt/CMakeLists.txt | 1 + + third_party/tinyexr/tnt/CMakeLists.txt | 8 +++++++- + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/imageio/CMakeLists.txt b/libs/imageio/CMakeLists.txt -index 47544655b..69dc695c4 100644 +index 47544655b..9eb92fc7a 100644 --- a/libs/imageio/CMakeLists.txt +++ b/libs/imageio/CMakeLists.txt -@@ -36,11 +36,17 @@ set_target_properties(${TARGET} PROPERTIES FOLDER Libs) - target_link_libraries(${TARGET} PUBLIC image math png tinyexr utils z basis_encoder) - if (WIN32) - target_link_libraries(${TARGET} PRIVATE wsock32) --endif() -+endif () - - # ================================================================================================== - # Compiler flags - # ================================================================================================== +@@ -44,3 +44,9 @@ endif() if (NOT MSVC) target_compile_options(${TARGET} PRIVATE -Wno-deprecated-register) --endif() -+endif () + endif() + +# ================================================================================================== +# Installation +# ================================================================================================== +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) +install(DIRECTORY ${PUBLIC_HDR_DIR}/imageio DESTINATION include) +\ No newline at end of file diff --git a/third_party/libpng/tnt/CMakeLists.txt b/third_party/libpng/tnt/CMakeLists.txt index cd5a033f5..4925a0474 100644 --- a/third_party/libpng/tnt/CMakeLists.txt @@ -46,7 +37,7 @@ index cd5a033f5..4925a0474 100644 + +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) diff --git a/third_party/stb/tnt/CMakeLists.txt b/third_party/stb/tnt/CMakeLists.txt -index 0c25061c0..563a2604d 100644 +index 0c25061c0..293dd486f 100644 --- a/third_party/stb/tnt/CMakeLists.txt +++ b/third_party/stb/tnt/CMakeLists.txt @@ -15,3 +15,4 @@ target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR}) @@ -54,11 +45,12 @@ index 0c25061c0..563a2604d 100644 install(TARGETS stb ARCHIVE DESTINATION lib/${DIST_DIR}) +install(FILES ${PUBLIC_HDRS} DESTINATION include) +\ No newline at end of file diff --git a/third_party/tinyexr/tnt/CMakeLists.txt b/third_party/tinyexr/tnt/CMakeLists.txt -index 20955b77b..ffe7cdfe1 100644 +index 20955b77b..1e2602d0d 100644 --- a/third_party/tinyexr/tnt/CMakeLists.txt +++ b/third_party/tinyexr/tnt/CMakeLists.txt -@@ -20,4 +20,7 @@ include_directories(${PUBLIC_HDR_DIR}) +@@ -20,4 +20,10 @@ include_directories(${PUBLIC_HDR_DIR}) add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS}) target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR}) target_link_libraries(${TARGET} LINK_PUBLIC z) @@ -66,8 +58,12 @@ index 20955b77b..ffe7cdfe1 100644 \ No newline at end of file +set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty) + ++# ================================================================================================== ++# Install ++# ================================================================================================== +install(FILES ${PUBLIC_HDRS} DESTINATION include) +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) +\ No newline at end of file -- -2.45.1 +2.25.1 diff --git a/patches/filament/0004-move-include-contents-to-include-filament.patch b/patches/filament/0003-move-include-contents-to-include-filament.patch similarity index 88% rename from patches/filament/0004-move-include-contents-to-include-filament.patch rename to patches/filament/0003-move-include-contents-to-include-filament.patch index b3f4a4c..5214f95 100644 --- a/patches/filament/0004-move-include-contents-to-include-filament.patch +++ b/patches/filament/0003-move-include-contents-to-include-filament.patch @@ -1,7 +1,7 @@ -From 97fd693d50312f684c209262de99383c0347f00c Mon Sep 17 00:00:00 2001 +From bd205f96b6db118fe090f1658d006601ffb82250 Mon Sep 17 00:00:00 2001 From: Joel Winarske -Date: Wed, 12 Jun 2024 06:47:04 -0700 -Subject: [PATCH 4/5] move include contents to include filament +Date: Fri, 22 Nov 2024 17:20:39 -0800 +Subject: [PATCH 3/4] move include contents to include filament Signed-off-by: Joel Winarske --- @@ -9,7 +9,6 @@ Signed-off-by: Joel Winarske filament/backend/CMakeLists.txt | 2 +- libs/camutils/CMakeLists.txt | 2 +- libs/filabridge/CMakeLists.txt | 2 +- - libs/filaflat/CMakeLists.txt | 2 +- libs/filamat/CMakeLists.txt | 2 +- libs/filameshio/CMakeLists.txt | 2 +- libs/geometry/CMakeLists.txt | 2 +- @@ -19,7 +18,6 @@ Signed-off-by: Joel Winarske libs/image/CMakeLists.txt | 2 +- libs/imageio/CMakeLists.txt | 2 +- libs/ktxreader/CMakeLists.txt | 2 +- - libs/matdbg/CMakeLists.txt | 2 +- libs/math/CMakeLists.txt | 2 +- libs/mathio/CMakeLists.txt | 2 +- libs/uberz/CMakeLists.txt | 2 +- @@ -32,13 +30,13 @@ Signed-off-by: Joel Winarske third_party/robin-map/tnt/CMakeLists.txt | 2 +- third_party/stb/tnt/CMakeLists.txt | 2 +- third_party/tinyexr/tnt/CMakeLists.txt | 2 +- - 27 files changed, 31 insertions(+), 31 deletions(-) + 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt -index 796acedb7..f9453335f 100644 +index 4fe1c6040..39baa099c 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt -@@ -614,7 +614,7 @@ target_link_libraries(${TARGET} PRIVATE +@@ -632,7 +632,7 @@ target_link_libraries(${TARGET} PRIVATE # ================================================================================================== set(INSTALL_TYPE ARCHIVE) install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) @@ -48,10 +46,10 @@ index 796acedb7..f9453335f 100644 install(FILES "../LICENSE" DESTINATION .) diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt -index 378f45aed..0cfbc6f82 100644 +index 66f7b275e..dd8699421 100644 --- a/filament/backend/CMakeLists.txt +++ b/filament/backend/CMakeLists.txt -@@ -399,4 +399,4 @@ target_link_libraries(${TARGET} PRIVATE +@@ -427,4 +427,4 @@ target_link_libraries(${TARGET} PRIVATE set(INSTALL_TYPE ARCHIVE) install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) install(TARGETS vkshaders ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) @@ -71,32 +69,21 @@ index 541261c1a..013cbce09 100644 # ================================================================================================== # Tests diff --git a/libs/filabridge/CMakeLists.txt b/libs/filabridge/CMakeLists.txt -index ffcd1ce23..27ed9e33b 100644 +index 6840ce536..9627713f7 100644 --- a/libs/filabridge/CMakeLists.txt +++ b/libs/filabridge/CMakeLists.txt -@@ -31,5 +31,5 @@ target_link_libraries(${TARGET} backend_headers) +@@ -32,5 +32,5 @@ target_link_libraries(${TARGET} backend_headers) # ================================================================================================== # Installation # ================================================================================================== -install(DIRECTORY ${PUBLIC_HDR_DIR}/filament DESTINATION include) +install(DIRECTORY ${PUBLIC_HDR_DIR}/filament DESTINATION include/filament) install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) -diff --git a/libs/filaflat/CMakeLists.txt b/libs/filaflat/CMakeLists.txt -index 0ebf53e06..5fff8201b 100644 ---- a/libs/filaflat/CMakeLists.txt -+++ b/libs/filaflat/CMakeLists.txt -@@ -34,5 +34,5 @@ endif() - # Installation - # ================================================================================================== - # We do not need filaflat headers in the install directory --# install(DIRECTORY ${PUBLIC_HDR_DIR}/filaflat DESTINATION include) -+# install(DIRECTORY ${PUBLIC_HDR_DIR}/filaflat DESTINATION include/filament) - install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) diff --git a/libs/filamat/CMakeLists.txt b/libs/filamat/CMakeLists.txt -index 2fc20d7e9..41c1f6c20 100644 +index c74ad631f..d7be743cf 100644 --- a/libs/filamat/CMakeLists.txt +++ b/libs/filamat/CMakeLists.txt -@@ -140,7 +140,7 @@ combine_static_libs(filamat "${FILAMAT_COMBINED_OUTPUT}" "${FILAMAT_DEPS}") +@@ -139,7 +139,7 @@ combine_static_libs(filamat "${FILAMAT_COMBINED_OUTPUT}" "${FILAMAT_DEPS}") set(FILAMAT_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}filamat${CMAKE_STATIC_LIBRARY_SUFFIX}) install(FILES "${FILAMAT_COMBINED_OUTPUT}" DESTINATION lib/${DIST_DIR} RENAME ${FILAMAT_LIB_NAME}) @@ -132,10 +119,10 @@ index a7e8f398e..5a5bb88ec 100644 set(COMBINED_DEPS ${TARGET} diff --git a/libs/gltfio/CMakeLists.txt b/libs/gltfio/CMakeLists.txt -index c066cc229..a383410c0 100644 +index 373df1f8a..de289cfb4 100644 --- a/libs/gltfio/CMakeLists.txt +++ b/libs/gltfio/CMakeLists.txt -@@ -257,5 +257,5 @@ endif() +@@ -265,5 +265,5 @@ endif() # ================================================================================================== install(TARGETS gltfio_core uberarchive ARCHIVE DESTINATION lib/${DIST_DIR}) @@ -177,15 +164,17 @@ index 351d39548..3ac6ff402 100644 # ================================================================================================== # Tests diff --git a/libs/imageio/CMakeLists.txt b/libs/imageio/CMakeLists.txt -index 69dc695c4..8711a78fa 100644 +index 9eb92fc7a..264c5ac9b 100644 --- a/libs/imageio/CMakeLists.txt +++ b/libs/imageio/CMakeLists.txt -@@ -49,4 +49,4 @@ endif () +@@ -49,4 +49,4 @@ endif() # Installation # ================================================================================================== install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) -install(DIRECTORY ${PUBLIC_HDR_DIR}/imageio DESTINATION include) +\ No newline at end of file +install(DIRECTORY ${PUBLIC_HDR_DIR}/imageio DESTINATION include/filament) +\ No newline at end of file diff --git a/libs/ktxreader/CMakeLists.txt b/libs/ktxreader/CMakeLists.txt index a9d5714e0..039ee6a3d 100644 --- a/libs/ktxreader/CMakeLists.txt @@ -199,16 +188,6 @@ index a9d5714e0..039ee6a3d 100644 # ================================================================================================== # Tests -diff --git a/libs/matdbg/CMakeLists.txt b/libs/matdbg/CMakeLists.txt -index e58058548..47b516c9e 100644 ---- a/libs/matdbg/CMakeLists.txt -+++ b/libs/matdbg/CMakeLists.txt -@@ -122,4 +122,4 @@ combine_static_libs(matdbg "${MATDBG_COMBINED_OUTPUT}" "${MATDBG_DEPS}") - set(MATDBG_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}matdbg${CMAKE_STATIC_LIBRARY_SUFFIX}) - install(FILES "${MATDBG_COMBINED_OUTPUT}" DESTINATION lib/${DIST_DIR} RENAME ${MATDBG_LIB_NAME}) - # We do not need matdbg headers in the install directory --# install(DIRECTORY ${PUBLIC_HDR_DIR}/matdbg DESTINATION include) -+# install(DIRECTORY ${PUBLIC_HDR_DIR}/matdbg DESTINATION include/filament) diff --git a/libs/math/CMakeLists.txt b/libs/math/CMakeLists.txt index 838aa2d53..4256d6607 100644 --- a/libs/math/CMakeLists.txt @@ -338,7 +317,7 @@ index 300da5248..ef5ef82d6 100644 -install(FILES ${PUBLIC_HDRS} DESTINATION include/${TARGET}) +install(FILES ${PUBLIC_HDRS} DESTINATION include/filament/${TARGET}) diff --git a/third_party/stb/tnt/CMakeLists.txt b/third_party/stb/tnt/CMakeLists.txt -index 563a2604d..946aa9264 100644 +index 293dd486f..b3f65fbba 100644 --- a/third_party/stb/tnt/CMakeLists.txt +++ b/third_party/stb/tnt/CMakeLists.txt @@ -15,4 +15,4 @@ target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR}) @@ -346,18 +325,21 @@ index 563a2604d..946aa9264 100644 install(TARGETS stb ARCHIVE DESTINATION lib/${DIST_DIR}) -install(FILES ${PUBLIC_HDRS} DESTINATION include) +\ No newline at end of file +install(FILES ${PUBLIC_HDRS} DESTINATION include/filament) +\ No newline at end of file diff --git a/third_party/tinyexr/tnt/CMakeLists.txt b/third_party/tinyexr/tnt/CMakeLists.txt -index ffe7cdfe1..6ae9c7787 100644 +index 1e2602d0d..6a65119c4 100644 --- a/third_party/tinyexr/tnt/CMakeLists.txt +++ b/third_party/tinyexr/tnt/CMakeLists.txt -@@ -22,5 +22,5 @@ target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR}) - target_link_libraries(${TARGET} LINK_PUBLIC z) - set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty) - +@@ -25,5 +25,5 @@ set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty) + # ================================================================================================== + # Install + # ================================================================================================== -install(FILES ${PUBLIC_HDRS} DESTINATION include) +install(FILES ${PUBLIC_HDRS} DESTINATION include/filament) install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) +\ No newline at end of file -- -2.45.1 +2.25.1 diff --git a/patches/filament/0005-move-libraries-so-they-install.patch b/patches/filament/0004-move-libraries-so-they-install.patch similarity index 80% rename from patches/filament/0005-move-libraries-so-they-install.patch rename to patches/filament/0004-move-libraries-so-they-install.patch index ed19ee9..6eb9327 100644 --- a/patches/filament/0005-move-libraries-so-they-install.patch +++ b/patches/filament/0004-move-libraries-so-they-install.patch @@ -1,7 +1,7 @@ -From ce9796a1f7af7dde4fbf1659630aaa038d048f2c Mon Sep 17 00:00:00 2001 +From c2d146b1fab57ccc333b4480518d394f2fe19868 Mon Sep 17 00:00:00 2001 From: Joel Winarske -Date: Wed, 12 Jun 2024 06:49:14 -0700 -Subject: [PATCH 5/5] move libraries so they install +Date: Fri, 22 Nov 2024 17:23:31 -0800 +Subject: [PATCH 4/4] move libraries so they install Signed-off-by: Joel Winarske --- @@ -9,10 +9,10 @@ Signed-off-by: Joel Winarske 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 283778b32..9f0d7ca2a 100644 +index 649577b39..dd9284f9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -725,6 +725,7 @@ add_subdirectory(${LIBRARIES}/gltfio) +@@ -741,6 +741,7 @@ add_subdirectory(${LIBRARIES}/gltfio) add_subdirectory(${LIBRARIES}/ibl) add_subdirectory(${LIBRARIES}/iblprefilter) add_subdirectory(${LIBRARIES}/image) @@ -20,7 +20,7 @@ index 283778b32..9f0d7ca2a 100644 add_subdirectory(${LIBRARIES}/ktxreader) add_subdirectory(${LIBRARIES}/math) add_subdirectory(${LIBRARIES}/mathio) -@@ -746,6 +747,9 @@ add_subdirectory(${EXTERNAL}/draco/tnt) +@@ -762,6 +763,9 @@ add_subdirectory(${EXTERNAL}/draco/tnt) add_subdirectory(${EXTERNAL}/jsmn/tnt) add_subdirectory(${EXTERNAL}/stb/tnt) add_subdirectory(${EXTERNAL}/getopt) @@ -30,7 +30,7 @@ index 283778b32..9f0d7ca2a 100644 # Note that this has to be placed after mikktspace in order for combine_static_libs to work. add_subdirectory(${LIBRARIES}/geometry) -@@ -785,15 +789,11 @@ if (IS_HOST_PLATFORM) +@@ -801,15 +805,11 @@ if (IS_HOST_PLATFORM) if (NOT FILAMENT_SKIP_SDL2) add_subdirectory(${LIBRARIES}/filamentapp) endif() @@ -47,5 +47,5 @@ index 283778b32..9f0d7ca2a 100644 add_subdirectory(${TOOLS}/cmgen) add_subdirectory(${TOOLS}/cso-lut) -- -2.45.1 +2.25.1 diff --git a/patches/filament/0006-return-shader-type-mobile-for-linux-vulkan.patch b/patches/filament/0005-return-shader-type-mobile-for-linux-vulkan.patch similarity index 100% rename from patches/filament/0006-return-shader-type-mobile-for-linux-vulkan.patch rename to patches/filament/0005-return-shader-type-mobile-for-linux-vulkan.patch