From 0ea31b7d91fd42392006ea9961a1a23cc2906ad9 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Oct 2019 19:03:49 +0100 Subject: [PATCH] amdvlk: update to 2019.Q4.1. --- srcpkgs/amdvlk/patches/deprected-copy.patch | 26 +++++++++++-------- srcpkgs/amdvlk/patches/musl.patch | 14 +++-------- srcpkgs/amdvlk/template | 28 ++++++++++----------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/srcpkgs/amdvlk/patches/deprected-copy.patch b/srcpkgs/amdvlk/patches/deprected-copy.patch index 4d833e4798f..a42a385c13b 100644 --- a/srcpkgs/amdvlk/patches/deprected-copy.patch +++ b/srcpkgs/amdvlk/patches/deprected-copy.patch @@ -1,12 +1,18 @@ ---- pal/shared/gpuopen/cmake/AMD.cmake 2019-06-30 09:35:25.000000000 +0200 -+++ - 2019-07-02 11:07:06.366534309 +0200 -@@ -46,7 +46,8 @@ - target_compile_options(${name} PRIVATE - -Wall # Enable warnings about questionable language constructs. - -Wextra # Enable extra warnings that are not enabled by -Wall. -- -Werror) # Turn warnings into errors. -+ -Werror # Turn warnings into errors. -+ -Wno-error=deprecated-copy) +--- pal/shared/gpuopen/cmake/AMD.cmake 2019-10-18 11:06:42.000000000 +0200 ++++ - 2019-10-29 19:06:00.059615384 +0100 +@@ -89,6 +89,7 @@ + -fno-exceptions # Disable exception handling support. + -fno-rtti # Disable run-time type information support. + -fno-math-errno # Single instruction math operations do not set ERRNO. ++ -Wno-error=deprecated-copy + ) - endfunction() + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -119,6 +120,7 @@ + -Wall # Enable warnings about questionable language constructs. + -Wextra # Enable extra warnings that are not enabled by -Wall. + -Werror # Turn warnings into errors. ++ -Wno-error=deprecated-copy + ) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch index 5e4e1e9f18d..266bde5a804 100644 --- a/srcpkgs/amdvlk/patches/musl.patch +++ b/srcpkgs/amdvlk/patches/musl.patch @@ -1,17 +1,11 @@ ---- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp 2019-03-01 15:31:04.000000000 +0100 -+++ - 2019-03-04 15:42:00.789284605 +0100 -@@ -34,12 +34,12 @@ +--- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp 2019-10-18 11:06:42.000000000 +0200 ++++ - 2019-10-29 20:15:35.614608453 +0100 +@@ -34,7 +34,7 @@ #include #include #include -#include ++#include #include #include #include - #include - -+#include - #include - #include - #include - diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template index ef74969d1a3..bb41aafd176 100644 --- a/srcpkgs/amdvlk/template +++ b/srcpkgs/amdvlk/template @@ -1,12 +1,12 @@ # Template file for 'amdvlk' pkgname=amdvlk -version=2019.Q3.6 +version=2019.Q4.1 revision=1 -_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101 -_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021 -_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c -_llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830 -_spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc +_llpc_commit=3f15347d38da804814fdd9e24e2875ee0b2b9245 +_xgl_commit=19a031d9f73b95101fd4d3d594aca27c00feb180 +_pal_commit=39abe2297ca58a2b84dcd9bc5e238fbc399bd6e0 +_llvm_project_commit=40fbaf4c5446a361269c241d9112fff26575b5d0 +_spvgen_commit=f1bc2ba988273c3724afffe72fe9cd933a022ce7 _MetroHash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f _CWPack_commit=b601c88aeca7a7b08becb3d32709de383c8ee428 archs="i686* x86_64*" @@ -27,16 +27,16 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz https://github.com/GPUOpen-Drivers/llpc/archive/${_llpc_commit}.tar.gz https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz - https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz + https://github.com/GPUOpen-Drivers/llvm-project/archive/${_llvm_project_commit}.tar.gz https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz" -checksum="9afb90b56c3c1213c97ef3364b1d31d0e85a81469c861b43dc389af5672c6331 - abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584 - 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906 - 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627 - efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1 - cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401 +checksum="2265bd0be973d4511cd47da29052b368369e5ac4133f3b08ab8c89c51d759986 + d1957eb1aaaab89aab78f3d375cea93c4b91e47f602627b048f0fb71d8e7eb3d + 47fdcb4ed0c9b2e1f61abe761bab912ca228dfd6103c2070c94244c6a2f13b5e + 3def3a94e20dbb67cb4effdacc4c180ebf5bf30a4ae27ad6849cd32aa0628463 + 6f469cac7c2deaff595cd689a83067da6cfbee0f97362f6fa9f6c50b5bb23b56 + 77a4cad8691960b825e86b624bb5433f5098b8a49cb0d758e17c6d59e25a9361 e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398 58ca397f33d62bcfecaecd89eb4ad466a6c33e1c619e5cf742822074f1f7d664" nocross=yes @@ -47,7 +47,7 @@ post_extract() { mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl mv ${wrksrc}/pal-${_pal_commit} ${wrksrc}/pal mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc - mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm + mv ${wrksrc}/llvm-project-${_llvm_project_commit} ${wrksrc}/llvm-project mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack