19.20_812932-1

4 files changed, 378 insertions, 527 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74fb1d132f40..8927faac4191 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,200 +1,158 @@
 pkgbase = amdgpu-pro-installer
-	pkgver = 17.40.492261
-	pkgrel = 2
-	url = http://www.amd.com
+	pkgver = 19.20_812932
+	pkgrel = 1
+	url = https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-20-unified
 	arch = x86_64
-	license = custom:AMD
+	groups = Radeon_Software_for_Linux
+	license = custom: multiple
 	makedepends = wget
-	source = https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-17.40-492261.tar.xz
-	source = 0001-disable-firmware-copy.patch
-	source = 0003-add-archlinux-as-build-option.patch
-	sha256sums = b0645157577c9ff175dc02487c4c682ded2624c8c2cfd6aa603960962e1d07b0
-	sha256sums = 85359c89d7f1317cf5176bc9c489314aba2db20d962b120a43fc532575466345
-	sha256sums = 2bf8eac2afac3bce0d17f840c15009838b578a72412ff66df6e8caa6c00fade7
-
-pkgname = amdgpu-pro
-	pkgdesc = The AMDGPU Pro driver package
-	install = amdgpu-pro-core.install
-	arch = x86_64
-	depends = binfmt-support
-	depends = libedit>=2.11-20080614
-	depends = libffi>=3.0.9
-	depends = libx11
-	depends = libxext
-	depends = libxfixes
-	depends = ncurses
-	depends = ncurses5-compat-libs>=6
-	depends = zlib>=1.2.0
+	source = https://drivers.amd.com/drivers/linux/amdgpu-pro-19.20-812932-ubuntu-18.04.tar.xz
+	sha256sums = c5376760ce15454c5ef5cef86571f3806114403d91b8a210629d2e927c98d852
 
-pkgname = amdgpu-pro-dkms
-	pkgdesc = amdgpu-pro driver in DKMS format.
+pkgname = amdgpu-core-meta
+	pkgdesc = Config file /etc/ld.so.conf.d/20-amdgpu.conf
+	install = amdgpu-core-meta.install
 	arch = any
-	depends = amdgpu-pro=17.40.492261-2
-	depends = dkms>=1.95
+	license = MIT
 
-pkgname = amdgpu-pro-gst-omx
-	pkgdesc = GStreamer OpenMAX plugins for AMDGPU Pro
-	arch = x86_64
-	depends = glib2>=2.37.3
-	depends = gst-plugins-base>=1.6.0
-	depends = gstreamer>=1.0.0
-	depends = libomxil-bellagio
-
-pkgname = amdgpu-pro-libdrm
-	pkgdesc = The AMDGPU Pro userspace interface to kernel DRM services
-	arch = x86_64
-	depends = amdgpu-pro=17.40.492261-2
-	depends = bcunit
+pkgname = amdgpu-pro-core-meta
+	pkgdesc = Config file /etc/ld.so.conf.d/10-amdgpu-pro.conf
+	install = amdgpu-pro-core-meta.install
+	arch = any
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-core-meta=19.20_812932-1
+
+pkgname = amf-amdgpu-pro
+	pkgdesc = AMDGPU Pro Advanced Multimedia Framework
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = gcc-libs
+	depends = glibc
+	depends = libx11
+	depends = opencl-amdgpu-pro-orca=19.20_812932-1
+	depends = opencl-amdgpu-pro-pal=19.20_812932-1
+	depends = vulkan-amdgpu-pro=19.20_812932-1
+
+pkgname = libdrm-amdgpu
+	pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime
+	license = MIT
+	depends = amdgpu-core-meta=19.20_812932-1
+	depends = glibc
 	provides = libdrm
-	conflicts = libdrm
+
+pkgname = lib32-libdrm-amdgpu
+	pkgdesc = Userspace interface to amdgpu-specific kernel DRM services -- runtime (32-bit)
+	license = MIT
+	depends = amdgpu-core-meta=19.20_812932-1
+	depends = lib32-glibc
+	depends = libdrm-amdgpu=19.20_812932-1
+	provides = lib32-libdrm
 
 pkgname = amdgpu-pro-libgl
-	pkgdesc = The AMDGPU Pro libgl library symlinks
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
+	pkgdesc = AMDGPU Pro OpenGL driver
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = gcc-libs
+	depends = glibc
+	depends = libdrm-amdgpu=19.20_812932-1
 	depends = libx11
-	depends = libx11>=1.4.99.1
 	depends = libxcb
-	depends = libxcb>=1.8
-	depends = libxcb>=1.9.2
-	depends = libxdamage>=1.1
+	depends = libxdamage
 	depends = libxext
 	depends = libxfixes
 	depends = libxshmfence
 	depends = libxxf86vm
 	provides = libgl
