diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index d87a0111fc4c..6baed8131a0f 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,50 +1,50 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.28.2 +DISTVERSION= 1.28.3 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 BUILD_DEPENDS= bash:shells/bash \ evdev-proto>0:devel/evdev-proto USES= cmake compiler:c++17-lang localbase:ldflags 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} LDFLAGS+= -lexecinfo -lSDL2 OPTIONS_DEFINE= SAMPLES OPTIONS_SUB= yes SAMPLES_DESC= Build samples SAMPLES_CMAKE_OFF= -DFILAMENT_SKIP_SAMPLES=ON 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 672f2929132e..52dd346a65dd 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667629561 -SHA256 (google-filament-v1.28.2_GH0.tar.gz) = c4f4f0e08f0ea33a67898ac558963caec4059c853fb1fe13fe16bfef17b1e1c7 -SIZE (google-filament-v1.28.2_GH0.tar.gz) = 496774738 +TIMESTAMP = 1668148666 +SHA256 (google-filament-v1.28.3_GH0.tar.gz) = 45b8fea0423377a23ce90a7de589308b9d928d0b19f0e56a00f29888353b2db3 +SIZE (google-filament-v1.28.3_GH0.tar.gz) = 496794254 diff --git a/graphics/filament/files/patch-filament_backend_src_Platform.cpp b/graphics/filament/files/patch-filament_backend_src_Platform.cpp index b26e228a487f..4e4edca1edd6 100644 --- a/graphics/filament/files/patch-filament_backend_src_Platform.cpp +++ b/graphics/filament/files/patch-filament_backend_src_Platform.cpp @@ -1,29 +1,29 @@ ---- filament/backend/src/Platform.cpp.orig 2022-08-16 18:01:04 UTC +--- filament/backend/src/Platform.cpp.orig 2022-11-10 00:38:02 UTC +++ filament/backend/src/Platform.cpp @@ -41,7 +41,7 @@ #if defined(FILAMENT_DRIVER_SUPPORTS_VULKAN) #include "vulkan/PlatformVkCocoa.h" #endif -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - #if defined(FILAMENT_SUPPORTS_WAYLAND) - #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN) - #include "vulkan/PlatformVkLinuxWayland.h" -@@ -125,7 +125,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back + #if defined(FILAMENT_SUPPORTS_GGP) + #include "vulkan/PlatformVkLinuxGGP.h" + #elif defined(FILAMENT_SUPPORTS_WAYLAND) +@@ -121,7 +121,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back return new PlatformVkAndroid(); #elif defined(IOS) return new PlatformVkCocoaTouch(); - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) - #if defined(FILAMENT_SUPPORTS_WAYLAND) - return new PlatformVkLinuxWayland(); - #elif defined(FILAMENT_SUPPORTS_X11) -@@ -159,7 +159,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back + #if defined(FILAMENT_SUPPORTS_GGP) + return new PlatformVkLinuxGGP(); + #elif defined(FILAMENT_SUPPORTS_WAYLAND) +@@ -158,7 +158,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back return new PlatformCocoaTouchGL(); #elif defined(__APPLE__) return new PlatformCocoaGL(); - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) #if defined(FILAMENT_SUPPORTS_X11) return new PlatformGLX(); #elif defined(FILAMENT_SUPPORTS_EGL_ON_LINUX) diff --git a/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h b/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h new file mode 100644 index 000000000000..3af2733630ee --- /dev/null +++ b/graphics/filament/files/patch-libs_bluevk_include_bluevk_BlueVK.h @@ -0,0 +1,11 @@ +--- libs/bluevk/include/bluevk/BlueVK.h.orig 2022-11-11 07:03:46 UTC ++++ libs/bluevk/include/bluevk/BlueVK.h +@@ -42,7 +42,7 @@ + #define VK_USE_PLATFORM_ANDROID_KHR 1 + #elif defined(IOS) + #define VK_USE_PLATFORM_IOS_MVK 1 +- #elif defined(__linux__) ++ #elif defined(__linux__) || defined(__FreeBSD__) + #if defined(FILAMENT_SUPPORTS_XCB) + #define VK_USE_PLATFORM_XCB_KHR 1 + #endif diff --git a/graphics/filament/files/patch-libs_bluevk_include_vulkan_vk__platform.h b/graphics/filament/files/patch-libs_bluevk_include_vulkan_vk__platform.h deleted file mode 100644 index cd131eedc729..000000000000 --- a/graphics/filament/files/patch-libs_bluevk_include_vulkan_vk__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/bluevk/include/vulkan/vk_platform.h.orig 2022-08-19 02:33:42 UTC -+++ libs/bluevk/include/vulkan/vk_platform.h -@@ -25,7 +25,7 @@ - #define VK_USE_PLATFORM_ANDROID_KHR 1 - #elif defined(IOS) - #define VK_USE_PLATFORM_IOS_MVK 1 --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #if defined(FILAMENT_SUPPORTS_XCB) - #define VK_USE_PLATFORM_XCB_KHR 1 - #endif