From nobody Wed Apr 06 20:49:00 2022 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 171A41A9763C; Wed, 6 Apr 2022 20:49:01 +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 4KYc7J3mGNz4jLx; Wed, 6 Apr 2022 20:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649278140; 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=rORDCZ7GDaijt3cb028XpIGD/HXVSCrBRln6FHQv754=; b=oVN4/zEbgYY65GwJEg/WQZobdpOiD/z8y9GimQco4MU2UEEQh3EcX7ZNTnDn/uPwqkBMUH UZiQw26TuXIo/CxII+vow9o2mjV93D8ictsiZOHuUAebRyVuaAIR693TbzRQfXcUAnxWHX RehfuvV3Dm7OuAuiEHl3El2AEg3dCTSE+FwerZw6EnSUzznXM1PpG0u/bGU3UGoR0uzfNp 6MgLQgU4PZw57z0El3BjK7hUj/Bpzm2oVGvRdDMYho1aHrX7MFSS8voW2KF3iBblLmDEsK yTv0Cc5Xm/whBYnA9DR1l7pYj30TT873qAVG5nQX0cFPv5BRVAfrlvlaeFFrIw== 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 4AFC221D5A; Wed, 6 Apr 2022 20:49:00 +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 236Kn0Vt065216; Wed, 6 Apr 2022 20:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236Kn0kP065215; Wed, 6 Apr 2022 20:49:00 GMT (envelope-from git) Date: Wed, 6 Apr 2022 20:49:00 GMT Message-Id: <202204062049.236Kn0kP065215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1b2196e50148 - main - graphics/vulkan-loader: update to 1.2.211 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b2196e50148c4825627b32903f7ced5014ebcd3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649278140; 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=rORDCZ7GDaijt3cb028XpIGD/HXVSCrBRln6FHQv754=; b=jTntvci9jy60IBYZPEluYbetU8HsDaz3flFvZbKP/zRSAKl86P/rMvf8/GMoya8/beORNZ ClvBKCMkRjsKrKxtuNwPMVJyNt/+rYkiBtAxaeQrse8V9PcxImh673jhXNzlNonE/DLbDO 6AjkkXYRwdlpaHxRIqdwyJWYCEpTx8hCWsOXGKk1NS7JfABKKZnD9XEw5iyduXs9u57Oev UxpG0jCco60Pq7Xw3dZa6rg3jyi79PafGSlYjeYFOObMxg2jU430Ozxq+kYh79P3iyweoj aHMHG4AZ2hwet0UfXjkLWb6DPI3+58OQtE4hXzDc2nItXBWaMdSbPJU904Z4SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649278140; a=rsa-sha256; cv=none; b=JSJbrV5UIgPjkgEJ064euXaKLJWFKE4Waxf/oEoa8OWHNi4kmONimSl9nSxEq7mFkzu7ga 97Dby/9twHolALAdKOguZroQuzwhy28GRaWm4MVBQPs95p7a4/PzSLKsYw4yDudpeBQuFO uv1u4H6XdI90DTSVN3KloPfJSYx9UIlck+GCuX40EEqMvu2Xfql6SjVsVjmv4Kyql5bc74 LNnIKJqNwQTp+W2z9uiXyu8ol475+sWx1WgYKQ3YL6DNk/DaIUMX/lnfQcnZK5qzq24qOU 0C3Unp0WrqwzUxxFUTsquh48ooVWXTgiw6J5Cg20hVvpO3FwM5bzPSjw0v2/yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b2196e50148c4825627b32903f7ced5014ebcd3 commit 1b2196e50148c4825627b32903f7ced5014ebcd3 Author: Jan Beich AuthorDate: 2022-04-05 17:27:27 +0000 Commit: Jan Beich CommitDate: 2022-04-06 20:48:47 +0000 graphics/vulkan-loader: update to 1.2.211 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.3.210...v1.3.211 Reported by: Repology, portscout --- graphics/vulkan-loader/Makefile | 3 +-- graphics/vulkan-loader/distinfo | 6 ++--- graphics/vulkan-loader/files/patch-i386 | 40 +++++++++++++++++++++++++++++++++ graphics/vulkan-loader/pkg-plist | 2 +- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 0799900554be..b36e6feb4240 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,7 +1,6 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.3.210 -PORTREVISION= 1 +DISTVERSION= 1.3.211 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index cf57acfa14e4..3843d659bc0e 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648835708 -SHA256 (KhronosGroup-Vulkan-Loader-v1.3.210_GH0.tar.gz) = 85b441cb985acd4dfa55f7b7d8b4b6a758060edeb92cf72ffb3869807d097b67 -SIZE (KhronosGroup-Vulkan-Loader-v1.3.210_GH0.tar.gz) = 1579013 +TIMESTAMP = 1649179647 +SHA256 (KhronosGroup-Vulkan-Loader-v1.3.211_GH0.tar.gz) = 1d889f093a85700f38be5d0047694c4d8c59f99e277fbe2dc781969c8f9537be +SIZE (KhronosGroup-Vulkan-Loader-v1.3.211_GH0.tar.gz) = 1582562 diff --git a/graphics/vulkan-loader/files/patch-i386 b/graphics/vulkan-loader/files/patch-i386 new file mode 100644 index 000000000000..2b0b64e759ff --- /dev/null +++ b/graphics/vulkan-loader/files/patch-i386 @@ -0,0 +1,40 @@ +Partially revert https://github.com/KhronosGroup/Vulkan-Loader/commit/aeec557162da +to fix https://github.com/KhronosGroup/Vulkan-Loader/issues/909 + +--- loader/unknown_ext_chain_gas_x86.S.orig 2022-04-05 17:27:27 UTC ++++ loader/unknown_ext_chain_gas_x86.S +@@ -99,14 +99,14 @@ terminError\num: + mov [esp + 4], ecx # Copy the unwrapped VkPhysicalDevice into the first arg + jmp [eax + (DISPATCH_OFFSET_ICD_TERM + (PTR_SIZE * \num))] # Jump to the next function in the chain + terminError\num: +- mov eax, dword ptr [eax + INSTANCE_OFFSET_ICD_TERM] # Load the loader_instance into eax +- push dword ptr [eax + (FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * \num))] # Push the func name (fifth arg) +- push offset termin_error_string # Push the error string (fourth arg) +- push 0 # Push zero (third arg) +- push VULKAN_LOADER_ERROR_BIT # Push the error logging bit (second arg) +- push eax # Push the loader_instance (first arg) +- call loader_log # Log the error message before we crash +- add esp, 20 # Clean up the args ++ mov eax, [eax + INSTANCE_OFFSET_ICD_TERM] # Load the loader_instance into eax ++ push [eax + (FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * \num))] # Push the func name (fifth arg) ++ push offset termin_error_string@GOT # Push the error string (fourth arg) ++ push 0 # Push zero (third arg) ++ push VULKAN_LOADER_ERROR_BIT # Push the error logging bit (second arg) ++ push eax # Push the loader_instance (first arg) ++ call loader_log # Log the error message before we crash ++ add esp, 20 # Clean up the args + mov eax, 0 + jmp eax # Crash intentionally by jumping to address zero + .endm +@@ -115,9 +115,8 @@ vkdev_ext\num: + .global vkdev_ext\num + vkdev_ext\num: + _CET_ENDBR +- mov eax, dword ptr [esp + 4] # Dereference the handle to get the dispatch table +- mov eax, dword ptr [eax] # Dereference the chain_device to get the loader_dispatch +- jmp dword ptr [eax + (EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * \num))] # Jump to the appropriate call chain ++ mov eax, [esp + 4] # Dereference the handle to get the dispatch table ++ jmp [eax + (EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * \num))] # Jump to the appropriate call chain + .endm + + .endif diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index d27c3c1daf09..80344eb5be21 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -1,4 +1,4 @@ lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.3.210 +lib/libvulkan.so.1.3.211 libdata/pkgconfig/vulkan.pc