Fix a few problems I had getting this running

default to xorg 1.18 driver
add modprobe conf
add ld conf and run ldconfig on install
remove firmwares
remove upstream version from pkgrel
remove conflicting docs and includes from lib32 packages

3 files changed, 81 insertions, 53 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8b7b87c5c01a..d979bae89929 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,26 @@
 # Autogenerated from AMD's Packages file
 # with https://github.com/LEW21/archlinux-amdgpu/blob/master/gen-PKGBUILD.py
 
+pkgver_base=16.15.2
+pkgver_build=277429
+
 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 lib32-amdgpu-pro-libopencl1 amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd lib32-amdgpu-pro-vulkan-driver 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 lib32-libegl1-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dri lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
-pkgver=16.15.2
-pkgrel=277429
+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 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd lib32-amdgpu-pro-vulkan-driver 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 lib32-libegl1-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dri lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
+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}-277429.tar.xz)
+source=(https://www2.ati.com/drivers/beta/amdgpu-pro_${pkgver_base}-${pkgver_build}.tar.xz)
 sha256sums=('e857cc74959706c276328b5876dfeba7d1ec0cbfacf966b607c50a748f7f5233')
 
 
 package_amdgpu-pro () {
 	pkgdesc="This package install all amdgpu-pro components."
-	depends=('amdgpu-pro-graphics=16.15.2-277429' 'amdgpu-pro-computing=16.15.2-277429')
+	depends=('amdgpu-pro-graphics' 'amdgpu-pro-computing')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro_16.15.2-277429_amd64
@@ -44,7 +47,7 @@ package_amdgpu-pro-clinfo () {
 
 package_amdgpu-pro-computing () {
 	pkgdesc="This package install amdgpu-pro OpenCL components."
-	depends=('amdgpu-pro-core=16.15.2-277429' 'amdgpu-pro-clinfo=16.15.2-277429' 'amdgpu-pro-opencl-icd=16.15.2-277429' 'amdgpu-pro-libopencl-dev=16.15.2-277429')
+	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.15.2-277429_amd64
@@ -57,7 +60,7 @@ package_amdgpu-pro-computing () {
 
 package_amdgpu-pro-core () {
 	pkgdesc="This package switchs the GPU stack to amdgpu-pro with basic components."
-	depends=('amdgpu-pro-firmware=16.15.2-277429' 'libdrm-amdgpu-pro-amdgpu1=16.15.2-277429')
+	depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-core_16.15.2-277429_amd64
@@ -67,6 +70,12 @@ package_amdgpu-pro-core () {
 	tar -C "${pkgdir}" -xf data.tar.xz
 
 	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
+
 }
 
 
@@ -83,24 +92,9 @@ package_amdgpu-pro-dkms () {
 }
 
 
-package_amdgpu-pro-firmware () {
-	pkgdesc="Firmware for amdgpu-pro cards."
-	depends=()
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-firmware_16.15.2-277429_amd64
-	mkdir "${srcdir}"/amdgpu-pro-firmware_16.15.2-277429_amd64
-	cd "${srcdir}"/amdgpu-pro-firmware_16.15.2-277429_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-firmware_16.15.2-277429_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	mv ${pkgdir}/lib ${pkgdir}/usr/
-}
-
-
 package_amdgpu-pro-graphics () {
 	pkgdesc="This package install amdgpu-pro graphics components."
-	depends=('amdgpu-pro-core=16.15.2-277429' 'libgles2-amdgpu-pro=16.15.2-277429' 'libgl1-amdgpu-pro-dev=16.15.2-277429' 'libgl1-amdgpu-pro-dri=16.15.2-277429' 'xserver-xorg-video-amdgpu-pro=16.15.2-277429' 'amdgpu-pro-vulkan-driver=16.15.2-277429' 'libvdpau-amdgpu-pro=16.15.2-277429')
+	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.15.2-277429_amd64
@@ -113,7 +107,7 @@ package_amdgpu-pro-graphics () {
 
 package_lib32-amdgpu-pro-lib32 () {
 	pkgdesc="This package contains x86 libs for x86_64 machine usage."
-	depends=('lib32-libgles2-amdgpu-pro=16.15.2-277429' 'lib32-libgl1-amdgpu-pro-dev=16.15.2-277429' 'lib32-libgl1-amdgpu-pro-dri=16.15.2-277429' 'lib32-libgbm1-amdgpu-pro=16.15.2-277429' 'lib32-amdgpu-pro-opencl-icd=16.15.2-277429' 'lib32-amdgpu-pro-libopencl-dev=16.15.2-277429' 'lib32-amdgpu-pro-vulkan-driver=16.15.2-277429')
+	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')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.15.2-277429_i386
@@ -121,12 +115,13 @@ package_lib32-amdgpu-pro-lib32 () {
 	cd "${srcdir}"/amdgpu-pro-lib32_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-lib32_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	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.15.2-277429')
+	depends=('lib32-amdgpu-pro-libopencl1')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.15.2-277429_i386
@@ -134,12 +129,13 @@ package_lib32-amdgpu-pro-libopencl-dev () {
 	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	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.15.2-277429')
+	depends=('amdgpu-pro-libopencl1')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.15.2-277429_amd64
@@ -160,6 +156,7 @@ package_lib32-amdgpu-pro-libopencl1 () {
 	cd "${srcdir}"/amdgpu-pro-libopencl1_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -199,6 +196,7 @@ package_lib32-amdgpu-pro-opencl-icd () {
 	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -212,6 +210,7 @@ package_lib32-amdgpu-pro-vulkan-driver () {
 	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -251,12 +250,13 @@ package_lib32-libdrm-amdgpu-pro-amdgpu1 () {
 	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	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.15.2-277429' 'libdrm-amdgpu-pro-amdgpu1=16.15.2-277429')
+	depends=('libdrm2-amdgpu-pro' 'libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.15.2-277429_amd64
@@ -269,7 +269,7 @@ package_libdrm-amdgpu-pro-dev () {
 
 package_lib32-libdrm-amdgpu-pro-dev () {
 	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('lib32-libdrm2-amdgpu-pro=16.15.2-277429' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.15.2-277429')
+	depends=('lib32-libdrm2-amdgpu-pro' 'lib32-libdrm-amdgpu-pro-amdgpu1')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.15.2-277429_i386
@@ -277,6 +277,7 @@ package_lib32-libdrm-amdgpu-pro-dev () {
 	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -316,6 +317,7 @@ package_lib32-libdrm2-amdgpu-pro () {
 	cd "${srcdir}"/libdrm2-amdgpu-pro_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -329,6 +331,7 @@ package_lib32-libegl1-amdgpu-pro () {
 	cd "${srcdir}"/libegl1-amdgpu-pro_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -355,6 +358,7 @@ package_lib32-libegl1-amdgpu-pro-dev () {
 	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -381,6 +385,7 @@ package_lib32-libgbm-amdgpu-pro-dev () {
 	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -420,12 +425,13 @@ package_lib32-libgbm1-amdgpu-pro () {
 	cd "${srcdir}"/libgbm1-amdgpu-pro_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	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.15.2-277429')
+	depends=('libgl1-amdgpu-pro-glx')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.15.2-277429_amd64
@@ -438,7 +444,7 @@ package_libgl1-amdgpu-pro-dev () {
 
 package_lib32-libgl1-amdgpu-pro-dev () {
 	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('lib32-libgl1-amdgpu-pro-glx=16.15.2-277429')
+	depends=('lib32-libgl1-amdgpu-pro-glx')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.15.2-277429_i386
@@ -446,6 +452,7 @@ package_lib32-libgl1-amdgpu-pro-dev () {
 	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -472,6 +479,7 @@ package_lib32-libgl1-amdgpu-pro-dri () {
 	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -498,12 +506,13 @@ package_lib32-libgl1-amdgpu-pro-glx () {
 	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
 package_lib32-libgles2-amdgpu-pro () {
 	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('lib32-libegl1-amdgpu-pro=16.15.2-277429')
+	depends=('lib32-libegl1-amdgpu-pro')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.15.2-277429_i386
@@ -511,12 +520,13 @@ package_lib32-libgles2-amdgpu-pro () {
 	cd "${srcdir}"/libgles2-amdgpu-pro_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	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.15.2-277429')
+	depends=('libegl1-amdgpu-pro')
 	arch=('x86_64')
 
 	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.15.2-277429_amd64
@@ -550,6 +560,7 @@ package_lib32-libgles2-amdgpu-pro-dev () {
 	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.15.2-277429_i386
 	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.15.2-277429_i386.deb
 	tar -C "${pkgdir}" -xf data.tar.xz
+	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
@@ -576,5 +587,6 @@ package_xserver-xorg-video-amdgpu-pro () {
 	cd "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.15.2-277429_amd64
 	ar x "${srcdir}"/amdgpu-pro-driver/./xserver-xorg-video-amdgpu-pro_16.15.2-277429_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/amdgpu-pro-core.install b/amdgpu-pro-core.install
new file mode 100755
index 000000000000..067a3a2e13dc
--- /dev/null
+++ b/amdgpu-pro-core.install
@@ -0,0 +1,3 @@
+post_install() {
+  ldconfig -r .
+}
diff --git a/gen-PKGBUILD.py b/gen-PKGBUILD.py
index 03eaba8dbdd3..9d62318a947d 100644
--- a/gen-PKGBUILD.py
+++ b/gen-PKGBUILD.py
@@ -6,17 +6,20 @@ header_tpl = """# Maintainer: Janusz Lewandowski <lew21@xtreeme.org>
 # Autogenerated from AMD's Packages file
 # with https://github.com/LEW21/archlinux-amdgpu/blob/master/gen-PKGBUILD.py
 
+pkgver_base=16.15.2
+pkgver_build=277429
+
 pkgbase=amdgpu-pro-installer
 pkgname={PACKAGES}
-pkgver=16.15.2
-pkgrel=277429
+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}}-277429.tar.xz)
+source=(https://www2.ati.com/drivers/beta/amdgpu-pro_${{pkgver_base}}-${{pkgver_build}}.tar.xz)
 sha256sums=('e857cc74959706c276328b5876dfeba7d1ec0cbfacf966b607c50a748f7f5233')
 """
 
@@ -37,8 +40,15 @@ package_footer = """}
 """
 
 special_ops = {
-	"amdgpu-pro-firmware": "mv ${pkgdir}/lib ${pkgdir}/usr/",
-	"amdgpu-pro-core": "mv ${pkgdir}/lib ${pkgdir}/usr/",
+	"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 = {
@@ -65,6 +75,7 @@ replace_deps = {
 	"xserver-xorg-core": "xorg-server",
 	"libcunit1": "cunit",
 	"libdrm-radeon1": "libdrm",
+	"amdgpu-pro-firmware": "linux-firmware",
 }
 
 dependency = re.compile(r"([^ ]+)(?: \((.+)\))?")
@@ -89,7 +100,11 @@ def convertName(name):
 		return "lib32-" + name
 	return name
 
-def convertVersionSpecifier(spec):
+def convertVersionSpecifier(name, spec, names):
+	if name == "linux-firmware":
+		return ""
+	if name in names:
+		return ""
 	if not spec:
 		return ""
 
@@ -100,7 +115,7 @@ def convertVersionSpecifier(spec):
 		whatever, spec = spec.rsplit(":", 1)
 	return sign + spec
 
-def convertPackage(info):
+def convertPackage(info, names):
 	if info["Architecture"] == "i386":
 		name = "lib32-" + info["Package"]
 		arch = "x86_64"
@@ -115,7 +130,7 @@ def convertPackage(info):
 
 	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(version) + "'" for name, version in deps if name]
+	deps = ["'" + convertName(name) + convertVersionSpecifier(name, version, names) + "'" for name, version in deps if name]
 	deps2 = []
 	for dep in deps:
 		if not dep in deps2:
@@ -130,9 +145,11 @@ def convertPackage(info):
 	else:
 		desc = " ".join(x.strip() for x in desc)
 
-	ret = package_header_tpl.format(DEPENDS=deps, NAME=name, ARCH=arch, SPECIAL_OPS=special_op, DESC=quote(desc), **info)
+	ret = package_header_tpl.format(DEPENDS=deps, NAME=name, ARCH=arch, DESC=quote(desc), **info)
 	if special_op:
-		ret += "\n\t" + special_op + "\n"
+		ret += special_op + "\n"
+	if info["Architecture"] == "i386":
+		ret += "\trm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include\n"
 	ret += package_footer
 
 	return ret
@@ -141,6 +158,8 @@ 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
 
@@ -149,20 +168,14 @@ with gzip.open("src/amdgpu-pro-driver/Packages.gz", "r") as f:
 
 		deb_archs[info["Package"]].add(info["Architecture"])
 
-		if info["Architecture"] == "i386":
-			name = "lib32-" + info["Package"]
-		else:
-			name = info["Package"]
+		package_list.append(info)
 
-		package_list.append(name)
+	names = ["lib32-" + info["Package"] if info["Architecture"] == "i386" else info["Package"] for info in package_list]
 
-	print(header_tpl.format(PACKAGES="(" + " ".join(package_list) + ")"))
+	print(header_tpl.format(PACKAGES="(" + " ".join(names) + ")"))
 
 	f.seek(0)
 
-	for info in deb822.Packages.iter_paragraphs(f):
-		if info["Filename"].startswith("./dkms/dst/amdgpu-pro/"):
-			continue
-
-		print(convertPackage(info))
+	for info in package_list:
+		print(convertPackage(info, names))