From nobody Wed Nov 15 19:06:38 2023 X-Original-To: dev-commits-ports-all@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 4SVt1p6tM0z50dB0; Wed, 15 Nov 2023 19:06:38 +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 4SVt1p6Spfz4TlF; Wed, 15 Nov 2023 19:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700075198; 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=vrxMV0AkEsDceDRaY+7PWzKiufYnQiQ4eZzi2clxvxI=; b=DACIQ1nWpJlhuJ2zEd84LMKnRgkX6iX4UOsRCz3VDiNI9M3JFZV/gpjL83P6Qk0WTmNytG ykl/1neBz++Q5N6nxjIoxdC80EHkr9760G4+lMWQuyGpA4W1KsVgmOXzy+pJnUYcxwxQ8t 4SG+7ZyiWQjhdjOw1BM7Y0MOtZO5uqtmpAVu4B+tHfMh5MpAoa3tVTEm0SPHG7QAqthSWL tDie7Cs0I1dXQaZtK0WvCU2HVk8NQbFAUMh7ZHHThC0+iDRtxlQA6YvyRmzx9lNu8TIcOD hhmOk7xtsuP6e5zL3llWEc5/EyT4aABoTPl/ooyXUVmUehfkYsDeBOc0b/ssOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700075198; 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=vrxMV0AkEsDceDRaY+7PWzKiufYnQiQ4eZzi2clxvxI=; b=EKprP9X3ZkvwU0rN48CdK2AnAiF9bQ02eH5xOdhZ2FXclGWp44uA/Xzw7P4oL+C6zlMYVn xXtl1JthouwinPsEHgiYFG4zmlIXkUuBoaGHXZvbuXqn16Y17cxEojD2v26ICEki3a5+lB iSi4HzvSrSCyIOCKbvA69MD4xMn1X5sfo3zXZ2hakTVIep1JmmWFZ9/PeSth9Rt2u5ub84 4v2Nukg2xaWtTwNbc1/tyRy5JSzZXZT0R17LczQ5Aq0Tioym0ueMYEZEj41MD0AobVxaCv BuzkRFYzp3kJ4PVFMQ/cqs/9DipijqohiVH0x3uD8l7l1WyB8v9feWGJ6UQ5fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700075198; a=rsa-sha256; cv=none; b=yKOJfvRI5cmUAxPrWT5Jd9eeHXv8k5lQFYzF57GIe7DCtNRbUHS+HyPTrARTHZQ4QSbCHJ 5Bz8DEgm2aglmazUsfzPnPPaunr1MWWYgLb0dTiTZylazutlizUpvjcGw+OfxQcJ4LU7cx 2EP0uCWB7JshrDLxLuKkFp+42QUauDAsi9PzmQCkAK2KWKQzTqYjpX/RUZ/slJ00C+/zh0 8URflbx1qzLpNusY3E1yMw0r/Rv54hy88ffId//h2u2xrVpn1H9IRB0GcpJNXfR938JvG9 b7IrVFTUO1ITHeQVUVpg7gMOmCnOOcm+waYbHocc+UJQeCG9KY/I3mVpfYBMKA== 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 4SVt1p5Kg0zDPL; Wed, 15 Nov 2023 19:06:38 +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 3AFJ6c1W062191; Wed, 15 Nov 2023 19:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFJ6c9v062189; Wed, 15 Nov 2023 19:06:38 GMT (envelope-from git) Date: Wed, 15 Nov 2023 19:06:38 GMT Message-Id: <202311151906.3AFJ6c9v062189@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: 0a6e08ba8fa6 - main - graphics/filament: update 1.45.0 =?utf-8?Q?=E2=86=92?= 1.46.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 0a6e08ba8fa6d32b734ef96df11728faafabfee4 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a6e08ba8fa6d32b734ef96df11728faafabfee4 commit 0a6e08ba8fa6d32b734ef96df11728faafabfee4 Author: Yuri Victorovich AuthorDate: 2023-11-15 19:06:23 +0000 Commit: Yuri Victorovich 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 --#elif defined(__linux__) && defined(FILAMENT_SUPPORTS_GGP) -+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(FILAMENT_SUPPORTS_GGP) - #include -#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 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(nativeWindow); extent.width = ptrval->width; extent.height = ptrval->height;