Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
conda
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bob
conda
Commits
3def42d8
Commit
3def42d8
authored
Nov 18, 2020
by
Vincent POLLET
Committed by
Amir MOHAMMADI
Nov 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable QT
parent
c52e1372
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
conda/opencv/build.sh
conda/opencv/build.sh
+1
-1
conda/opencv/meta.yaml
conda/opencv/meta.yaml
+0
-3
No files found.
conda/opencv/build.sh
View file @
3def42d8
...
...
@@ -8,7 +8,7 @@ MACHINE_STR=$(uname -m)
# https://gitlab.kitware.com/cmake/cmake/blob/master/Modules/FindPNG.cmake#L55
ln
-s
$PREFIX
/include/libpng16
$PREFIX
/include/libpng
QT
=
"
5
"
QT
=
"
OFF
"
V4L
=
"1"
if
[
"
${
SHORT_OS_STR
:0:5
}
"
==
"Linux"
]
;
then
...
...
conda/opencv/meta.yaml
View file @
3def42d8
...
...
@@ -83,14 +83,12 @@ requirements:
-
harfbuzz {{ harfbuzz }}
# [unix]
-
libpng {{ libpng }}
-
ffmpeg {{ ffmpeg }}
# [not win]
-
qt 5.9.*
# [not osx and not aarch64 and not ppc64le]
-
freetype {{ freetype }}
-
glib {{ glib }}
# [unix]
run
:
-
{{
pin_compatible('harfbuzz')
}}
# [unix]
# Don't depend on python in the run section
# py-opencv will depend on python
-
qt 5.9.*
# [not osx and not aarch64 and not ppc64le]
# https://github.com/conda-forge/opencv-feedstock/issues/174
# Seems like the OSX ABI has changed between 2.9 and 2.10???
# That or a dependency wasn't merged in
...
...
@@ -107,7 +105,6 @@ test:
-
nomkl
# [blas_impl == 'openblas']
-
cmake
-
ninja
-
qt 5.9.*
# [linux64]
files
:
-
CMakeLists.txt
-
test.cpp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment