Update to version 2021.4

1 files changed, 24 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 201e62ed8aa7..49174e5fd8a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=openvino
-pkgver=2021.3
+pkgver=2021.4
 pkgrel=1
 pkgdesc='A toolkit for developing artificial inteligence and deep learning applications'
 arch=('x86_64')
 url='https://docs.openvinotoolkit.org/'
 license=('Apache')
-depends=('protobuf')
+depends=('protobuf' 'numactl' 'libxml2')
 # GPU (clDNN) plugin: only Intel GPUs are supported:
 # https://github.com/openvinotoolkit/openvino/issues/452#issuecomment-722941119
 optdepends=('intel-compute-runtime: for GPU (clDNN) plugin'
@@ -26,43 +26,51 @@ provides=('intel-openvino')
 conflicts=('intel-openvino')
 replaces=('intel-openvino')
 # supported firmwares: VPU_SUPPORTED_FIRMWARES in inference-engine/cmake/vpu_dependencies.cmake
-_firmware_ver=1639 # FIRMWARE_PACKAGE_VERSION in inference-engine/cmake/vpu_dependencies.cmake
-_gnaver=02.00.00.1047.1 # GNA_VERSION (GNA2) in inference-engine/cmake/dependencies.cmake
+_firmware_ver=1688 # FIRMWARE_PACKAGE_VERSION in inference-engine/cmake/vpu_dependencies.cmake
+_gnaver=02.00.00.1226 # GNA_VERSION (GNA2) in inference-engine/cmake/dependencies.cmake
 _tbbver=2020_20200415 # inference-engine/cmake/dependencies.cmake
+_tbbbind_ver=2_4_static_lin_v2 # inference-engine/cmake/dependencies.cmake
 source=("git+https://github.com/openvinotoolkit/openvino.git#tag=${pkgver}"
         'git+https://github.com/opencv/ade.git'
         'git+https://github.com/openvinotoolkit/oneDNN.git'
         'googletest-openvinotoolkit'::'git+https://github.com/openvinotoolkit/googletest.git'
         'git+https://github.com/gflags/gflags.git'
         'git+https://github.com/herumi/xbyak.git'
+        'git+https://github.com/madler/zlib.git'
         "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_${_firmware_ver}.zip"
         "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_${_firmware_ver}.zip"
         "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/GNA/GNA_${_gnaver}.zip"
         "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbb${_tbbver}_lin_strip.tgz"
+        "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${_tbbbind_ver}.tgz"
         'openvino.conf'
         'openvino.sh'
         'setupvars.sh'
         '010-ade-disable-werror.patch'
-        '020-openvino-cldnn-disable-werror.patch')
+        '020-openvino-cldnn-disable-werror.patch'
+        '030-openvino-ngraph-disable-werror.patch')
 noextract=("firmware_usb-ma2x8x_${_firmware_ver}.zip"
            "firmware_pcie-ma2x8x_${_firmware_ver}.zip"
            "GNA_${_gnaver}.zip"
-           "tbb${_tbbver}_lin_strip.tgz")
+           "tbb${_tbbver}_lin_strip.tgz"
+           "tbbbind_${_tbbbind_ver}.tgz")
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'cfba5fc0895a564fa51a1438f1c4d4f06198be982b1c2fb973c5cb9ab0a3c1f3'
-            '4176456c96b151470de3a723b603503306cff2e52975b739927e37d730c053be'
-            '20820e07392a1e876cf5577430c1c4c74b924d8f34cc17bfa3e36e641555e05d'
+            'SKIP'
+            '420b300d193f7fcfe7e3f9bbec6c247d65b784a500b5cd2effb7cb1ec6e1b209'
+            'bfe3caf270b168b9de18ef88f04bde3907d7d12a679f1fa7cc580423c35db637'
+            'd5450af15c993e264c25ac4591a7dab44722e10d15fca4f222a1b84429d4e5b6'
             '95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008'
+            '6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6'
             '66cbaab93a6097207ff0908db155d590ad30b5fe12b429473e0bdfa99d1fd37f'
             '49a1cdd2357ac3c657b28d72aea1294e4af46389e41ed0d55ccbd12bd995058d'
             'cfcc5af35d7a50f83c780716f69f8a800b14bcf143f7abafd31a7a0dcb8c9ae8'
             '502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0'
