Update to version 2022.1.0

7 files changed, 154 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed99fa98c110..d937abcf4c90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openvino
 	pkgdesc = A toolkit for developing artificial inteligence and deep learning applications
-	pkgver = 2021.4.2
-	pkgrel = 3
+	pkgver = 2022.1.0
+	pkgrel = 1
 	url = https://docs.openvinotoolkit.org/
 	arch = x86_64
 	license = Apache
@@ -15,6 +15,7 @@ pkgbase = openvino
 	makedepends = python
 	makedepends = cython
 	makedepends = shellcheck
+	depends = protobuf
 	depends = numactl
 	depends = libxml2
 	optdepends = intel-compute-runtime: for GPU (clDNN) plugin
@@ -31,45 +32,64 @@ pkgbase = openvino
 	replaces = intel-openvino
 	noextract = firmware_usb-ma2x8x_1875.zip
 	noextract = firmware_pcie-ma2x8x_1875.zip
-	noextract = GNA_03.00.00.1377.zip
-	noextract = tbb2020_20200415_lin_strip.tgz
-	noextract = tbbbind_2_4_static_lin_v2.tgz
 	options = !emptydirs
-	source = git+https://github.com/openvinotoolkit/openvino.git#tag=2021.4.2
-	source = git+https://github.com/opencv/ade.git
+	source = git+https://github.com/openvinotoolkit/openvino.git#tag=2022.1.0
+	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip
+	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip
+	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/GNA/GNA_03.00.00.1455.0.zip
+	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbb2020_20200415_lin_strip.tgz
+	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_2_5_static_lin_v2.tgz
 	source = oneDNN-openvinotoolkit::git+https://github.com/openvinotoolkit/oneDNN.git
-	source = googletest-openvinotoolkit::git+https://github.com/openvinotoolkit/googletest.git
-	source = git+https://github.com/gflags/gflags.git
 	source = git+https://github.com/herumi/xbyak.git
 	source = git+https://github.com/madler/zlib.git
-	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip
-	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip
-	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/GNA/GNA_03.00.00.1377.zip
-	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbb2020_20200415_lin_strip.tgz
-	source = https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_2_4_static_lin_v2.tgz
+	source = git+https://github.com/zeux/pugixml.git
+	source = git+https://github.com/opencv/ade.git
+	source = git+https://github.com/gflags/gflags.git
+	source = googletest-openvinotoolkit::git+https://github.com/openvinotoolkit/googletest.git
+	source = git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
+	source = git+https://github.com/KhronosGroup/OpenCL-Headers.git
+	source = git+https://github.com/KhronosGroup/OpenCL-CLHPP.git
+	source = git+https://github.com/onnx/onnx.git
+	source = git+https://github.com/protocolbuffers/protobuf.git
+	source = git+https://github.com/pybind/pybind11.git
+	source = git+https://github.com/intel/ittapi.git
+	source = git+https://github.com/nithinn/ncc.git
+	source = git+https://github.com/oneapi-src/oneDNN.git
+	source = git+https://github.com/openvinotoolkit/open_model_zoo.git
+	source = git+https://github.com/nlohmann/json.git
+	source = git+https://github.com/pboettch/json-schema-validator.git
 	source = openvino.conf
-	source = openvino.sh
 	source = setupvars.sh
 	source = 010-ade-disable-werror.patch
-	source = 020-openvino-cldnn-disable-werror.patch
-	source = 030-openvino-ngraph-disable-werror.patch
+	source = 020-openvino-use-protobuf-shared-libs.patch
 	sha256sums = SKIP
