From e3128f98885df886ea76467c66f2ca35b3104acd Mon Sep 17 00:00:00 2001 From: Abdelaziz Mahdy Date: Wed, 24 Jul 2024 15:12:34 +0300 Subject: [PATCH 1/2] enable vulkan --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e4f6f98..1b31ad6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -183,7 +183,7 @@ class OcvDartDesktop(ConanFile): "with_obsensor": False, "with_ipp": "opencv-icv", "with_protobuf": True, - "with_vulkan": False, + "with_vulkan": True, # imgcodecs module options "with_avif": False, "with_jpeg": "libjpeg-turbo", From 0fa695e7e2be803caac4372e2350fcccaac29d36 Mon Sep 17 00:00:00 2001 From: rainy liu Date: Wed, 24 Jul 2024 21:40:20 +0800 Subject: [PATCH 2/2] disable ffmpeg from conan for linux --- .github/workflows/build_test_release.yaml | 7 +++++-- conanfile.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test_release.yaml b/.github/workflows/build_test_release.yaml index 9c1548b..4a3c22a 100644 --- a/.github/workflows/build_test_release.yaml +++ b/.github/workflows/build_test_release.yaml @@ -1,4 +1,4 @@ -name: OPENCV build release +name: build release on: push: @@ -82,7 +82,10 @@ jobs: run: | sudo apt-get update sudo apt-get install -y curl git wget python3 unzip build-essential \ - libgtk-3-dev python3-pip + libgtk-3-dev ffmpeg libavcodec-dev \ + cmake ninja-build libavformat-dev libavutil-dev \ + libswscale-dev libgflags-dev \ + libjpeg-dev libpng-dev libtiff-dev python3-pip python3 -m pip install conan conan profile detect -f diff --git a/conanfile.py b/conanfile.py index 1b31ad6..8878f17 100644 --- a/conanfile.py +++ b/conanfile.py @@ -386,8 +386,8 @@ def build_requirements(self): # build ffmpeg only for linux, on macos, install with brew, # on windows use prebuilt dll # android and ios are unsupported - if self.settings.os == "Linux": - self.tool_requires("ffmpeg/6.1") + # if self.settings.os == "Linux": + # self.tool_requires("ffmpeg/6.1") if self.settings.os != "Windows": self.tool_requires("ninja/1.11.1")