From nobody Wed Apr 06 22:42:08 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 2BDDC1A8E6F3; Wed, 6 Apr 2022 22:42:09 +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 4KYfdr5s3Gz3QNt; Wed, 6 Apr 2022 22:42:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649284928; 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=XOCb13lMmplHyiEAfO1thyksGAkpn3bA73az3L+/JH0=; b=YsrnzPKyLsvZcugh7xx4Tk6+mrV/SWnm9lVlCD7hSqWXs2tLPFmDzoBozXWYxOeVg3ibP9 qkYYlZkryQxItihZE0U4Ypm0O/isB+RA3Y+SeSe6V0nqxWb4P1ZclDxX6DpXSYT9szSsdw CQhCJtMsXWqqNIV4H717dsbVYpcaFFTwPhb3kO2qCOQh1tdwPQuaZSmJwnSvI/bJLn8yDy n6r5olQ3M7gSum7ROppyvsFd7JwgXZ8IvLyP5hlybhzixMpdlT21XdZlMynKLsvvN+G0YH 0IQhrJMYW9cHOzaS/fkLN6soX6oPGxqwqRLjJ3XczcZYBNqUMoi95td/WD+osw== 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 A9FF024018; Wed, 6 Apr 2022 22:42:08 +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 236Mg8ja023457; Wed, 6 Apr 2022 22:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236Mg8i0023456; Wed, 6 Apr 2022 22:42:08 GMT (envelope-from git) Date: Wed, 6 Apr 2022 22:42:08 GMT Message-Id: <202204062242.236Mg8i0023456@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: c321f8141937 - main - graphics/vulkan-loader: switch to upstream i386 fix after 6f7ec57256db 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: c321f8141937a97b5b775694e9b5cd4bfc2f9b47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649284928; 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=XOCb13lMmplHyiEAfO1thyksGAkpn3bA73az3L+/JH0=; b=pQtnQncnkT9DXv6+hdquJBL6zj18OmFHxTCFf34fiL18CbydT0udviJEkTM8u7ZnqHaom9 +lNJlG9B2xMMCuVRKsU695Hi/8e4SDu6xYpbFinoZ0/3J92aVsrJYdVEfYrsNQfAuqmKoZ RiZ9XK3aTdF3P2Z0OmwbAI0a4TBtDDRbFQzrei1dI3G/nFCzNDj+ZvWR+eSTd1PoiPRqSM Netn1sEhtxv1H8bq/QfgqT4rqdXUs4QQ8H2THX1C/uVuAX1rBee794NI7BllLU5mI3expA 2nn/FXdZ+e9aL4YaxNMQPSwG9tk+sREEnrlA7mEXXW6XPUwRcJZuLSzPdbbReg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649284928; a=rsa-sha256; cv=none; b=wllU+CGSHcaFjyiPMapmgqpQq+a6LFArIwjdVDu9+kZt4mo8k/5RZh20BJzVW90D6Qx2t7 7TAmwmULGytC1yk5KtOfU78CigDju2gPoHGVFHS2nlmoyDP/Ltj/4ijCFLsX3dE5zELy4h KHCEVzMjd0QvAMF5cMlPMCj4k0wz1CpKYIK8r69GLybi7UXt1XrH7QCoJkowZ64zuMIC2M pk6HVKkEN49c3AE4+udtCCTa0fzMoyCwysNNYxnz3hr8v591jW67Y/jmway5L+OxCIOuDq 3lZKg8+HyCuqhaUg4PxV2G07LW/d4m2+yDGV2wJc0vVsqQxs87Prz4+pyU+ccA== 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=c321f8141937a97b5b775694e9b5cd4bfc2f9b47 commit c321f8141937a97b5b775694e9b5cd4bfc2f9b47 Author: Jan Beich AuthorDate: 2022-04-06 22:38:30 +0000 Commit: Jan Beich CommitDate: 2022-04-06 22:41:07 +0000 graphics/vulkan-loader: switch to upstream i386 fix after 6f7ec57256db --- graphics/vulkan-loader/Makefile | 3 +++ graphics/vulkan-loader/distinfo | 2 ++ graphics/vulkan-loader/files/patch-i386 | 40 --------------------------------- 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index b36e6feb4240..921ab1305f8c 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.3.211 CATEGORIES= graphics devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= e7f0c7535447.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Loader/pull/910 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 3843d659bc0e..9071a6724af6 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1649179647 SHA256 (KhronosGroup-Vulkan-Loader-v1.3.211_GH0.tar.gz) = 1d889f093a85700f38be5d0047694c4d8c59f99e277fbe2dc781969c8f9537be SIZE (KhronosGroup-Vulkan-Loader-v1.3.211_GH0.tar.gz) = 1582562 +SHA256 (e7f0c7535447.patch) = 73c00c6693023886c541b89d44ba028d9f32b9f9395737a2c94afaf58b0414e2 +SIZE (e7f0c7535447.patch) = 1467 diff --git a/graphics/vulkan-loader/files/patch-i386 b/graphics/vulkan-loader/files/patch-i386 deleted file mode 100644 index 2b0b64e759ff..000000000000 --- a/graphics/vulkan-loader/files/patch-i386 +++ /dev/null @@ -1,40 +0,0 @@ -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