Skip to content

Commit

Permalink
Merge pull request #6 from abdelaziz-mahdy/patch-1
Browse files Browse the repository at this point in the history
enable vulkan
  • Loading branch information
rainyl authored Jul 24, 2024
2 parents 899bc69 + 0fa695e commit fa580fd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build_test_release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: OPENCV build release
name: build release

on:
push:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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")

Expand Down

0 comments on commit fa580fd

Please sign in to comment.