16.60.379184-1

19 files changed, 544 insertions, 1721 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84b2a14d0ae3..3afaa3537252 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,328 +1,173 @@
 pkgbase = amdgpu-pro-installer
-	pkgver = 16.30.3.315407
-	pkgrel = 2
+	pkgver = 16.60.379184
+	pkgrel = 1
 	url = http://www.amd.com
 	arch = x86_64
 	license = custom:AMD
 	makedepends = wget
-	source = https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz
-	source = 0001-add-OS-detection-for-arch.patch
-	source = 0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
-	source = 0003-add-kcl_drm_gem_object_lookup.patch
-	source = 0004-paging-changes-for-linux-4.6.patch
-	source = 0005-LRU-stuff-isn-t-available-until-4.7.x.patch
-	source = 0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
-	source = 0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
-	source = 0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
-	source = 0009-disable-dal-by-default.patch
-	source = 0010-remove-dependency-on-System.map.patch
-	sha256sums = 97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354
-	sha256sums = ae5fed04cd626aadff6d4c7c59657f52a8dd6be3df4a9686702e74aa8c72d1de
-	sha256sums = df36d1d9f470094432b765016b558624fa9b28355c82a722f7bd4facdf912ce2
-	sha256sums = 4afabc203dc52a8ad15f1d4dc62887d1a11472f11c1aa9f9adb8affc183f297b
-	sha256sums = 0a0657826270a963be76f9e3a882432df4f6ac0628dd0966289cc5c064cadeb6
-	sha256sums = fe0075575bae0a7f76daa0686ab23464b867ef8ed0b4d39cec4bd566ec39f99c
-	sha256sums = a0e94234555f5254df096a93e050edbc341603d0b1d527f7b0c3179e111b7be1
-	sha256sums = 2e291935e35ecdc9f7c87d288db9d73a27f4f5cc3b08f95b8b39fef3934c6735
-	sha256sums = 50c56c4e2ed55d66e5d5e5689b2f146de63dbb3edc2bafabf5ca98e8ae58e028
-	sha256sums = 7e5640468e9ede54a8b3cc8fd67d6c3ae3738aec959a655c9aeaac9570a646f9
-	sha256sums = 2f6c74a5a909f27a5a18eae5acf2ca90c99c4f2e4aa8ceb766dbf8a0cb431817
+	source = https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-16.60-379184.tar.xz
+	source = 0001-add-archlinux-as-build-option.patch
+	source = 0002-fix_get_user_pages_calls.patch
+	source = 0003-fix_drm_connector.patch
+	source = 0004-Change-seq_printf-format-for-64-bit-context.patch
+	source = 0005-fix_drm_vma_node_verify_access.patch
+	source = 0006-fix_dm_plane_helper_funcs.patch
+	source = 0007-disable-dal-by-default.patch
+	sha256sums = d88b5a747ac765a75eb738aaf5641428c3b1c9c02bc6fde452c423de7dd620bd
+	sha256sums = 400df0077464003fad74bb77a8f6e5ba24bffc7c2e32e6b3f0dab08a17eb3486
+	sha256sums = 5708b6641bd62fe768e1cb36f88d0895c4fdf90d1d3110033bafdabc47fe1e31
+	sha256sums = b6a98ed84733bab544461991f642dc1a73ee065b32f7c1b3a235d5e2bc814943
+	sha256sums = 21c78811107d8ee59f3566d21ed4a7ccfd622f4e07350fca7ed662392ab07190
+	sha256sums = 885330f3749db53a491b7c35c7e0d9d58965a717e62434101c4d72f1a31ef39a
+	sha256sums = b10bb6b2382f995ee90f9cc807b69cb336d0edb65096b66df315f0c60132e04d
+	sha256sums = e28d79fcb808d7c275938a4d9871da3138fdd38eb7c1c69495bf9a9d36dc271a
 
 pkgname = amdgpu-pro
-	pkgdesc = This package install all amdgpu-pro components.
-	arch = x86_64
-	depends = amdgpu-pro-graphics=16.30.3.315407-2
-	depends = amdgpu-pro-computing=16.30.3.315407-2
-
-pkgname = amdgpu-pro-clinfo
-	pkgdesc = AMD OpenCL info utility
-	arch = x86_64
-	depends = amdgpu-pro-libopencl1=16.30.3.315407-2
-
-pkgname = amdgpu-pro-computing
-	pkgdesc = This package install amdgpu-pro OpenCL components.
-	arch = x86_64
-	depends = amdgpu-pro-core=16.30.3.315407-2
-	depends = amdgpu-pro-clinfo=16.30.3.315407-2
-	depends = amdgpu-pro-opencl-icd=16.30.3.315407-2
-	depends = amdgpu-pro-libopencl-dev=16.30.3.315407-2
-
-pkgname = amdgpu-pro-core
-	pkgdesc = This package switchs the GPU stack to amdgpu-pro with basic components.
+	pkgdesc = The AMDGPU Pro driver package
 	install = amdgpu-pro-core.install
 	arch = x86_64
-	depends = linux-firmware
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
+	depends = glib2>=2.37.3
+	depends = gst-plugins-base>=1.6.0
+	depends = gstreamer>=1.0.0
+	depends = lib32-amdgpu-pro-libdrm=16.60.379184-1
+	depends = lib32-amdgpu-pro-opencl=16.60.379184-1
+	depends = lib32-amdgpu-pro-vdpau=16.60.379184-1
+	depends = lib32-amdgpu-pro-vulkan=16.60.379184-1
+	depends = lib32-amdgpu-pro=16.60.379184-1
+	depends = libomxil-bellagio
+	depends = libx11
+	depends = libx11>=1.4.99.1
+	depends = libxcb
+	depends = libxcb>=1.8
+	depends = libxcb>=1.9.2
+	depends = libxdamage>=1.1
+	depends = libxext
+	depends = libxfixes
+	depends = libxshmfence
+	depends = libxxf86vm
+	depends = ncurses5-compat-libs>=6
+	depends = openssl>=1.0.0
+	depends = xf86-video-amdgpu-pro=16.60.379184-1
+	depends = zlib>=1.2.0
 
 pkgname = amdgpu-pro-dkms
 	pkgdesc = amdgpu-pro driver in DKMS format.
 	arch = any
 	depends = dkms>=1.95
 
-pkgname = amdgpu-pro-firmware
-	pkgdesc = Firmware for amdgpu-pro cards.
+pkgname = amdgpu-pro-libdrm
+	pkgdesc = The AMDGPU Pro userspace interface to kernel DRM services
 	arch = x86_64
-	depends = 
+	depends = bcunit
+	provides = libdrm
+	conflicts = libdrm
 
-pkgname = amdgpu-pro-graphics
-	pkgdesc = This package install amdgpu-pro graphics components.
+pkgname = amdgpu-pro-libgl
+	pkgdesc = The AMDGPU Pro libgl library symlinks
 	arch = x86_64
-	depends = amdgpu-pro-core=16.30.3.315407-2
-	depends = libgles2-amdgpu-pro=16.30.3.315407-2
-	depends = libgl1-amdgpu-pro-dev=16.30.3.315407-2
-	depends = libgl1-amdgpu-pro-dri=16.30.3.315407-2
-	depends = xserver-xorg-video-amdgpu-pro=16.30.3.315407-2
-	depends = amdgpu-pro-vulkan-driver=16.30.3.315407-2
-	depends = libvdpau-amdgpu-pro=16.30.3.315407-2
+	depends = amdgpu-pro
 	provides = libgl
 	conflicts = libgl
 
