git: 0a6e08ba8fa6 - main - graphics/filament: update 1.45.0 → 1.46.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Nov 2023 19:06:38 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0a6e08ba8fa6d32b734ef96df11728faafabfee4
commit 0a6e08ba8fa6d32b734ef96df11728faafabfee4
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-11-15 19:06:23 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-11-15 19:06:35 +0000
graphics/filament: update 1.45.0 → 1.46.0
Reported by: portscout
---
graphics/filament/Makefile | 2 +-
graphics/filament/distinfo | 6 ++---
..._platform_VulkanPlatformAndroidLinuxWindows.cpp | 29 ++++++----------------
3 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile
index d9cea0424abe..63a2b1030578 100644
--- a/graphics/filament/Makefile
+++ b/graphics/filament/Makefile
@@ -1,6 +1,6 @@
PORTNAME= filament
DISTVERSIONPREFIX= v
-DISTVERSION= 1.45.0
+DISTVERSION= 1.46.0
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
diff --git a/graphics/filament/distinfo b/graphics/filament/distinfo
index 201230b28c72..dc259ec1a0bf 100644
--- a/graphics/filament/distinfo
+++ b/graphics/filament/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698348364
-SHA256 (google-filament-v1.45.0_GH0.tar.gz) = 438eb19f8ee825f00026d6e7ed0373b072f537e73a86c84888713f70cefb414d
-SIZE (google-filament-v1.45.0_GH0.tar.gz) = 502461128
+TIMESTAMP = 1700067280
+SHA256 (google-filament-v1.46.0_GH0.tar.gz) = 62d53c50edb7e84bcbb0cb3968c14d677df4d0378e2113c19d27ffd96f57ed07
+SIZE (google-filament-v1.46.0_GH0.tar.gz) = 502693231
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 478a3375fb1a..611fa047ed6d 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,44 +1,29 @@
---- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2023-06-20 18:57:42 UTC
+--- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2023-11-15 05:34:54 UTC
+++ filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp
-@@ -30,9 +30,9 @@
+@@ -30,7 +30,7 @@
// Platform specific includes and defines
#if defined(__ANDROID__)
#include <android/native_window.h>
--#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_GGP)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_GGP)
- #include <ggp_c/ggp.h>
-#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_WAYLAND)
++#elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND)
#include <dlfcn.h>
namespace {
typedef struct _wl {
-@@ -86,9 +86,9 @@ VulkanPlatform::ExtensionSet VulkanPlatform::getRequir
+@@ -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_GGP)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_GGP)
- ret.insert(VK_GGP_STREAM_DESCRIPTOR_SURFACE_EXTENSION_NAME);
- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && 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)
-@@ -121,7 +121,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
+@@ -117,7 +117,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_GGP)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_GGP)
- VkStreamDescriptorSurfaceCreateInfoGGP const surface_create_info = {
- .sType = VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP,
- .streamDescriptor = kGgpPrimaryStreamDescriptor,
-@@ -135,7 +135,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
- VkResult const result = fpCreateStreamDescriptorSurfaceGGP(instance, &surface_create_info,
- nullptr, (VkSurfaceKHR*) &surface);
- ASSERT_POSTCONDITION(result == VK_SUCCESS, "vkCreateStreamDescriptorSurfaceGGP error.");
- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_WAYLAND)
++ #elif defined(LINUX_OR_FREEBSD) && defined(FILAMENT_SUPPORTS_WAYLAND)
wl* ptrval = reinterpret_cast<wl*>(nativeWindow);
extent.width = ptrval->width;
extent.height = ptrval->height;