[aomp-amdgpu] Upstream release 11.7-1 (#308)

2 files changed, 33 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72e60c91dd6d..f6cd4d7ffbca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aomp-amdgpu
 	pkgdesc = Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs
-	pkgver = 11.7.0
+	pkgver = 11.7.1
 	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/aomp
 	arch = x86_64
@@ -8,20 +8,36 @@ pkgbase = aomp-amdgpu
 	makedepends = git
 	makedepends = cmake
 	makedepends = python
+	makedepends = python-pip
+	makedepends = python-argparse
+	makedepends = python-cppheaderparser
+	makedepends = python-ply
+	makedepends = python-wheel
 	makedepends = mesa
+	makedepends = texinfo
 	depends = z3
 	depends = numactl
 	depends = pciutils
 	depends = libelf
 	depends = libffi
-	source = aomp-amdgpu-11.7.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.7-0.tar.gz
+	depends = guile2.0
+	depends = ncurses
+	depends = expat
+	depends = xz
+	depends = zlib
+	depends = mpfr
+	depends = source-highlight
+	depends = babeltrace
+	source = aomp-amdgpu-11.7.1.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.7-1.tar.gz
 	source = disable_ocl_tests.patch
 	source = adjust_rpath.patch
 	source = remove_gcc_logic.patch
-	sha256sums = 1f16492ed32b3df87c378503207d6b219779580f8f98ae268c8b46c1a148ab40
+	source = opencl_includes.patch::https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCclr/pull/16.patch
+	sha256sums = 74089dc689408ace339998cfd2fb8c04dded3776e63a30cc78f4c43fe3d5016f
 	sha256sums = bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170
 	sha256sums = 94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44
 	sha256sums = d1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722
+	sha256sums = 3edeb8aeaf335297ec0f61a15b99c259d607d8f534173fbc3d17832ad03cd63f
 
 pkgname = aomp-amdgpu
 
diff --git a/PKGBUILD b/PKGBUILD
index 3f5ea839d475..6241a2196e28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,26 @@
 
 pkgname=aomp-amdgpu
 pkgdesc='Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs'
-_pkgver=11.7-0
-pkgver=11.7.0
+_pkgver=11.7-1
+pkgver=11.7.1
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/aomp'
 license=('Apache')
-depends=(z3 numactl pciutils libelf libffi)
-makedepends=(git cmake python mesa)
+depends=(z3 numactl pciutils libelf libffi guile2.0 ncurses expat xz zlib mpfr source-highlight babeltrace)
+makedepends=(git cmake
+    python python-pip python-argparse python-cppheaderparser python-ply python-wheel
+    mesa texinfo)
 source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rel_$_pkgver.tar.gz"
         'disable_ocl_tests.patch'
         'adjust_rpath.patch'
-        'remove_gcc_logic.patch')
-sha256sums=('1f16492ed32b3df87c378503207d6b219779580f8f98ae268c8b46c1a148ab40'
+        'remove_gcc_logic.patch'
+        'opencl_includes.patch::https://patch-diff.githubusercontent.com/raw/ROCm-Developer-Tools/ROCclr/pull/16.patch')
+sha256sums=('74089dc689408ace339998cfd2fb8c04dded3776e63a30cc78f4c43fe3d5016f'
             'bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170'
             '94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44'
-            'd1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722')
+            'd1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722'
+            '3edeb8aeaf335297ec0f61a15b99c259d607d8f534173fbc3d17832ad03cd63f')
 _dirname="$(basename "$url")-$(basename ${source[0]} .tar.gz)"
 
 prepare() {
@@ -31,6 +35,9 @@ prepare() {
     cd "$srcdir/opencl-on-vdi"
     patch -Np1 -i "$srcdir/disable_ocl_tests.patch"
 
+    cd "$srcdir/vdi"
+    patch -Np1 -i "$srcdir/opencl_includes.patch"
+
     cd "$srcdir/aomp"
     patch -Np1 -i "$srcdir/adjust_rpath.patch"
     patch -p1  -i "$srcdir/remove_gcc_logic.patch"