+	sha256sums = b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5
+	sha256sums = e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf
+	sha256sums = 99891696269d8fa10116c96e6b7bda4362736881f0df8df8b56c751ee18e5820
+	sha256sums = 95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008
+	sha256sums = 865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf
-	sha256sums = b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5
-	sha256sums = d45fb48994d8c2803a16e88e29ae48851066325b97c1c6c4a5bf4f4573d55c65
-	sha256sums = 95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008
-	sha256sums = 6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6
-	sha256sums = 66cbaab93a6097207ff0908db155d590ad30b5fe12b429473e0bdfa99d1fd37f
-	sha256sums = 49a1cdd2357ac3c657b28d72aea1294e4af46389e41ed0d55ccbd12bd995058d
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 48b6a93bb54c36f9bc87a7f326b0a634f752f34f57f90a60dccc13f92fd96a9d
 	sha256sums = cfcc5af35d7a50f83c780716f69f8a800b14bcf143f7abafd31a7a0dcb8c9ae8
 	sha256sums = 502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0
-	sha256sums = bd5ede546abb49f7f07bf9f2aa7d9c7b1ecd9deba35ea6f4338ac4dfa8887542
-	sha256sums = cc35be4846faca62aa7b34a6e98f126499fbdfd52a34ba839be1bdf98b5dbe20
+	sha256sums = 33233c69916485f1bef20c9d5f48bdba1189012ce8bad9dafc01249e7bc10f86
 
 pkgname = openvino
diff --git a/020-openvino-cldnn-disable-werror.patch b/020-openvino-cldnn-disable-werror.patch
deleted file mode 100644
index f5cdb8a941a1..000000000000
--- a/020-openvino-cldnn-disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
-+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -518,7 +518,7 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
-         MultiProcessorCompilation
-         DeadCodeEliminate
-         ExtensionsEnabled
--        TreatWarnAsErrorEnabled
-+        TreatWarnAsErrorDisabled
-         WarnLevel4
-         NoFastMath
-         StackProtector
diff --git a/020-openvino-use-protobuf-shared-libs.patch b/020-openvino-use-protobuf-shared-libs.patch
new file mode 100644
index 000000000000..9db3a5711101
--- /dev/null
+++ b/020-openvino-use-protobuf-shared-libs.patch
@@ -0,0 +1,11 @@
+--- a/thirdparty/CMakeLists.txt
++++ b/thirdparty/CMakeLists.txt
+@@ -84,7 +84,7 @@ endif()
+ 
+ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
+     if(ENABLE_SYSTEM_PROTOBUF)
+-        set(Protobuf_USE_STATIC_LIBS ON)
++        set(Protobuf_USE_STATIC_LIBS OFF)
+         if(VERBOSE_BUILD)
+             set(Protobuf_DEBUG ON)
+         endif()
diff --git a/030-openvino-ngraph-disable-werror.patch b/030-openvino-ngraph-disable-werror.patch
deleted file mode 100644
index 645c5dd3a268..000000000000
--- a/030-openvino-ngraph-disable-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -197,7 +197,7 @@ if (WIN32)
- endif()
- 
- if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
- 
- if(WIN32)
diff --git a/PKGBUILD b/PKGBUILD
index f3ca0bc56504..5d1c731fd1a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=openvino
-pkgver=2021.4.2
-pkgrel=3
+pkgver=2022.1.0
+pkgrel=1
 pkgdesc='A toolkit for developing artificial inteligence and deep learning applications'
 arch=('x86_64')
 url='https://docs.openvinotoolkit.org/'
 license=('Apache')
-depends=('numactl' 'libxml2')
+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'
@@ -25,52 +25,71 @@ provides=('intel-openvino')
 conflicts=('intel-openvino')
 replaces=('intel-openvino')
 options=('!emptydirs')
-# supported firmwares: VPU_SUPPORTED_FIRMWARES in inference-engine/cmake/vpu_dependencies.cmake
-_firmware_ver=1875 # FIRMWARE_PACKAGE_VERSION in inference-engine/cmake/vpu_dependencies.cmake
-_gnaver=03.00.00.1377 # 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
+# supported firmwares: VPU_SUPPORTED_FIRMWARES in src/plugins/intel_myriad/myriad_dependencies.cmake
+_firmware_ver=1875 # FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake
+_gnaver=03.00.00.1455.0 # GNA_VERSION (GNA2) in cmake/dependencies.cmake
+_tbbver=2020_20200415 # cmake/dependencies.cmake
+_tbbbind_ver=2_5_static_lin_v2 # cmake/dependencies.cmake
 source=("git+https://github.com/openvinotoolkit/openvino.git#tag=${pkgver}"
-        'git+https://github.com/opencv/ade.git'
-        'oneDNN-openvinotoolkit'::'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/VPU/usb-ma2x8x/firmware_usb-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"
+        'oneDNN-openvinotoolkit'::'git+https://github.com/openvinotoolkit/oneDNN.git'
+        'git+https://github.com/herumi/xbyak.git'
+        'git+https://github.com/madler/zlib.git'
+        'git+https://github.com/zeux/pugixml.git'
+        'git+https://github.com/opencv/ade.git'
+        'git+https://github.com/gflags/gflags.git'
+        'googletest-openvinotoolkit'::'git+https://github.com/openvinotoolkit/googletest.git'
+        'git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git'
+        'git+https://github.com/KhronosGroup/OpenCL-Headers.git'
+        'git+https://github.com/KhronosGroup/OpenCL-CLHPP.git'
+        'git+https://github.com/onnx/onnx.git'
+        'git+https://github.com/protocolbuffers/protobuf.git'
+        'git+https://github.com/pybind/pybind11.git'
+        'git+https://github.com/intel/ittapi.git'
+        'git+https://github.com/nithinn/ncc.git'
+        'git+https://github.com/oneapi-src/oneDNN.git'
+        'git+https://github.com/openvinotoolkit/open_model_zoo.git'
+        'git+https://github.com/nlohmann/json.git'
+        'git+https://github.com/pboettch/json-schema-validator.git'
         'openvino.conf'
-        'openvino.sh'
         'setupvars.sh'
         '010-ade-disable-werror.patch'
-        '020-openvino-cldnn-disable-werror.patch'
-        '030-openvino-ngraph-disable-werror.patch')
+        '020-openvino-use-protobuf-shared-libs.patch')
 noextract=("firmware_usb-ma2x8x_${_firmware_ver}.zip"
-           "firmware_pcie-ma2x8x_${_firmware_ver}.zip"
-           "GNA_${_gnaver}.zip"
-           "tbb${_tbbver}_lin_strip.tgz"
-           "tbbbind_${_tbbbind_ver}.tgz")
+           "firmware_pcie-ma2x8x_${_firmware_ver}.zip")
 sha256sums=('SKIP'
+            'b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5'
+            'e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf'
+            '99891696269d8fa10116c96e6b7bda4362736881f0df8df8b56c751ee18e5820'
+            '95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008'
+            '865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf'
-            'b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5'
-            'd45fb48994d8c2803a16e88e29ae48851066325b97c1c6c4a5bf4f4573d55c65'
-            '95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008'
-            '6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6'
-            '66cbaab93a6097207ff0908db155d590ad30b5fe12b429473e0bdfa99d1fd37f'
-            '49a1cdd2357ac3c657b28d72aea1294e4af46389e41ed0d55ccbd12bd995058d'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '48b6a93bb54c36f9bc87a7f326b0a634f752f34f57f90a60dccc13f92fd96a9d'
             'cfcc5af35d7a50f83c780716f69f8a800b14bcf143f7abafd31a7a0dcb8c9ae8'
             '502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0'
-            'bd5ede546abb49f7f07bf9f2aa7d9c7b1ecd9deba35ea6f4338ac4dfa8887542'
-            'cc35be4846faca62aa7b34a6e98f126499fbdfd52a34ba839be1bdf98b5dbe20')
+            '33233c69916485f1bef20c9d5f48bdba1189012ce8bad9dafc01249e7bc10f86')
 
 export GIT_LFS_SKIP_SMUDGE='1'
 
