update to 16.30.3.306809

3 files changed, 242 insertions, 429 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b11b536d9eca..da4e36f68102 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = amdgpu-pro-installer
-	pkgver = 16.20.3.294842
-	pkgrel = 2
+	pkgver = 16.30.3.306809
+	pkgrel = 1
 	url = http://www.amd.com
 	arch = x86_64
-	license = custom:AMD
-	source = https://www2.ati.com/drivers/beta/amdgpu-pro_16.20.3-294842.tar.xz
-	sha256sums = 4a2988f5047e858c3c6ae22528162b2537780deeaf5dda5d8a8f61e213058a66
+	source = https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-306809.tar.xz
+	sha256sums = 40fc78dc10823096882bd5840a0c49221bbd977e1eda1a9b79b620d06298c389
 
 pkgname = amdgpu-pro
 	pkgdesc = This package install all amdgpu-pro components.
@@ -95,21 +94,11 @@ pkgname = amdgpu-pro-vulkan-driver
 	pkgdesc = AMDGPU Pro Vulkan driver
 	arch = x86_64
 	depends = libdrm-amdgpu-pro-amdgpu1
-	depends = libx11
-	depends = libxcb
-	depends = libxcb>=1.9.2
-	depends = libxext
-	depends = libxshmfence
 
 pkgname = lib32-amdgpu-pro-vulkan-driver
 	pkgdesc = AMDGPU Pro Vulkan driver
 	arch = x86_64
 	depends = lib32-libdrm-amdgpu-pro-amdgpu1
-	depends = lib32-libx11
-	depends = lib32-libxcb
-	depends = lib32-libxcb>=1.9.2
-	depends = lib32-libxext
-	depends = lib32-libxshmfence
 
 pkgname = libdrm-amdgpu-pro-amdgpu1
 	pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime
@@ -121,18 +110,18 @@ pkgname = lib32-libdrm-amdgpu-pro-amdgpu1
 	arch = x86_64
 	depends = lib32-libdrm2-amdgpu-pro
 
-pkgname = lib32-libdrm-amdgpu-pro-dev
-	pkgdesc = Userspace interface to kernel DRM services -- development files
-	arch = x86_64
-	depends = lib32-libdrm2-amdgpu-pro
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1
-
 pkgname = libdrm-amdgpu-pro-dev
 	pkgdesc = Userspace interface to kernel DRM services -- development files
 	arch = x86_64
 	depends = libdrm2-amdgpu-pro
 	depends = libdrm-amdgpu-pro-amdgpu1
 
+pkgname = lib32-libdrm-amdgpu-pro-dev
+	pkgdesc = Userspace interface to kernel DRM services -- development files
+	arch = x86_64
+	depends = lib32-libdrm2-amdgpu-pro
+	depends = lib32-libdrm-amdgpu-pro-amdgpu1
+
 pkgname = libdrm-amdgpu-pro-tools
 	pkgdesc = testing tools for libdrm-amdgpu-pro
 	arch = x86_64
@@ -179,31 +168,27 @@ pkgname = libgbm-amdgpu-pro-dev
 	arch = x86_64
 	depends = libgbm1-amdgpu-pro
 
-pkgname = lib32-libgbm1-amdgpu-pro
-	pkgdesc = generic buffer management API -- runtime
-	arch = x86_64
-	depends = lib32-libdrm-amdgpu-pro-amdgpu1
-
 pkgname = libgbm1-amdgpu-pro
 	pkgdesc = generic buffer management API -- runtime
 	arch = x86_64
 	depends = libdrm-amdgpu-pro-amdgpu1
+	depends = libdrm2-amdgpu-pro
 
-pkgname = libgl1-amdgpu-pro-dev
-	pkgdesc = implementation of the OpenGL API -- GLX development files
+pkgname = lib32-libgbm1-amdgpu-pro
+	pkgdesc = generic buffer management API -- runtime
 	arch = x86_64
-	depends = libgl1-amdgpu-pro-glx
+	depends = lib32-libdrm-amdgpu-pro-amdgpu1
+	depends = lib32-libdrm2-amdgpu-pro
 
 pkgname = lib32-libgl1-amdgpu-pro-dev
 	pkgdesc = implementation of the OpenGL API -- GLX development files
 	arch = x86_64
 	depends = lib32-libgl1-amdgpu-pro-glx
 