-pkgname = lib32-amdgpu-pro-lib32
-	pkgdesc = This package contains x86 libs for x86_64 machine usage.
-	arch = x86_64
-	depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-2
-	depends = lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-2
-	depends = lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-2
-	depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-2
-	depends = lib32-amdgpu-pro-opencl-icd=16.30.3.315407-2
-	depends = lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-2
-	depends = lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-2
-	depends = lib32-libvdpau-amdgpu-pro=16.30.3.315407-2
-	provides = lib32-libgl
-	conflicts = lib32-libgl
-
-pkgname = lib32-amdgpu-pro-libopencl-dev
-	pkgdesc = AMD OpenCL ICD Loader library
-	arch = x86_64
-	depends = lib32-amdgpu-pro-libopencl1=16.30.3.315407-2
-	provides = lib32-libcl
-	conflicts = lib32-libcl
-
-pkgname = amdgpu-pro-libopencl-dev
-	pkgdesc = AMD OpenCL ICD Loader library
-	arch = x86_64
-	depends = amdgpu-pro-libopencl1=16.30.3.315407-2
-	provides = libcl
-	conflicts = libcl
-
-pkgname = amdgpu-pro-libopencl1
-	pkgdesc = AMD OpenCL ICD Loader library
-	arch = x86_64
-	depends = 
-
-pkgname = lib32-amdgpu-pro-libopencl1
-	pkgdesc = AMD OpenCL ICD Loader library
-	arch = x86_64
-	depends = 
-
-pkgname = amdgpu-pro-opencl-icd
-	pkgdesc = non-free AMD OpenCL ICD Loaders
-	arch = x86_64
-	depends = 
-
-pkgname = lib32-amdgpu-pro-opencl-icd
-	pkgdesc = non-free AMD OpenCL ICD Loaders
-	arch = x86_64
-	depends = 
-
-pkgname = amdgpu-pro-vulkan-driver
-	pkgdesc = AMDGPU Pro Vulkan driver
-	arch = x86_64
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-
-pkgname = lib32-amdgpu-pro-vulkan-driver
-	pkgdesc = AMDGPU Pro Vulkan driver
-	arch = x86_64
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-
-pkgname = libdrm-amdgpu-pro-amdgpu1
-	pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime
-	arch = x86_64
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libdrm-amdgpu-pro-amdgpu1
-	pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime
-	arch = x86_64
-	depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libdrm-amdgpu-pro-dev
-	pkgdesc = Userspace interface to kernel DRM services -- development files
-	arch = x86_64
-	depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-
-pkgname = libdrm-amdgpu-pro-dev
-	pkgdesc = Userspace interface to kernel DRM services -- development files
-	arch = x86_64
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-
-pkgname = libdrm-amdgpu-pro-tools
-	pkgdesc = testing tools for libdrm-amdgpu-pro
-	arch = x86_64
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-
-pkgname = libdrm2-amdgpu-pro
-	pkgdesc = Userspace interface to kernel DRM services -- runtime
-	arch = x86_64
-	depends = 
-
-pkgname = lib32-libdrm2-amdgpu-pro
-	pkgdesc = Userspace interface to kernel DRM services -- runtime
-	arch = x86_64
-	depends = 
-
-pkgname = libegl1-amdgpu-pro
-	pkgdesc = implementation of the EGL API -- runtime
-	arch = x86_64
-	depends = 
-
-pkgname = lib32-libegl1-amdgpu-pro
-	pkgdesc = implementation of the EGL API -- runtime
+pkgname = amdgpu-pro-opencl
+	pkgdesc = The AMDGPU Pro OpenCL implementation
 	arch = x86_64
 	depends = 
+	provides = opencl-driver
 
-pkgname = lib32-libegl1-amdgpu-pro-dev
-	pkgdesc = implementation of the EGL API -- development files
+pkgname = amdgpu-pro-vdpau
+	pkgdesc = The AMDGPU Pro VDPAU driver
 	arch = x86_64
-	depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-2
-
-pkgname = libegl1-amdgpu-pro-dev
-	pkgdesc = implementation of the EGL API -- development files
-	arch = x86_64
-	depends = libegl1-amdgpu-pro=16.30.3.315407-2
-
-pkgname = libgbm-amdgpu-pro-dev
-	pkgdesc = generic buffer management API -- development files
-	arch = x86_64
-	depends = libgbm1-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libgbm-amdgpu-pro-dev
-	pkgdesc = generic buffer management API -- development files
-	arch = x86_64
-	depends = lib32-libgbm1-amdgpu-pro=16.30.3.315407-2
-
-pkgname = libgbm1-amdgpu-pro
-	pkgdesc = generic buffer management API -- runtime
-	arch = x86_64
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libgbm1-amdgpu-pro
-	pkgdesc = generic buffer management API -- runtime
-	arch = x86_64
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libgl1-amdgpu-pro-dev
-	pkgdesc = implementation of the OpenGL API -- GLX development files
-	arch = x86_64
-	depends = lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-2
-
-pkgname = libgl1-amdgpu-pro-dev
-	pkgdesc = implementation of the OpenGL API -- GLX development files
-	arch = x86_64
-	depends = libgl1-amdgpu-pro-glx=16.30.3.315407-2
-
-pkgname = lib32-libgl1-amdgpu-pro-dri
-	pkgdesc = implementation of the OpenGL API -- DRI modules
-	arch = x86_64
-	depends = lib32-libx11
-	depends = lib32-libxext
-
-pkgname = libgl1-amdgpu-pro-dri
-	pkgdesc = implementation of the OpenGL API -- DRI modules
-	arch = x86_64
-	depends = libx11
-	depends = libxext
-
-pkgname = libgl1-amdgpu-pro-glx
-	pkgdesc = implementation of the OpenGL API -- GLX runtime
-	arch = x86_64
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-	depends = libx11>=1.4.99.1
-	depends = libxcb>=1.8
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	depends = libvdpau>=1.1
 	depends = libxcb
-	depends = libxcb>=1.9.2
-	depends = libxdamage>=1.1
-	depends = libxext
-	depends = libxfixes
-	depends = libxshmfence
-	depends = libxxf86vm
-
-pkgname = lib32-libgl1-amdgpu-pro-glx
-	pkgdesc = implementation of the OpenGL API -- GLX runtime
-	arch = x86_64
-	depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2
+	depends = libxcb>=1.8
+	depends = ncurses5-compat-libs>=6
+	depends = openssl>=1.0.0
+	depends = zlib>=1.2.0
+
+pkgname = amdgpu-pro-vulkan
+	pkgdesc = The AMDGPU Pro Vulkan driver
+	arch = x86_64
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	provides = vulkan-driver
+
+pkgname = lib32-amdgpu-pro
+	pkgdesc = Meta package to install amdgpu Pro components. (32bit libraries)
+	arch = x86_64
+	depends = amdgpu-pro-dkms=16.60.379184-1
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	depends = amdgpu-pro-opencl=16.60.379184-1
+	depends = amdgpu-pro-vdpau=16.60.379184-1
+	depends = amdgpu-pro-vulkan=16.60.379184-1
+	depends = amdgpu-pro=16.60.379184-1
+	depends = lib32-glib2>=2.37.3
+	depends = lib32-gst-plugins-base>=1.6.0
+	depends = lib32-gstreamer>=1.0.0
+	depends = lib32-libomxil-bellagio
+	depends = lib32-libx11
 	depends = lib32-libx11>=1.4.99.1
-	depends = lib32-libxcb>=1.8
 	depends = lib32-libxcb
+	depends = lib32-libxcb>=1.8
 	depends = lib32-libxcb>=1.9.2
 	depends = lib32-libxdamage>=1.1
 	depends = lib32-libxext
 	depends = lib32-libxfixes
 	depends = lib32-libxshmfence
 	depends = lib32-libxxf86vm
+	depends = lib32-ncurses5-compat-libs>=6
+	depends = lib32-openssl>=1.0.0
+	depends = lib32-zlib>=1.2.0
+	depends = xf86-video-amdgpu-pro=16.60.379184-1
 
