upgpkg: hip-rocclr 4.2.0-1

upstream release

new release

3 files changed, 24 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bba6dd03135a..2db6f3b73efc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hip-rocclr
 	pkgdesc = Heterogeneous Interface for Portability ROCm
-	pkgver = 4.1.1
-	pkgrel = 3
+	pkgver = 4.2.0
+	pkgrel = 1
 	url = https://rocmdocs.amd.com/en/latest/Installation_Guide/HIP.html
 	arch = x86_64
 	license = MIT
@@ -13,9 +13,9 @@ pkgbase = hip-rocclr
 	depends = libelf
 	provides = hip
 	conflicts = hip
-	source = hip-rocclr-4.1.1.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.1.1.tar.gz
+	source = hip-rocclr-4.2.0.tar.gz::https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.2.0.tar.gz
 	source = amdgpu-targets.patch
-	sha256sums = 4dbdbcd79e8803387790cba7ea94f28fd312a60e6704361f43b3241d2afe0f45
-	sha256sums = c6358b4dfac658c0a27a3425ace455d951cd26be827dd7751c28cb83dc84b67d
+	sha256sums = ecb929e0fc2eaaf7bbd16a1446a876a15baf72419c723734f456ee62e70b4c24
+	sha256sums = c1ccea2c6ca3e0e2a5f6449dccab7081386cb224db8c95391b27d8ac6f1d5754
 
 pkgname = hip-rocclr
diff --git a/PKGBUILD b/PKGBUILD
index 63d378375297..28742af19c46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Torsten Keßler <t dot kessler at posteo dot de>
 # Contributor: acxz <akashpatel2008 at yahoo dot com>
 pkgname=hip-rocclr
-pkgver=4.1.1
-pkgrel=3
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Heterogeneous Interface for Portability ROCm"
 arch=('x86_64')
 url='https://rocmdocs.amd.com/en/latest/Installation_Guide/HIP.html'
@@ -14,13 +14,13 @@ conflicts=('hip')
 _git='https://github.com/ROCm-Developer-Tools/HIP'
 source=("$pkgname-$pkgver.tar.gz::$_git/archive/rocm-$pkgver.tar.gz"
         'amdgpu-targets.patch')
-sha256sums=('4dbdbcd79e8803387790cba7ea94f28fd312a60e6704361f43b3241d2afe0f45'
-            'c6358b4dfac658c0a27a3425ace455d951cd26be827dd7751c28cb83dc84b67d')
+sha256sums=('ecb929e0fc2eaaf7bbd16a1446a876a15baf72419c723734f456ee62e70b4c24'
+            'c1ccea2c6ca3e0e2a5f6449dccab7081386cb224db8c95391b27d8ac6f1d5754')
 _dirname="$(basename "$_git")-$(basename "${source[0]}" ".tar.gz")"
 
 prepare() {
     cd "$_dirname"
-    patch -Np1 -i "$srcdir/amdgpu-targets.patch"
+    # patch -Np1 -i "$srcdir/amdgpu-targets.patch"
 }
 
 build() {
diff --git a/amdgpu-targets.patch b/amdgpu-targets.patch
index b29fdce943bc..210e076cfa8e 100644
--- a/amdgpu-targets.patch
+++ b/amdgpu-targets.patch
@@ -1,19 +1,19 @@
-*** HIP-rocm-3.7.0/hip-config.cmake.in.bak	2020-09-09 15:37:55.780535875 +0200
---- HIP-rocm-3.7.0/hip-config.cmake.in	2020-09-09 15:38:13.160302239 +0200
+*** HIP-rocm-4.2.0/hip-config.cmake.in.bak	2021-05-13 09:58:42.409738663 +0200
+--- HIP-rocm-4.2.0/hip-config.cmake.in	2021-05-13 09:59:03.402050161 +0200
 ***************
-*** 79,85 ****
-            ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
-        NO_DEFAULT_PATH)
-    find_dependency(AMDDeviceLibs)
+*** 123,129 ****
+    if(NOT WIN32)
+      find_dependency(AMDDeviceLibs)
+    endif()
 !   set(AMDGPU_TARGETS "gfx900;gfx906;gfx908" CACHE STRING "AMD GPU targets to compile for")
     set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "GPU targets to compile for")
-  else()
-    find_dependency(hcc)
---- 79,85 ----
-            ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
-        NO_DEFAULT_PATH)
-    find_dependency(AMDDeviceLibs)
+  endif()
+  
+--- 123,129 ----
+    if(NOT WIN32)
+      find_dependency(AMDDeviceLibs)
+    endif()
 !   set(AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908" CACHE STRING "AMD GPU targets to compile for")
     set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "GPU targets to compile for")
-  else()
-    find_dependency(hcc)
+  endif()
+