-	conflicts = libgl
-
-pkgname = amdgpu-pro-mesa-omx
-	pkgdesc = Mesa OpenMAX video drivers for AMDGPU Pro
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	depends = libomxil-bellagio
-	depends = libx11
-	depends = libxcb
-	depends = libxcb>=1.8
-	depends = ncurses5-compat-libs>=6
-	depends = zlib>=1.2.0
-
-pkgname = amdgpu-pro-opencl
-	pkgdesc = The AMDGPU Pro OpenCL implementation
-	arch = x86_64
-	depends = amdgpu-pro=17.40.492261-2
-	depends = pciutils>=3.3.1-1
-	provides = opencl-driver
-
-pkgname = amdgpu-pro-vdpau
-	pkgdesc = The AMDGPU Pro VDPAU driver
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	depends = libvdpau>=1.1
-	depends = libxcb
-	depends = libxcb>=1.8
-	depends = ncurses5-compat-libs>=6
-	depends = zlib>=1.2.0
-
-pkgname = amdgpu-pro-vulkan
-	pkgdesc = The AMDGPU Pro Vulkan driver
-	arch = x86_64
-	depends = amdgpu-pro=17.40.492261-2
-	provides = vulkan-driver
-
-pkgname = lib32-amdgpu-pro
-	pkgdesc = Meta package to install amdgpu Pro components. (32bit libraries)
-	arch = x86_64
-	depends = binfmt-support
-	depends = lib32-libedit>=2.11-20080614
-	depends = lib32-libffi>=3.0.9
-	depends = lib32-libx11
-	depends = lib32-libxext
-	depends = lib32-libxfixes
-	depends = lib32-ncurses
-	depends = lib32-ncurses5-compat-libs>=6
-	depends = lib32-zlib>=1.2.0
-
-pkgname = lib32-amdgpu-pro-gst-omx
-	pkgdesc = GStreamer OpenMAX plugins for AMDGPU Pro (32bit libraries)
-	arch = x86_64
-	depends = lib32-glib2>=2.37.3
-	depends = lib32-gst-plugins-base>=1.6.0
-	depends = lib32-gstreamer>=1.0.0
-	depends = lib32-libomxil-bellagio
-
-pkgname = lib32-amdgpu-pro-libdrm
-	pkgdesc = The AMDGPU Pro userspace interface to kernel DRM services (32bit libraries)
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	provides = lib32-libdrm
-	conflicts = lib32-libdrm
+	backup = etc/gbm/gbm.conf
 
 pkgname = lib32-amdgpu-pro-libgl
-	pkgdesc = The AMDGPU Pro libgl library symlinks (32bit libraries)
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro-libgl=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
+	pkgdesc = AMDGPU Pro OpenGL driver (32-bit)
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = amdgpu-pro-libgl=19.20_812932-1
+	depends = lib32-gcc-libs
+	depends = lib32-glibc
+	depends = lib32-libdrm-amdgpu=19.20_812932-1
 	depends = lib32-libx11
-	depends = lib32-libx11>=1.4.99.1
 	depends = lib32-libxcb
-	depends = lib32-libxcb>=1.8
-	depends = lib32-libxcb>=1.9.2
-	depends = lib32-libxdamage>=1.1
+	depends = lib32-libxdamage
 	depends = lib32-libxext
 	depends = lib32-libxfixes
 	depends = lib32-libxshmfence
 	depends = lib32-libxxf86vm
 	provides = lib32-libgl
-	conflicts = lib32-libgl
-
-pkgname = lib32-amdgpu-pro-mesa-omx
-	pkgdesc = Mesa OpenMAX video drivers for AMDGPU Pro (32bit libraries)
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	depends = lib32-libomxil-bellagio
-	depends = lib32-libx11
-	depends = lib32-libxcb
-	depends = lib32-libxcb>=1.8
-	depends = lib32-ncurses5-compat-libs>=6
-	depends = lib32-zlib>=1.2.0
-
-pkgname = lib32-amdgpu-pro-opencl
-	pkgdesc = The AMDGPU Pro OpenCL implementation
-	arch = x86_64
-	depends = amdgpu-pro=17.40.492261-2
+	backup = etc/amd/amdrc
+	backup = etc/ld.so.conf.d/10-amdgpu-pro-i386.conf
+
+pkgname = opencl-amdgpu-pro-comgr
+	pkgdesc = Code object manager (COMGR)
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = glibc
+
+pkgname = opencl-amdgpu-pro-dev
+	pkgdesc = AMD OpenCL SDK
+	license = custom: AMDGPU-PRO EULA
+	depends = glibc
+
+pkgname = opencl-amdgpu-pro-hip
+	pkgdesc = HIP-CLANG allows developers to convert CUDA code to common C++
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = glibc
+
+pkgname = opencl-amdgpu-pro-pal
+	pkgdesc = AMDGPU Pro OpenCL driver PAL
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = glibc
+	depends = libdrm-amdgpu=19.20_812932-1
+	provides = opencl-driver
+	backup = etc/OpenCL/vendors/amdocl64.icd
+
+pkgname = opencl-amdgpu-pro-orca
+	pkgdesc = AMDGPU Pro OpenCL driver ORCA aka legacy
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = glibc
+	depends = libdrm-amdgpu=19.20_812932-1
+	provides = opencl-driver
+	backup = etc/OpenCL/vendors/amdocl-orca64.icd
+
+pkgname = lib32-opencl-amdgpu-pro-orca
+	pkgdesc = AMDGPU Pro OpenCL driver ORCA aka legacy (32-bit)
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = lib32-glibc
+	depends = lib32-libdrm-amdgpu=19.20_812932-1
 	provides = lib32-opencl-driver
