8000 Merge pull request #932 from asmorkalov/as/pre-4.9.0_linux_upgrade · ArtificialZeng/opencv-python@ea3538a · GitHub
[go: up one dir, main page]
Skip to content

Commit ea3538a

Browse files
asmorkalovasmorkalov
authored
Merge pull request opencv#932 from asmorkalov/as/pre-4.9.0_linux_upgrade
Linux environment update for release 4.9.0
2 parents c886152 + f5c47b3 commit ea3538a

File tree

5 files changed

+13
-11
lines changed
  • build_wheels_linux_arm.yml
  • docker/manylinux2014

    • 5 files changed

    +13
    -11
    lines changed

    ‎.github/workflows/build_wheels_linux.yml

    Lines changed: 2 additions & 2 deletions
    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:20231006
    44+
    DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
    4545
    USE_CCACHE: 0
    4646
    UNICODE_WIDTH: 32
    4747
    PLAT: x86_64
    @@ -139,7 +139,7 @@ jobs:
    139139
    NP_TEST_DEP: numpy==1.19.4
    140140
    TRAVIS_BUILD_DIR: ${{ github.workspace }}
    141141
    CONFIG_PATH: travis_config.sh
    142-
    DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
    142+
    DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
    143143
    USE_CCACHE: 1
    144144
    UNICODE_WIDTH: 32
    145145
    SDIST: ${{ matrix.build_sdist || 0 }}

    ‎.github/workflows/build_wheels_linux_arm.yml

    Lines 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:20231109
    45+
    DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231225
    4646
    USE_CCACHE: 0
    4747
    UNICODE_WIDTH: 32
    4848
    SDIST: ${{ matrix.build_sdist || 0 }}

    ‎docker/manylinux2014/Dockerfile_aarch64

    Lines changed: 4 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,13 @@
    1-
    # Version: 20231006
    1+
    # Version: 20231225
    22
    # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
    33

    44
    FROM quay.io/pypa/manylinux2014_aarch64:latest
    55

    66
    ARG CCACHE_VERSION=3.7.9
    7-
    ARG FFMPEG_VERSION=5.1.3
    7+
    ARG FFMPEG_VERSION=5.1.4
    88
    ARG FREETYPE_VERSION=2.13.2
    99
    ARG LIBPNG_VERSION=1.6.40
    10+
    ARG VPX_VERSION=v1.13.1
    1011
    ARG NASM_VERSION=2.15.04
    1112
    ARG OPENSSL_VERSION=1_1_1w
    1213
    ARG QT_VERSION=5.15.0
    @@ -93,7 +94,7 @@ RUN mkdir ~/yasm_sources && \
    9394

    9495
    RUN mkdir ~/libvpx_sources && \
    9596
    cd ~/libvpx_sources && \
    96-
    git clone --depth 1 https://github.com/webmproject/libvpx.git && \
    97+
    git clone --depth 1 -b ${VPX_VERSION} https://github.com/webmproject/libvpx.git && \
    9798
    cd libvpx && \
    9899
    ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
    99100
    make -j$(getconf _NPROCESSORS_ONLN) && \

    ‎docker/manylinux2014/Dockerfile_i686

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
    22

    33
    ARG CCACHE_VERSION=3.7.9
    44
    ARG CMAKE_VERSION=3.17.0
    5-
    ARG FFMPEG_VERSION=5.1.2
    5+
    ARG FFMPEG_VERSION=5.1.4
    66
    ARG NASM_VERSION=2.15.04
    7-
    ARG OPENSSL_VERSION=1_1_1s
    7+
    ARG OPENSSL_VERSION=1_1_1w
    88
    ARG QT_VERSION=5.15.0
    99
    ARG YASM_VERSION=1.3.0
    1010

    ‎docker/manylinux2014/Dockerfile_x86_64

    Lines changed: 4 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,13 @@
    1-
    # Version: 20231109
    1+
    # Version: 20231225
    22
    # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
    33

    44
    FROM quay.io/pypa/manylinux2014_x86_64:latest
    55

    66
    ARG CCACHE_VERSION=3.7.9
    7-
    ARG FFMPEG_VERSION=5.1.3
    7+
    ARG FFMPEG_VERSION=5.1.4
    88
    ARG FREETYPE_VERSION=2.13.2
    99
    ARG LIBPNG_VERSION=1.6.40
    10+
    ARG VPX_VERSION=v1.13.1
    1011
    ARG NASM_VERSION=2.15.04
    1112
    ARG OPENSSL_VERSION=1_1_1w
    1213
    ARG QT_VERSION=5.15.0
    @@ -92,7 +93,7 @@ RUN mkdir ~/yasm_sources && \
    9293

    9394
    RUN mkdir ~/libvpx_sources && \
    9495
    cd ~/libvpx_sources && \
    95-
    git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
    96+
    git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
    9697
    cd libvpx && \
    9798
    ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
    9899
    make -j$(getconf _NPROCESSORS_ONLN) && \

    0 commit comments

    Comments
     (0)
    0