[rocclr] Update to 3.7.0 (#372)

2 files changed, 16 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b0f0d3d58e5..16b1f1a962a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = rocclr
 	pkgdesc = Radeon Open Compute Common Language Runtime
-	pkgver = 3.5.0
-	pkgrel = 3
+	pkgver = 3.7.0
+	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/ROCclr
 	arch = x86_64
-	license = unknown
+	license = MIT
 	makedepends = cmake
 	depends = mesa
 	depends = comgr
 	depends = hsa-rocr
 	depends = hsakmt-roct
 	depends = rocm-cmake
-	source = rocclr-3.5.0.tar.gz::https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-3.5.0.tar.gz
-	source = rocclr-opencl-3.5.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz
-	source = opencl_includes.patch::https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCclr/pull/16.patch
-	sha256sums = 87c1ee9f02b8aa487b628c543f058198767c474cec3d21700596a73c028959e1
-	sha256sums = 511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0
-	sha256sums = 3edeb8aeaf335297ec0f61a15b99c259d607d8f534173fbc3d17832ad03cd63f
+	source = rocclr-3.7.0.tar.gz::https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.7.0.tar.gz
+	source = rocclr-opencl-3.7.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.7.0.tar.gz
+	sha256sums = a49f464bb2eab6317e87e3cc249aba3b2517a34fbdfe50175f0437f69a219adc
+	sha256sums = 283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b
 
 pkgname = rocclr
 
diff --git a/PKGBUILD b/PKGBUILD
index ea543f01ab8b..7d763823a0fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,30 @@
 # Maintainer Torsten Keßler <t dot kessler at posteo dot de>
 pkgname=rocclr
-pkgver=3.5.0
-pkgrel=3
+pkgver=3.7.0
+pkgrel=1
 pkgdesc='Radeon Open Compute Common Language Runtime'
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/ROCclr'
-license=('unknown')
+license=('MIT')
 depends=('mesa' 'comgr' 'hsa-rocr' 'hsakmt-roct' 'rocm-cmake')
 makedepends=('cmake')
 _opencl='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime'
-source=("$pkgname-$pkgver.tar.gz::$url/archive/roc-$pkgver.tar.gz"
-        "$pkgname-opencl-$pkgver.tar.gz::$_opencl/archive/roc-$pkgver.tar.gz"
-	'opencl_includes.patch::https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCclr/pull/16.patch')
-sha256sums=('87c1ee9f02b8aa487b628c543f058198767c474cec3d21700596a73c028959e1'
-            '511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0'
-	    '3edeb8aeaf335297ec0f61a15b99c259d607d8f534173fbc3d17832ad03cd63f')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/rocm-$pkgver.tar.gz"
+        "$pkgname-opencl-$pkgver.tar.gz::$_opencl/archive/rocm-$pkgver.tar.gz")
+sha256sums=('a49f464bb2eab6317e87e3cc249aba3b2517a34fbdfe50175f0437f69a219adc'
+            '283e1dfe4c3d2e8af4d677ed3c20e975393cdb0856e3ccd77b9c7ed2a151650b')
 _dirname="$(basename "$url")-$(basename "${source[0]}" .tar.gz)"
 
-prepare() {
-	cd "$_dirname"
-	patch -Np1 -i "$srcdir/opencl_includes.patch"
-}
-
 build() {
     cmake -Wno-dev -B build \
 	-S "$srcdir/$_dirname" \
 	-DCMAKE_INSTALL_PREFIX='/opt/rocm/rocclr' \
-        -DOPENCL_DIR="$srcdir/ROCm-OpenCL-Runtime-roc-$pkgver"
+        -DOPENCL_DIR="$srcdir/ROCm-OpenCL-Runtime-rocm-$pkgver"
 
     make -C build
 }
 
 package() {
     DESTDIR="$pkgdir" make -C build install
-
-    sed -i "s@$srcdir/build/libamdrocclr_static.a@/opt/rocm/rocclr/lib/libamdrocclr_static.a@" \
-        "$srcdir/build/amdrocclr_staticTargets.cmake"
-    install -Dm644 "$srcdir/build/amdrocclr_staticTargets.cmake" \
-        "$pkgdir/opt/rocm/rocclr/lib/amdrocclr_staticTargets.cmake"
+    install -Dm644 "$_dirname/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }