diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index 2e3083138a39..b6ceb627939c 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,56 +1,56 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.52.1 +DISTVERSION= 1.52.2 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Real-time physically based rendering engine WWW= https://google.github.io/filament/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= compilation breaks: unexpected token in operand, see https://github.com/google/filament/issues/6131 BROKEN_i386= compilation breaks: register r11 is only available in 64-bit mode BROKEN_powerpc= compilation breaks: invalid register name, see https://github.com/google/filament/issues/7552 BROKEN_powerpc64= compilation breaks: invalid register name, see https://github.com/google/filament/issues/7552 BROKEN_powerpc64le= compilation breaks: invalid register name, see https://github.com/google/filament/issues/7552 BUILD_DEPENDS= bash:shells/bash \ evdev-proto>0:devel/evdev-proto USES= cmake compiler:c++17-lang localbase:ldflags python:build sdl shebangfix xorg USE_SDL= sdl2 USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= google SHEBANG_FILES= build/launch-c.in build/launch-cxx.in #CMAKE_ON= BUILD_SHARED_LIBS # not yet supported, see https://github.com/google/filament/issues/1075 CMAKE_OFF= USE_STATIC_LIBCXX FILAMENT_ENABLE_JAVA CMAKE_ARGS+= -DDIST_DIR="." # prevent subdirectory for libraries CMAKE_ARGS+= -DUSE_CCACHE:BOOL=${CCACHE_ENABLED:tu} CMAKE_ARGS+= -DPython3_EXECUTABLE=${PYTHON_CMD} LDFLAGS+= -lexecinfo -lSDL2 OPTIONS_DEFINE= SAMPLES OPTIONS_SUB= yes SAMPLES_DESC= Build samples SAMPLES_CMAKE_OFF= -DFILAMENT_SKIP_SAMPLES=ON # gltf_viewer is broken with the Vulkan backend, see https://github.com/google/filament/issues/6445 post-patch: @${REINPLACE_CMD} -e 's|"/proc/self/exe"|"/proc/curproc/file"|' ${WRKSRC}/libs/utils/src/linux/Path.cpp post-install: # remove unnecessary files @cd ${STAGEDIR}${PREFIX} && ${RM} -r README.md LICENSE docs # remove conflicting file, see https://github.com/google/filament/issues/5957 @${RM} ${STAGEDIR}${PREFIX}/lib/libzstd.a .include diff --git a/graphics/filament/distinfo b/graphics/filament/distinfo index f7c6a8370cdf..ea2fe1803b20 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717059112 -SHA256 (google-filament-v1.52.1_GH0.tar.gz) = 74d56947adf9856a7330a05464de3d024e25f3fca1cc8707468e8abd2c1313aa -SIZE (google-filament-v1.52.1_GH0.tar.gz) = 502788948 +TIMESTAMP = 1717493088 +SHA256 (google-filament-v1.52.2_GH0.tar.gz) = 7d1a81363897a1c0f9f6147ff8da5bf125451d965a128805e0e2f75e0d195334 +SIZE (google-filament-v1.52.2_GH0.tar.gz) = 502782821 diff --git a/graphics/filament/files/patch-CMakeLists.txt b/graphics/filament/files/patch-CMakeLists.txt index 8a81794c1f14..40f6db9d930b 100644 --- a/graphics/filament/files/patch-CMakeLists.txt +++ b/graphics/filament/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2023-03-01 19:24:13 UTC +--- CMakeLists.txt.orig 2024-06-03 18:10:41 UTC +++ CMakeLists.txt -@@ -68,7 +68,7 @@ endif() +@@ -87,7 +87,7 @@ find_program(CCACHE_PROGRAM ccache) # Support for ccache # ================================================================================================== find_program(CCACHE_PROGRAM ccache) -if (CCACHE_PROGRAM) +if (USE_CCACHE AND CCACHE_PROGRAM) if (WIN32) set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}") diff --git a/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp b/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp index d955272015bb..3d6afc6837e9 100644 --- a/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp +++ b/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp @@ -1,29 +1,29 @@ ---- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2024-05-29 23:19:39 UTC +--- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2024-06-03 18:10:41 UTC +++ filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp @@ -36,7 +36,7 @@ // Platform specific includes and defines #if defined(__ANDROID__) #include -#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND) +#elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND) #include namespace { typedef struct _wl { @@ -90,7 +90,7 @@ VulkanPlatform::ExtensionSet VulkanPlatform::getSwapch VulkanPlatform::ExtensionSet const ret = { #if defined(__ANDROID__) VK_KHR_ANDROID_SURFACE_EXTENSION_NAME, -#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND) +#elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND) VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, #elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_X11) #if defined(FILAMENT_SUPPORTS_XCB) @@ -124,7 +124,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk VkResult const result = vkCreateAndroidSurfaceKHR(instance, &createInfo, VKALLOC, (VkSurfaceKHR*) &surface); - ASSERT_POSTCONDITION(result == VK_SUCCESS, "vkCreateAndroidSurfaceKHR error."); + FILAMENT_CHECK_POSTCONDITION(result == VK_SUCCESS) << "vkCreateAndroidSurfaceKHR error."; - #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND) + #elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND) wl* ptrval = reinterpret_cast(nativeWindow); extent.width = ptrval->width; extent.height = ptrval->height;