From nobody Thu May 30 12:24:28 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vqlmr6g1Dz5MYLR; Thu, 30 May 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vqlmr5vRfz4SRG; Thu, 30 May 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717071868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FiVtGzvyauIgj40qlfAb5VBCoMd/+SlnHw5Gy94K0xY=; b=KIpU2QbWBUCDoR6VNg7HshB/j3C26sw7u4Y6dvaT/7QjAKrD8dYkL2gorPIX8wfk9ssDSU Xwq2j9rJ3LfH5Aw1XZG7WwMZhh8xSVzPgTOInVgewb9tOEToyKgRjA83/uB8CaSvL9AYqG LdFGaFyhJpjna//n/L5iY/7cdx/YWSmQ3fNKWa2wwpzVQI+zxORpZNlj1QkRWkjEIsTmmf zDwx340KUon9MSFA1kzCxo/OZxU4fXF5Yqb1LJxrESR0vU6JRVmM+G4yunKSy0KVnMXy9q n0iN2TIJz9CnrpsigbcUDiHV3WWeuupnmbhxaM/Bh5Cpii94YywyjwJZY2Ig+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717071868; a=rsa-sha256; cv=none; b=vwF9/q5OHjGDWrIdsHXsz4+lNma7Wb/La/tg7y6EaWrrwB2KR6+j1nNYzTW2PftQuyzuvy wDIe+b6sSI63Sx5y2u9Mp0zTeZgX8ec18lx1lmJaDt4mRtyuw9kZIYPtZl6SBiugsEF2Xc ln0UIsO+XUrtL2VfpmAiRJ5VOaSHgetg6GmIC5t+7/U6qjwmn9837NO5YZNvnZrpzHcidb VDJFOYAvyGqZHyCVPflxxucCsTGiwj61/nmLGzBc9ipIALetdcxdzdqGRzVbdqjjzqzKhU STwXefLBeNjdcWJRDoyQb80JsphtLKsAvHIAUEWqf5KAT6cy55z2WHBwB5Vj4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717071868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FiVtGzvyauIgj40qlfAb5VBCoMd/+SlnHw5Gy94K0xY=; b=qh0GE1MELDBpZQTWPhLkGxnQ+2v1IMHtndeu0K5p34zugqCbx4aTzP8ddOD/b4TvUirW00 WTjDQQm2s5nr/ZtfsPcQVhNe7qIVwJrX4rrIjiPw0NP7bolUyyQwi5D9lk2enm2VB1MlnG 9o2aempLqJFeDi5kkRE7vVsaWfeqFaFyOYM+DDcmOpOw6SANbpJvIEdKNo2Sssr+sDPZvF NMR7tAU94aWLaM3rYQH94mJMefXnt0q+eU/1+BbLmMYEysVZD6s6H30W+AhgU7ay1hGLJa WJSIlK0R8lwuQXTp3kH0RsDt5Y6qePIdme6IUc9+wSltUA/8LEO/sOIfydAGGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vqlmr5Rx0zgb3; Thu, 30 May 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44UCOSNt011963; Thu, 30 May 2024 12:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UCOSg4011960; Thu, 30 May 2024 12:24:28 GMT (envelope-from git) Date: Thu, 30 May 2024 12:24:28 GMT Message-Id: <202405301224.44UCOSg4011960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c5443fbae7bd - main - graphics/filament: update 1.52.0 =?utf-8?Q?=E2=86=92?= 1.52.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5443fbae7bd78185e0bc9aa8339c5b2a6ef562a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5443fbae7bd78185e0bc9aa8339c5b2a6ef562a commit c5443fbae7bd78185e0bc9aa8339c5b2a6ef562a Author: Yuri Victorovich AuthorDate: 2024-05-30 11:51:53 +0000 Commit: Yuri Victorovich 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 #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 @@ -9,16 +9,16 @@ #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."); 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