diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index 8fc036dfda96..92c02779c770 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,53 +1,53 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.31.1 +DISTVERSION= 1.31.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 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 c91730dbebf4..3e1ec6942c19 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674153432 -SHA256 (google-filament-v1.31.1_GH0.tar.gz) = f800ef014fdc123b082d18aea79050f56b6e4d6aef53b98a5d7b3bfeeff11e73 -SIZE (google-filament-v1.31.1_GH0.tar.gz) = 496334380 +TIMESTAMP = 1674705343 +SHA256 (google-filament-v1.31.2_GH0.tar.gz) = 93ef888e986b75c48c9f7f1d523f716e0b89a3b2c64d0ce5058d2c9b3213a3c6 +SIZE (google-filament-v1.31.2_GH0.tar.gz) = 496343438 diff --git a/graphics/filament/files/patch-filament_backend_src_Platform.cpp b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp similarity index 80% rename from graphics/filament/files/patch-filament_backend_src_Platform.cpp rename to graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp index 4e4edca1edd6..f1497e65ba5d 100644 --- a/graphics/filament/files/patch-filament_backend_src_Platform.cpp +++ b/graphics/filament/files/patch-filament_backend_src_PlatformFactory.cpp @@ -1,29 +1,29 @@ ---- filament/backend/src/Platform.cpp.orig 2022-11-10 00:38:02 UTC -+++ filament/backend/src/Platform.cpp +--- filament/backend/src/PlatformFactory.cpp.orig 2023-01-26 04:37:03 UTC ++++ filament/backend/src/PlatformFactory.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_GGP) #include "vulkan/PlatformVkLinuxGGP.h" #elif defined(FILAMENT_SUPPORTS_WAYLAND) -@@ -121,7 +121,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back +@@ -118,7 +118,7 @@ Platform* PlatformFactory::create(Backend* backend) no return new PlatformVkAndroid(); #elif defined(IOS) return new PlatformVkCocoaTouch(); - #elif defined(__linux__) + #elif defined(__linux__) || defined(__FreeBSD__) #if defined(FILAMENT_SUPPORTS_GGP) return new PlatformVkLinuxGGP(); #elif defined(FILAMENT_SUPPORTS_WAYLAND) -@@ -158,7 +158,7 @@ DefaultPlatform* DefaultPlatform::create(Backend* back +@@ -155,7 +155,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/pkg-plist b/graphics/filament/pkg-plist index 996475dd8d1e..d5527d01e03f 100644 --- a/graphics/filament/pkg-plist +++ b/graphics/filament/pkg-plist @@ -1,190 +1,202 @@ %%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 %%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/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/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/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/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/SpinLock.h include/utils/StructureOfArrays.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/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/libfilamat_lite.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/libshaders.a lib/libsmol-v.a lib/libstb.a lib/libuberarchive.a lib/libuberzlib.a lib/libutils.a lib/libviewer.a lib/libvkshaders.a