+	backup = etc/OpenCL/vendors/amdocl-orca32.icd
+
+pkgname = roct-amdgpu-pro
+	pkgdesc = development environment for hsakmt-roct
+	license = MIT
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = glibc
+	depends = numactl
+
+pkgname = roct-amdgpu-pro-dev
+	pkgdesc = development environment for hsakmt-roct
+	license = MIT
+	depends = roct-amdgpu-pro=19.20_812932-1
+
+pkgname = vulkan-amdgpu-pro
+	pkgdesc = AMDGPU Pro Vulkan driver
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = gcc-libs
+	depends = glibc
+	provides = vulkan-driver
 
-pkgname = lib32-amdgpu-pro-vdpau
-	pkgdesc = The AMDGPU Pro VDPAU driver (32bit libraries)
-	arch = x86_64
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	depends = lib32-libvdpau>=1.1
-	depends = lib32-libxcb
-	depends = lib32-libxcb>=1.8
-	depends = lib32-ncurses5-compat-libs>=6
-	depends = lib32-zlib>=1.2.0
-
-pkgname = lib32-amdgpu-pro-vulkan
-	pkgdesc = The AMDGPU Pro Vulkan driver (32bit libraries)
-	arch = x86_64
-	depends = amdgpu-pro=17.40.492261-2
+pkgname = lib32-vulkan-amdgpu-pro
+	pkgdesc = AMDGPU Pro Vulkan driver (32-bit)
+	license = custom: AMDGPU-PRO EULA
+	depends = amdgpu-pro-core-meta=19.20_812932-1
+	depends = lib32-gcc-libs
+	depends = lib32-glibc
 	provides = lib32-vulkan-driver
 
-pkgname = xf86-video-amdgpu-pro
-	pkgdesc = The AMDGPU Pro X.org video driver
-	arch = x86_64
-	groups = xorg-drivers
-	depends = amdgpu-pro-libdrm=17.40.492261-2
-	depends = amdgpu-pro=17.40.492261-2
-	depends = libsystemd>=183
-	provides = xf86-video-amdgpu
-	conflicts = xf86-video-amdgpu
-	conflicts = xorg-server<1.19.0
-	conflicts = X-ABI-VIDEODRV_VERSION<23
-	conflicts = X-ABI-VIDEODRV_VERSION>=24
-
diff --git a/PKGBUILD b/PKGBUILD
index e91bb02db007..6db5b7f7ecf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,429 +1,288 @@
 # Author: Janusz Lewandowski <lew21@xtreeme.org>
-# Maintainer: David McFarland <corngood@gmail.com>
+# Contributor: David McFarland <corngood@gmail.com>
+# Maintainer: Andrew Shark <ashark @at@ linuxcomp.ru>
 # Autogenerated from AMD's Packages file
 
+major=19.20
+minor=812932
+
 pkgbase=amdgpu-pro-installer
-pkgname=(amdgpu-pro amdgpu-pro-dkms amdgpu-pro-gst-omx amdgpu-pro-libdrm amdgpu-pro-libgl amdgpu-pro-mesa-omx amdgpu-pro-opencl amdgpu-pro-vdpau amdgpu-pro-vulkan lib32-amdgpu-pro lib32-amdgpu-pro-gst-omx lib32-amdgpu-pro-libdrm lib32-amdgpu-pro-libgl lib32-amdgpu-pro-mesa-omx lib32-amdgpu-pro-opencl lib32-amdgpu-pro-vdpau lib32-amdgpu-pro-vulkan xf86-video-amdgpu-pro)
-pkgver=17.40.492261
-pkgrel=2
+pkgname=(
+amdgpu-core-meta
+amdgpu-pro-core-meta
+amf-amdgpu-pro
+libdrm-amdgpu
+lib32-libdrm-amdgpu
+amdgpu-pro-libgl
+lib32-amdgpu-pro-libgl
+opencl-amdgpu-pro-comgr
+opencl-amdgpu-pro-dev
+opencl-amdgpu-pro-hip
+opencl-amdgpu-pro-pal
+opencl-amdgpu-pro-orca
+lib32-opencl-amdgpu-pro-orca
+roct-amdgpu-pro
+roct-amdgpu-pro-dev
+vulkan-amdgpu-pro
+lib32-vulkan-amdgpu-pro
+)
+pkgver=${major}_${minor}
+pkgrel=1
 arch=('x86_64')
