diff options
author | Marijn Suijten | 2023-06-19 10:44:01 +0200 |
---|---|---|
committer | Marijn Suijten | 2023-06-19 10:49:04 +0200 |
commit | 11345adada12d00a5a2fa96927eae478dfc7898e (patch) | |
tree | 1ebf7c29a77e5c408c287fe9e89c40bd3aa3fda6 | |
parent | 574fb07fb58c5fdb1d6e2079fe29f8f0ee688f69 (diff) | |
download | aur-11345adada12d00a5a2fa96927eae478dfc7898e.tar.gz |
Update to 2023.Q2.3 and drop PAL patch for compiling with GCC 13
This patch [landed upstream] and should no longer be applied manually.
[landed upstream]: https://github.com/GPUOpen-Drivers/pal/commit/2609e1f718a41adc73a343fbcd2d76f41b9e91c7
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch | 40 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 4 insertions, 49 deletions
@@ -1,6 +1,6 @@ pkgbase = amdvlk-git pkgdesc = AMD's standalone Vulkan driver - pkgver = 2023.Q2.2.r0.ff6b9ba + pkgver = 2023.Q2.3.r0.c07a4b3 pkgrel = 1 url = https://github.com/GPUOpen-Drivers arch = x86_64 @@ -23,7 +23,5 @@ pkgbase = amdvlk-git provides = vulkan-driver conflicts = vulkan-amdvlk conflicts = amdvlk - source = 0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch - sha256sums = 0943859eeab66bf24598cfba99e07d839bb018360e93ffb8b5c94b45ab36d389 pkgname = amdvlk-git diff --git a/0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch b/0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch deleted file mode 100644 index c36dc6db25a6..000000000000 --- a/0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 56868b78dddddd975f2c1dfe671646f7b434d29b Mon Sep 17 00:00:00 2001 -From: Marijn Suijten <marijns95@gmail.com> -Date: Tue, 23 May 2023 10:23:10 +0200 -Subject: [PATCH] rdf: Include `cstdint` header explicitly for `std::int64_t` - and friends -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On gcc-13 these integer types appear to no longer be included via -`(c)string` or other `std` headers (according to a [similar fix]), -resulting in many of the following compiler errors in `amdrdf.{cpp,h}`: - - In file included from pal/src/core/imported/rdf/rdf/src/amdrdf.cpp:25: - pal/src/core/imported/rdf/rdf/inc/amdrdf.h:112:39: error: ‘int64_t’ in namespace ‘std’ does not name a type - 112 | int (*Read)(void* ctx, const std::int64_t count, void* buffer, std::int64_t* bytesRead); - | ^~~~~~~ - -Solve this by including `cstdint` explicitly. - -[similar fix]: https://github.com/google/breakpad/commit/7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa ---- - src/core/imported/rdf/rdf/inc/amdrdf.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/imported/rdf/rdf/inc/amdrdf.h b/src/core/imported/rdf/rdf/inc/amdrdf.h -index 2ac8b1ce..cbee874d 100644 ---- a/src/core/imported/rdf/rdf/inc/amdrdf.h -+++ b/src/core/imported/rdf/rdf/inc/amdrdf.h -@@ -25,6 +25,7 @@ - #pragma once - - #include <cstddef> -+#include <cstdint> - #include <cstring> - #include <functional> - #include <memory> --- -2.40.1 - @@ -4,7 +4,7 @@ # Contributor: Adrià Cereto i Massagué <ssorgatem at gmail.com> pkgname=amdvlk-git -pkgver=2023.Q2.2.r0.ff6b9ba +pkgver=2023.Q2.3.r0.c07a4b3 pkgrel=1 pkgdesc="AMD's standalone Vulkan driver" arch=(x86_64) @@ -14,8 +14,8 @@ depends=('vulkan-icd-loader') provides=('vulkan-amdvlk' 'amdvlk' 'vulkan-driver') conflicts=('vulkan-amdvlk' 'amdvlk') makedepends=('xorgproto' 'xorg-server-devel' 'libxrandr' 'cmake' 'python' 'libxml2' 'wayland' 'libdrm' 'git' 'ninja' 'repo' 'directx-shader-compiler') -source=('0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch') -sha256sums=('0943859eeab66bf24598cfba99e07d839bb018360e93ffb8b5c94b45ab36d389') +source=() +sha256sums=() pkgver() { pushd .repo/manifests/ > /dev/null @@ -32,9 +32,6 @@ prepare() { do sed -i "s/-Werror//g" "$srcdir"/$i done - - msg 'Applying https://github.com/GPUOpen-Drivers/pal/pull/94' - git -C drivers/pal am "$srcdir/0001-rdf-Include-cstdint-header-explicitly-for-std-int64_.patch" } build() { |