-pkgname = libgl1-amdgpu-pro-dri
-	pkgdesc = implementation of the OpenGL API -- DRI modules
+pkgname = libgl1-amdgpu-pro-dev
+	pkgdesc = implementation of the OpenGL API -- GLX development files
 	arch = x86_64
-	depends = libx11
-	depends = libxext
+	depends = libgl1-amdgpu-pro-glx
 
 pkgname = lib32-libgl1-amdgpu-pro-dri
 	pkgdesc = implementation of the OpenGL API -- DRI modules
@@ -211,6 +196,12 @@ pkgname = lib32-libgl1-amdgpu-pro-dri
 	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 = lib32-libgl1-amdgpu-pro-glx
 	pkgdesc = implementation of the OpenGL API -- GLX runtime
 	arch = x86_64
@@ -218,9 +209,11 @@ pkgname = lib32-libgl1-amdgpu-pro-glx
 	depends = lib32-libx11>=1.4.99.1
 	depends = lib32-libxcb>=1.8
 	depends = lib32-libxcb
+	depends = lib32-libxcb>=1.9.2
 	depends = lib32-libxdamage>=1.1
 	depends = lib32-libxext
 	depends = lib32-libxfixes
+	depends = lib32-libxshmfence
 	depends = lib32-libxxf86vm
 
 pkgname = libgl1-amdgpu-pro-glx
@@ -230,9 +223,11 @@ pkgname = libgl1-amdgpu-pro-glx
 	depends = libx11>=1.4.99.1
 	depends = libxcb>=1.8
 	depends = libxcb
+	depends = libxcb>=1.9.2
 	depends = libxdamage>=1.1
 	depends = libxext
 	depends = libxfixes
+	depends = libxshmfence
 	depends = libxxf86vm
 
 pkgname = libgles2-amdgpu-pro
@@ -245,15 +240,15 @@ pkgname = lib32-libgles2-amdgpu-pro
 	arch = x86_64
 	depends = lib32-libegl1-amdgpu-pro
 
-pkgname = libgles2-amdgpu-pro-dev
+pkgname = lib32-libgles2-amdgpu-pro-dev
 	pkgdesc = implementation of the OpenGL|ES 2.x API -- development files
 	arch = x86_64
-	depends = libgles2-amdgpu-pro
+	depends = lib32-libgles2-amdgpu-pro
 
-pkgname = lib32-libgles2-amdgpu-pro-dev
+pkgname = libgles2-amdgpu-pro-dev
 	pkgdesc = implementation of the OpenGL|ES 2.x API -- development files
 	arch = x86_64
-	depends = lib32-libgles2-amdgpu-pro
+	depends = libgles2-amdgpu-pro
 
 pkgname = libvdpau-amdgpu-pro
 	pkgdesc = AMDGPU Pro VDPAU driver
diff --git a/PKGBUILD b/PKGBUILD
index 29a7e71161e6..b9a9e9c817dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,18 @@
-# Maintainer: Janusz Lewandowski <lew21@xtreeme.org>
+# Author: Janusz Lewandowski <lew21@xtreeme.org>
+# Maintainer: David McFarland <corngood@gmail.com>
 # Autogenerated from AMD's Packages file
 
-pkgver_base=16.20.3
-pkgver_build=294842
-
 pkgbase=amdgpu-pro-installer
-pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-dkms amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev lib32-amdgpu-pro-libopencl1 amdgpu-pro-libopencl1 lib32-amdgpu-pro-opencl-icd 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 libegl1-amdgpu-pro-dev lib32-libegl1-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm1-amdgpu-pro libgbm1-amdgpu-pro libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dri lib32-libgl1-amdgpu-pro-dri lib32-libgl1-amdgpu-pro-glx libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev libvdpau-amdgpu-pro lib32-libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
-pkgver=${pkgver_base}.${pkgver_build}
-pkgrel=2
+pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-dkms amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev lib32-amdgpu-pro-libopencl1 amdgpu-pro-libopencl1 lib32-amdgpu-pro-opencl-icd amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 libdrm-amdgpu-pro-dev lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro libegl1-amdgpu-pro-dev lib32-libegl1-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev 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 lib32-libgl1-amdgpu-pro-glx libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro-dev libgles2-amdgpu-pro-dev libvdpau-amdgpu-pro lib32-libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
+pkgver=16.30.3.306809
+pkgrel=1
 arch=('x86_64')
-url="http://www.amd.com"
-license=('custom:AMD')
+url='http://www.amd.com'
 
