diff --git a/srcpkgs/amdvlk/patches/deprected-copy.patch b/srcpkgs/amdvlk/patches/deprected-copy.patch
new file mode 100644
index 00000000000..4d833e4798f
--- /dev/null
+++ b/srcpkgs/amdvlk/patches/deprected-copy.patch
@@ -0,0 +1,12 @@
+--- 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)
+ 
+ endfunction()
+ 
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 0d5b00093fb..7ccbadf7082 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,18 +1,17 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2019.Q2.5
+version=2019.Q3.1
 revision=1
-_llpc_commit=ddb909580e9996356c3bbe23bc1b14c44987eb4c
-_xgl_commit=96d84068b622b2c3ce8cf9aa8ff597260aa5ad3f
-_pal_commit=135258ac31901e1293fea5e2f599659ee438ba1f
-_llvm_commit=b9910c8bfcccc63c07c959963fa567120d11f024
-_wsa_commit=f558403d3292039de4d17334e562bda58abfc72c
-_spvgen_commit=64013f150c2d41965a3d36fa159b55fba52b727a
+_llpc_commit=aa8a9d7f2b7ad7b81b70e7959e99e3f31f85c211
+_xgl_commit=eee58c8e482ac4a6fdc40452cb4ad744395d0f74
+_pal_commit=6c8eaa257e6216437fdfe3f17d418eccfe42e0bd
+_llvm_commit=8118692e8aefbd95f791ff49beddb8ce90e8927c
+_spvgen_commit=53245b96b7a647743f50b9d841751f9755002661
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
 build_style=cmake
-configure_args="-DBUILD_WAYLAND_SUPPORT=ON -DBUILD_WSA=ON"
+configure_args="-DBUILD_WAYLAND_SUPPORT=ON"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel"
 depends="vulkan-loader"
@@ -25,16 +24,15 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.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/wsa/archive/${_wsa_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz"
-checksum="4017d5ef9deacbbe0d1d952ce9f79242212f1ac94c39ed4daf267cb703618974
- 32e6f6e330a7ff82bd7840e43a81d7950878c9eae93f0e1e376c37c27426c244
- 49f6cfd63f89db1a2cbf1bb5be882919af45443e057efb1715785e0983b3cd32
- dfebaf29c6dedb9c6fcbe4d02407a4267703aa7ae570d105ef146f2df455486f
- 8b0052682f0665e18ea3f4b7a9b533dce95949c366c0d82a9e388056706383ae
- b23e9453fa7b14bb13157fb645936ec74b18b12cdef301758452a92b23f27705
- 01b156285b25c4f84fc098f334b3959d8fd1d7f77589618449288506eadb92d4"
+checksum="e41418633653279c55cc8d70a9f576e0de3018a3953bcb3372bfb809db48ae23
+ f7efe91134588233e2d3f25ff53068fb0b7c6d144fabf907c7b8c807efe635e8
+ 828bf0936e0efc86c40e3abb6f92cc214a493ab8e2ff2054d455bab399ae2d0a
+ 83a4940d3bd64f38a83e14d7225cce6b2234610dbe6e3d55c50e1adc6126b2d2
+ b0cbcd4d83530ad5bd515642f903837e6cc308eb68da51900208acf9f2dbe351
+ 253bfaf1fc33c8ef01ca1681a5ea7400fd4ab7373c48e4f79beb10d89455d307"
 nocross=yes
+lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" rand48_r-devel"
@@ -46,7 +44,6 @@ post_extract() {
 	mv ${wrksrc}/pal-${_pal_commit} ${wrksrc}/pal
 	mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc
 	mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm
-	mv ${wrksrc}/wsa-${_wsa_commit} ${wrksrc}/wsa
 	mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen
 }
 
@@ -64,6 +61,7 @@ do_install() {
 		i686*|mips*|arm*|ppc|ppc-musl)
 			vinstall build/icd/amdvlk32.so 644 usr/lib/
 			vinstall ${wrksrc}/AMDVLK/json/Redhat/amd_icd32.json 644 usr/share/vulkan/icd.d/
+			vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd32.json -e 's#/usr/lib/#/usr/lib32/#g'
 			;;
 		*)
 			vinstall build/icd/amdvlk64.so 644 usr/lib/
@@ -71,6 +69,5 @@ do_install() {
 			vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd64.json -e 's#/usr/lib64/#/usr/lib/#g'
 			;;
 	esac
-	vinstall build/wsa/wayland/libamdgpu_wsa_wayland.so 644 usr/lib/
 	vlicense ${wrksrc}/AMDVLK/LICENSE.txt
 }