updated conflicts/provides, added bitcode

2 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fc027f87745..fc0876677ae9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.45.1164792
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.amd.com
 	arch = x86_64
 	license = custom:AMD
@@ -12,13 +12,6 @@ pkgbase = opencl-amd
 	depends = numactl
 	optdepends = clinfo
 	provides = opencl-driver
-	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.45-1164792-ubuntu-20.04.tar.xz
 	sha256sums = 482e7a1f8dc41839aa720bb62730f1176b9d608117f94dc2f7e2bd2cf1a5ac1a
diff --git a/PKGBUILD b/PKGBUILD
index 626a9eed8dbb..ac0a6c9d4eae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,14 +17,14 @@ tarname="${prefix}${major}-${minor}${postfix}"
 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=${major}.${minor}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='http://www.amd.com'
 license=('custom:AMD')
 makedepends=('wget')
 depends=('libdrm' 'ocl-icd' 'gcc-libs' 'numactl')
-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
+conflicts=('rocm-opencl-runtime')
+provides=('opencl-driver')
 optdepends=('clinfo')
 
 DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-45 -N %u'
@@ -97,6 +97,8 @@ package() {
 	cd "${pkgdir}/opt/amdgpu/share/libdrm"
 	ln -s /usr/share/libdrm/amdgpu.ids amdgpu.ids
 
+	mv "${srcdir}/opencl/opt/amdgpu-pro" "${pkgdir}/opt"
+
 	rm -r "${srcdir}/opencl"
 	rm -r "${srcdir}/libdrm"
 }