diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index a07264cc9a55..d370502c7531 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,56 +1,56 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.56.4 +DISTVERSION= 1.56.5 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 793f264d4bb2..b93e00e2fe7a 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734517773 -SHA256 (google-filament-v1.56.4_GH0.tar.gz) = 690b7da214f97f58b7bc91e8f64631251b790ce43be935ec76367e5f0550a419 -SIZE (google-filament-v1.56.4_GH0.tar.gz) = 503608573 +TIMESTAMP = 1736488439 +SHA256 (google-filament-v1.56.5_GH0.tar.gz) = 352cdef7fb8c4652d8e3b8d5301435ca04e045dc9b2a90496aed2a40ecaee73e +SIZE (google-filament-v1.56.5_GH0.tar.gz) = 503609136 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 deleted file mode 100644 index 3d6afc6837e9..000000000000 --- a/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); - 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;