Update to version 2023.1.0

3 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e1072c27a3b..69cc84d67133 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openvino
 	pkgdesc = A toolkit for developing artificial inteligence and deep learning applications
-	pkgver = 2023.0.2
+	pkgver = 2023.1.0
 	pkgrel = 1
 	url = https://docs.openvinotoolkit.org/
 	arch = x86_64
@@ -32,7 +32,7 @@ pkgbase = openvino
 	conflicts = intel-openvino
 	replaces = intel-openvino
 	options = !emptydirs
-	source = git+https://github.com/openvinotoolkit/openvino.git#tag=2023.0.2
+	source = git+https://github.com/openvinotoolkit/openvino.git#tag=2023.1.0
 	source = https://storage.openvinotoolkit.org/dependencies/gna/gna_03.05.00.2116.zip
 	source = oneDNN-openvinotoolkit::git+https://github.com/openvinotoolkit/oneDNN.git
 	source = git+https://github.com/herumi/xbyak.git
@@ -55,6 +55,7 @@ pkgbase = openvino
 	source = git+https://github.com/google/flatbuffers.git
 	source = git+https://github.com/google/snappy.git
 	source = git+https://github.com/ARM-software/ComputeLibrary.git
+	source = git+https://github.com/openvinotoolkit/mlas.git
 	source = openvino.conf
 	source = setupvars.sh
 	source = 010-ade-disable-werror.patch
@@ -83,10 +84,11 @@ pkgbase = openvino
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 335a55533ab26bd1f63683921baf33b8e8e3f2732a94554916d202ee500f90af
 	sha256sums = e5024ad3382f285fe63dc58faca379f11a669bbe9f5d90682c59ad588aab434c
 	sha256sums = 502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0
 	sha256sums = 7f81f5ef6600b069e7e0b8ff11b7b48768991b9b4d9cd3c4cf845cd8dc99d26d
-	sha256sums = 49464620f363dfbd06c539e80e4f6bdf233e2d28f78e1aeedb419fb1eb9ebc81
+	sha256sums = fd22227bfbec18ee4f4fc4010deba387f6b8ae1c602938d36c8b86b128342647
 
 pkgname = openvino
diff --git a/020-openvino-use-protobuf-shared-libs.patch b/020-openvino-use-protobuf-shared-libs.patch
index 3abd09946452..e5bbff35e5b5 100644
--- a/020-openvino-use-protobuf-shared-libs.patch
+++ b/020-openvino-use-protobuf-shared-libs.patch
@@ -1,11 +1,11 @@
---- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -419,7 +419,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-     if(ENABLE_SYSTEM_PROTOBUF)
+--- a/thirdparty/dependencies.cmake
++++ b/thirdparty/dependencies.cmake
+@@ -410,7 +410,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
          # Note: Debian / Ubuntu / RHEL libprotobuf.a can only be used with -DBUILD_SHARED_LIBS=OFF
          # because they are compiled without -fPIC
--        set(Protobuf_USE_STATIC_LIBS ON)
-+        set(Protobuf_USE_STATIC_LIBS OFF)
+         if(NOT DEFINED Protobuf_USE_STATIC_LIBS)
+-            set(Protobuf_USE_STATIC_LIBS ON)
++            set(Protobuf_USE_STATIC_LIBS OFF)
+         endif()
          if(CMAKE_VERBOSE_MAKEFILE)
              set(Protobuf_DEBUG ON)
-         endif()
diff --git a/PKGBUILD b/PKGBUILD
index 1cb3f515861b..12c129e52bac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # https://github.com/openvinotoolkit/openvino/issues/452#issuecomment-722941119
 
 pkgname=openvino
-pkgver=2023.0.2
+pkgver=2023.1.0
 pkgrel=1
 pkgdesc='A toolkit for developing artificial inteligence and deep learning applications'
 arch=('x86_64')
@@ -49,6 +49,7 @@ source=("git+https://github.com/openvinotoolkit/openvino.git#tag=${pkgver}"
         'git+https://github.com/google/flatbuffers.git'
         'git+https://github.com/google/snappy.git'
         'git+https://github.com/ARM-software/ComputeLibrary.git'
+        'git+https://github.com/openvinotoolkit/mlas.git'
         'openvino.conf'
         'setupvars.sh'
         '010-ade-disable-werror.patch'
@@ -77,11 +78,12 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '335a55533ab26bd1f63683921baf33b8e8e3f2732a94554916d202ee500f90af'
             'e5024ad3382f285fe63dc58faca379f11a669bbe9f5d90682c59ad588aab434c'
             '502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0'
             '7f81f5ef6600b069e7e0b8ff11b7b48768991b9b4d9cd3c4cf845cd8dc99d26d'
-            '49464620f363dfbd06c539e80e4f6bdf233e2d28f78e1aeedb419fb1eb9ebc81')
+            'fd22227bfbec18ee4f4fc4010deba387f6b8ae1c602938d36c8b86b128342647')
 
 export GIT_LFS_SKIP_SMUDGE='1'
 
@@ -111,6 +113,7 @@ prepare() {
     git -C openvino config --local submodule.thirdparty/flatbuffers/flatbuffers.url "${srcdir}/flatbuffers"
     git -C openvino config --local submodule.thirdparty/snappy.url "${srcdir}/snappy"
     git -C openvino config --local submodule.ARMComputeLibrary.url "${srcdir}/ComputeLibrary"
+    git -C openvino config --local submodule.src/plugins/intel_cpu/thirdparty/mlas.url "${srcdir}/mlas"
     git -C openvino -c protocol.file.allow='always' submodule update
     
     mkdir -p openvino/temp
@@ -122,15 +125,10 @@ prepare() {
     
     patch -d openvino/thirdparty/ade -Np1 -i "${srcdir}/010-ade-disable-werror.patch"
     patch -d openvino -Np1 -i "${srcdir}/015-openvino-disable-werror.patch"
-    #patch -d openvino -Np1 -i "${srcdir}/020-openvino-use-protobuf-shared-libs.patch"
+    patch -d openvino -Np1 -i "${srcdir}/020-openvino-use-protobuf-shared-libs.patch"
 }
 
 build() {
-    local _ocvmaj
-    _ocvmaj="$(opencv_version | awk -F'.' '{ print $1 }')"
-    
-    local -x OpenCV_DIR="/usr/lib/cmake/opencv${_ocvmaj}"
-    
     # note: does not accept 'None' build type
     cmake -B build -S openvino \
         -G 'Unix Makefiles' \
@@ -139,7 +137,6 @@ build() {
         -DCMAKE_INSTALL_PREFIX:PATH='/opt/intel/openvino' \
         -DENABLE_AVX512F:BOOL='OFF' \
         -DENABLE_PYTHON:BOOL='ON' \
-        -DENABLE_OPENCV:BOOL='OFF' \
         -DENABLE_CLANG_FORMAT:BOOL='OFF' \
         -DENABLE_NCC_STYLE:BOOL='OFF' \
         -DENABLE_SYSTEM_PUGIXML:BOOL='ON' \