-            '97a5c979aa4553879e95ce7a081e558504f0e4141a10cd3fc0b549ca54bbced5')
+            'bd5ede546abb49f7f07bf9f2aa7d9c7b1ecd9deba35ea6f4338ac4dfa8887542'
+            'cc35be4846faca62aa7b34a6e98f126499fbdfd52a34ba839be1bdf98b5dbe20')
 
 export GIT_LFS_SKIP_SMUDGE='1'
 
@@ -76,15 +84,17 @@ prepare() {
     git -C openvino config --local submodule.inference-engine/tests/ie_test_utils/common_test_utils/gtest.url "${srcdir}/googletest-openvinotoolkit"
     git -C openvino config --local submodule.inference-engine/samples/thirdparty/gflags.url "${srcdir}/gflags"
     git -C openvino config --local submodule.thirdparty/xbyak.url "${srcdir}/xbyak"
+    git -C openvino config --local submodule.thirdparty/zlib/zlib.url "${srcdir}/zlib"
     git -C openvino submodule update
     
     install -D -m644 "firmware_usb-ma2x8x_${_firmware_ver}.zip"  -t thirdparty/unified/VPU/usb-ma2x8x
     install -D -m644 "firmware_pcie-ma2x8x_${_firmware_ver}.zip" -t thirdparty/unified/VPU/pcie-ma2x8x
     install -D -m644 "GNA_${_gnaver}.zip" -t thirdparty/unified/GNA
-    install -D -m644 "tbb${_tbbver}_lin_strip.tgz" -t thirdparty/linux
+    install -D -m644 "tbb${_tbbver}_lin_strip.tgz" "tbbbind_${_tbbbind_ver}.tgz" -t thirdparty/linux
     
     patch -d openvino/inference-engine/thirdparty/ade -Np1 -i "${srcdir}/010-ade-disable-werror.patch"
     patch -d openvino -Np1 -i "${srcdir}/020-openvino-cldnn-disable-werror.patch"
+    patch -d openvino -Np1 -i "${srcdir}/030-openvino-ngraph-disable-werror.patch"
 }
 
 build() {
@@ -109,7 +119,6 @@ build() {
         -DPYTHON_INCLUDE_DIR="/usr/include/python${_pyver}" \
         -DENABLE_SPEECH_DEMO:BOOL='OFF' \
         -DENABLE_OPENCV:BOOL='OFF' \
-        -DNGRAPH_TEST_UTIL_ENABLE:BOOL='OFF' \
         -DNGRAPH_UNIT_TEST_ENABLE:BOOL='FALSE' \
         -DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL='ON' \
         -DTREAT_WARNING_AS_ERROR:BOOL='OFF' \
@@ -124,13 +133,7 @@ package() {
     install -D -m755 openvino.sh -t "${pkgdir}/etc/profile.d"
     install -D -m755 setupvars.sh -t "${pkgdir}/opt/intel/openvino/bin"
     
-    local _gnasover
-    local _gnasover_full
-    local _gnadir="${pkgdir}/opt/intel/openvino/deployment_tools/inference_engine/external/gna"
-    _gnasover="$(find "${_gnadir}/lib" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*$' | sed 's/.*\.so\.//')"
-    _gnasover_full="$(find "${_gnadir}/lib" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*\..*' | sed 's/.*\.so\.//')"
-    cp -dr --no-preserve='ownership' "openvino/inference-engine/temp/gna_${_gnaver}/include" "$_gnadir"
-    rm "${_gnadir}/lib"/libgna.so{,".${_gnasover}"}
-    ln -s "libgna.so.${_gnasover_full}" "${_gnadir}/lib/libgna.so.${_gnasover}"
-    ln -s "libgna.so.${_gnasover}" "${_gnadir}/lib/libgna.so"
+    cp -dr --no-preserve='ownership' "openvino/inference-engine/temp/gna_${_gnaver}/include" \
+        "${pkgdir}/opt/intel/openvino/deployment_tools/inference_engine/external/gna"
+    chmod -R a+r "${pkgdir}/opt/intel/openvino/deployment_tools/inference_engine/external/gna/include"
 }