upgpkg: mivisionx 5.2.0-1 (#814)

2 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67f7ef52ce30..ed9624545ce1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mivisionx
 	pkgdesc = Set of comprehensive computer vision and machine intelligence libraries, utilities
-	pkgver = 5.1.3
+	pkgver = 5.2.0
 	pkgrel = 1
 	url = https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/
 	arch = x86_64
@@ -15,7 +15,9 @@ pkgbase = mivisionx
 	depends = ffmpeg4.4
 	depends = qt5-base
 	options = !lto
-	source = mivisionx-5.1.3.tar.gz::https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-5.1.3.tar.gz
-	sha256sums = 62591d5caedc13832c3ccef629a88d9c2a43c884daad1124ddcb9c5f7d5470e9
+	source = mivisionx-5.2.0.tar.gz::https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-5.2.0.tar.gz
+	source = include-path.patch::https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/commit/ff4f54f4a4a99052494ff940860597a03c9f1f21.patch
+	sha256sums = fee620a1edd3bce18b2cec9ef26ec2afe0a85d6da8a37ed713ab0d1342382503
+	sha256sums = d0e39d5f85a1f112dfb8c7cd0987680872a08f5a41d7dc2978efc954c3591154
 
 pkgname = mivisionx
diff --git a/PKGBUILD b/PKGBUILD
index de01aa785cff..119d6a189039 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributer: JP-Ellis <josh@jpellis.me>
 
 pkgname=mivisionx
-pkgver=5.1.3
+pkgver=5.2.0
 pkgrel=1
 pkgdesc="Set of comprehensive computer vision and machine intelligence libraries, utilities"
 arch=('x86_64')
@@ -11,32 +11,37 @@ url="https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/"
 license=('MIT')
 depends=('rocm-core' 'rocm-cmake' 'miopengemm' 'miopen' 'protobuf' 'opencv' 'ffmpeg4.4' 'qt5-base')
 makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-$pkgver.tar.gz")
+_git='https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX'
+source=("$pkgname-$pkgver.tar.gz::$_git/archive/rocm-$pkgver.tar.gz"
+        "include-path.patch::$_git/commit/ff4f54f4a4a99052494ff940860597a03c9f1f21.patch")
+sha256sums=('fee620a1edd3bce18b2cec9ef26ec2afe0a85d6da8a37ed713ab0d1342382503'
+            'd0e39d5f85a1f112dfb8c7cd0987680872a08f5a41d7dc2978efc954c3591154')
 options=(!lto)
-sha256sums=('62591d5caedc13832c3ccef629a88d9c2a43c884daad1124ddcb9c5f7d5470e9')
+_dirname="$(basename "$_git")-$(basename "${source[0]}" ".tar.gz")"
 
-build() {
-  mkdir -p "$srcdir/build"
-  cd "$srcdir/build"
-
-  export CXXFLAGS="${CXXFLAGS} -fcf-protection=none -fPIC -isystem /usr/include/ffmpeg4.4"
+prepare() {
+    cd "$_dirname"
+    patch -Np1 -i "$srcdir/include-path.patch"
+}
 
-  cmake -DBACKEND=HIP \
+build() {
+  # -fcf-protection is not supported by HIP, see
+  # https://docs.amd.com/bundle/ROCm-Compiler-Reference-Guide-v5.2/page/Appendix_A.html
+  CXXFLAGS="${CXXFLAGS} -fcf-protection=none -isystem /usr/include/ffmpeg4.4" \
+  cmake -B build -Wno-dev \
+        -S "$_dirname" \
         -DCMAKE_INSTALL_PREFIX=/opt/rocm/mivisionx \
-        "$srcdir/MIVisionX-rocm-$pkgver"
-  make
+        -DBACKEND=HIP
+  make -C build
 }
 
 package() {
-  cd "$srcdir/build"
-
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" make -C build install
 
   # add links
   install -d "$pkgdir/usr/bin"
   local _fn
-  for _file in bin/* ; do
-    _fn="$(basename -- $_file)"
+  for _fn in mv_compile runvx; do
     ln -s "/opt/rocm/mivisionx/bin/$_fn" "$pkgdir/usr/bin/$_fn"
   done
 }