20.45 update; thanks to luciddream

2 files changed, 46 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c595827b8df..c974b998ce22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencl-amd
 	pkgdesc = OpenCL userspace driver as provided in the amdgpu-pro driver stack. This package is intended to work along with the free amdgpu stack.
-	pkgver = 20.40.1147286
+	pkgver = 20.45.1164792
 	pkgrel = 1
 	url = http://www.amd.com
 	arch = x86_64
@@ -10,16 +10,16 @@ pkgbase = opencl-amd
 	depends = ocl-icd
 	depends = gcc-libs
 	provides = opencl-driver
-	provides = opencl-amdgpu-pro-orca=20.40.1147286
-	provides = opencl-amdgpu-pro-pal=20.40.1147286
-	provides = opencl-amdgpu-pro-comgr=20.40.1147286
+	provides = opencl-amdgpu-pro-orca=20.45.1164792
+	provides = opencl-amdgpu-pro-pal=20.45.1164792
+	provides = opencl-amdgpu-pro-comgr=20.45.1164792
 	conflicts = amdgpocl
 	conflicts = opencl-amdgpu-pro-orca
 	conflicts = opencl-amdgpu-pro-comgr
 	conflicts = opencl-amdgpu-pro-pal
 	conflicts = rocm-opencl-runtime
-	source = https://drivers.amd.com/drivers/linux/amdgpu-pro-20.40-1147286-ubuntu-20.04.tar.xz
-	sha256sums = e6b2b2d76cc80ca989b5f2f1cf3e0c0bd0bdee97b1dba0767c28c91995cffb5e
+	source = https://drivers.amd.com/drivers/linux/amdgpu-pro-20.45-1164792-ubuntu-20.04.tar.xz
+	sha256sums = 482e7a1f8dc41839aa720bb62730f1176b9d608117f94dc2f7e2bd2cf1a5ac1a
 
 pkgname = opencl-amd
 
diff --git a/PKGBUILD b/PKGBUILD
index e2b67d9308ad..7000d88a25ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,13 @@
-# Maintainer: Christopher Snowhill <kode54 at gmail dot com>
+# Maintainer: Carson Rueter <roachh at proton mail dot com>
+# Co-Maintainer: George Sofianos
+# Contributor: Christopher Snowhill <kode54 at gmail dot com>
 # Contributor: ipha <ipha00 at gmail dot com>
 # Contributor: johnnybash <georgpfahler at wachenzell dot org>
 # Contributor: grmat <grmat at sub dot red>
 
 pkgname=opencl-amd
 pkgdesc="OpenCL userspace driver as provided in the amdgpu-pro driver stack. This package is intended to work along with the free amdgpu stack."
-pkgver=20.40.1147286
+pkgver=20.45.1164792
 pkgrel=1
 arch=('x86_64')
 url='http://www.amd.com'
@@ -15,31 +17,39 @@ depends=('libdrm' 'ocl-icd' 'gcc-libs')
 conflicts=('amdgpocl' 'opencl-amdgpu-pro-orca' 'opencl-amdgpu-pro-comgr' 'opencl-amdgpu-pro-pal' 'rocm-opencl-runtime')
 provides=('opencl-driver' "opencl-amdgpu-pro-orca=${pkgver}" "opencl-amdgpu-pro-pal=${pkgver}" "opencl-amdgpu-pro-comgr=${pkgver}") # this package provides both drivers, and installs them in a different location
 
-DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-30 -N %u'
+DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-45 -N %u'
 
 prefix='amdgpu-pro-'
 postfix='-ubuntu-20.04'
-major='20.40'
-minor='1147286'
+major='20.45'
+minor='1164792'
 amdver='2.4.100'
 shared="opt/amdgpu-pro/lib/x86_64-linux-gnu"
+shared2="opt/amdgpu/lib/x86_64-linux-gnu"
 tarname="${prefix}${major}-${minor}${postfix}"
 
 source=("https://drivers.amd.com/drivers/linux/$tarname.tar.xz")
