Date: Thu, 30 May 2024 12:24:28 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c5443fbae7bd - main - graphics/filament: update 1.52.0 =?utf-8?Q?=E2=86=92?= 1.52.1 Message-ID: <202405301224.44UCOSg4011960@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5443fbae7bd78185e0bc9aa8339c5b2a6ef562a commit c5443fbae7bd78185e0bc9aa8339c5b2a6ef562a Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-05-30 11:51:53 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-05-30 12:24:26 +0000 graphics/filament: update 1.52.0 → 1.52.1 Reported by: portscout --- graphics/filament/Makefile | 2 +- graphics/filament/distinfo | 6 +++--- .../patch-filament_backend_src_PlatformFactory.cpp | 8 ++++---- ..._platform_VulkanPlatformAndroidLinuxWindows.cpp | 24 +++++++++++----------- graphics/filament/pkg-plist | 1 + 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index aa3c5e22fd3b..2e3083138a39 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,6 +1,6 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.52.0 +DISTVERSION= 1.52.1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org 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,15 +1,15 @@ ---- 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 <backend/platforms/PlatformCocoaGL.h> #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(); 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,6 +1,6 @@ ---- 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 <android/native_window.h> @@ -9,16 +9,16 @@ #include <dlfcn.h> 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."); 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 @@ -168,6 +168,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405301224.44UCOSg4011960>