-url='http://www.amd.com'
-license=('custom:AMD')
+url=https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-20-unified
+license=('custom: multiple')
+groups=('Radeon_Software_for_Linux')
 makedepends=('wget')
 
-DLAGENTS='https::/usr/bin/wget --referer https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Install.aspx -N %u'
-
-major=17.40
-minor=492261
+DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-20-unified -N %u'
 
-source=(https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${major}-${minor}.tar.xz
-	0001-disable-firmware-copy.patch
-	0003-add-archlinux-as-build-option.patch)
-sha256sums=(b0645157577c9ff175dc02487c4c682ded2624c8c2cfd6aa603960962e1d07b0
-	85359c89d7f1317cf5176bc9c489314aba2db20d962b120a43fc532575466345
-	2bf8eac2afac3bce0d17f840c15009838b578a72412ff66df6e8caa6c00fade7)
+source=(https://drivers.amd.com/drivers/linux/amdgpu-pro-${major}-${minor}-ubuntu-18.04.tar.xz)
+sha256sums=(c5376760ce15454c5ef5cef86571f3806114403d91b8a210629d2e927c98d852)
 
+PKGEXT=".pkg.tar"
 
 
 # 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
+    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)
+# $1: debian package library dir (goes from opt/amdgpu or opt/amdgpu-pro and from x86_64 or i386)
+# $2: arch package library dir (goes to usr/lib or usr/lib32)
 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
