summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--0001-build-Fix-clang-linking.patch25
-rw-r--r--0001-build-Remove-forced-Werror-option.patch40
-rw-r--r--PKGBUILD21
4 files changed, 7 insertions, 87 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9359aa46d960..fb41828c2022 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = amdvlk-git
pkgdesc = AMD's standalone Vulkan driver
- pkgver = v.2019.Q4.5.r0.e6d1928
+ pkgver = v.2020.Q1.3.r2.bd57537
pkgrel = 1
url = https://github.com/GPUOpen-Drivers
arch = x86_64
@@ -20,12 +20,6 @@ pkgbase = amdvlk-git
provides = vulkan-amdvlk
provides = vulkan-driver
conflicts = vulkan-amdvlk
- source = git+https://github.com/GPUOpen-Drivers/wsa.git#branch=master
- source = 0001-build-Remove-forced-Werror-option.patch
- source = 0001-build-Fix-clang-linking.patch
- sha512sums = SKIP
- sha512sums = ff9dcfe2f3b739b74a51dc82e3469f8b4ad1a0b044d868fbb99e0c07dd5f7bdc1e5bb1ae93f44c25d6dd90a5b7ddbb294fa29e8082f40e5794269143a1af2467
- sha512sums = 39152c24ca6e6bdbd16d7fb66438117101c106a6e5e4e5bcc1248495e6d2f6a1907a639750b1eb25c3d754f7f21801de2b15b232b1c974748551927b783abceb
pkgname = amdvlk-git
diff --git a/0001-build-Fix-clang-linking.patch b/0001-build-Fix-clang-linking.patch
deleted file mode 100644
index ab2dfad4b2c5..000000000000
--- a/0001-build-Fix-clang-linking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b5680fc14a577dd6dd57bd3d8568f0b05871b1c8 Mon Sep 17 00:00:00 2001
-From: Matt Coffin <mcoffin13@gmail.com>
-Date: Sat, 9 Nov 2019 11:01:58 -0700
-Subject: [PATCH] build: Fix clang linking
-
----
- icd/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
-index a60a9db..06b21f7 100644
---- a/icd/CMakeLists.txt
-+++ b/icd/CMakeLists.txt
-@@ -381,7 +381,7 @@ if (UNIX)
-
- target_link_libraries(xgl PRIVATE c stdc++ ${CMAKE_DL_LIBS} pthread)
-
-- if(NOT ICD_USE_GCC)
-+ if((NOT ICD_USE_GCC) AND (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
- message(WARNING "Intel ICC untested in CMake.")
- target_link_libraries(xgl PRIVATE -fabi-version=0 -static-intel)
- endif()
---
-2.23.0
-
diff --git a/0001-build-Remove-forced-Werror-option.patch b/0001-build-Remove-forced-Werror-option.patch
deleted file mode 100644
index a666c148e457..000000000000
--- a/0001-build-Remove-forced-Werror-option.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b37631a8216051f4c5916f48570ff4ad3c1091c4 Mon Sep 17 00:00:00 2001
-From: Matt Coffin <mcoffin13@gmail.com>
-Date: Sat, 9 Nov 2019 10:50:55 -0700
-Subject: [PATCH] build: Remove forced -Werror option
-
----
- CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb44edb..5ec3b72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -83,7 +83,6 @@ if(UNIX)
- -fvisibility-inlines-hidden
- -fcolor-diagnostics
- -Wall
-- -Werror
- -Wno-invalid-offsetof
- -Wno-missing-braces
- )
-@@ -460,7 +459,6 @@ if(UNIX)
- -fvisibility-inlines-hidden
- -fcolor-diagnostics
- -Wall
-- -Werror
- )
- target_compile_options(vfx PRIVATE $<$<COMPILE_LANGUAGE:CXX>:
- -std=c++14
-@@ -542,7 +540,6 @@ if(UNIX)
- -fvisibility-inlines-hidden
- -fcolor-diagnostics
- -Wall
-- -Werror
- -Wno-missing-braces
- )
- target_compile_options(amdllpc PRIVATE $<$<COMPILE_LANGUAGE:CXX>:
---
-2.23.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 299b360381fe..42d952ba82c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: Adrià Cereto i Massagué <ssorgatem at gmail.com>
pkgname=amdvlk-git
-pkgver=v.2019.Q4.5.r0.e6d1928
+pkgver=v.2020.Q1.3.r2.bd57537
pkgrel=1
pkgdesc="AMD's standalone Vulkan driver"
arch=(x86_64)
@@ -13,12 +13,8 @@ depends=('vulkan-icd-loader')
provides=('vulkan-amdvlk' 'vulkan-driver')
conflicts=('vulkan-amdvlk')
makedepends=('xorgproto' 'xorg-server-devel' 'libxrandr' 'cmake' 'python' 'libxml2' 'wayland' 'libdrm' 'git' 'ninja' 'repo')
-source=('git+https://github.com/GPUOpen-Drivers/wsa.git#branch=master'
- 0001-build-Remove-forced-Werror-option.patch
- 0001-build-Fix-clang-linking.patch)
-sha512sums=('SKIP'
- 'ff9dcfe2f3b739b74a51dc82e3469f8b4ad1a0b044d868fbb99e0c07dd5f7bdc1e5bb1ae93f44c25d6dd90a5b7ddbb294fa29e8082f40e5794269143a1af2467'
- '39152c24ca6e6bdbd16d7fb66438117101c106a6e5e4e5bcc1248495e6d2f6a1907a639750b1eb25c3d754f7f21801de2b15b232b1c974748551927b783abceb')
+source=()
+sha512sums=()
pkgver() {
pushd drivers/AMDVLK > /dev/null
@@ -49,18 +45,13 @@ prepare() {
# popd
# Don't turn Werror on for people will build with more recent compilers than you have. Just don't.
- for i in drivers/pal/shared/gpuopen/cmake/AMD.cmake
+ for i in drivers/pal/shared/gpuopen/cmake/AMD.cmake #drivers/llpc/llpc/CMakeLists.txt
do
+ #sed -i "s/-Werror=unused-variable//g" "$srcdir"/$i
+ #sed -i "s/-Werror=unused-function//g" "$srcdir"/$i
sed -i "s/-Werror//g" "$srcdir"/$i
done
- pushd drivers/llpc
- patch -p1 < $srcdir/0001-build-Remove-forced-Werror-option.patch
- popd
- pushd drivers/xgl
- patch -p1 < $srcdir/0001-build-Fix-clang-linking.patch
- popd
-
msg 'No patches to apply...'
}