git: 806b945c792e - main - graphics/filament: Update 1.38.0 → 1.39.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 21 Jun 2023 07:44:40 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=806b945c792ec021354eb870a64fb5b33a36e133
commit 806b945c792ec021354eb870a64fb5b33a36e133
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-06-21 07:43:11 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-06-21 07:44:30 +0000
graphics/filament: Update 1.38.0 → 1.39.0
Reported by: portscout
---
graphics/filament/Makefile | 2 +-
graphics/filament/distinfo | 6 ++--
..._platform_VulkanPlatformAndroidLinuxWindows.cpp | 33 ++++------------------
3 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile
index e1a01d239a90..a155e7e02ceb 100644
--- a/graphics/filament/Makefile
+++ b/graphics/filament/Makefile
@@ -1,6 +1,6 @@
PORTNAME= filament
DISTVERSIONPREFIX= v
-DISTVERSION= 1.38.0
+DISTVERSION= 1.39.0
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
diff --git a/graphics/filament/distinfo b/graphics/filament/distinfo
index 01761fcd06c6..60d0acb28de3 100644
--- a/graphics/filament/distinfo
+++ b/graphics/filament/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686269588
-SHA256 (google-filament-v1.38.0_GH0.tar.gz) = 905df6a0078be147fc78fce5b2d5ae9d0cf5a25e849c0e439fdf6f00c8464be4
-SIZE (google-filament-v1.38.0_GH0.tar.gz) = 500623474
+TIMESTAMP = 1687329176
+SHA256 (google-filament-v1.39.0_GH0.tar.gz) = 9fa06df7cf83c55282679ba5951688e770d2f16bceaa655143473d9cb5ad0e21
+SIZE (google-filament-v1.39.0_GH0.tar.gz) = 500625510
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 74cdbf43622a..478a3375fb1a 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-06-09 00:40:30 UTC
+--- filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp.orig 2023-06-20 18:57:42 UTC
+++ filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp
-@@ -26,9 +26,9 @@
+@@ -30,9 +30,9 @@
// Platform specific includes and defines
#if defined(__ANDROID__)
#include <android/native_window.h>
@@ -12,16 +12,7 @@
#include <dlfcn.h>
namespace {
typedef struct _wl {
-@@ -38,7 +38,7 @@
- uint32_t height;
- } wl;
- }// anonymous namespace
--#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_X11)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_X11)
- // TODO: we should allow for headless on Linux explicitly. Right now this is the headless path
- // (with no FILAMENT_SUPPORTS_XCB or FILAMENT_SUPPORTS_XLIB).
- #include <dlfcn.h>
-@@ -82,11 +82,11 @@ VulkanPlatform::ExtensionSet VulkanPlatform::getRequir
+@@ -86,9 +86,9 @@ VulkanPlatform::ExtensionSet VulkanPlatform::getRequir
VulkanPlatform::ExtensionSet ret;
#if defined(__ANDROID__)
ret.insert("VK_KHR_android_surface");
@@ -31,12 +22,9 @@
- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_WAYLAND)
+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_WAYLAND)
ret.insert("VK_KHR_wayland_surface");
-- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_X11)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_X11)
+ #elif LINUX_OR_FREEBSD && defined(FILAMENT_SUPPORTS_X11)
#if defined(FILAMENT_SUPPORTS_XCB)
- ret.insert("VK_KHR_xcb_surface");
- #endif
-@@ -117,7 +117,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
+@@ -121,7 +121,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
VkResult const result = vkCreateAndroidSurfaceKHR(instance, &createInfo, VKALLOC,
(VkSurfaceKHR*) &surface);
ASSERT_POSTCONDITION(result == VK_SUCCESS, "vkCreateAndroidSurfaceKHR error.");
@@ -45,7 +33,7 @@
VkStreamDescriptorSurfaceCreateInfoGGP const surface_create_info = {
.sType = VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP,
.streamDescriptor = kGgpPrimaryStreamDescriptor,
-@@ -131,7 +131,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
+@@ -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.");
@@ -54,12 +42,3 @@
wl* ptrval = reinterpret_cast<wl*>(nativeWindow);
extent.width = ptrval->width;
extent.height = ptrval->height;
-@@ -146,7 +146,7 @@ VulkanPlatform::SurfaceBundle VulkanPlatform::createVk
- VkResult const result = vkCreateWaylandSurfaceKHR(instance, &createInfo, VKALLOC,
- (VkSurfaceKHR*) &surface);
- ASSERT_POSTCONDITION(result == VK_SUCCESS, "vkCreateWaylandSurfaceKHR error.");
-- #elif defined(__linux__) && defined(FILAMENT_SUPPORTS_X11)
-+ #elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_X11)
- if (g_x11_vk.library == nullptr) {
- g_x11_vk.library = dlopen(LIBRARY_X11, RTLD_LOCAL | RTLD_NOW);
- ASSERT_PRECONDITION(g_x11_vk.library, "Unable to open X11 library.");