diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index aa3c5e22fd3b..2e3083138a39 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,56 +1,56 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.52.0 +DISTVERSION= 1.52.1 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 c9577c200a63..f7c6a8370cdf 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716438163 -SHA256 (google-filament-v1.52.0_GH0.tar.gz) = a084b24d610cd6911d99487ed3ebd9fc7754f9cfff3874bba02ebcfcf0cf37ec -SIZE (google-filament-v1.52.0_GH0.tar.gz) = 502783730 +TIMESTAMP = 1717059112 +SHA256 (google-filament-v1.52.1_GH0.tar.gz) = 74d56947adf9856a7330a05464de3d024e25f3fca1cc8707468e8abd2c1313aa +SIZE (google-filament-v1.52.1_GH0.tar.gz) = 502788948 diff --git a/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp index d9c7385d548c..0aab22ea4996 100644 --- a/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp +++ b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp @@ -1,20 +1,20 @@ ---- filament/backend/src/PlatformFactory.cpp.orig 2023-05-30 23:22:31 UTC +--- filament/backend/src/PlatformFactory.cpp.orig 2024-05-29 23:19:39 UTC +++ filament/backend/src/PlatformFactory.cpp @@ -32,7 +32,7 @@ - #if defined(FILAMENT_SUPPORTS_OPENGL) && !defined(FILAMENT_USE_EXTERNAL_GLES3) && !defined(FILAMENT_USE_SWIFTSHADER) + #if defined(FILAMENT_SUPPORTS_OPENGL) && !defined(FILAMENT_USE_EXTERNAL_GLES3) #include #endif -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #if defined(FILAMENT_SUPPORTS_X11) - #if defined(FILAMENT_SUPPORTS_OPENGL) && !defined(FILAMENT_USE_EXTERNAL_GLES3) && !defined(FILAMENT_USE_SWIFTSHADER) + #if defined(FILAMENT_SUPPORTS_OPENGL) && !defined(FILAMENT_USE_EXTERNAL_GLES3) #include "backend/platforms/PlatformGLX.h" -@@ -120,7 +120,7 @@ Platform* PlatformFactory::create(Backend* backend) no +@@ -119,7 +119,7 @@ Platform* PlatformFactory::create(Backend* backend) no 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-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp b/graphics/filament/files/patch-filament_backend_src_vulkan_platform_VulkanPlatformAndroidLinuxWindows.cpp index 611fa047ed6d..d955272015bb 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 2023-11-15 05:34:54 UTC +--- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2024-05-29 23:19:39 UTC +++ filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp -@@ -30,7 +30,7 @@ +@@ -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 { -@@ -84,7 +84,7 @@ VulkanPlatform::ExtensionSet VulkanPlatform::getRequir - VulkanPlatform::ExtensionSet ret; - #if defined(__ANDROID__) - ret.insert("VK_KHR_android_surface"); -- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND) -+ #elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND) - ret.insert("VK_KHR_wayland_surface"); - #elif LINUX_OR_FREEBSD && defined(FILAMENT_SUPPORTS_X11) - #if defined(FILAMENT_SUPPORTS_XCB) -@@ -117,7 +117,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk +@@ -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."); - #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; diff --git a/graphics/filament/pkg-plist b/graphics/filament/pkg-plist index 5628b9ef58fc..8b68309efccd 100644 --- a/graphics/filament/pkg-plist +++ b/graphics/filament/pkg-plist @@ -1,207 +1,208 @@ %%SAMPLES%%bin/assets/fonts/Roboto-License.txt %%SAMPLES%%bin/assets/fonts/Roboto-Medium.ttf %%SAMPLES%%bin/assets/ibl/lightroom_14b/lightroom_14b_ibl.ktx %%SAMPLES%%bin/assets/ibl/lightroom_14b/lightroom_14b_skybox.ktx %%SAMPLES%%bin/assets/ibl/lightroom_14b/sh.txt bin/basisu bin/cmgen bin/filamesh bin/glslminifier %%SAMPLES%%bin/gltf_viewer bin/matc bin/matedit %%SAMPLES%%bin/material_sandbox bin/matinfo bin/mipgen bin/normal-blending bin/resgen bin/roughness-prefilter bin/specular-color bin/uberz include/backend/AcquiredImage.h include/backend/BufferDescriptor.h include/backend/CallbackHandler.h include/backend/DriverApiForward.h include/backend/DriverEnums.h include/backend/Handle.h include/backend/PipelineState.h include/backend/PixelBufferDescriptor.h include/backend/Platform.h include/backend/PresentCallable.h include/backend/Program.h include/backend/README.md include/backend/SamplerDescriptor.h include/backend/TargetBufferInfo.h include/backend/platforms/OpenGLPlatform.h include/backend/platforms/PlatformCocoaGL.h include/backend/platforms/PlatformCocoaTouchGL.h include/backend/platforms/PlatformEGL.h include/backend/platforms/PlatformEGLAndroid.h include/backend/platforms/PlatformEGLHeadless.h include/backend/platforms/PlatformGLX.h include/backend/platforms/PlatformWGL.h include/backend/platforms/PlatformWebGL.h include/backend/platforms/VulkanPlatform.h include/camutils/Bookmark.h include/camutils/Manipulator.h include/camutils/compiler.h include/filamat/Enums.h include/filamat/IncludeCallback.h include/filamat/MaterialBuilder.h include/filamat/Package.h include/filament-iblprefilter/IBLPrefilterContext.h include/filament/Box.h include/filament/BufferObject.h include/filament/Camera.h include/filament/Color.h include/filament/ColorGrading.h include/filament/ColorSpace.h include/filament/DebugRegistry.h include/filament/Engine.h include/filament/Exposure.h include/filament/Fence.h include/filament/FilamentAPI.h include/filament/Frustum.h include/filament/IndexBuffer.h include/filament/IndirectLight.h include/filament/InstanceBuffer.h include/filament/LightManager.h include/filament/Material.h include/filament/MaterialChunkType.h include/filament/MaterialEnums.h include/filament/MaterialInstance.h include/filament/MorphTargetBuffer.h include/filament/Options.h include/filament/RenderTarget.h include/filament/RenderableManager.h include/filament/Renderer.h include/filament/Scene.h include/filament/SkinningBuffer.h include/filament/Skybox.h include/filament/Stream.h include/filament/SwapChain.h include/filament/Texture.h include/filament/TextureSampler.h include/filament/ToneMapper.h include/filament/TransformManager.h include/filament/VertexBuffer.h include/filament/View.h include/filament/Viewport.h include/filameshio/MeshReader.h include/geometry/SurfaceOrientation.h include/geometry/TangentSpaceMesh.h include/geometry/Transcoder.h include/gltfio/Animator.h include/gltfio/AssetLoader.h include/gltfio/FilamentAsset.h include/gltfio/FilamentInstance.h include/gltfio/MaterialProvider.h include/gltfio/NodeManager.h include/gltfio/ResourceLoader.h include/gltfio/TextureProvider.h include/gltfio/TrsTransformManager.h include/gltfio/materials/uberarchive.h include/gltfio/math.h include/ibl/Cubemap.h include/ibl/CubemapIBL.h include/ibl/CubemapSH.h include/ibl/CubemapUtils.h include/ibl/Image.h include/ibl/utilities.h include/image/ColorTransform.h include/image/ImageOps.h include/image/ImageSampler.h include/image/Ktx1Bundle.h include/image/LinearImage.h include/ktxreader/Ktx1Reader.h include/ktxreader/Ktx2Reader.h include/math/TMatHelpers.h include/math/TQuatHelpers.h include/math/TVecHelpers.h include/math/compiler.h include/math/fast.h include/math/half.h include/math/mat2.h include/math/mat3.h include/math/mat4.h include/math/mathfwd.h include/math/norm.h include/math/quat.h include/math/scalar.h include/math/vec2.h include/math/vec3.h include/math/vec4.h include/mathio/ostream.h include/mikktspace/mikktspace.h include/tsl/robin_growth_policy.h include/tsl/robin_hash.h include/tsl/robin_map.h include/tsl/robin_set.h include/uberz/ArchiveEnums.h include/uberz/ReadableArchive.h include/uberz/WritableArchive.h include/utils/Allocator.h include/utils/BitmaskEnum.h include/utils/CString.h include/utils/CallStack.h include/utils/Entity.h include/utils/EntityInstance.h include/utils/EntityManager.h include/utils/FixedCapacityVector.h include/utils/Invocable.h include/utils/Log.h include/utils/Mutex.h include/utils/NameComponentManager.h include/utils/Panic.h include/utils/Path.h include/utils/PrivateImplementation-impl.h include/utils/PrivateImplementation.h include/utils/SingleInstanceComponentManager.h include/utils/Slice.h include/utils/StructureOfArrays.h include/utils/Systrace.h include/utils/algorithm.h include/utils/bitset.h include/utils/compiler.h include/utils/compressed_pair.h include/utils/debug.h include/utils/generic/Mutex.h include/utils/memalign.h include/utils/ostream.h +include/utils/sstream.h include/utils/unwindows.h include/viewer/AutomationEngine.h include/viewer/AutomationSpec.h include/viewer/RemoteServer.h include/viewer/Settings.h include/viewer/ViewerGui.h lib/libbackend.a lib/libbasis_transcoder.a lib/libbluegl.a lib/libbluevk.a lib/libcamutils.a lib/libcivetweb.a lib/libdracodec.a lib/libfilabridge.a lib/libfilaflat.a lib/libfilamat.a lib/libfilament-iblprefilter.a lib/libfilament.a lib/libfilameshio.a lib/libgeometry.a lib/libgltfio.a lib/libgltfio_core.a lib/libibl-lite.a lib/libibl.a lib/libimage.a lib/libktxreader.a lib/libmatdbg.a lib/libmeshoptimizer.a lib/libmikktspace.a lib/libshaders.a lib/libsmol-v.a lib/libstb.a lib/libuberarchive.a lib/libuberzlib.a lib/libutils.a lib/libviewer.a lib/libvkshaders.a