public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Aaron Chan <aaron.chun.yew.chan@intel.com>
To: git-commits@fedoraproject.org
Subject: [rpms/openvino] origin/pr/8/head: Add openvino-2026.0.0 source patches
Date: Thu, 11 Jun 2026 16:11:00 GMT	[thread overview]
Message-ID: <178119426061.1.1418472612643375121.rpms-openvino-0f1cf41c165e@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/openvino
            Branch : origin/pr/8/head
            Commit : 0f1cf41c165e6e334b3596e61495c6b820171b89
            Author : Aaron Chan <aaron.chun.yew.chan@intel.com>
            Date   : 2026-05-21T18:18:29+08:00
            Stats  : +104/-0 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/openvino/c/0f1cf41c165e6e334b3596e61495c6b820171b89?branch=origin/pr/8/head

            Log:
            Add openvino-2026.0.0 source patches

- protobuf_version.patch
  Enable openvino to source 3rd party deps Protobuf v3.19.6 from distro

- samples-system-gflags-json.patch
  Enable openvino sample apps to source gflags-devel from distro
  Enable openvino benchmark_app to source nlohmann_json-devel from distro

- xbyak-gflags-system-modules.patch
  Enable openvino 3rd party deps like Zlib, gflags, xybak from Distro

Signed-off-by: Aaron Chan <aaron.chun.yew.chan@intel.com>

---
diff --git a/protobuf_version.patch b/protobuf_version.patch
new file mode 100644
index 0000000..61ba309
--- /dev/null
+++ b/protobuf_version.patch
@@ -0,0 +1,13 @@
+diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
+index 14ee8f56ef..504580a635 100644
+--- a/thirdparty/dependencies.cmake
++++ b/thirdparty/dependencies.cmake
+@@ -371,7 +371,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
+                 set(protobuf_config CONFIG)
+             endif()
+             # otherwise, fallback to existing default
+-            find_package(Protobuf 3.20.3 REQUIRED ${protobuf_config})
++            find_package(Protobuf 3.19.6 REQUIRED ${protobuf_config})
+         endif()
+ 
+         # with newer protobuf versions (4.22 and newer), we use CONFIG first

diff --git a/samples-system-gflags-json.patch b/samples-system-gflags-json.patch
new file mode 100644
index 0000000..ae88b22
--- /dev/null
+++ b/samples-system-gflags-json.patch
@@ -0,0 +1,30 @@
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index 25d85ba213..204ce3f941 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -112,6 +112,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/utils")
+     set(gflags_required ON)
+ endif()
+ 
++if(NOT TARGET gflags)
++    find_package(gflags QUIET)
++endif()
++
+ if(TARGET gflags)
+     set(GFLAGS_TARGET gflags)
+ elseif(gflags_required)
+diff --git a/samples/cpp/benchmark_app/CMakeLists.txt b/samples/cpp/benchmark_app/CMakeLists.txt
+index ef339e0a5d..7451e896fd 100644
+--- a/samples/cpp/benchmark_app/CMakeLists.txt
++++ b/samples/cpp/benchmark_app/CMakeLists.txt
+@@ -14,6 +14,10 @@ ov_add_sample(NAME ${TARGET_NAME}
+ 
+ # Required nlohmann_json dependency
+ 
++if(NOT TARGET nlohmann_json::nlohmann_json)
++    find_package(nlohmann_json QUIET)
++endif()
++
+ if(NOT TARGET nlohmann_json::nlohmann_json)
+     if(EXISTS "${Samples_SOURCE_DIR}/thirdparty/nlohmann_json")
+         # OpenVINO package puts thirdparty to samples dir

diff --git a/xbyak-gflags-system-modules.patch b/xbyak-gflags-system-modules.patch
new file mode 100644
index 0000000..e83b244
--- /dev/null
+++ b/xbyak-gflags-system-modules.patch
@@ -0,0 +1,61 @@
+diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
+index 053006c031..18d14ca390 100644
+--- a/thirdparty/dependencies.cmake
++++ b/thirdparty/dependencies.cmake
+@@ -59,6 +59,16 @@ if(X86_64 OR X86 OR UNIVERSAL2)
+     find_package(xbyak QUIET)
+     if(xbyak_FOUND)
+         # conan creates alias xbyak::xbyak, no extra steps are required
++        # Fedora: xbyak cmake config sets INTERFACE_INCLUDE_DIRECTORIES=/usr/include
++        # and INTERFACE_SYSTEM_INCLUDE_DIRECTORIES=/usr/include/xbyak, resulting in
++        # both -isystem /usr/include and -isystem /usr/include/xbyak on the command
++        # line. GCC 16 deduplicates system paths and drops implicit /usr/include,
++        # breaking #include_next <stdlib.h> in libstdc++ headers.
++        if(TARGET xbyak::xbyak)
++            set_target_properties(xbyak::xbyak PROPERTIES
++                INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ""
++                INTERFACE_INCLUDE_DIRECTORIES "/usr/include/xbyak")
++        endif()
+     else()
+         add_subdirectory(thirdparty/xbyak EXCLUDE_FROM_ALL)
+     endif()
+@@ -162,7 +172,15 @@ endif()
+ #
+ 
+ if(ENABLE_SAMPLES OR ENABLE_TESTS)
+-    add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
++    find_package(ZLIB QUIET)
++    if(ZLIB_FOUND)
++        add_library(openvino_zlib INTERFACE IMPORTED GLOBAL)
++        target_link_libraries(openvino_zlib INTERFACE ZLIB::ZLIB)
++        target_include_directories(openvino_zlib INTERFACE ${ZLIB_INCLUDE_DIRS})
++        add_library(openvino::zlib ALIAS openvino_zlib)
++    else()
++        add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
++    endif()
+ endif()
+ 
+ #
+@@ -306,11 +324,17 @@ endif()
+ #
+ 
+ if(ENABLE_SAMPLES OR ENABLE_TESTS OR ENABLE_INTEL_NPU_INTERNAL)
+-    add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
+-    ov_developer_package_export_targets(
+-        TARGET gflags
+-        INSTALL_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/thirdparty/gflags/gflags/include/gflags"
+-        INSTALL_DESTIONATION "developer_package/include/gflags")
++    # Prefer system gflags if available (Fedora provides gflags-devel)
++    find_package(gflags QUIET)
++    if(gflags_FOUND AND TARGET gflags)
++        message(STATUS "Using system gflags")
++    else()
++        add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
++        ov_developer_package_export_targets(
++            TARGET gflags
++            INSTALL_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/thirdparty/gflags/gflags/include/gflags"
++            INSTALL_DESTIONATION "developer_package/include/gflags")
++    endif()
+ endif()
+ 
+ #

                 reply	other threads:[~2026-06-11 16:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178119426061.1.1418472612643375121.rpms-openvino-0f1cf41c165e@fedoraproject.org \
    --to=aaron.chun.yew.chan@intel.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox