Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7ebbdc3

Browse filesBrowse files
asmorkalovasmorkalov
authored
Merge pull request opencv#756 from asmorkalov:as/pipelines_update_4.7
Pipelines update for FFmpeg 5 and security fixes
2 parents ede2269 + 2b57f53 commit 7ebbdc3
Copy full SHA for 7ebbdc3

9 files changed

+17
-19
lines changed

‎.github/workflows/build_wheels_linux.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
MB_ML_VER: 2014
4242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4343
CONFIG_PATH: travis_config.sh
44-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220824
44+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20221205
4545
USE_CCACHE: 0
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64

‎.github/workflows/build_wheels_linux_arm.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_linux_arm.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
MB_ML_VER: 2014
4343
TRAVIS_BUILD_DIR: ${{ github.workspace }}
4444
CONFIG_PATH: travis_config.sh
45-
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824
45+
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20221205
4646
USE_CCACHE: 0
4747
UNICODE_WIDTH: 32
4848
SDIST: ${{ matrix.build_sdist || 0 }}

‎.github/workflows/build_wheels_macos.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos.yml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
USE_CCACHE: 1
4646
UNICODE_WIDTH: 32
4747
PLAT: x86_64
48-
FFMPEG_FORMULA_VERSION: '@4'
4948
SDIST: ${{ matrix.build_sdist || 0 }}
5049
ENABLE_HEADLESS: ${{ matrix.without_gui }}
5150
ENABLE_CONTRIB: ${{ matrix.with_contrib }}

‎docker/manylinux2014/Dockerfile_aarch64

Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_aarch64
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20220824
1+
# Version: 20221205
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
33

44
FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -11,13 +11,13 @@ ARG NASM_VERSION=2.15.04
1111
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
14-
ARG ZLIB_VERSION=1.2.12
14+
ARG ZLIB_VERSION=1.2.13
1515

1616
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1717

1818
# epel-release need for aarch64 to get openblas packages
1919
RUN yum install bzip2-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
20-
yum install openblas-devel -y && \
20+
yum install openblas-devel dejavu-sans-fonts -y && \
2121
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2222
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
2323
# libpng will be built from source

‎docker/manylinux2014/Dockerfile_x86_64

Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_x86_64
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version: 20220824
1+
# Version: 20221205
22
# Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
33

44
FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -11,13 +11,13 @@ ARG NASM_VERSION=2.15.04
1111
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
14-
ARG ZLIB_VERSION=1.2.12
14+
ARG ZLIB_VERSION=1.2.13
1515

1616
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1717

1818
# epel-release need for aarch64 to get openblas packages
1919
RUN yum install bzip2-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
20-
yum install openblas-devel -y && \
20+
yum install openblas-devel dejavu-sans-fonts -y && \
2121
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2222
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
2323
# libpng will be built from source

‎opencv

Copy file name to clipboard
Submodule opencv updated 1020 files

‎opencv_contrib

Copy file name to clipboard
Submodule opencv_contrib updated 133 files

‎opencv_extra

Copy file name to clipboard
Submodule opencv_extra updated 513 files

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ if [ -n "$IS_OSX" ]; then
5050

5151
BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \
5252
"cmake 15" \
53-
"ffmpeg_opencv 10" \
53+
"ffmpeg 10" \
5454
)
5555

5656
function generate_ffmpeg_formula {
5757
local FF="ffmpeg"
58-
local LFF="ffmpeg_opencv"
59-
local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}${FFMPEG_FORMULA_VERSION}")
58+
local LFF="ffmpeg"
59+
local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}")
6060
local LFF_FORMULA; LFF_FORMULA="$(dirname "$FF_FORMULA")/${LFF}.rb"
6161

6262
local REGENERATE
@@ -76,9 +76,8 @@ if [ -n "$IS_OSX" ]; then
7676
if [ -n "$REGENERATE" ]; then
7777
echo "Regenerating custom ffmpeg formula"
7878
# Bottle block syntax: https://docs.brew.sh/Bottles#bottle-dsl-domain-specific-language
79-
# FfmpegAT4 is a class in ffmpeg@4 formula
8079
perl -wpe 'BEGIN {our ($found_blank, $bottle_block);}
81-
if (/(^class )(FfmpegAT4)(\s.*)/) {$_=$1."FfmpegOpencv".$3."\n"; next;}
80+
if (/(^class )(Ffmpeg)(\s.*)/) {$_=$1."Opencv".$3."\n"; next;}
8281
if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;}
8382
if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; }
8483
if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; }
@@ -118,9 +117,9 @@ function pre_build {
118117
brew update
119118
generate_ffmpeg_formula
120119
brew_add_local_bottles
121-
brew install --build-bottle ffmpeg_opencv
120+
brew install --build-bottle ffmpeg
122121
# It needs when we use not the latest ffmpeg formula
123-
brew link ffmpeg_opencv
122+
brew link ffmpeg
124123

125124
if [ -n "$CACHE_STAGE" ]; then
126125
brew_go_bootstrap_mode 0

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.