Match latest upstream changes

1 files changed, 9 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f5a01c10d745..a0e4a6256050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # https://github.com/openvinotoolkit/openvino/issues/452#issuecomment-722941119
 
 pkgname=openvino-git
-pkgver=2023.0.0.r501.g3c623e890d0
+pkgver=2023.1.0.r339.g10dc2d8b9ba
 pkgrel=1
 pkgdesc='A toolkit for developing artificial inteligence and deep learning applications (git version)'
 arch=('x86_64')
@@ -19,7 +19,7 @@ optdepends=('intel-compute-runtime: for Intel GPU plugin'
             'python-numpy: for Python API'
             'cython: for Python API')
 makedepends=('git' 'git-lfs' 'cmake' 'opencl-clhpp' 'opencl-headers' 'ocl-icd' 'opencv'
-             'protobuf' 'snappy' 'python' 'python-setuptools' 'cython' 'fdupes' 'patchelf'
+             'snappy' 'python' 'python-setuptools' 'cython' 'fdupes' 'patchelf'
              'shellcheck')
 provides=('openvino' 'intel-openvino-git')
 conflicts=('openvino' 'intel-openvino-git')
@@ -47,6 +47,7 @@ source=('git+https://github.com/openvinotoolkit/openvino.git'
         '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'
@@ -74,11 +75,12 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '335a55533ab26bd1f63683921baf33b8e8e3f2732a94554916d202ee500f90af'
             'e5024ad3382f285fe63dc58faca379f11a669bbe9f5d90682c59ad588aab434c'
             '502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0'
-            '7f81f5ef6600b069e7e0b8ff11b7b48768991b9b4d9cd3c4cf845cd8dc99d26d'
-            'ed7a026d3d4c40760f09f0600fa82b897172f119c8e92ffefc3f71b8cc6ebfb0')
+            '1b420e3cc2afca11154c672123f001cf03cd2b96be3baafd229f6ee7d752419e'
+            'fd22227bfbec18ee4f4fc4010deba387f6b8ae1c602938d36c8b86b128342647')
 
 export GIT_LFS_SKIP_SMUDGE='1'
 
@@ -108,11 +110,12 @@ 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
     
     # ade gcc 13 fix
     git -C openvino/thirdparty/ade cherry-pick --no-commit 7cecc9138b89e1946e3e515727bb69b2ab119806
-
+    
     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"
@@ -127,11 +130,6 @@ pkgver() {
 }
 
 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' \
@@ -140,13 +138,12 @@ 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' \
         -DENABLE_SYSTEM_TBB:BOOL='ON' \
         -DENABLE_SYSTEM_OPENCL:BOOL='ON' \
-        -DENABLE_SYSTEM_PROTOBUF:BOOL='ON' \
+        -DENABLE_SYSTEM_PROTOBUF:BOOL='OFF' \
         -DENABLE_SYSTEM_FLATBUFFERS:BOOL='OFF' \
         -DENABLE_SYSTEM_SNAPPY:BOOL='ON' \
         -Wno-dev