-url_ref="http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"
-DLAGENTS="https::/usr/bin/curl --referer ${url_ref} -o %o %u"
+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/beta/amdgpu-pro_${pkgver_base}-${pkgver_build}.tar.xz)
-sha256sums=('4a2988f5047e858c3c6ae22528162b2537780deeaf5dda5d8a8f61e213058a66')
+source=('https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-306809.tar.xz')
+sha256sums=('40fc78dc10823096882bd5840a0c49221bbd977e1eda1a9b79b620d06298c389')
 
 
 package_amdgpu-pro () {
@@ -24,10 +20,10 @@ package_amdgpu-pro () {
 	depends=('amdgpu-pro-graphics' 'amdgpu-pro-computing')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -37,10 +33,10 @@ package_amdgpu-pro-clinfo () {
 	depends=('amdgpu-pro-libopencl1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-clinfo_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-clinfo_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-clinfo_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-clinfo_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-clinfo_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-clinfo_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -50,10 +46,10 @@ package_amdgpu-pro-computing () {
 	depends=('amdgpu-pro-core' 'amdgpu-pro-clinfo' 'amdgpu-pro-opencl-icd' 'amdgpu-pro-libopencl-dev')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-computing_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-computing_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-computing_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-computing_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-computing_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-computing_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-computing_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-computing_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -63,10 +59,10 @@ package_amdgpu-pro-core () {
 	depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-core_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-core_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-core_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-core_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-core_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-core_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-core_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-core_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 
 	mv ${pkgdir}/lib ${pkgdir}/usr/
@@ -84,10 +80,10 @@ package_amdgpu-pro-dkms () {
 	depends=('dkms>=1.95')
 	arch=('any')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-dkms_16.20.3-294842_all
-	mkdir "${srcdir}"/amdgpu-pro-dkms_16.20.3-294842_all
-	cd "${srcdir}"/amdgpu-pro-dkms_16.20.3-294842_all
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-dkms_16.20.3-294842_all.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-dkms_16.30.3-306809_all
+	mkdir "${srcdir}"/amdgpu-pro-dkms_16.30.3-306809_all
+	cd "${srcdir}"/amdgpu-pro-dkms_16.30.3-306809_all
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-dkms_16.30.3-306809_all.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -97,10 +93,10 @@ package_amdgpu-pro-graphics () {
 	depends=('amdgpu-pro-core' 'libgles2-amdgpu-pro' 'libgl1-amdgpu-pro-dev' 'libgl1-amdgpu-pro-dri' 'xserver-xorg-video-amdgpu-pro' 'amdgpu-pro-vulkan-driver' 'libvdpau-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-graphics_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-graphics_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-graphics_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-graphics_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-graphics_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-graphics_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -110,10 +106,10 @@ package_lib32-amdgpu-pro-lib32 () {
 	depends=('lib32-libgles2-amdgpu-pro' 'lib32-libgl1-amdgpu-pro-dev' 'lib32-libgl1-amdgpu-pro-dri' 'lib32-libgbm1-amdgpu-pro' 'lib32-amdgpu-pro-opencl-icd' 'lib32-amdgpu-pro-libopencl-dev' 'lib32-amdgpu-pro-vulkan-driver' 'lib32-libvdpau-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.20.3-294842_i386
-	mkdir "${srcdir}"/amdgpu-pro-lib32_16.20.3-294842_i386
-	cd "${srcdir}"/amdgpu-pro-lib32_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-lib32_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.30.3-306809_i386
+	mkdir "${srcdir}"/amdgpu-pro-lib32_16.30.3-306809_i386
+	cd "${srcdir}"/amdgpu-pro-lib32_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-lib32_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -124,10 +120,10 @@ package_lib32-amdgpu-pro-libopencl-dev () {
 	depends=('lib32-amdgpu-pro-libopencl1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_i386
+	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -138,10 +134,10 @@ package_amdgpu-pro-libopencl-dev () {
 	depends=('amdgpu-pro-libopencl1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -151,10 +147,10 @@ package_lib32-amdgpu-pro-libopencl1 () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_i386
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_i386
+	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_i386
+	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -165,10 +161,10 @@ package_amdgpu-pro-libopencl1 () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -178,10 +174,10 @@ package_lib32-amdgpu-pro-opencl-icd () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_i386
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_i386
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_i386
+	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_i386
+	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -192,36 +188,36 @@ package_amdgpu-pro-opencl-icd () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
 
 package_amdgpu-pro-vulkan-driver () {
 	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1' 'libx11' 'libxcb' 'libxcb>=1.9.2' 'libxext' 'libxshmfence')
+	depends=('libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_amd64
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_amd64
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_amd64
+	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_amd64
+	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
 
 package_lib32-amdgpu-pro-vulkan-driver () {
 	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1' 'lib32-libx11' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxext' 'lib32-libxshmfence')
+	depends=('lib32-libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_i386
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_i386
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_i386
+	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_i386
+	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -232,10 +228,10 @@ package_libdrm-amdgpu-pro-amdgpu1 () {
 	depends=('libdrm2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_amd64
+	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -245,39 +241,39 @@ package_lib32-libdrm-amdgpu-pro-amdgpu1 () {
 	depends=('lib32-libdrm2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_i386
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_i386
+	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_i386
+	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libdrm-amdgpu-pro-dev () {
+package_libdrm-amdgpu-pro-dev () {
 	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('lib32-libdrm2-amdgpu-pro' 'lib32-libdrm-amdgpu-pro-amdgpu1')
+	depends=('libdrm2-amdgpu-pro' 'libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libdrm-amdgpu-pro-dev () {
+package_lib32-libdrm-amdgpu-pro-dev () {
 	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('libdrm2-amdgpu-pro' 'libdrm-amdgpu-pro-amdgpu1')
+	depends=('lib32-libdrm2-amdgpu-pro' 'lib32-libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_i386
+	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -286,10 +282,10 @@ package_libdrm-amdgpu-pro-tools () {
 	depends=('libdrm-amdgpu-pro-amdgpu1' 'libdrm2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-tools_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-tools_16.20.3-294842_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-tools_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-tools_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-306809_amd64
+	cd "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-tools_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -299,10 +295,10 @@ package_libdrm2-amdgpu-pro () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -312,10 +308,10 @@ package_lib32-libdrm2-amdgpu-pro () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_i386
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_i386
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_i386
+	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_i386
+	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -326,10 +322,10 @@ package_libegl1-amdgpu-pro () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -339,10 +335,10 @@ package_lib32-libegl1-amdgpu-pro () {
 	depends=()
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_i386
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_i386
+	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_i386
+	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -353,10 +349,10 @@ package_libegl1-amdgpu-pro-dev () {
 	depends=('libegl1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -366,10 +362,10 @@ package_lib32-libegl1-amdgpu-pro-dev () {
 	depends=('lib32-libegl1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_i386
+	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -380,10 +376,10 @@ package_lib32-libgbm-amdgpu-pro-dev () {
 	depends=('lib32-libgbm1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_i386
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_i386
+	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -394,104 +390,104 @@ package_libgbm-amdgpu-pro-dev () {
 	depends=('libgbm1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
 
-package_lib32-libgbm1-amdgpu-pro () {
+package_libgbm1-amdgpu-pro () {
 	pkgdesc="generic buffer management API -- runtime"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1')
+	depends=('libdrm-amdgpu-pro-amdgpu1' 'libdrm2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_i386
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgbm1-amdgpu-pro () {
+package_lib32-libgbm1-amdgpu-pro () {
 	pkgdesc="generic buffer management API -- runtime"
-	depends=('libdrm-amdgpu-pro-amdgpu1')
+	depends=('lib32-libdrm-amdgpu-pro-amdgpu1' 'lib32-libdrm2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_i386
+	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgl1-amdgpu-pro-dev () {
+package_lib32-libgl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('libgl1-amdgpu-pro-glx')
+	depends=('lib32-libgl1-amdgpu-pro-glx')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_i386
+	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libgl1-amdgpu-pro-dev () {
+package_libgl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('lib32-libgl1-amdgpu-pro-glx')
+	depends=('libgl1-amdgpu-pro-glx')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgl1-amdgpu-pro-dri () {
+package_lib32-libgl1-amdgpu-pro-dri () {
 	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('libx11' 'libxext')
+	depends=('lib32-libx11' 'lib32-libxext')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_i386
+	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libgl1-amdgpu-pro-dri () {
+package_libgl1-amdgpu-pro-dri () {
 	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('lib32-libx11' 'lib32-libxext')
+	depends=('libx11' 'libxext')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_amd64
+	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
 package_lib32-libgl1-amdgpu-pro-glx () {
 	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('lib32-libdrm2-amdgpu-pro' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxxf86vm')
+	depends=('lib32-libdrm2-amdgpu-pro' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.20.3-294842_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_i386
+	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -499,13 +495,13 @@ package_lib32-libgl1-amdgpu-pro-glx () {
 
 package_libgl1-amdgpu-pro-glx () {
 	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('libdrm2-amdgpu-pro' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm')
+	depends=('libdrm2-amdgpu-pro' '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.20.3-294842_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.20.3-294842_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_amd64
+	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -515,10 +511,10 @@ package_libgles2-amdgpu-pro () {
 	depends=('libegl1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -528,39 +524,39 @@ package_lib32-libgles2-amdgpu-pro () {
 	depends=('lib32-libegl1-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_i386
+	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgles2-amdgpu-pro-dev () {
+package_lib32-libgles2-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('libgles2-amdgpu-pro')
+	depends=('lib32-libgles2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_i386
+	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_i386
+	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libgles2-amdgpu-pro-dev () {
+package_libgles2-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('lib32-libgles2-amdgpu-pro')
+	depends=('libgles2-amdgpu-pro')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_amd64
+	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -569,10 +565,10 @@ package_libvdpau-amdgpu-pro () {
 	depends=('libdrm-amdgpu-pro-amdgpu1' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 }
 
@@ -582,10 +578,10 @@ package_lib32-libvdpau-amdgpu-pro () {
 	depends=('lib32-libdrm-amdgpu-pro-amdgpu1' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro' '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.20.3-294842_i386
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.20.3-294842_i386
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.20.3-294842_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.20.3-294842_i386.deb
+	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_i386
+	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_i386
+	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-306809_i386
+	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-306809_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
@@ -596,10 +592,10 @@ package_xserver-xorg-video-amdgpu-pro () {
 	depends=('libdrm-amdgpu-pro-amdgpu1' 'libdrm2-amdgpu-pro' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro' 'libgl1-amdgpu-pro-glx' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server')
 	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.20.3-294842_amd64
-	mkdir "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.20.3-294842_amd64
-	cd "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.20.3-294842_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./xserver-xorg-video-amdgpu-pro_16.20.3-294842_amd64.deb
+	rm -Rf "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-306809_amd64
+	mkdir "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-306809_amd64
+	cd "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-306809_amd64
+	ar x "${srcdir}"/amdgpu-pro-driver/./xserver-xorg-video-amdgpu-pro_16.30.3-306809_amd64.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
 	ln -sfn 1.18 ${pkgdir}/usr/lib/x86_64-linux-gnu/amdgpu-pro/xorg
 }
diff --git a/gen-PKGBUILD.py b/gen-PKGBUILD.py
deleted file mode 100644
index 713f76eab4ad..000000000000
--- a/gen-PKGBUILD.py
+++ /dev/null
@@ -1,178 +0,0 @@
-from debian import deb822
-import re
-import gzip
-
-header_tpl = """# Maintainer: Janusz Lewandowski <lew21@xtreeme.org>
-# Autogenerated from AMD's Packages file
-
-pkgver_base=16.20.3
-pkgver_build=294842
-
-pkgbase=amdgpu-pro-installer
-pkgname={PACKAGES}
-pkgver=${{pkgver_base}}.${{pkgver_build}}
-pkgrel=1
-arch=('x86_64')
-url="http://www.amd.com"
-
-url_ref="http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"
-DLAGENTS="https::/usr/bin/curl --referer ${{url_ref}} -o %o %u"
-
-source=(https://www2.ati.com/drivers/beta/amdgpu-pro_${{pkgver_base}}-${{pkgver_build}}.tar.xz)
-sha256sums=('4a2988f5047e858c3c6ae22528162b2537780deeaf5dda5d8a8f61e213058a66')
-"""
-
-package_header_tpl = """
-package_{NAME} () {{
-	pkgdesc={DESC}
-	depends={DEPENDS}
-	arch=('{ARCH}')
-
-	rm -Rf "${{srcdir}}"/{Package}_{Version}_{Architecture}
-	mkdir "${{srcdir}}"/{Package}_{Version}_{Architecture}
-	cd "${{srcdir}}"/{Package}_{Version}_{Architecture}
-	ar x "${{srcdir}}"/amdgpu-pro-driver/{Filename}
-	tar -C "${{pkgdir}}" -xf data.tar.xz
-"""
-
-package_footer = """}
-"""
-
-special_ops = {
-	"amdgpu-pro-core": """
-	mv ${pkgdir}/lib ${pkgdir}/usr/
-	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
-	install=amdgpu-pro-core.install
-""",
-	"xserver-xorg-video-amdgpu-pro": "\tln -sfn 1.18 ${pkgdir}/usr/lib/x86_64-linux-gnu/amdgpu-pro/xorg",
-}
-
-replace_deps = {
-	"libc6": None,
-	"libgcc1": None,
-	"libstdc++6": None,
-	"libx11-6": "libx11",
-	"libx11-xcb1": None,
-	"libxcb-dri2-0": "libxcb",
-	"libxcb-dri3-0": "libxcb",
-	"libxcb-present0": "libxcb",
-	"libxcb-sync1": "libxcb",
-	"libxcb-glx0": "libxcb",
-	"libxcb1": "libxcb",
-	"libxext6": "libxext",
-	"libxshmfence1": "libxshmfence",
-	"libxdamage1": "libxdamage",
-	"libxfixes3": "libxfixes",
-	"libxxf86vm1": "libxxf86vm",
-	"libudev1": "libsystemd",
-	"libpciaccess0": "libpciaccess",
-	"libepoxy0": "libepoxy",
-	"libelf1": None, # no lib32- package in Arch, just disabling for now
-	"xserver-xorg-core": "xorg-server",
-	"libcunit1": "cunit",
-	"libdrm-radeon1": "libdrm",
-	"amdgpu-pro-firmware": "linux-firmware",
-	"libssl1.0.0": "openssl",
-	"zlib1g": "zlib",
-}
-
-dependency = re.compile(r"([^ ]+)(?: \((.+)\))?")
-
-arch_map = {
-	"amd64": "x86_64",
-	"i386": "i686",
-	"all": "any"
-}
-
-deb_archs={}
-
-def quote(string):
-	return "\"" + string.replace("\\", "\\\\").replace("\"", "\\\"") + "\""
-
-def convertName(name):
-	if info["Architecture"] == "i386" and (name not in deb_archs or "any" not in deb_archs[name]):
-		return "lib32-" + name
-	return name
-
-def convertVersionSpecifier(name, spec, names):
-	if name == "linux-firmware":
-		return ""
-	if name in names:
-		return ""
-	if not spec:
-		return ""
-
-	sign, spec = spec.split(" ", 1)
-
-	spec = spec.strip()
-	if ":" in spec:
-		whatever, spec = spec.rsplit(":", 1)
-	return sign + spec
-
-def convertPackage(info, names):
-	if info["Architecture"] == "i386":
-		name = "lib32-" + info["Package"]
-		arch = "x86_64"
-	else:
-		name = info["Package"]
-		arch = arch_map[info["Architecture"]]
-
-	try:
-		deps = info["Depends"].split(", ")
-	except:
-		deps = []
-
-	deps = [dependency.match(dep).groups() for dep in deps]
-	deps = [(replace_deps[name] if name in replace_deps else name, version) for name, version in deps]
-	deps = ["'" + convertName(name) + convertVersionSpecifier(name, version, names) + "'" for name, version in deps if name]
-	deps2 = []
-	for dep in deps:
-		if not dep in deps2:
-			deps2.append(dep)
-	deps = "(" + " ".join(deps2) + ")"
-
-	special_op = special_ops[info["Package"]] if info["Package"] in special_ops else ""
-
-	desc = info["Description"].split("\n")
-	if len(desc) > 2:
-		desc = desc[0]
-	else:
-		desc = " ".join(x.strip() for x in desc)
-
-	ret = package_header_tpl.format(DEPENDS=deps, NAME=name, ARCH=arch, DESC=quote(desc), **info)
-	if special_op:
-		ret += special_op + "\n"
-	if info["Architecture"] == "i386":
-		ret += "\trm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include\n"
-	ret += package_footer
-
-	return ret
-
-with gzip.open("src/amdgpu-pro-driver/Packages.gz", "r") as f:
-	package_list=[]
-
-	for info in deb822.Packages.iter_paragraphs(f):
-		if info["Package"] == "amdgpu-pro-firmware":
-			continue
-		if info["Filename"].startswith("./dkms/dst/amdgpu-pro/"):
-			continue
-
-		if not info["Package"] in deb_archs:
-			deb_archs[info["Package"]] = set()
-
-		deb_archs[info["Package"]].add(info["Architecture"])
-
-		package_list.append(info)
-
-	names = ["lib32-" + info["Package"] if info["Architecture"] == "i386" else info["Package"] for info in package_list]
-
-	print(header_tpl.format(PACKAGES="(" + " ".join(names) + ")"))
-
-	f.seek(0)
-
-	for info in package_list:
-		print(convertPackage(info, names))
-