From nobody Wed Jun 21 07:44:40 2023 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 4QmFrm4zbYz4fprl; Wed, 21 Jun 2023 07:44:40 +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 4QmFrm2rL3z3x9n; Wed, 21 Jun 2023 07:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687333480; 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=haxq04ByQDYA8tpERmZypMx8JDRH9/PBGJBq11QGjdg=; b=ek5xa5UXLv9y3AsWbyNo99OaesUgq5gi+G6Ft5BJcOxp2hfzK1quYYLXC4CfWMDIAhyOJb AF7JFfmrhVuY0f0+cK4WhNWNgmL1TtCeyWE6aZ2MinN1/LdvCZjU3aRXzine53Be2jII/X NxWDx9cUIEehoT7krQP0Yusv6pR5ci0SL+tvVhMbdFxvRXM+dUDtuVf1wmzFU1V/x2ZNcw Et3T9uyaeOiVWWo4UxjL19SmodI+PGNQTatisWVbMeWxvsehk7linDvgYE6i8wL+q5fPM5 38BWdeyOSnw1Wu0UxG9WgaMPEXsJCOLgHwbEe+B1Uhu9oCfWQEv+TSZ8oemN6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687333480; 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=haxq04ByQDYA8tpERmZypMx8JDRH9/PBGJBq11QGjdg=; b=Y7ewu6s/uyK2If7MyR6erZxbhIe9koviVlaCU0RIIBRHs7j0gnpFbOJ6W8p6aoYtLSYcN3 gSFiGwpt4RQ+/BJdmU6BmTiT5WQ4J8HrIfaDYSG2IoPEPza3hidDgdvErTDc0/gqUpMIyA mIrfpCSRFYHzE5/n1rnA2SDUt6bqir0B5yoQTaA5DHnsrRPo3xTWJxkO5FBgEAkcMFSKQl Piux50dreGYmXpPVWtMehmbuZWqbqfuhOOhighCzkXjg4m7shbWStYesc3rAjQp0dNVEs8 nzLc3fUsc7VCnuHjYiMoUPcdiT8lx+fuV0pmQ/FyPFo6u3TG0EdTXSCq1yBv+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687333480; a=rsa-sha256; cv=none; b=sOAGYODbW67wmtKRwuurdB2Vss0vzqN9+w3CF+P5szgW31pa/69EQAt7MsU3FIkwutIOSZ t9RamrfHwOU8ZklX4cOFbXmsE3ofTY1qTKdhhiiMmUTiLdFjIEw5gh/l2jKDkI9NMHxM9G 0tkGLCzZxauPMUHdfOYN/QZAvlN/Jn9Au1l6V1TxYU7OeTNyajKF9qkUWiOin6jgmsYvl7 401Wiv1fIPAf3O6ZJ8KugZzIIBVtL+uYgJcfOy2ZNt2AlaE5Uh7ALd5HtvWDkwTcDMwEkp 2TDBEAhPHAXSvkRRYqUzZTIOiPPcwgPMku9lD5K6WE+4hk1okUOQ4qato3394Q== 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 4QmFrm1C0LzYbw; Wed, 21 Jun 2023 07:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L7ie8K063351; Wed, 21 Jun 2023 07:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L7ieZp063350; Wed, 21 Jun 2023 07:44:40 GMT (envelope-from git) Date: Wed, 21 Jun 2023 07:44:40 GMT Message-Id: <202306210744.35L7ieZp063350@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: 806b945c792e - main - =?utf-8?Q?graphics/filament:=20Update=201.38.0=20=E2=86=92=201.39.0?= 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 806b945c792ec021354eb870a64fb5b33a36e133 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=806b945c792ec021354eb870a64fb5b33a36e133 commit 806b945c792ec021354eb870a64fb5b33a36e133 Author: Yuri Victorovich AuthorDate: 2023-06-21 07:43:11 +0000 Commit: Yuri Victorovich 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 @@ -12,16 +12,7 @@ #include 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 -@@ -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(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.");