-pkgname = libgles2-amdgpu-pro
-	pkgdesc = implementation of the OpenGL|ES 2.x API -- runtime
-	arch = x86_64
-	depends = libegl1-amdgpu-pro=16.30.3.315407-2
-
-pkgname = lib32-libgles2-amdgpu-pro
-	pkgdesc = implementation of the OpenGL|ES 2.x API -- runtime
+pkgname = lib32-amdgpu-pro-libdrm
+	pkgdesc = The AMDGPU Pro userspace interface to kernel DRM services (32bit libraries)
 	arch = x86_64
-	depends = lib32-libegl1-amdgpu-pro=16.30.3.315407-2
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	provides = lib32-libdrm
+	conflicts = lib32-libdrm
 
-pkgname = libgles2-amdgpu-pro-dev
-	pkgdesc = implementation of the OpenGL|ES 2.x API -- development files
+pkgname = lib32-amdgpu-pro-libgl
+	pkgdesc = The AMDGPU Pro libgl library symlinks (32bit libraries)
 	arch = x86_64
-	depends = libgles2-amdgpu-pro=16.30.3.315407-2
+	depends = lib32-amdgpu-pro
+	provides = lib32-libgl
+	conflicts = lib32-libgl
 
-pkgname = lib32-libgles2-amdgpu-pro-dev
-	pkgdesc = implementation of the OpenGL|ES 2.x API -- development files
+pkgname = lib32-amdgpu-pro-opencl
+	pkgdesc = The AMDGPU Pro OpenCL implementation
 	arch = x86_64
-	depends = lib32-libgles2-amdgpu-pro=16.30.3.315407-2
+	depends = 
+	provides = lib32-opencl-driver
 
-pkgname = lib32-libvdpau-amdgpu-pro
-	pkgdesc = AMDGPU Pro VDPAU driver
+pkgname = lib32-amdgpu-pro-vdpau
+	pkgdesc = The AMDGPU Pro VDPAU driver (32bit libraries)
 	arch = x86_64
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = lib32-libdrm>=2.4.31
-	depends = lib32-libdrm2-amdgpu-pro=16.30.3.315407-2
-	depends = lib32-openssl>=1.0.0
-	depends = lib32-libx11
-	depends = lib32-libxcb>=1.8
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	depends = lib32-libvdpau>=1.1
 	depends = lib32-libxcb
+	depends = lib32-libxcb>=1.8
+	depends = lib32-ncurses5-compat-libs>=6
+	depends = lib32-openssl>=1.0.0
 	depends = lib32-zlib>=1.2.0
 
-pkgname = libvdpau-amdgpu-pro
-	pkgdesc = AMDGPU Pro VDPAU driver
+pkgname = lib32-amdgpu-pro-vulkan
+	pkgdesc = The AMDGPU Pro Vulkan driver (32bit libraries)
 	arch = x86_64
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = libdrm>=2.4.31
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
-	depends = openssl>=1.0.0
-	depends = libx11
-	depends = libxcb>=1.8
-	depends = libxcb
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	provides = lib32-vulkan-driver
 
-pkgname = xserver-xorg-video-amdgpu-pro
-	pkgdesc = X.Org X server -- AMD/ATI Amdgpu-Pro display driver
+pkgname = xf86-video-amdgpu-pro
+	pkgdesc = The AMDGPU Pro X.org video driver
 	arch = x86_64
-	depends = libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2
-	depends = libdrm2-amdgpu-pro=16.30.3.315407-2
+	groups = xorg-driversxorg
+	depends = amdgpu-pro-libdrm=16.60.379184-1
+	depends = amdgpu-pro=16.60.379184-1
 	depends = libepoxy>=1.0
-	depends = libgbm1-amdgpu-pro=16.30.3.315407-2
-	depends = libgl1-amdgpu-pro-glx=16.30.3.315407-2
 	depends = libsystemd>=183
-	depends = libx11
-	depends = libxcb
-	depends = libxdamage>=1.1
-	depends = libxext
-	depends = libxfixes
-	depends = libxxf86vm
-	depends = xorg-server
+	provides = xf86-video-amdgpu
 	conflicts = xf86-video-amdgpu
+	conflicts = xorg-server<1.18.0
+	conflicts = xorg-server>=1.19.0X-ABI-VIDEODRV_VERSION<20
+	conflicts = X-ABI-VIDEODRV_VERSION>=21
 
