Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43530661
opencv-python
提交
602a8be9
O
opencv-python
项目概览
weixin_43530661
/
opencv-python
与 Fork 源项目一致
Fork自
OpenCV / opencv-python
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
602a8be9
编写于
3月 03, 2022
作者:
A
Andrey Senyaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Defined ffmpeg version for macos (4.4.1) and fixed MacOS build
上级
141a763d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
28 deletion
+10
-28
.github/workflows/build_wheels_macos.yml
.github/workflows/build_wheels_macos.yml
+1
-0
travis_config.sh
travis_config.sh
+9
-28
未找到文件。
.github/workflows/build_wheels_macos.yml
浏览文件 @
602a8be9
...
...
@@ -55,6 +55,7 @@ jobs:
USE_CCACHE
:
1
UNICODE_WIDTH
:
32
PLAT
:
x86_64
FFMPEG_FORMULA_VERSION
:
'
@4'
SDIST
:
${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS
:
${{ matrix.without_gui }}
ENABLE_CONTRIB
:
${{ matrix.with_contrib }}
...
...
travis_config.sh
浏览文件 @
602a8be9
...
...
@@ -50,7 +50,7 @@ if [ -n "$IS_OSX" ]; then
function
generate_ffmpeg_formula
{
local
FF
=
"ffmpeg"
local
LFF
=
"ffmpeg_opencv"
local
FF_FORMULA
;
FF_FORMULA
=
$(
brew formula
"
$
FF
"
)
local
FF_FORMULA
;
FF_FORMULA
=
$(
brew formula
"
$
{
FF
}${
FFMPEG_FORMULA_VERSION
}
"
)
local
LFF_FORMULA
;
LFF_FORMULA
=
"
$(
dirname
"
$FF_FORMULA
"
)
/
${
LFF
}
.rb"
local
REGENERATE
...
...
@@ -70,8 +70,9 @@ if [ -n "$IS_OSX" ]; then
if
[
-n
"
$REGENERATE
"
]
;
then
echo
"Regenerating custom ffmpeg formula"
# Bottle block syntax: https://docs.brew.sh/Bottles#bottle-dsl-domain-specific-language
# FfmpegAT4 is a class in ffmpeg@4 formula
perl
-wpe
'BEGIN {our ($found_blank, $bottle_block);}
if (/(^class )(Ffmpeg
)(\s.*)/) {$_=$1.$2."
Opencv".$3."\n"; next;}
if (/(^class )(Ffmpeg
AT4)(\s.*)/) {$_=$1."Ffmpeg
Opencv".$3."\n"; next;}
if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;}
if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; }
if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; }
...
...
@@ -111,34 +112,14 @@ function pre_build {
CACHE_STAGE
=
export
HOMEBREW_NO_AUTO_UPDATE
=
1
#after the cache stage, all bottles and Homebrew metadata should be already cached locally
# if [ -n "$CACHE_STAGE" ]; then
# brew update
# generate_ffmpeg_formula
# brew_add_local_bottles
# fi
echo
'Installing FFmpeg'
# if [ -n "$CACHE_STAGE" ]; then
# brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
# else
brew update
generate_ffmpeg_formula
brew_add_local_bottles
# brew unlink python@2
brew
install
--build-bottle
ffmpeg_opencv
# fi
# echo 'Installing qt5'
# if [ -n "$CACHE_STAGE" ]; then
# echo "Qt5 has bottle, no caching needed"
# else
# brew switch qt 5.13.2
# brew pin qt
# export PATH="/usr/local/opt/qt/bin:$PATH"
# fi
brew update
generate_ffmpeg_formula
brew_add_local_bottles
brew
install
--build-bottle
ffmpeg_opencv
# It needs when we use not the latest ffmpeg formula
brew
link
ffmpeg_opencv
if
[
-n
"
$CACHE_STAGE
"
]
;
then
brew_go_bootstrap_mode 0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录