16.30.3.315407-2

1 files changed, 74 insertions, 37 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 33e877578bf2..3d0e6998c2c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 # Autogenerated from AMD's Packages file
 
 pkgbase=amdgpu-pro-installer
-pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev amdgpu-pro-libopencl1 lib32-amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev lib32-libvdpau-amdgpu-pro libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
+pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-dkms amdgpu-pro-firmware amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev amdgpu-pro-libopencl1 lib32-amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev lib32-libvdpau-amdgpu-pro libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
 if [ "$ALL_PACKAGES" = "true" ]; then
-	pkgname+=(amdgpu-pro-dkms amdgpu-pro-firmware)
+	pkgname+=()
 fi
 pkgver=16.30.3.315407
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://www.amd.com'
 license=('custom:AMD')
@@ -16,13 +16,33 @@ makedepends=('wget')
 
 DLAGENTS='https::/usr/bin/wget --referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx -N %u'
 
-source=('https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz')
-sha256sums=('97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354')
+source=(https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz
+	0001-add-OS-detection-for-arch.patch
+	0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
+	0003-add-kcl_drm_gem_object_lookup.patch
+	0004-paging-changes-for-linux-4.6.patch
+	0005-LRU-stuff-isn-t-available-until-4.7.x.patch
+	0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
+	0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
+	0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
+	0009-disable-dal-by-default.patch
+	0010-remove-dependency-on-System.map.patch)
+sha256sums=(97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354
+	ae5fed04cd626aadff6d4c7c59657f52a8dd6be3df4a9686702e74aa8c72d1de
+	df36d1d9f470094432b765016b558624fa9b28355c82a722f7bd4facdf912ce2
+	4afabc203dc52a8ad15f1d4dc62887d1a11472f11c1aa9f9adb8affc183f297b
+	0a0657826270a963be76f9e3a882432df4f6ac0628dd0966289cc5c064cadeb6
+	fe0075575bae0a7f76daa0686ab23464b867ef8ed0b4d39cec4bd566ec39f99c
+	a0e94234555f5254df096a93e050edbc341603d0b1d527f7b0c3179e111b7be1
+	2e291935e35ecdc9f7c87d288db9d73a27f4f5cc3b08f95b8b39fef3934c6735
+	50c56c4e2ed55d66e5d5e5689b2f146de63dbb3edc2bafabf5ca98e8ae58e028
+	7e5640468e9ede54a8b3cc8fd67d6c3ae3738aec959a655c9aeaac9570a646f9
+	2f6c74a5a909f27a5a18eae5acf2ca90c99c4f2e4aa8ceb766dbf8a0cb431817)
 
 
 package_amdgpu-pro () {
 	pkgdesc="This package install all amdgpu-pro components."
-	depends=('amdgpu-pro-graphics=16.30.3.315407-1' 'amdgpu-pro-computing=16.30.3.315407-1')
+	depends=('amdgpu-pro-graphics=16.30.3.315407-2' 'amdgpu-pro-computing=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
@@ -41,7 +61,7 @@ package_amdgpu-pro () {
 
 package_amdgpu-pro-clinfo () {
 	pkgdesc="AMD OpenCL info utility"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-1')
+	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
@@ -60,7 +80,7 @@ package_amdgpu-pro-clinfo () {
 
 package_amdgpu-pro-computing () {
 	pkgdesc="This package install amdgpu-pro OpenCL components."
-	depends=('amdgpu-pro-core=16.30.3.315407-1' 'amdgpu-pro-clinfo=16.30.3.315407-1' 'amdgpu-pro-opencl-icd=16.30.3.315407-1' 'amdgpu-pro-libopencl-dev=16.30.3.315407-1')
+	depends=('amdgpu-pro-core=16.30.3.315407-2' 'amdgpu-pro-clinfo=16.30.3.315407-2' 'amdgpu-pro-opencl-icd=16.30.3.315407-2' 'amdgpu-pro-libopencl-dev=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
@@ -79,7 +99,7 @@ package_amdgpu-pro-computing () {
 
 package_amdgpu-pro-core () {
 	pkgdesc="This package switchs the GPU stack to amdgpu-pro with basic components."
-	depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1')
+	depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
@@ -122,6 +142,19 @@ package_amdgpu-pro-dkms () {
 		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
 		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
 	fi
+	(cd ${pkgdir}/usr/src/amdgpu-pro-16.30.3-315407;
+		sed -i 's/\/extra/\/extramodules/' dkms.conf
+		patch -p1 -i "${srcdir}/0001-add-OS-detection-for-arch.patch";
+		patch -p1 -i "${srcdir}/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch";
+		patch -p1 -i "${srcdir}/0003-add-kcl_drm_gem_object_lookup.patch";
+		patch -p1 -i "${srcdir}/0004-paging-changes-for-linux-4.6.patch";
+		patch -p1 -i "${srcdir}/0005-LRU-stuff-isn-t-available-until-4.7.x.patch";
+		patch -p1 -i "${srcdir}/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch";
+		patch -p1 -i "${srcdir}/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch";
+		patch -p1 -i "${srcdir}/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch";
+		patch -p1 -i "${srcdir}/0009-disable-dal-by-default.patch";
+		patch -p1 -i "${srcdir}/0010-remove-dependency-on-System.map.patch")
+
 }
 
 
@@ -143,13 +176,16 @@ package_amdgpu-pro-firmware () {
 	fi
 
 	mv ${pkgdir}/lib ${pkgdir}/usr/
+	mv ${pkgdir}/usr/lib/firmware ${pkgdir}/usr/lib/firmware.tmp
+	mkdir -p ${pkgdir}/usr/lib/firmware
+	mv ${pkgdir}/usr/lib/firmware.tmp ${pkgdir}/usr/lib/firmware/updates
 
 }
 
 
 package_amdgpu-pro-graphics () {
 	pkgdesc="This package install amdgpu-pro graphics components."
-	depends=('amdgpu-pro-core=16.30.3.315407-1' 'libgles2-amdgpu-pro=16.30.3.315407-1' 'libgl1-amdgpu-pro-dev=16.30.3.315407-1' 'libgl1-amdgpu-pro-dri=16.30.3.315407-1' 'xserver-xorg-video-amdgpu-pro=16.30.3.315407-1' 'amdgpu-pro-vulkan-driver=16.30.3.315407-1' 'libvdpau-amdgpu-pro=16.30.3.315407-1')
+	depends=('amdgpu-pro-core=16.30.3.315407-2' 'libgles2-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'xserver-xorg-video-amdgpu-pro=16.30.3.315407-2' 'amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'libvdpau-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
@@ -172,7 +208,7 @@ package_amdgpu-pro-graphics () {
 
 package_lib32-amdgpu-pro-lib32 () {
 	pkgdesc="This package contains x86 libs for x86_64 machine usage."
-	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-1' 'lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-1' 'lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-1' 'lib32-libgbm1-amdgpu-pro=16.30.3.315407-1' 'lib32-amdgpu-pro-opencl-icd=16.30.3.315407-1' 'lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-1' 'lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-1' 'lib32-libvdpau-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'lib32-libgbm1-amdgpu-pro=16.30.3.315407-2' 'lib32-amdgpu-pro-opencl-icd=16.30.3.315407-2' 'lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-2' 'lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'lib32-libvdpau-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
@@ -196,7 +232,7 @@ package_lib32-amdgpu-pro-lib32 () {
 
 package_lib32-amdgpu-pro-libopencl-dev () {
 	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=('lib32-amdgpu-pro-libopencl1=16.30.3.315407-1')
+	depends=('lib32-amdgpu-pro-libopencl1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
@@ -220,7 +256,7 @@ package_lib32-amdgpu-pro-libopencl-dev () {
 
 package_amdgpu-pro-libopencl-dev () {
 	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-1')
+	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
@@ -321,7 +357,7 @@ package_lib32-amdgpu-pro-opencl-icd () {
 
 package_amdgpu-pro-vulkan-driver () {
 	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1')
+	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
@@ -343,7 +379,7 @@ package_amdgpu-pro-vulkan-driver () {
 
 package_lib32-amdgpu-pro-vulkan-driver () {
 	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1')
+	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
@@ -366,7 +402,7 @@ package_lib32-amdgpu-pro-vulkan-driver () {
 
 package_libdrm-amdgpu-pro-amdgpu1 () {
 	pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-1')
+	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
@@ -385,7 +421,7 @@ package_libdrm-amdgpu-pro-amdgpu1 () {
 
 package_lib32-libdrm-amdgpu-pro-amdgpu1 () {
 	pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
@@ -405,7 +441,7 @@ package_lib32-libdrm-amdgpu-pro-amdgpu1 () {
 
 package_lib32-libdrm-amdgpu-pro-dev () {
 	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1')
+	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
@@ -425,7 +461,7 @@ package_lib32-libdrm-amdgpu-pro-dev () {
 
 package_libdrm-amdgpu-pro-dev () {
 	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-1' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1')
+	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
@@ -444,7 +480,7 @@ package_libdrm-amdgpu-pro-dev () {
 
 package_libdrm-amdgpu-pro-tools () {
 	pkgdesc="testing tools for libdrm-amdgpu-pro"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1')
+	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
@@ -549,7 +585,7 @@ package_lib32-libegl1-amdgpu-pro () {
 
 package_lib32-libegl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the EGL API -- development files"
-	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
@@ -573,7 +609,7 @@ package_lib32-libegl1-amdgpu-pro-dev () {
 
 package_libegl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the EGL API -- development files"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-1')
+	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
@@ -596,7 +632,7 @@ package_libegl1-amdgpu-pro-dev () {
 
 package_libgbm-amdgpu-pro-dev () {
 	pkgdesc="generic buffer management API -- development files"
-	depends=('libgbm1-amdgpu-pro=16.30.3.315407-1')
+	depends=('libgbm1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
@@ -615,7 +651,7 @@ package_libgbm-amdgpu-pro-dev () {
 
 package_lib32-libgbm-amdgpu-pro-dev () {
 	pkgdesc="generic buffer management API -- development files"
-	depends=('lib32-libgbm1-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libgbm1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
@@ -635,7 +671,7 @@ package_lib32-libgbm-amdgpu-pro-dev () {
 
 package_libgbm1-amdgpu-pro () {
 	pkgdesc="generic buffer management API -- runtime"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1')
+	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
@@ -654,7 +690,7 @@ package_libgbm1-amdgpu-pro () {
 
 package_lib32-libgbm1-amdgpu-pro () {
 	pkgdesc="generic buffer management API -- runtime"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
@@ -674,7 +710,7 @@ package_lib32-libgbm1-amdgpu-pro () {
 
 package_lib32-libgl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-1')
+	depends=('lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
@@ -698,7 +734,7 @@ package_lib32-libgl1-amdgpu-pro-dev () {
 
 package_libgl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('libgl1-amdgpu-pro-glx=16.30.3.315407-1')
+	depends=('libgl1-amdgpu-pro-glx=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
@@ -760,7 +796,7 @@ package_libgl1-amdgpu-pro-dri () {
 
 package_libgl1-amdgpu-pro-glx () {
 	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-1' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm')
+	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
@@ -783,7 +819,7 @@ package_libgl1-amdgpu-pro-glx () {
 
 package_lib32-libgl1-amdgpu-pro-glx () {
 	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm')
+	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
@@ -807,7 +843,7 @@ package_lib32-libgl1-amdgpu-pro-glx () {
 
 package_libgles2-amdgpu-pro () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-1')
+	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
@@ -826,7 +862,7 @@ package_libgles2-amdgpu-pro () {
 
 package_lib32-libgles2-amdgpu-pro () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
@@ -846,7 +882,7 @@ package_lib32-libgles2-amdgpu-pro () {
 
 package_libgles2-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('libgles2-amdgpu-pro=16.30.3.315407-1')
+	depends=('libgles2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
@@ -869,7 +905,7 @@ package_libgles2-amdgpu-pro-dev () {
 
 package_lib32-libgles2-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-1')
+	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
@@ -893,7 +929,7 @@ package_lib32-libgles2-amdgpu-pro-dev () {
 
 package_lib32-libvdpau-amdgpu-pro () {
 	pkgdesc="AMDGPU Pro VDPAU driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-1' 'lib32-openssl>=1.0.0' 'lib32-libx11' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-zlib>=1.2.0')
+	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-openssl>=1.0.0' 'lib32-libx11' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-zlib>=1.2.0')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
@@ -913,7 +949,7 @@ package_lib32-libvdpau-amdgpu-pro () {
 
 package_libvdpau-amdgpu-pro () {
 	pkgdesc="AMDGPU Pro VDPAU driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro=16.30.3.315407-1' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb')
+	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
@@ -932,7 +968,7 @@ package_libvdpau-amdgpu-pro () {
 
 package_xserver-xorg-video-amdgpu-pro () {
 	pkgdesc="X.Org X server -- AMD/ATI Amdgpu-Pro display driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-1' 'libdrm2-amdgpu-pro=16.30.3.315407-1' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro=16.30.3.315407-1' 'libgl1-amdgpu-pro-glx=16.30.3.315407-1' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server')
+	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-glx=16.30.3.315407-2' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
@@ -947,6 +983,7 @@ package_xserver-xorg-video-amdgpu-pro () {
 		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
 	fi
 
+	conflicts=('xf86-video-amdgpu')
 	mkdir -p ${pkgdir}/usr/lib/x86_64-linux-gnu
 	# This is needed because libglx.so has a hardcoded DRI_DRIVER_PATH
 	ln -s /usr/lib/dri ${pkgdir}/usr/lib/x86_64-linux-gnu/dri