diff --git a/0001-add-OS-detection-for-arch.patch b/0001-add-OS-detection-for-arch.patch
deleted file mode 100644
index 46302ae0ea89..000000000000
--- a/0001-add-OS-detection-for-arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 21 Aug 2016 16:30:25 -0300
-Subject: [PATCH 1/8] add OS detection for arch
-
----
- amd/backport/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index 0c285ef..6447a15 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME))
- ccflags-y += -DOS_NAME_UBUNTU
- else ifeq ("steamos",$(OS_NAME))
- ccflags-y += -DOS_NAME_STEAMOS
-+else ifeq ("arch",$(OS_NAME))
-+ccflags-y += -DOS_NAME_ARCH
-+OS_VERSION = "0.0"
- else
- ccflags-y += -DOS_NAME_UNKNOWN
- endif
--- 
-2.9.3
-
diff --git a/0001-add-archlinux-as-build-option.patch b/0001-add-archlinux-as-build-option.patch
new file mode 100644
index 000000000000..aa8c86e6363b
--- /dev/null
+++ b/0001-add-archlinux-as-build-option.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.original	2017-01-28 02:08:55.850223022 +0100
++++ b/Makefile	2017-01-28 02:10:59.110499356 +0100
+@@ -24,6 +24,9 @@
+ subdir-ccflags-y += -DOS_NAME_SLE
+ else ifeq ("sles",$(OS_NAME))
+ subdir-ccflags-y += -DOS_NAME_SLE
++else ifeq ("arch",$(OS_NAME))
++subdir-ccflags-y += -DOS_NAME_ARCH
++OS_VERSION = "0.0"
+ else
+ subdir-ccflags-y += -DOS_NAME_UNKNOWN
+ endif
diff --git a/0002-fix_get_user_pages_calls.patch b/0002-fix_get_user_pages_calls.patch
new file mode 100644
index 000000000000..95fe41cf7767
--- /dev/null
+++ b/0002-fix_get_user_pages_calls.patch
@@ -0,0 +1,42 @@
+--- a/include/kcl/kcl_mm.h.orig	2017-01-28 02:30:14.442885328 +0100
++++ b/include/kcl/kcl_mm.h	2017-01-28 02:37:26.820383177 +0100
+@@ -5,15 +5,23 @@
+ 
+ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+                                      unsigned long start, unsigned long nr_pages,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++                                     unsigned int gup_flags, struct page **pages,
++#else
+                                      int write, int force, struct page **pages,
++#endif
+                                      struct vm_area_struct **vmas)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++        return get_user_pages(start, nr_pages, gup_flags, pages, vmas);
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+         return get_user_pages(start, nr_pages, write, force, pages, vmas);
+ #else
+         return get_user_pages(tsk, mm, start, nr_pages,
+                               write, force, pages, vmas);
+ #endif
++#endif
+ }
+ 
+ #endif /* AMDKCL_MM_H */
+--- a/amd/amdgpu/amdgpu_ttm.c.orig	2017-01-28 02:47:28.851390146 +0100
++++ b/amd/amdgpu/amdgpu_ttm.c	2017-01-28 02:49:47.584961727 +0100
+@@ -662,8 +662,13 @@
+ 		list_add(&guptask.list, &gtt->guptasks);
+ 		spin_unlock(&gtt->guptasklock);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++		r = kcl_get_user_pages(current, current->mm, userptr, num_pages,
++				       write ? FOLL_WRITE : 0, p, NULL);
++#else
+ 		r = kcl_get_user_pages(current, current->mm, userptr, num_pages,
+ 				       write, 0, p, NULL);
++#endif
+ 
+ 		spin_lock(&gtt->guptasklock);
+ 		list_del(&guptask.list);
diff --git a/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
deleted file mode 100644
index 4101662a4ebe..000000000000
--- a/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 21 Aug 2016 16:31:12 -0300
-Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7
-
----
- amd/backport/include/kcl/kcl_ttm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
-index 3575004..0d1560d 100644
---- a/amd/backport/include/kcl/kcl_ttm.h
-+++ b/amd/backport/include/kcl/kcl_ttm.h
-@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
- 				 bool interruptible, bool no_wait,
- 				 struct ww_acquire_ctx *ticket)
- {
--#if defined(BUILD_AS_DKMS)
-+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 	return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
- #else
- 	return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
--- 
-2.9.3
-
diff --git a/0003-add-kcl_drm_gem_object_lookup.patch b/0003-add-kcl_drm_gem_object_lookup.patch
deleted file mode 100644
index 214b8effd9d3..000000000000
--- a/0003-add-kcl_drm_gem_object_lookup.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 21 Aug 2016 16:37:34 -0300
-Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup
-
----
- amd/amdgpu/amdgpu_atpx_handler.c    |  4 ++++
- amd/amdgpu/amdgpu_bo_list.c         |  2 +-
- amd/amdgpu/amdgpu_cs.c              |  2 +-
- amd/amdgpu/amdgpu_display.c         |  2 +-
- amd/amdgpu/amdgpu_gem.c             | 10 +++++-----
- amd/amdgpu/dce_v10_0.c              |  2 +-
- amd/amdgpu/dce_v11_0.c              |  2 +-
- amd/amdgpu/dce_v8_0.c               |  2 +-
- amd/backport/include/kcl/kcl_drm.h  | 11 +++++++++++
- amd/dal/amdgpu_dm/amdgpu_dm_types.c |  2 +-
- 10 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c
-index cc9b998..7e47478 100644
---- a/amd/amdgpu/amdgpu_atpx_handler.c
-+++ b/amd/amdgpu/amdgpu_atpx_handler.c
-@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void)
- 	if (!r)
- 		return;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+	vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0);
-+#else
- 	vga_switcheroo_register_handler(&amdgpu_atpx_handler);
-+#endif
- }
- 
- /**
-diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
-index 35d0856..1d163ec 100644
---- a/amd/amdgpu/amdgpu_bo_list.c
-+++ b/amd/amdgpu/amdgpu_bo_list.c
-@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
- 		struct amdgpu_bo *bo;
- 		struct mm_struct *usermm;
- 
--		gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
-+		gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
- 		if (!gobj) {
- 			r = -ENOENT;
- 			goto error_free;
-diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
-index d16ed26..b0390b5 100644
---- a/amd/amdgpu/amdgpu_cs.c
-+++ b/amd/amdgpu/amdgpu_cs.c
-@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
- {
- 	struct drm_gem_object *gobj;
- 
--	gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
-+	gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp,
- 				     data->handle);
- 	if (gobj == NULL)
- 		return -EINVAL;
-diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
-index 46326b3..9b5441f 100644
---- a/amd/amdgpu/amdgpu_display.c
-+++ b/amd/amdgpu/amdgpu_display.c
-@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
- 	struct amdgpu_framebuffer *amdgpu_fb;
- 	int ret;
- 
--	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
-+	obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
- 	if (obj ==  NULL) {
- 		dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
- 			"can't create framebuffer\n", mode_cmd->handles[0]);
-diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
-index 0069aec..d10c282 100644
---- a/amd/amdgpu/amdgpu_gem.c
-+++ b/amd/amdgpu/amdgpu_gem.c
-@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
- 	struct drm_gem_object *gobj;
- 	struct amdgpu_bo *robj;
- 
--	gobj = drm_gem_object_lookup(dev, filp, handle);
-+	gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
- 	int r = 0;
- 	long ret;
- 
--	gobj = drm_gem_object_lookup(dev, filp, handle);
-+	gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
- 	int r = -1;
- 
- 	DRM_DEBUG("%d \n", args->handle);
--	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+	gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- 	if (gobj == NULL)
- 		return -ENOENT;
- 	robj = gem_to_amdgpu_bo(gobj);
-@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
- 		return -EINVAL;
- 	}
- 
--	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+	gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- 	if (gobj == NULL)
- 		return -ENOENT;
- 	rbo = gem_to_amdgpu_bo(gobj);
-@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
- 	struct amdgpu_bo *robj;
- 	int r;
- 
--	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+	gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 7554dd7..6d38754 100644
---- a/amd/amdgpu/dce_v10_0.c
-+++ b/amd/amdgpu/dce_v10_0.c
-@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
--	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+	obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index d9c9b88..93dbc1a 100644
---- a/amd/amdgpu/dce_v11_0.c
-+++ b/amd/amdgpu/dce_v11_0.c
-@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
--	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+	obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 7a027ce..c56a298 100644
---- a/amd/amdgpu/dce_v8_0.c
-+++ b/amd/amdgpu/dce_v8_0.c
-@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
--	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+	obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
-index a65ee25..5a8a7b3 100644
---- a/amd/backport/include/kcl/kcl_drm.h
-+++ b/amd/backport/include/kcl/kcl_drm.h
-@@ -3,6 +3,7 @@
- 
- #include <linux/version.h>
- #include <drm/drmP.h>
-+#include <drm/drm_gem.h>
- 
- #if defined(BUILD_AS_DKMS)
- extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
-@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr
- #endif
- }
- 
-+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev,
-+                                 struct drm_file *filp,
-+                                 u32 handle) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    return drm_gem_object_lookup(filp, handle);
-+#else
-+    return drm_gem_object_lookup(dev, filp, handle);
-+#endif
-+}
-+
- #endif /* AMDGPU_BACKPORT_KCL_DRM_H */
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index 3f357a5..2e2d2e6 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new(
- 
- 		amdgpu_crtc = to_amdgpu_crtc(crtc);
- 
--		obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+		obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
- 
- 		if (!obj) {
- 			DRM_ERROR(
--- 
-2.9.3
-
diff --git a/0003-fix_drm_connector.patch b/0003-fix_drm_connector.patch
new file mode 100644
index 000000000000..a056ebe3d3c5
--- /dev/null
+++ b/0003-fix_drm_connector.patch
@@ -0,0 +1,25 @@
+diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c
+index 818d589..cb78d1c 100644
+--- a/amd/amdgpu/amdgpu_connectors.c
++++ b/amd/amdgpu/amdgpu_connectors.c
+@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)
+ 		}
+ 
+ 		/* Any defined maximum tmds clock limit we must not exceed? */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++		if (connector->display_info.max_tmds_clock > 0) {
++#else
+ 		if (connector->max_tmds_clock > 0) {
++#endif
+ 			/* mode_clock is clock in kHz for mode to be modeset on this connector */
+ 			mode_clock = amdgpu_connector->pixelclock_for_modeset;
+ 
+ 			/* Maximum allowable input clock in kHz */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++			max_tmds_clock = connector->display_info.max_tmds_clock * 1000;
++#else
+ 			max_tmds_clock = connector->max_tmds_clock * 1000;
++#endif
+ 
+ 			DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n",
+ 				  connector->name, mode_clock, max_tmds_clock);
diff --git a/0004-Change-seq_printf-format-for-64-bit-context.patch b/0004-Change-seq_printf-format-for-64-bit-context.patch
new file mode 100644
index 000000000000..925a92e2a7e5
--- /dev/null
+++ b/0004-Change-seq_printf-format-for-64-bit-context.patch
@@ -0,0 +1,25 @@
+From 084b2915e6876d8fdb913938569c0ce7ffef65bc Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest" <laguest@archeia.com>
+Date: Sun, 25 Sep 2016 16:46:39 +0100
+Subject: [PATCH 04/11] Change seq_printf format for 64 bit context
+
+---
+ amd/amdgpu/amdgpu_sa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 052f745..5886b9a 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ 			   soffset, eoffset, eoffset - soffset);
+ 
+ 		if (i->fence)
+-#if defined(BUILD_AS_DKMS)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
+ 			seq_printf(m, " protected by 0x%08x on context %d",
+ 				   i->fence->seqno, i->fence->context);
+ #else
+-- 
+2.11.0
+
diff --git a/0004-paging-changes-for-linux-4.6.patch b/0004-paging-changes-for-linux-4.6.patch
deleted file mode 100644
index 54394b7879be..000000000000
--- a/0004-paging-changes-for-linux-4.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 21 Aug 2016 16:40:32 -0300
-Subject: [PATCH 4/8] paging changes for linux-4.6
-
----
- amd/amdgpu/amdgpu_ttm.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 7bdebde..8b676c2 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)
- 		list_add(&guptask.list, &gtt->guptasks);
- 		spin_unlock(&gtt->guptasklock);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+		r = get_user_pages(userptr, num_pages, write, 0, p, NULL);
-+#else
- 		r = get_user_pages(current, current->mm, userptr, num_pages,
--				   write, 0, p, NULL);
-+			write, 0, p, NULL);
-+#endif
- 
- 		spin_lock(&gtt->guptasklock);
- 		list_del(&guptask.list);
-@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
- 			set_page_dirty(page);
- 
- 		mark_page_accessed(page);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+		put_page(page);
-+#else
- 		page_cache_release(page);
-+#endif
- 	}
- 
- 	sg_free_table(ttm->sg);
--- 
-2.9.3
-
diff --git a/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
deleted file mode 100644
index 6da3e46a3ee6..000000000000
--- a/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Mon, 4 Jul 2016 19:19:45 +0100
-Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x
-
----
- amd/amdgpu/amdgpu_ttm.c | 4 ++--
- amd/backport/kcl_ttm.c  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 8b676c2..752d065 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
- 	return flags;
- }
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
-@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
- 	.fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
- 	.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
- 	.io_mem_free = &amdgpu_ttm_io_mem_free,
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 	.lru_removal = &amdgpu_ttm_lru_removal,
- 	.lru_tail = &amdgpu_ttm_lru_tail,
- 	.swap_lru_tail = &amdgpu_ttm_swap_lru_tail,
-diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c
-index 24f7a83..1a2cb7b 100644
---- a/amd/backport/kcl_ttm.c
-+++ b/amd/backport/kcl_ttm.c
-@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
- {
- 	int put_count = 0;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 	struct ttm_bo_device *bdev = bo->bdev;
- 
- 	if (bdev->driver->lru_removal)
--- 
-2.9.3
-
diff --git a/0005-fix_drm_vma_node_verify_access.patch b/0005-fix_drm_vma_node_verify_access.patch
new file mode 100644
index 000000000000..8c1d49bfe31f
--- /dev/null
+++ b/0005-fix_drm_vma_node_verify_access.patch
@@ -0,0 +1,22 @@
+--- a/amd/amdgpu/amdgpu_ttm.c	2017-01-23 03:01:42.000000000 +0100
++++ b/amd/amdgpu/amdgpu_ttm.c	2017-02-06 13:49:25.767120946 +0100
+@@ -251,11 +251,19 @@
+ 
+ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++	struct drm_file *file_priv;
++#endif
+ 	struct amdgpu_bo *abo = container_of(bo, struct amdgpu_bo, tbo);
+ 
+ 	if (amdgpu_ttm_tt_get_usermm(bo->ttm))
+ 		return -EPERM;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++	file_priv = filp->private_data;
++	return drm_vma_node_verify_access(&abo->gem_base.vma_node, file_priv);
++#else
+ 	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp);
++#endif
+ }
+ 
+ static void amdgpu_move_null(struct ttm_buffer_object *bo,
diff --git a/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
deleted file mode 100644
index 5be5acad00d6..000000000000
--- a/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Mon, 4 Jul 2016 19:30:08 +0100
-Subject: [PATCH 6/8] Change name of vblank_disable_allowed to
- vblank_disable_immediate under 4.7.x.
-
----
- amd/amdgpu/amdgpu_irq.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
-index d13865a..5cfa69f 100644
---- a/amd/amdgpu/amdgpu_irq.c
-+++ b/amd/amdgpu/amdgpu_irq.c
-@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
- 		INIT_WORK(&adev->hotplug_work,
- 				amdgpu_hotplug_work_func);
- 	}
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	adev->ddev->vblank_disable_immediate = true;
-+#else
- 	adev->ddev->vblank_disable_allowed = true;
-+#endif
- 
- 	INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
- 
--- 
-2.9.3
-
diff --git a/0006-fix_dm_plane_helper_funcs.patch b/0006-fix_dm_plane_helper_funcs.patch
new file mode 100644
index 000000000000..310dd4b49b11
--- /dev/null
+++ b/0006-fix_dm_plane_helper_funcs.patch
@@ -0,0 +1,26 @@
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+index edc8e86..0b38016 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
+@@ -1675,6 +1676,10 @@ static int dm_plane_helper_prepare_fb(
+ 	struct drm_plane *plane,
+ 	struct drm_framebuffer *fb,
+ 	const struct drm_plane_state *new_state)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++static int dm_plane_helper_prepare_fb(
++	struct drm_plane *plane,
++	struct drm_plane_state *new_state)
+ #else
+ static int dm_plane_helper_prepare_fb(
+ 	struct drm_plane *plane,
+@@ -1718,6 +1723,10 @@ static void dm_plane_helper_cleanup_fb(
+ 	struct drm_plane *plane,
+ 	struct drm_framebuffer *fb,
+ 	const struct drm_plane_state *old_state)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++static void dm_plane_helper_cleanup_fb(
++	struct drm_plane *plane,
++	struct drm_plane_state *old_state)
+ #else
+ static void dm_plane_helper_cleanup_fb(
+ 	struct drm_plane *plane,
diff --git a/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
deleted file mode 100644
index 13d4a282ac82..000000000000
--- a/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Mon, 4 Jul 2016 19:41:08 +0100
-Subject: [PATCH 7/8] Remove connector parameter from
- __drm_atomic_helper_connector_destroy_state for 4.7.x kernels.
-
----
- amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index 2e2d2e6..cd34607 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
- 	struct dm_connector_state *dm_state =
- 		to_dm_connector_state(state);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	__drm_atomic_helper_connector_destroy_state(state);
-+#else
- 	__drm_atomic_helper_connector_destroy_state(connector, state);
-+#endif
- 
- 	kfree(dm_state);
- }
--- 
-2.9.3
-
diff --git a/0007-disable-dal-by-default.patch b/0007-disable-dal-by-default.patch
new file mode 100644
index 000000000000..f62d4e64509a
--- /dev/null
+++ b/0007-disable-dal-by-default.patch
@@ -0,0 +1,11 @@
+--- a/amd/amdgpu/amdgpu_drv.c.orig	2017-01-30 00:29:42.740832196 +0100
++++ b/amd/amdgpu/amdgpu_drv.c	2017-01-30 00:29:59.947499459 +0100
+@@ -88,7 +88,7 @@
+ int amdgpu_vm_debug = 0;
+ int amdgpu_vram_page_split = 1024;
+ int amdgpu_exp_hw_support = 0;
+-int amdgpu_dc = -1;
++int amdgpu_dc = 0;
+ int amdgpu_sched_jobs = 32;
+ int amdgpu_sched_hw_submission = 2;
+ int amdgpu_powerplay = -1;
diff --git a/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
deleted file mode 100644
index 693ad8b2f40d..000000000000
--- a/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Sun, 21 Aug 2016 16:58:45 -0300
-Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error
-
----
- amd/dal/dc/calcs/bandwidth_calcs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c
-index 8a19139..c4ededd 100644
---- a/amd/dal/dc/calcs/bandwidth_calcs.c
-+++ b/amd/dal/dc/calcs/bandwidth_calcs.c
-@@ -3181,7 +3181,7 @@ static void calculate_bandwidth(
- 																	bw_int_to_fixed(
- 																		2),
- 																	vbios->mcifwrmc_urgent_latency),
--																results->dmif_burst_time[i][j]),
-+																results->dmif_burst_time[results->y_clk_level][results->sclk_level]),
- 															results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])),
- 														results->dispclk),
- 													bw_int_to_fixed(
--- 
-2.9.3
-
diff --git a/0009-disable-dal-by-default.patch b/0009-disable-dal-by-default.patch
deleted file mode 100644
index 05bcbf8bd061..000000000000
--- a/0009-disable-dal-by-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 25 Aug 2016 22:17:06 -0300
-Subject: [PATCH] disable dal by default
-
----
- amd/amdgpu/amdgpu_drv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
-index 793528b..9a4dfcc 100644
---- a/amd/amdgpu/amdgpu_drv.c
-+++ b/amd/amdgpu/amdgpu_drv.c
-@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1;
- int amdgpu_vm_fault_stop = 0;
- int amdgpu_vm_debug = 0;
- int amdgpu_exp_hw_support = 0;
--int amdgpu_dal = -1;
-+int amdgpu_dal = 0;
- int amdgpu_sched_jobs = 32;
- int amdgpu_sched_hw_submission = 2;
- int amdgpu_powerplay = -1;
--- 
-2.9.3
-
diff --git a/0010-remove-dependency-on-System.map.patch b/0010-remove-dependency-on-System.map.patch
deleted file mode 100644
index ec8f2c5a5999..000000000000
--- a/0010-remove-dependency-on-System.map.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 25 Aug 2016 23:08:02 -0300
-Subject: [PATCH] remove dependency on System.map
-
----
- amd/backport/Makefile    |  3 +--
- amd/backport/kcl_fence.c | 10 ++++++++--
- amd/backport/symbols     |  3 ---
- dkms.conf                |  1 -
- pre-build.sh             | 32 --------------------------------
- 5 files changed, 9 insertions(+), 40 deletions(-)
- delete mode 100644 amd/backport/symbols
- delete mode 100755 pre-build.sh
-
-diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index 6447a15..4682e0f 100644
---- a/amd/backport/Makefile
-+++ b/amd/backport/Makefile
-@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7
- endif
- endif
- 
--BACKPORT_OBJS = symbols.o
- endif
- 
--BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
-+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
- 
- amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
- 
-diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
-index 2141eef..ceef1fe 100644
---- a/amd/backport/kcl_fence.c
-+++ b/amd/backport/kcl_fence.c
-@@ -22,8 +22,14 @@ struct default_wait_cb {
- 	struct task_struct *task;
- };
- 
--extern void
--(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
-+static void
-+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
-+{
-+	struct default_wait_cb *wait =
-+		container_of(cb, struct default_wait_cb, base);
-+
-+	wake_up_process(wait->task);
-+}
- 
- signed long
- _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
-diff --git a/amd/backport/symbols b/amd/backport/symbols
-deleted file mode 100644
-index 2d3f2ee..0000000
---- a/amd/backport/symbols
-+++ /dev/null
-@@ -1,3 +0,0 @@
--SYMS=""
--
--SYMS+="fence_default_wait_cb"
-diff --git a/dkms.conf b/dkms.conf
-index 9ca148e..36be480 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu"
- BUILT_MODULE_LOCATION[0]="amd/amdgpu"
- DEST_MODULE_LOCATION[0]="/extra"
- AUTOINSTALL="yes"
--PRE_BUILD="pre-build.sh $kernelver"
-\ No newline at end of file
-diff --git a/pre-build.sh b/pre-build.sh
-deleted file mode 100755
-index 88ec680..0000000
---- a/pre-build.sh
-+++ /dev/null
-@@ -1,32 +0,0 @@
--#!/bin/bash
--
--KERNELVER=$1
--KERNELVER_BASE=${KERNELVER%%-*}
--
--version_lt () {
--    newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
--    [ "$1" != "$newest" ]
--}
--
--version_ge () {
--    newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
--    [ "$1" = "$newest" ]
--}
--
--version_gt () {
--    oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
--    [ "$1" != "$oldest" ]
--}
--
--version_le () {
--    oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
--    [ "$1" = "$oldest" ]
--}
--
--source amd/backport/symbols
--
--echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
--for sym in $SYMS; do
--    addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
--    echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
--done
--- 
-2.9.3
-
diff --git a/PKGBUILD b/PKGBUILD
index 3d0e6998c2c1..b780235387d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,992 +3,372 @@
 # Autogenerated from AMD's Packages file
 
 pkgbase=amdgpu-pro-installer
-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+=()
-fi
-pkgver=16.30.3.315407
-pkgrel=2
+pkgname=(amdgpu-pro amdgpu-pro-dkms amdgpu-pro-libdrm amdgpu-pro-libgl amdgpu-pro-opencl amdgpu-pro-vdpau amdgpu-pro-vulkan lib32-amdgpu-pro lib32-amdgpu-pro-libdrm lib32-amdgpu-pro-libgl lib32-amdgpu-pro-opencl lib32-amdgpu-pro-vdpau lib32-amdgpu-pro-vulkan xf86-video-amdgpu-pro)
+pkgver=16.60.379184
+pkgrel=1
 arch=('x86_64')
 url='http://www.amd.com'
 license=('custom:AMD')
 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
-	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-2' 'amdgpu-pro-computing=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_amdgpu-pro-clinfo () {
-	pkgdesc="AMD OpenCL info utility"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-clinfo_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_amdgpu-pro-computing () {
-	pkgdesc="This package install amdgpu-pro OpenCL components."
-	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
-	mkdir "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-computing_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
+DLAGENTS='https::/usr/bin/wget --referer https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Install.aspx -N %u'
+
+source=(https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-16.60-379184.tar.xz
+	0001-add-archlinux-as-build-option.patch
+	0002-fix_get_user_pages_calls.patch
+	0003-fix_drm_connector.patch
+	0004-Change-seq_printf-format-for-64-bit-context.patch
+	0005-fix_drm_vma_node_verify_access.patch
+	0006-fix_dm_plane_helper_funcs.patch
+	0007-disable-dal-by-default.patch)
+sha256sums=(d88b5a747ac765a75eb738aaf5641428c3b1c9c02bc6fde452c423de7dd620bd
+	400df0077464003fad74bb77a8f6e5ba24bffc7c2e32e6b3f0dab08a17eb3486
+	5708b6641bd62fe768e1cb36f88d0895c4fdf90d1d3110033bafdabc47fe1e31
+	b6a98ed84733bab544461991f642dc1a73ee065b32f7c1b3a235d5e2bc814943
+	21c78811107d8ee59f3566d21ed4a7ccfd622f4e07350fca7ed662392ab07190
+	885330f3749db53a491b7c35c7e0d9d58965a717e62434101c4d72f1a31ef39a
+	b10bb6b2382f995ee90f9cc807b69cb336d0edb65096b66df315f0c60132e04d
+	e28d79fcb808d7c275938a4d9871da3138fdd38eb7c1c69495bf9a9d36dc271a)
+
+
+
+# extracts a debian package
+# $1: deb file to extract
+extract_deb() {
+	local tmpdir="$(basename "${1%.deb}")"
+	rm -Rf "$tmpdir"
+	mkdir "$tmpdir"
+	cd "$tmpdir"
+	ar x "$1"
+	tar -C "${pkgdir}" -xf data.tar.xz
+}
+# move ubuntu specific /usr/lib/x86_64-linux-gnu to /usr/lib
+# $1: library dir
+# $2: destination (optional)
+move_libdir() {
+	local libdir="usr/lib"
+	if [ -n "$2" ]; then
+		libdir="$2"
+	fi
+	if [ -d "$1" ]; then
+		if [ -d "${pkgdir}/${libdir}" ]; then
+			cp -ar -t "${pkgdir}/${libdir}/" "$1"/*
+			rm -rf "$1"
+		else
+			mkdir -p "${pkgdir}/${libdir}"
+			mv -t "${pkgdir}/${libdir}/" "$1"/*
+			rmdir "$1"
+		fi
 	fi
 }
 
 
-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-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-core_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/lib ${pkgdir}/usr/
-	sed -i 's/\/usr\/lib\/x86_64-linux-gnu\//\/usr\/lib\//' ${pkgdir}/usr/lib/amdgpu-pro/ld.conf
-	sed -i 's/\/usr\/lib\/i386-linux-gnu\//\/usr\/lib32\//' ${pkgdir}/usr/lib/amdgpu-pro/ld.conf
-	mkdir -p ${pkgdir}/etc/ld.so.conf.d/
-	ln -s /usr/lib/amdgpu-pro/ld.conf ${pkgdir}/etc/ld.so.conf.d/10-amdgpu-pro.conf
-	mkdir -p ${pkgdir}/etc/modprobe.d/
-	ln -s /usr/lib/amdgpu-pro/modprobe.conf ${pkgdir}/etc/modprobe.d/amdgpu-pro.conf
+package_amdgpu-pro () {
+	pkgdesc="The AMDGPU Pro driver package"
 	install=amdgpu-pro-core.install
-
+	arch=('x86_64')
+	depends=('glib2>=2.37.3' 'gst-plugins-base>=1.6.0' 'gstreamer>=1.0.0' 'lib32-amdgpu-pro-libdrm=16.60.379184-1' 'lib32-amdgpu-pro-opencl=16.60.379184-1' 'lib32-amdgpu-pro-vdpau=16.60.379184-1' 'lib32-amdgpu-pro-vulkan=16.60.379184-1' 'lib32-amdgpu-pro=16.60.379184-1' 'libomxil-bellagio' 'libx11' 'libx11>=1.4.99.1' 'libxcb' 'libxcb>=1.8' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm' 'ncurses5-compat-libs>=6' 'openssl>=1.0.0' 'xf86-video-amdgpu-pro=16.60.379184-1' 'zlib>=1.2.0')
+
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro-lib32_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./gst-omx-amdgpu-pro_1.0.0.1-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libegl1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-base_16.60-379184_all.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-dev_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-appprofiles_16.60-379184_all.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-dri_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-ext_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-glx_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libglamor-amdgpu-pro-dev_1.18.3-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgles2-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./mesa-amdgpu-pro-omx-drivers_12.0.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
+
+	# extra_commands:
+	mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/dri ${pkgdir}/usr/lib/
+	# 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
+	mkdir -p "${pkgdir}/etc/ld.so.conf.d/"
+	echo "/opt/amdgpu-pro/lib/x86_64-linux-gnu/" > "${pkgdir}"/etc/ld.so.conf.d/amdgpu-pro.conf
 }
 
 
 package_amdgpu-pro-dkms () {
 	pkgdesc="amdgpu-pro driver in DKMS format."
-	depends=('dkms>=1.95')
 	arch=('any')
+	depends=('dkms>=1.95')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	mkdir "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	cd "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-dkms_16.30.3-315407_all.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro-dkms_16.60-379184_all.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		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;
+	# extra_commands:
+	msg 'Applying patches...'
+	(cd ${pkgdir}/usr/src/amdgpu-pro-16.60-379184;
 		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")
-
+			msg2 '0001-add-archlinux-as-build-option.patch'
+		patch -p1 -i "${srcdir}/0001-add-archlinux-as-build-option.patch";
+		msg2 '0002-fix_get_user_pages_calls.patch'
+		patch -p1 -i "${srcdir}/0002-fix_get_user_pages_calls.patch";
+		msg2 '0003-fix_drm_connector.patch'
+		patch -p1 -i "${srcdir}/0003-fix_drm_connector.patch";
+		msg2 '0004-Change-seq_printf-format-for-64-bit-context.patch'
+		patch -p1 -i "${srcdir}/0004-Change-seq_printf-format-for-64-bit-context.patch";
+		msg2 '0005-fix_drm_vma_node_verify_access.patch'
+		patch -p1 -i "${srcdir}/0005-fix_drm_vma_node_verify_access.patch";
+		msg2 '0006-fix_dm_plane_helper_funcs.patch'
+		patch -p1 -i "${srcdir}/0006-fix_dm_plane_helper_funcs.patch";
+		msg2 '0007-disable-dal-by-default.patch'
+		patch -p1 -i "${srcdir}/0007-disable-dal-by-default.patch"
+	)
 }
 
 
-package_amdgpu-pro-firmware () {
-	pkgdesc="Firmware for amdgpu-pro cards."
-	depends=()
+package_amdgpu-pro-libdrm () {
+	pkgdesc="The AMDGPU Pro userspace interface to kernel DRM services"
 	arch=('x86_64')
+	provides=('libdrm')
+	conflicts=('libdrm')
+	depends=('bcunit')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-firmware_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	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
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-amdgpu1_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-dev_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-radeon1_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-utils_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm2-amdgpu-pro_2.4.70-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
 }
 
 
-package_amdgpu-pro-graphics () {
-	pkgdesc="This package install amdgpu-pro graphics components."
-	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')
+package_amdgpu-pro-libgl () {
+	pkgdesc="The AMDGPU Pro libgl library symlinks"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-graphics_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
 	provides=('libgl')
 	conflicts=('libgl')
+	depends=(amdgpu-pro)
 
-}
-
-
-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-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
-	mkdir "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-lib32_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	provides=('lib32-libgl')
-	conflicts=('lib32-libgl')
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-amdgpu-pro-libopencl-dev () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	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
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	provides=(lib32-libcl)
-	conflicts=(lib32-libcl)
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_amdgpu-pro-libopencl-dev () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	provides=(libcl)
-	conflicts=(libcl)
-
-}
-
-
-package_amdgpu-pro-libopencl1 () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=()
-	arch=('x86_64')
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 }
 
 
-package_lib32-amdgpu-pro-libopencl1 () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=()
+package_amdgpu-pro-opencl () {
+	pkgdesc="The AMDGPU Pro OpenCL implementation"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_amdgpu-pro-opencl-icd () {
-	pkgdesc="non-free AMD OpenCL ICD Loaders"
+	provides=('opencl-driver')
 	depends=()
-	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./clinfo-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libopencl1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./opencl-amdgpu-pro-icd_16.60-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 }
 
 
-package_lib32-amdgpu-pro-opencl-icd () {
-	pkgdesc="non-free AMD OpenCL ICD Loaders"
-	depends=()
+package_amdgpu-pro-vdpau () {
+	pkgdesc="The AMDGPU Pro VDPAU driver"
 	arch=('x86_64')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'libvdpau>=1.1' 'libxcb' 'libxcb>=1.8' 'ncurses5-compat-libs>=6' 'openssl>=1.0.0' 'zlib>=1.2.0')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libvdpau-amdgpu-pro_12.0.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib/
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so.1.0.0
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so.1
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so
 }
 
 
-package_amdgpu-pro-vulkan-driver () {
-	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
+package_amdgpu-pro-vulkan () {
+	pkgdesc="The AMDGPU Pro Vulkan driver"
 	arch=('x86_64')
+	provides=('vulkan-driver')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	sed -i 's/\/usr\/lib\/x86_64-linux-gnu\//\/usr\/lib\//' ${pkgdir}/etc/vulkan/icd.d/amd_icd64.json
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./vulkan-amdgpu-pro_16.60-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+	mv "${pkgdir}"/etc/vulkan/icd.d/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
+	rm -rf "${pkgdir}"/etc/vulkan/
 }
 
 
-package_lib32-amdgpu-pro-vulkan-driver () {
-	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
+package_lib32-amdgpu-pro () {
+	pkgdesc="Meta package to install amdgpu Pro components. (32bit libraries)"
 	arch=('x86_64')
+	depends=('amdgpu-pro-dkms=16.60.379184-1' 'amdgpu-pro-libdrm=16.60.379184-1' 'amdgpu-pro-opencl=16.60.379184-1' 'amdgpu-pro-vdpau=16.60.379184-1' 'amdgpu-pro-vulkan=16.60.379184-1' 'amdgpu-pro=16.60.379184-1' 'lib32-glib2>=2.37.3' 'lib32-gst-plugins-base>=1.6.0' 'lib32-gstreamer>=1.0.0' 'lib32-libomxil-bellagio' 'lib32-libx11' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb' 'lib32-libxcb>=1.8' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-ncurses5-compat-libs>=6' 'lib32-openssl>=1.0.0' 'lib32-zlib>=1.2.0' 'xf86-video-amdgpu-pro=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./gst-omx-amdgpu-pro_1.0.0.1-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libegl1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-dev_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-dri_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-ext_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-glx_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libglamor-amdgpu-pro-dev_1.18.3-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgles2-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./mesa-amdgpu-pro-omx-drivers_12.0.3-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib32/
+	mv "${pkgdir}"/usr/lib/i386-linux-gnu/dri "${pkgdir}"/usr/lib32/
+	rm -rf "${pkgdir}"/etc
+	mkdir -p "${pkgdir}/etc/ld.so.conf.d/"
+	echo "/opt/amdgpu-pro/lib/i386-linux-gnu/" > "${pkgdir}"/etc/ld.so.conf.d/lib32-amdgpu-pro.conf
 
-	sed -i 's/\/usr\/lib\/i386-linux-gnu\//\/usr\/lib32\//' ${pkgdir}/etc/vulkan/icd.d/amd_icd32.json
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libdrm-amdgpu-pro-amdgpu1 () {
-	pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2')
+package_lib32-amdgpu-pro-libdrm () {
+	pkgdesc="The AMDGPU Pro userspace interface to kernel DRM services (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-libdrm')
+	conflicts=('lib32-libdrm')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-amdgpu1_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-dev_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-radeon1_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm2-amdgpu-pro_2.4.70-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-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-2')
-	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libdrm-amdgpu-pro-dev () {
-	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	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
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libdrm-amdgpu-pro-dev () {
-	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	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
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libdrm-amdgpu-pro-tools () {
-	pkgdesc="testing tools for libdrm-amdgpu-pro"
-	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
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-tools_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libdrm2-amdgpu-pro () {
-	pkgdesc="Userspace interface to kernel DRM services -- runtime"
-	depends=()
+package_lib32-amdgpu-pro-libgl () {
+	pkgdesc="The AMDGPU Pro libgl library symlinks (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-libgl')
+	conflicts=('lib32-libgl')
+	depends=(lib32-amdgpu-pro)
 
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
 
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-package_lib32-libdrm2-amdgpu-pro () {
-	pkgdesc="Userspace interface to kernel DRM services -- runtime"
-	depends=()
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libegl1-amdgpu-pro () {
-	pkgdesc="implementation of the EGL API -- runtime"
-	depends=()
+package_lib32-amdgpu-pro-opencl () {
+	pkgdesc="The AMDGPU Pro OpenCL implementation"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libEGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_lib32-libegl1-amdgpu-pro () {
-	pkgdesc="implementation of the EGL API -- runtime"
+	provides=('lib32-opencl-driver')
 	depends=()
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libEGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-libegl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the EGL API -- development files"
-	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
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libEGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libegl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the EGL API -- development files"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libEGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_libgbm-amdgpu-pro-dev () {
-	pkgdesc="generic buffer management API -- development files"
-	depends=('libgbm1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_lib32-libgbm-amdgpu-pro-dev () {
-	pkgdesc="generic buffer management API -- development files"
-	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
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgbm1-amdgpu-pro () {
-	pkgdesc="generic buffer management API -- runtime"
-	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
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_lib32-libgbm1-amdgpu-pro () {
-	pkgdesc="generic buffer management API -- runtime"
-	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
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-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-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	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
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_lib32-libgl1-amdgpu-pro-dri () {
-	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('lib32-libx11' 'lib32-libxext')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgl1-amdgpu-pro-dri () {
-	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('libx11' 'libxext')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libgl1-amdgpu-pro-glx () {
-	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	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
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libopencl1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./opencl-amdgpu-pro-icd_16.60-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
 }
 
 
-package_lib32-libgl1-amdgpu-pro-glx () {
-	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	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')
+package_lib32-amdgpu-pro-vdpau () {
+	pkgdesc="The AMDGPU Pro VDPAU driver (32bit libraries)"
 	arch=('x86_64')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'lib32-libvdpau>=1.1' 'lib32-libxcb' 'lib32-libxcb>=1.8' 'lib32-ncurses5-compat-libs>=6' 'lib32-openssl>=1.0.0' 'lib32-zlib>=1.2.0')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libvdpau-amdgpu-pro_12.0.3-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib32/
+	ln -s /opt/amdgpu-pro/lib/i386-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so.1.0.0
+	ln -s /opt/amdgpu-pro/lib/i368-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so.1
+	ln -s /opt/amdgpu-pro/lib/i368-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so
 
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgles2-amdgpu-pro () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
+package_lib32-amdgpu-pro-vulkan () {
+	pkgdesc="The AMDGPU Pro Vulkan driver (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-vulkan-driver')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./vulkan-amdgpu-pro_16.60-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+	mv "${pkgdir}"/etc/vulkan/icd.d/amd_icd32.json "${pkgdir}"/usr/share/vulkan/icd.d/
+	rm -rf "${pkgdir}"/etc/vulkan/
 
-package_lib32-libgles2-amdgpu-pro () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgles2-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('libgles2-amdgpu-pro=16.30.3.315407-2')
+package_xf86-video-amdgpu-pro () {
+	pkgdesc="The AMDGPU Pro X.org video driver"
 	arch=('x86_64')
+	provides=('xf86-video-amdgpu')
+	conflicts=('xf86-video-amdgpu' 'xorg-server<1.18.0' 'xorg-server>=1.19.0X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
+	groups=('xorg-driversxorg')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'amdgpu-pro=16.60.379184-1' 'libepoxy>=1.0' 'libsystemd>=183')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGLES* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-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-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGLES* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-libvdpau-amdgpu-pro () {
-	pkgdesc="AMDGPU Pro VDPAU driver"
-	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
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libvdpau-amdgpu-pro () {
-	pkgdesc="AMDGPU Pro VDPAU driver"
-	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
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-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-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
-	mkdir "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		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
-	mv ${pkgdir}/usr/lib/amdgpu-pro/1.18/ ${pkgdir}/usr/lib/xorg
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-amdgpu-pro_1.2.99-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-glamoregl-amdgpu-pro_1.18.3-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-modesetting-amdgpu-pro_1.18.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
 }