-sha256sums=('e6b2b2d76cc80ca989b5f2f1cf3e0c0bd0bdee97b1dba0767c28c91995cffb5e')
-
-pkgver() {
-	echo "${major}.${minor}"
-}
+sha256sums=('482e7a1f8dc41839aa720bb62730f1176b9d608117f94dc2f7e2bd2cf1a5ac1a')
 
 package() {
 	mkdir -p "${srcdir}/opencl"
 	cd "${srcdir}/opencl"
-	# pal
-	ar x "${srcdir}/$tarname/opencl-amdgpu-pro-icd_${major}-${minor}_amd64.deb"
+	# roc*
+	ar x "${srcdir}/$tarname/opencl-rocr-amdgpu-pro_${major}-${minor}_amd64.deb"
+	tar xJf data.tar.xz
+	ar x "${srcdir}/$tarname/rocm-device-libs-amdgpu-pro_1.0.0-${minor}_amd64.deb"
+	tar xJf data.tar.xz
+	ar x "${srcdir}/$tarname/hsa-runtime-rocr-amdgpu_1.2.0-${minor}_amd64.deb"
+	tar xJf data.tar.xz
+	ar x "${srcdir}/$tarname/hsakmt-roct-amdgpu_1.0.9-${minor}_amd64.deb"
 	tar xJf data.tar.xz
-	ar x "${srcdir}/$tarname/opencl-amdgpu-pro-comgr_${major}-${minor}_amd64.deb"
+	ar x "${srcdir}/$tarname/hip-rocr-amdgpu-pro_${major}-${minor}_amd64.deb"
 	tar xJf data.tar.xz
+
+	# comgr
+	ar x "${srcdir}/$tarname/comgr-amdgpu-pro_1.7.0-${minor}_amd64.deb"
+	tar xJf data.tar.xz
+
 	# orca
 	ar x "${srcdir}/$tarname/opencl-orca-amdgpu-pro-icd_${major}-${minor}_amd64.deb"
 	tar xJf data.tar.xz
@@ -50,22 +60,35 @@ package() {
 	cd "${srcdir}/libdrm"
 	ar x "${srcdir}/$tarname/libdrm-amdgpu-amdgpu1_${amdver}-${minor}_amd64.deb"
 	tar xJf data.tar.xz
-	cd ${shared/amdgpu-pro/amdgpu}
+	cd ${shared2}
 	rm "libdrm_amdgpu.so.1"
 	mv "libdrm_amdgpu.so.1.0.0" "libdrm_amdgpo.so.1.0.0"
 	ln -s "libdrm_amdgpo.so.1.0.0" "libdrm_amdgpo.so.1"
 
 	mv "${srcdir}/opencl/etc" "${pkgdir}/"
 	mkdir -p ${pkgdir}/usr/lib
-	# pal
+	# roc*
 	mv "${srcdir}/opencl/${shared}/libamdocl64.so" "${pkgdir}/usr/lib/"
 	mv "${srcdir}/opencl/${shared}/libamd_comgr.so.1.7.0" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared}/libamdhip64.so.1.5.19245" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared}/libamdhip64.so" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared}/libamdhip64.so.1" "${pkgdir}/usr/lib"	
+	mv "${srcdir}/opencl/${shared}/libhsa-runtime64.so.1.2.0" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared}/libhsa-runtime64.so.1" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared2}/libhsakmt.so.1.0.6" "${pkgdir}/usr/lib"
+	mv "${srcdir}/opencl/${shared2}/libhsakmt.so.1" "${pkgdir}/usr/lib"
+	
+	# comgr
+	cd ${srcdir}/opencl/${shared}	
+	ln -s "libamd_comgr.so.1.7.0" "libamd_comgr.so"
 	mv "${srcdir}/opencl/${shared}/libamd_comgr.so" "${pkgdir}/usr/lib/"
+	mv "${srcdir}/opencl/${shared}/libamd_comgr.so.1" "${pkgdir}/usr/lib/libamd_comgr.so"
+
 	# orca
 	mv "${srcdir}/opencl/${shared}/libamdocl-orca64.so" "${pkgdir}/usr/lib/"
 	mv "${srcdir}/opencl/${shared}/libamdocl12cl64.so" "${pkgdir}/usr/lib/"
-	mv "${srcdir}/libdrm/${shared/amdgpu-pro/amdgpu}/libdrm_amdgpo.so.1.0.0" "${pkgdir}/usr/lib/"
-	mv "${srcdir}/libdrm/${shared/amdgpu-pro/amdgpu}/libdrm_amdgpo.so.1" "${pkgdir}/usr/lib/"
+	mv "${srcdir}/libdrm/${shared2}/libdrm_amdgpo.so.1.0.0" "${pkgdir}/usr/lib/"
+	mv "${srcdir}/libdrm/${shared2}/libdrm_amdgpo.so.1" "${pkgdir}/usr/lib/"
 
 	mkdir -p "${pkgdir}/opt/amdgpu/share/libdrm"
 	cd "${pkgdir}/opt/amdgpu/share/libdrm"