+    local deb_libdir="$1"
+    local arch_libdir="$2"
+
+    if [ -d "${pkgdir}/${deb_libdir}" ]; then
+        if [ ! -d "${pkgdir}/${arch_libdir}" ]; then
+            mkdir -p "${pkgdir}/${arch_libdir}"
+        fi
+        mv -t "${pkgdir}/${arch_libdir}/" "${pkgdir}/${deb_libdir}"/*
+        find ${pkgdir} -type d -empty -delete
+    fi
 }
-
-
-package_amdgpu-pro () {
-	pkgdesc="The AMDGPU Pro driver package"
-	install=amdgpu-pro-core.install
-	arch=('x86_64')
-	depends=("binfmt-support" "libedit>=2.11-20080614" "libffi>=3.0.9" "libx11" "libxext" "libxfixes" "ncurses" "ncurses5-compat-libs>=6" "zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./amdgpu-pro-core_${major}-${minor}_all.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./amdgpu-pro-lib32_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./ids-amdgpu-pro_1.0.0-${minor}_all.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgbm1-amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgbm1-amdgpu-pro-base_${major}-${minor}_all.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgbm1-amdgpu-pro-dev_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-dri_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libllvm5.0-amdgpu-pro_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0-dev_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0-doc_5.0-${minor}_all.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0-runtime_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-dev_5.0-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-runtime_5.0-${minor}_amd64.deb
-
-	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
+# move copyright file to proper place and remove debian changelog
+move_copyright() {
+    find ${pkgdir}/usr/share/doc -name "changelog.Debian.gz" -delete
+    mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
+    find ${pkgdir}/usr/share/doc -name "copyright" -exec mv {} ${pkgdir}/usr/share/licenses/${pkgname} \;
+    find ${pkgdir}/usr/share/doc -type d -empty -delete
 }
 
+package_amdgpu-core-meta () {
+    pkgdesc="Config file /etc/ld.so.conf.d/20-amdgpu.conf"
+    license=('MIT')
+    install=amdgpu-core-meta.install
+    arch=('any')
 
-package_amdgpu-pro-dkms () {
-	pkgdesc="amdgpu-pro driver in DKMS format."
-	arch=('any')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}" "dkms>=1.95")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./amdgpu-pro-dkms_${major}-${minor}_all.deb
-
-	move_libdir "${pkgdir}/lib"
-
-	# extra_commands:
-	msg 'Applying patches...'
-	(cd ${pkgdir}/usr/src/amdgpu-${major}-${minor};
-		sed -i 's/\/extra/\/extramodules/' dkms.conf
-			msg2 '0001-disable-firmware-copy.patch'
-		patch -p1 -i "${srcdir}/0001-disable-firmware-copy.patch";
-		msg2 '0003-add-archlinux-as-build-option.patch'
-		patch -p1 -i "${srcdir}/0003-add-archlinux-as-build-option.patch"
-	)
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/amdgpu-core_${major}-${minor}_all.deb
+    move_copyright
 }
 
+package_amdgpu-pro-core-meta () {
+    pkgdesc="Config file /etc/ld.so.conf.d/10-amdgpu-pro.conf"
+    license=('custom: AMDGPU-PRO EULA')
+    install=amdgpu-pro-core-meta.install
+    arch=('any')
+    depends=("amdgpu-core-meta=${major}_${minor}-${pkgrel}")
 
-package_amdgpu-pro-gst-omx () {
-	pkgdesc="GStreamer OpenMAX plugins for AMDGPU Pro"
-	arch=('x86_64')
-	depends=("glib2>=2.37.3" "gst-plugins-base>=1.6.0" "gstreamer>=1.0.0" "libomxil-bellagio")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./gst-omx-amdgpu-pro_1.0.0.1-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/amdgpu-pro-core_${major}-${minor}_all.deb
+    move_copyright
 }
 
+package_amf-amdgpu-pro () {
+    pkgdesc="AMDGPU Pro Advanced Multimedia Framework"
+    license=('custom: AMDGPU-PRO EULA')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "gcc-libs" "glibc" "libx11" "opencl-amdgpu-pro-orca=${major}_${minor}-${pkgrel}" "opencl-amdgpu-pro-pal=${major}_${minor}-${pkgrel}" "vulkan-amdgpu-pro=${major}_${minor}-${pkgrel}")
 
-package_amdgpu-pro-libdrm () {
-	pkgdesc="The AMDGPU Pro userspace interface to kernel DRM services"
-	arch=('x86_64')
-	provides=('libdrm')
-	conflicts=('libdrm')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}" "bcunit")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-amdgpu1_2.4.82-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-dev_2.4.82-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-radeon1_2.4.82-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-utils_2.4.82-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm2-amdgpu-pro_2.4.82-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/amf-amdgpu-pro_1.4.12-${minor}_amd64.deb
+    move_copyright
 }
 
+package_libdrm-amdgpu () {
+    pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
+    license=('MIT')
+    provides=('libdrm')
+    depends=("amdgpu-core-meta=${major}_${minor}-${pkgrel}" "glibc")
 
-package_amdgpu-pro-libgl () {
-	pkgdesc="The AMDGPU Pro libgl library symlinks"
-	arch=('x86_64')
-	provides=('libgl')
-	conflicts=('libgl')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "libx11" "libx11>=1.4.99.1" "libxcb" "libxcb>=1.8" "libxcb>=1.9.2" "libxdamage>=1.1" "libxext" "libxfixes" "libxshmfence" "libxxf86vm")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libegl1-amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-appprofiles_${major}-${minor}_all.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-ext_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-glx_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgles2-amdgpu-pro_${major}-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libdrm-amdgpu-amdgpu1_2.4.97-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libdrm-amdgpu-common_1.0.0-${minor}_all.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libdrm2-amdgpu_2.4.97-${minor}_amd64.deb
+    move_copyright
 
+    # extra_commands:
+    mv ${pkgdir}/lib/* ${pkgdir}/usr/lib
+    rmdir ${pkgdir}/lib
 }
 
+package_lib32-libdrm-amdgpu () {
+    pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime (32-bit)"
+    license=('MIT')
+    provides=('lib32-libdrm')
+    depends=("amdgpu-core-meta=${major}_${minor}-${pkgrel}" "lib32-glibc" "libdrm-amdgpu=${major}_${minor}-${pkgrel}")
 
-package_amdgpu-pro-mesa-omx () {
-	pkgdesc="Mesa OpenMAX video drivers for AMDGPU Pro"
-	arch=('x86_64')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "libomxil-bellagio" "libx11" "libxcb" "libxcb>=1.8" "ncurses5-compat-libs>=6" "zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./mesa-amdgpu-pro-omx-drivers_17.0.1-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libdrm-amdgpu-amdgpu1_2.4.97-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libdrm2-amdgpu_2.4.97-${minor}_i386.deb
+    move_copyright
 
+    # extra_commands:
+    mv ${pkgdir}/lib ${pkgdir}/usr
 }
 
-
-package_amdgpu-pro-opencl () {
-	pkgdesc="The AMDGPU Pro OpenCL implementation"
-	arch=('x86_64')
-	provides=('opencl-driver')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}" "pciutils>=3.3.1-1")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./clinfo-amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./hsa-ext-amdgpu-pro-finalize_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./hsa-ext-amdgpu-pro-image_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./hsa-runtime-tools-amdgpu-pro_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./hsa-runtime-tools-amdgpu-pro-dev_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libopencl1-amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./opencl-amdgpu-pro-icd_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocm-amdgpu-pro_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocm-amdgpu-pro-icd_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocm-amdgpu-pro-opencl_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocm-amdgpu-pro-opencl-dev_${major}-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocr-amdgpu-pro_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./rocr-amdgpu-pro-dev_1.1.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./roct-amdgpu-pro_1.0.6-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./roct-amdgpu-pro-dev_1.0.6-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
-
+package_amdgpu-pro-libgl () {
+    pkgdesc="AMDGPU Pro OpenGL driver"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('libgl')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "gcc-libs" "glibc" "libdrm-amdgpu=${major}_${minor}-${pkgrel}" "libx11" "libxcb" "libxdamage" "libxext" "libxfixes" "libxshmfence" "libxxf86vm")
+    backup=(etc/gbm/gbm.conf)
+
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libegl1-amdgpu-pro_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgbm1-amdgpu-pro_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgbm1-amdgpu-pro-base_${major}-${minor}_all.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-appprofiles_${major}-${minor}_all.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-dri_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-ext-hwe_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-glx_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libglapi1-amdgpu-pro_${major}-${minor}_amd64.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgles2-amdgpu-pro_${major}-${minor}_amd64.deb
+    move_copyright
+
+    # extra_commands:
+    mv "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx-ext-hwe.so "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx.so
 }
 
-
-package_amdgpu-pro-vdpau () {
-	pkgdesc="The AMDGPU Pro VDPAU driver"
-	arch=('x86_64')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "libvdpau>=1.1" "libxcb" "libxcb>=1.8" "ncurses5-compat-libs>=6" "zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libvdpau-amdgpu-pro_17.0.1-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
-
-	# 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_lib32-amdgpu-pro-libgl () {
+    pkgdesc="AMDGPU Pro OpenGL driver (32-bit)"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('lib32-libgl')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "amdgpu-pro-libgl=${major}_${minor}-${pkgrel}" "lib32-gcc-libs" "lib32-glibc" "lib32-libdrm-amdgpu=${major}_${minor}-${pkgrel}" "lib32-libx11" "lib32-libxcb" "lib32-libxdamage" "lib32-libxext" "lib32-libxfixes" "lib32-libxshmfence" "lib32-libxxf86vm")
+    backup=(etc/amd/amdrc etc/ld.so.conf.d/10-amdgpu-pro-i386.conf)
+
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libegl1-amdgpu-pro_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgbm1-amdgpu-pro_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-dri_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-ext-hwe_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgl1-amdgpu-pro-glx_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libglapi1-amdgpu-pro_${major}-${minor}_i386.deb
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/libgles2-amdgpu-pro_${major}-${minor}_i386.deb
+    move_copyright
+
+    # extra_commands:
+    mv "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx-ext-hwe.so "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx.so
+    rm "${pkgdir}"/etc/amd/amdrc "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx.so
 }
 
+package_opencl-amdgpu-pro-comgr () {
+    pkgdesc="Code object manager (COMGR)"
+    license=('custom: AMDGPU-PRO EULA')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "glibc")
 
-package_amdgpu-pro-vulkan () {
-	pkgdesc="The AMDGPU Pro Vulkan driver"
-	arch=('x86_64')
-	provides=('vulkan-driver')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./vulkan-amdgpu-pro_${major}-${minor}_amd64.deb
-
-	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/
-	sed -i "s@abi_versions\(.*\)0.9.0\(.*\)@api_version\11.0.61\2@" "${pkgdir}"/usr/share/vulkan/icd.d/amd_icd64.json
-	rm -rf "${pkgdir}"/etc/vulkan/
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-amdgpu-pro-comgr_${major}-${minor}_amd64.deb
+    move_copyright
 }
 
+package_opencl-amdgpu-pro-dev () {
+    pkgdesc="AMD OpenCL SDK"
+    license=('custom: AMDGPU-PRO EULA')
+    depends=("glibc")
 
-package_lib32-amdgpu-pro () {
-	pkgdesc="Meta package to install amdgpu Pro components. (32bit libraries)"
-	arch=('x86_64')
-	depends=("binfmt-support" "lib32-libedit>=2.11-20080614" "lib32-libffi>=3.0.9" "lib32-libx11" "lib32-libxext" "lib32-libxfixes" "lib32-ncurses" "lib32-ncurses5-compat-libs>=6" "lib32-zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./amdgpu-pro_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgbm1-amdgpu-pro_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgbm1-amdgpu-pro-dev_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-dri_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libllvm5.0-amdgpu-pro_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0-dev_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-5.0-runtime_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-dev_5.0-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./llvm-amdgpu-pro-runtime_5.0-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-	# 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
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-amdgpu-pro-dev_${major}-${minor}_amd64.deb
+    move_copyright
 }
 
+package_opencl-amdgpu-pro-hip () {
+    pkgdesc="HIP-CLANG allows developers to convert CUDA code to common C++"
+    license=('custom: AMDGPU-PRO EULA')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "glibc")
 
-package_lib32-amdgpu-pro-gst-omx () {
-	pkgdesc="GStreamer OpenMAX plugins for AMDGPU Pro (32bit libraries)"
-	arch=('x86_64')
-	depends=("lib32-glib2>=2.37.3" "lib32-gst-plugins-base>=1.6.0" "lib32-gstreamer>=1.0.0" "lib32-libomxil-bellagio")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./gst-omx-amdgpu-pro_1.0.0.1-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-amdgpu-pro-hip_${major}-${minor}_amd64.deb
+    move_copyright
 }
 
+package_opencl-amdgpu-pro-pal () {
+    pkgdesc="AMDGPU Pro OpenCL driver PAL"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('opencl-driver')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "glibc" "libdrm-amdgpu=${major}_${minor}-${pkgrel}")
+    backup=(etc/OpenCL/vendors/amdocl64.icd)
 
-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=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-amdgpu1_2.4.82-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-dev_2.4.82-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm-amdgpu-pro-radeon1_2.4.82-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libdrm2-amdgpu-pro_2.4.82-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-amdgpu-pro-icd_${major}-${minor}_amd64.deb
+    move_copyright
 }
 
+package_opencl-amdgpu-pro-orca () {
+    pkgdesc="AMDGPU Pro OpenCL driver ORCA aka legacy"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('opencl-driver')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "glibc" "libdrm-amdgpu=${major}_${minor}-${pkgrel}")
+    backup=(etc/OpenCL/vendors/amdocl-orca64.icd)
 
-package_lib32-amdgpu-pro-libgl () {
-	pkgdesc="The AMDGPU Pro libgl library symlinks (32bit libraries)"
-	arch=('x86_64')
-	provides=('lib32-libgl')
-	conflicts=('lib32-libgl')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro-libgl=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "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")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libegl1-amdgpu-pro_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-ext_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgl1-amdgpu-pro-glx_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libgles2-amdgpu-pro_${major}-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-	# extra_commands:
-	rm -rf "${pkgdir}"/etc
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-orca-amdgpu-pro-icd_${major}-${minor}_amd64.deb
+    move_copyright
 }
 
+package_lib32-opencl-amdgpu-pro-orca () {
+    pkgdesc="AMDGPU Pro OpenCL driver ORCA aka legacy (32-bit)"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('lib32-opencl-driver')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "lib32-glibc" "lib32-libdrm-amdgpu=${major}_${minor}-${pkgrel}")
+    backup=(etc/OpenCL/vendors/amdocl-orca32.icd)
 
-package_lib32-amdgpu-pro-mesa-omx () {
-	pkgdesc="Mesa OpenMAX video drivers for AMDGPU Pro (32bit libraries)"
-	arch=('x86_64')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "lib32-libomxil-bellagio" "lib32-libx11" "lib32-libxcb" "lib32-libxcb>=1.8" "lib32-ncurses5-compat-libs>=6" "lib32-zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./mesa-amdgpu-pro-omx-drivers_17.0.1-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-	# extra_commands:
-	rm -f "${pkgdir}"/etc/xdg/gstomx.conf
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/opencl-orca-amdgpu-pro-icd_${major}-${minor}_i386.deb
+    move_copyright
 }
 
+package_roct-amdgpu-pro () {
+    pkgdesc="development environment for hsakmt-roct"
+    license=('MIT')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "glibc" "numactl")
 
-package_lib32-amdgpu-pro-opencl () {
-	pkgdesc="The AMDGPU Pro OpenCL implementation"
-	arch=('x86_64')
-	provides=('lib32-opencl-driver')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libopencl1-amdgpu-pro_${major}-${minor}_i386.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./opencl-amdgpu-pro-icd_${major}-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/roct-amdgpu-pro_1.0.9-${minor}_amd64.deb
+    move_copyright
 }
 
+package_roct-amdgpu-pro-dev () {
+    pkgdesc="development environment for hsakmt-roct"
+    license=('MIT')
+    depends=("roct-amdgpu-pro=${major}_${minor}-${pkgrel}")
 
-package_lib32-amdgpu-pro-vdpau () {
-	pkgdesc="The AMDGPU Pro VDPAU driver (32bit libraries)"
-	arch=('x86_64')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "lib32-libvdpau>=1.1" "lib32-libxcb" "lib32-libxcb>=1.8" "lib32-ncurses5-compat-libs>=6" "lib32-zlib>=1.2.0")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./libvdpau-amdgpu-pro_17.0.1-${minor}_i386.deb
-
-	move_libdir "${pkgdir}/lib" "usr/lib32"
-
-	# 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/i386-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so.1
-	ln -s /opt/amdgpu-pro/lib/i386-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so
-
-	# 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/
-
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/roct-amdgpu-pro-dev_1.0.9-${minor}_amd64.deb
+    move_copyright
 }
 
+package_vulkan-amdgpu-pro () {
+    pkgdesc="AMDGPU Pro Vulkan driver"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('vulkan-driver')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "gcc-libs" "glibc")
 
-package_lib32-amdgpu-pro-vulkan () {
-	pkgdesc="The AMDGPU Pro Vulkan driver (32bit libraries)"
-	arch=('x86_64')
-	provides=('lib32-vulkan-driver')
-	depends=("amdgpu-pro=${major}.${minor}-${pkgrel}")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./vulkan-amdgpu-pro_${major}-${minor}_i386.deb
-
-	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/
-	sed -i "s@abi_versions\(.*\)0.9.0\(.*\)@api_version\11.0.61\2@" "${pkgdir}"/usr/share/vulkan/icd.d/amd_icd32.json
-	rm -rf "${pkgdir}"/etc/vulkan/
-
-	# 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/
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/vulkan-amdgpu-pro_${major}-${minor}_amd64.deb
+    move_copyright
 
+    # extra_commands:
+    mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+    mv "${pkgdir}"/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/amd_pro_icd64.json
+    rm -rf "${pkgdir}"/opt/amdgpu-pro/etc/
 }
 
+package_lib32-vulkan-amdgpu-pro () {
+    pkgdesc="AMDGPU Pro Vulkan driver (32-bit)"
+    license=('custom: AMDGPU-PRO EULA')
+    provides=('lib32-vulkan-driver')
+    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "lib32-gcc-libs" "lib32-glibc")
 
-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.19.0' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
-	groups=('xorg-drivers')
-	depends=("amdgpu-pro-libdrm=${major}.${minor}-${pkgrel}" "amdgpu-pro=${major}.${minor}-${pkgrel}" "libsystemd>=183")
-
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./xserver-xorg-video-amdgpu-pro_1.3.99-${minor}_amd64.deb
-	extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}/./xserver-xorg-video-modesetting-amdgpu-pro_1.19.0-${minor}_amd64.deb
-
-	move_libdir "${pkgdir}/lib"
+    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-18.04/vulkan-amdgpu-pro_${major}-${minor}_i386.deb
+    move_copyright
 
+    # extra_commands:
+    mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+    mv "${pkgdir}"/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json "${pkgdir}"/usr/share/vulkan/icd.d/amd_pro_icd32.json
+    rm -rf "${pkgdir}"/opt/amdgpu-pro/etc/
 }
 
diff --git a/amdgpu-core-meta.install b/amdgpu-core-meta.install
new file mode 100755
index 000000000000..9befaa7a484b
--- /dev/null
+++ b/amdgpu-core-meta.install
@@ -0,0 +1,19 @@
+# 3f5f1e12af4667a5522a0d5862c92a3d  amdgpu-core_19.20-812932_all.deb/postinst
+# Converted for arch linux:
+post_install() {
+    prefix=/opt/amdgpu
+    lib=lib/x86_64-linux-gnu
+    conf=/etc/ld.so.conf.d/20-amdgpu.conf
+    
+    echo "$prefix/lib/x86_64-linux-gnu" >$conf
+    echo "$prefix/lib/i386-linux-gnu" >>$conf
+}
+
+# e66513716fefe727886eadb5b95923f9  amdgpu-core_19.20-812932_all.deb/preinst
+# There is nothing but checking Ubuntu version there. So did not use it.
+
+# 9f9130053049b57ee04a078ddf71e927  amdgpu-core_19.20-812932_all.deb/prerm
+# Converted for arch linux:
+pre_remove() {
+    rm -f /etc/ld.so.conf.d/20-amdgpu.conf && /sbin/ldconfig
+}
diff --git a/amdgpu-pro-core-meta.install b/amdgpu-pro-core-meta.install
new file mode 100644
index 000000000000..ef439a24e347
--- /dev/null
+++ b/amdgpu-pro-core-meta.install
@@ -0,0 +1,15 @@
+# 995d510d3099f2be343b1d6445a85bdc  amdgpu-pro-core_19.20-812932_all.deb/postinst
+# Converted for arch linux:
+post_install() {
+    prefix=/opt/amdgpu-pro
+    conf=/etc/ld.so.conf.d/10-amdgpu-pro.conf
+
+    echo "$prefix/lib/x86_64-linux-gnu" >$conf
+    echo "$prefix/lib/i386-linux-gnu" >>$conf
+}
+
+# 41e43dfaf280600942eab53da384100d  amdgpu-pro-core_19.20-812932_all.deb/prerm
+# Converted for arch linux:
+pre_remove() {
+    rm -f /etc/ld.so.conf.d/10-amdgpu-pro.conf && /sbin/ldconfig
+}