@@ -79,29 +98,48 @@ prepare() {
     git -C openvino lfs pull "$(printf '%s' "${source[0]/git+/}" | sed 's/#.*$//')"
     
     git -C openvino submodule init
-    git -C openvino config --local submodule.inference-engine/thirdparty/ade.url "${srcdir}/ade"
-    git -C openvino config --local submodule.inference-engine/thirdparty/mkl-dnn.url "${srcdir}/oneDNN-openvinotoolkit"
-    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.src/plugins/intel_cpu/thirdparty/mkl-dnn.url "${srcdir}/oneDNN-openvinotoolkit"
     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 config --local submodule.thirdparty/pugixml.url "${srcdir}/pugixml"
+    git -C openvino config --local submodule.thirdparty/ade.url "${srcdir}/ade"
+    git -C openvino config --local submodule.thirdparty/gflags/gflags.url "${srcdir}/gflags"
+    git -C openvino config --local submodule.thirdparty/gtest/gtest.url "${srcdir}/googletest-openvinotoolkit"
+    git -C openvino config --local submodule.thirdparty/ocl/icd_loader.url "${srcdir}/OpenCL-ICD-Loader"
+    git -C openvino config --local submodule.thirdparty/ocl/cl_headers.url "${srcdir}/OpenCL-Headers"
+    git -C openvino config --local submodule.thirdparty/ocl/clhpp_headers.url "${srcdir}/OpenCL-CLHPP"
+    git -C openvino config --local submodule.thirdparty/onnx.url "${srcdir}/onnx"
+    git -C openvino config --local submodule.thirdparty/protobuf.url "${srcdir}/protobuf"
+    git -C openvino config --local submodule.src/bindings/python/thirdparty/pybind11.url "${srcdir}/pybind11"
+    git -C openvino config --local submodule.thirdparty/ittapi/ittapi.url "${srcdir}/ittapi"
+    git -C openvino config --local submodule.ncc.url "${srcdir}/ncc"
+    git -C openvino config --local submodule.thirdparty/onednn_gpu.url "${srcdir}/oneDNN"
+    git -C openvino config --local submodule.tools/pot/thirdparty/open_model_zoo.url "${srcdir}/open_model_zoo"
+    git -C openvino config --local submodule.thirdparty/json/nlohmann_json.url "${srcdir}/json"
+    git -C openvino config --local submodule.thirdparty/json/nlohmann_json_schema_validator.url "${srcdir}/json-schema-validator"
     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" "tbbbind_${_tbbbind_ver}.tgz" -t thirdparty/linux
+    mkdir -p openvino/temp/vpu/firmware/{pcie,usb}-ma2x8x
+    bsdtar -xf "firmware_pcie-ma2x8x_${_firmware_ver}.zip" -C openvino/temp/vpu/firmware/pcie-ma2x8x
+    bsdtar -xf "firmware_usb-ma2x8x_${_firmware_ver}.zip"  -C openvino/temp/vpu/firmware/usb-ma2x8x
+    cp -af "gna_${_gnaver}" openvino/temp
+    cp -af tbb openvino/temp
+    cp -af "tbbbind_${_tbbbind_ver/_static*/}" openvino/temp
     
-    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"
+    printf '%s\n' "${source[1]}" > openvino/temp/vpu/firmware/pcie-ma2x8x/ie_dependency.info
+    printf '%s\n' "${source[2]}" > openvino/temp/vpu/firmware/usb-ma2x8x/ie_dependency.info
+    printf '%s\n' "${source[3]}" > "openvino/temp/gna_${_gnaver}/ie_dependency.info"
+    printf '%s\n' "${source[4]}" > openvino/temp/tbb/ie_dependency.info
+    printf '%s\n' "${source[5]}" > "openvino/temp/tbbbind_${_tbbbind_ver/_static*/}/ie_dependency.info"
+    
+    patch -d openvino/thirdparty/ade -Np1 -i "${srcdir}/010-ade-disable-werror.patch"
+    patch -d openvino -Np1 -i "${srcdir}/020-openvino-use-protobuf-shared-libs.patch"
 }
 
 build() {
     local _ocvmaj
     _ocvmaj="$(opencv_version | awk -F'.' '{ print $1 }')"
     
-    export IE_PATH_TO_DEPS="$srcdir"
     export OpenCV_DIR="/usr/lib/cmake/opencv${_ocvmaj}"
     
     # note: does not accept 'None' build type
@@ -112,10 +150,11 @@ build() {
         -DENABLE_AVX512F:BOOL='OFF' \
         -DENABLE_PROFILING_ITT:BOOL='OFF' \
         -DENABLE_PYTHON:BOOL='ON' \
-        -DENABLE_SPEECH_DEMO:BOOL='OFF' \
         -DENABLE_OPENCV:BOOL='OFF' \
-        -DNGRAPH_UNIT_TEST_ENABLE:BOOL='FALSE' \
-        -DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL='OFF' \
+        -DENABLE_CLANG_FORMAT:BOOL='OFF' \
+        -DENABLE_NCC_STYLE:BOOL='OFF' \
+        -DENABLE_SYSTEM_PROTOBUF:BOOL='ON' \
+        -DENABLE_ONEDNN_FOR_GPU:BOOL='OFF' \
         -DTREAT_WARNING_AS_ERROR:BOOL='OFF' \
         -Wno-dev
     make -C build
@@ -123,22 +162,22 @@ build() {
 
 package() {
     make -C build DESTDIR="$pkgdir" install
-    
     install -D -m644 openvino.conf -t "${pkgdir}/etc/ld.so.conf.d"
-    install -D -m755 openvino.sh -t "${pkgdir}/etc/profile.d"
-    install -D -m755 setupvars.sh -t "${pkgdir}/opt/intel/openvino/bin"
     
+    local _gnaver
     local _gnasover
     local _gnasover_full
-    local _gnadir="${pkgdir}/opt/intel/openvino/deployment_tools/inference_engine/external/gna/lib"
-    _gnasover="$(find "$_gnadir" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*$' | sed 's/.*\.//')"
-    _gnasover_full="$(find "$_gnadir" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*\..*' | sed 's/.*\.so\.//')"
+    local _gnadir="${pkgdir}/opt/intel/openvino/runtime/lib/intel64"
+    _gnaver="$(find openvino/temp -maxdepth 1 -type d -name 'gna_*' | sed 's/.*_//')"
+    _gnasover="$(find -L "$_gnadir" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*$' | sed 's/.*\.//')"
+    _gnasover_full="$(find -L "$_gnadir" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*\..*' | sed 's/.*\.so\.//')"
     
-    rm "${_gnadir}/libgna.so"{,".${_gnasover}"}
+    rm "${_gnadir}/libgna.so."{"${_gnasover}","${_gnasover_full}"}
+    mv "${_gnadir}/libgna.so"{,."${_gnasover_full}"}
     ln -s "libgna.so.${_gnasover_full}" "${_gnadir}/libgna.so.${_gnasover}"
     ln -s "libgna.so.${_gnasover}" "${_gnadir}/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"
+    cp -dr --no-preserve='ownership' "openvino/temp/gna_${_gnaver}/include" \
+        "${pkgdir}/opt/intel/openvino/runtime/include/gna"
+    chmod -R a+r "${pkgdir}/opt/intel/openvino/runtime/include/gna"
 }
diff --git a/openvino.conf b/openvino.conf
index 14288999b873..6e7b19ae182b 100644
--- a/openvino.conf
+++ b/openvino.conf
@@ -1,4 +1,2 @@
-/opt/intel/openvino/deployment_tools/inference_engine/lib/intel64
-/opt/intel/openvino/deployment_tools/inference_engine/external/gna/lib
-/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/lib
-/opt/intel/openvino/lib
+/opt/intel/openvino/runtime/lib/intel64
+/opt/intel/openvino/runtime/3rdparty/tbb/lib
diff --git a/openvino.sh b/openvino.sh
deleted file mode 100644
index 0687ecd671cf..000000000000
--- a/openvino.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export INTEL_OPENVINO_DIR='/opt/intel/openvino'
-export INTEL_CVSDK_DIR="$INTEL_OPENVINO_DIR"