From 2585d6f6b39141e3e3d1b9ffd52f4faed3d0296e Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Mon, 1 Aug 2022 09:21:27 +0300
Subject: [PATCH 01/65] Run pipelines on 4.x and 5.x branches (#697)

---
 .github/workflows/build_wheels_linux.yml     | 2 ++
 .github/workflows/build_wheels_linux_arm.yml | 2 ++
 .github/workflows/build_wheels_macos.yml     | 2 ++
 .github/workflows/build_wheels_macos_m1.yml  | 2 ++
 .github/workflows/build_wheels_windows.yml   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 98ad3dc8..76a6d649 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 3.4
+      - 4.x
+      - 5.x
     paths-ignore:
       - '.github/workflows/build_wheels_linux_arm.yml'
       - '.github/workflows/build_wheels_windows*'
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 4d0c3daf..0a4dadbc 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 3.4
+      - 4.x
+      - 5.x
     paths-ignore:
       - '.github/workflows/build_wheels_linux.yml'
       - '.github/workflows/build_wheels_windows*'
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index af892101..438373bb 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 3.4
+      - 4.x
+      - 5.x
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_windows*'
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index a1d7c924..134d5450 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 3.4
+      - 4.x
+      - 5.x
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_windows*'
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index 087efc04..f7d2c408 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - 3.4
+      - 4.x
+      - 5.x
     paths-ignore:
       - '.github/workflows/build_wheels_linux*'
       - '.github/workflows/build_wheels_macos*'

From 615f3dff836d820398105b82b6ada39d0155cbdc Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Wed, 3 Aug 2022 15:12:49 +0300
Subject: [PATCH 02/65] Scheduled rolling workflows (#699)

* Scheduled rolling workflows

* Fixed a bug in commit/date for package version

* Changed the name of Windows pipelines
---
 .github/workflows/build_wheels_linux.yml     | 96 ++++++++++++++------
 .github/workflows/build_wheels_linux_arm.yml | 80 ++++++++++++----
 .github/workflows/build_wheels_macos.yml     | 78 +++++++++++-----
 .github/workflows/build_wheels_macos_m1.yml  | 81 +++++++++++++----
 .github/workflows/build_wheels_windows.yml   | 76 ++++++++++++----
 find_version.py                              | 13 ++-
 scripts/build.sh                             |  1 +
 scripts/install.sh                           |  1 +
 setup.py                                     | 39 +++++---
 9 files changed, 345 insertions(+), 120 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 76a6d649..a0933da5 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -1,4 +1,4 @@
-name: Build PYPI wheels for opencv-python on Linux x86_64
+name: Linux x86_64
 
 on:
   pull_request:
@@ -13,10 +13,13 @@ on:
       - '.github/workflows/build_wheels_macos*'
   release:
     types: [published, edited]
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
 
 
 jobs:
-  build:
+  Build:
     runs-on: ubuntu-20.04
     defaults:
       run:
@@ -32,7 +35,7 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: master
+      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -50,29 +53,33 @@ jobs:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
-    - name: Update submodules
-      if: github.event_name == 'pull_request'
-      run: git submodule update --remote
     - name: Build a package
       run: source scripts/build.sh
     - name: Saving all wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: wheelhouse/opencv*.whl
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
 
-  test:
-    needs: [build]
+  Test:
+    needs: [Build]
     runs-on: ubuntu-20.04
     defaults:
       run:
@@ -97,21 +104,21 @@ jobs:
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
     - name: Package installation and run tests
       run: source scripts/install.sh
 
-  build_sdist:
+  Build_sdist:
     runs-on: ubuntu-20.04
     defaults:
       run:
@@ -127,7 +134,7 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: master
+      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       PLAT: x86_64
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -142,20 +149,25 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui || 0 }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib || 0 }}
+      ENABLE_ROLLING: 1
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
-    - name: Update submodules
-      if: github.event_name == 'pull_request'
-      run: git submodule update --remote
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
@@ -172,21 +184,51 @@ jobs:
         set -x
         echo "skipping tests because of sdist"
     - name: saving artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: dist/opencv*.tar.gz
 
-  test_release_opencv_python:
+  Release_rolling:
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    needs: [Build, Build_sdist, Test]
+    runs-on: ubuntu-20.04
+    environment: opencv-python-rolling-release
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse/
+      - name: Upload wheels for opencv_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-* wheelhouse/opencv-python-rolling-[^h]*
+      - name: Upload wheels for opencv_contrib_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-* wheelhouse/opencv-contrib-python-rolling-[^h]*
+      - name: Upload wheels for opencv_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-* wheelhouse/opencv-python-headless-rolling-*
+      - name: Upload wheels for opencv_contrib_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-* wheelhouse/opencv-contrib-python-headless-rolling-*
+
+  Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [build, build_sdist, test]
+    needs: [Build, Build_sdist, Test]
     runs-on: ubuntu-20.04
     environment: test-opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
@@ -195,16 +237,16 @@ jobs:
           python -m pip install twine
           python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_* wheelhouse/opencv-*
 
-  release_opencv_python:
+  Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [build, build_sdist, test]
+    needs: [Build, Build_sdist, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 0a4dadbc..d2c5ea35 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -1,4 +1,4 @@
-name: Build PYPI wheels for opencv-python on Linux ARM
+name: Linux ARM64
 
 on:
   pull_request:
@@ -13,10 +13,13 @@ on:
       - '.github/workflows/build_wheels_macos*'
   release:
     types: [published, edited]
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
 
 
 jobs:
-  build_arm:
+  Build:
     runs-on: opencv-cn-lin-arm64
     defaults:
       run:
@@ -32,7 +35,7 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: master
+      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -47,31 +50,36 @@ jobs:
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
     steps:
-    - name: UID
-      run: id -u
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
     - name: Build a package
       run: source scripts/build.sh
     - name: Saving all wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: wheelhouse/opencv*.whl
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
 
-  test:
-    needs: [build_arm]
+  Test:
+    needs: [Build]
     runs-on: opencv-cn-lin-arm64
     defaults:
       run:
@@ -88,6 +96,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       PLAT: aarch64
+      BUILD_COMMIT: ${{ github.ref }}
       NP_TEST_DEP: numpy==1.19.4
       NP_TEST_DEP_LATEST: numpy==1.21.4
       CONFIG_PATH: travis_config.sh
@@ -97,31 +106,66 @@ jobs:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
     - name: Package installation and run tests
       run: source scripts/install.sh
 
-  test_release_opencv_python:
+  Release_rolling:
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    needs: [Build, Test]
+    runs-on: ubuntu-20.04
+    environment: opencv-python-rolling-release
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse/
+      - name: Upload wheels for opencv_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-*
+      - name: Upload wheels for opencv_contrib_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-*
+      - name: Upload wheels for opencv_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-*
+      - name: Upload wheels for opencv_contrib_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-*
+
+  Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [build_arm, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: test-opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
@@ -130,16 +174,16 @@ jobs:
           python -m pip install twine
           python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_*
 
-  release_opencv_python:
+  Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [build_arm, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 438373bb..5b110fb7 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -1,4 +1,4 @@
-name: Build PYPI wheels for opencv-python on Macos
+name: macOS x86_64
 
 on:
   pull_request:
@@ -13,10 +13,13 @@ on:
       - '.github/workflows/build_wheels_macos_m1.yml'
   release:
     types: [published, edited]
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
 
 
 jobs:
-  build:
+  Build:
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -44,7 +47,7 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: master
+      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -52,7 +55,6 @@ jobs:
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       TRAVIS_OS_NAME: osx
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -64,14 +66,18 @@ jobs:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
-    - name: Update submodules
-      if: github.event_name == 'pull_request'
-      run: git submodule update --remote
     - name: Build a package
       run: |
         set -e
@@ -90,18 +96,18 @@ jobs:
         set -x
         build_wheel $REPO_DIR $PLAT
     - name: Saving all wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: wheelhouse/opencv*.whl
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
 
-  test:
-    needs: [build]
+  Test:
+    needs: [Build]
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -140,19 +146,19 @@ jobs:
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
     - name: Setup Environment variables
       run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
@@ -171,16 +177,46 @@ jobs:
         cd ${{ github.workspace }}/tests
         python -m pylint $PYLINT_TEST_FILE
 
-  test_release_opencv_python:
+  Release_rolling:
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    needs: [Build, Test]
+    runs-on: ubuntu-20.04
+    environment: opencv-python-rolling-release
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse/
+      - name: Upload wheels for opencv_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-*
+      - name: Upload wheels for opencv_contrib_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-*
+      - name: Upload wheels for opencv_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-*
+      - name: Upload wheels for opencv_contrib_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-*
+
+  Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [build, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: test-opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
@@ -189,16 +225,16 @@ jobs:
           python -m pip install twine
           python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_*
 
-  release_opencv_python:
+  Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [build, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 134d5450..91d70ff3 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -1,4 +1,4 @@
-name: Build PYPI wheels for opencv-python on Macos M1
+name: macOS ARM64
 
 on:
   pull_request:
@@ -13,10 +13,13 @@ on:
       - '.github/workflows/build_wheels_macos.yml'
   release:
     types: [published, edited]
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
 
 
 jobs:
-  build:
+  Build:
     runs-on: opencv-cn-mac-arm64
     strategy:
       fail-fast: false
@@ -27,6 +30,7 @@ jobs:
         without_gui: [0, 1]
         build_sdist: [0]
     env:
+      BUILD_COMMIT: ${{ github.ref }}
       CI_BUILD: 1
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
@@ -35,14 +39,18 @@ jobs:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
-    - name: Update submodules
-      if: github.event_name == 'pull_request'
-      run: git submodule update --remote
     - name: Build a package
       run: |
         git submodule update --init multibuild
@@ -53,18 +61,18 @@ jobs:
         arch -arm64 python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
         delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
     - name: Saving all wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: wheelhouse/opencv*.whl
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
 
-  test:
-    needs: [build]
+  Test:
+    needs: [Build]
     runs-on: opencv-cn-mac-arm64-tests
     strategy:
       fail-fast: false
@@ -75,19 +83,25 @@ jobs:
         without_gui: [0, 1]
         build_sdist: [0]
     env:
+      BUILD_COMMIT: ${{ github.ref }}
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
       PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      run: |
+        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
+          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
     - name: Download a wheel accordingly to matrix
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
@@ -106,35 +120,64 @@ jobs:
         cd ${{ github.workspace }}/tests
         arch -arm64 python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
 
-  test_release_opencv_python:
+  Release_rolling:
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    needs: [Build, Test]
+    runs-on: ubuntu-20.04
+    environment: opencv-python-rolling-release
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse/
+      - name: Upload wheels for opencv_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-*
+      - name: Upload wheels for opencv_contrib_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-*
+      - name: Upload wheels for opencv_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-*
+      - name: Upload wheels for opencv_contrib_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-*
+
+  Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [build, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: test-opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
-
       - name: Upload all wheels
         run: |
           python -m pip install twine
           python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_*
 
-  release_opencv_python:
+  Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [build, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index f7d2c408..f8970768 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -1,4 +1,4 @@
-name: Build PYPI wheels for opencv-python on Windows
+name: Windows x86_64
 
 on:
   pull_request:
@@ -12,10 +12,13 @@ on:
       - '.github/workflows/build_wheels_macos*'
   release:
     types: [published, edited]
+  schedule:
+    - cron: '0 3 * * 6'
+  workflow_dispatch:
 
 
 jobs:
-  build-windows-x86_64:
+  Build:
     runs-on: windows-2019
     strategy:
       fail-fast: false
@@ -38,16 +41,19 @@ jobs:
         rm -rf ./* || true
         rm -rf ./.??* || true
       working-directory: ${{ github.workspace }}
+    - name: Setup environment
+      shell: bash
+      run: |
+        if [[ "${{ github.event_name }}" == "schedule" ]]; then
+          echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
+        fi
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
-    - name: Update submodules
-      if: github.event_name == 'pull_request'
-      run: git submodule update --remote
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
@@ -62,18 +68,18 @@ jobs:
         set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp36 --dist-dir=%cd%\wheelhouse -v
       shell: cmd
     - name: Saving all wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheels
         path: wheelhouse/opencv*.whl
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
         path: wheelhouse/opencv*
 
-  test:
-    needs: [build-windows-x86_64]
+  Test:
+    needs: [Build]
     runs-on: windows-2019
     defaults:
       run:
@@ -98,17 +104,17 @@ jobs:
         rm -rf ./.??* || true
       working-directory: ${{ github.workspace }}
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
     - name: Download a wheel accordingly to matrix
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
         path: wheelhouse/
@@ -129,16 +135,46 @@ jobs:
         cd ${{ github.workspace }}\tests
         python -m pylint $PYLINT_TEST_FILE
 
-  test_release_opencv_python:
+  Release_rolling:
+    if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    needs: [Build, Test]
+    runs-on: ubuntu-20.04
+    environment: opencv-python-rolling-release
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse/
+      - name: Upload wheels for opencv_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-*
+      - name: Upload wheels for opencv_contrib_python_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-*
+      - name: Upload wheels for opencv_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-*
+      - name: Upload wheels for opencv_contrib_python_headless_rolling
+        run: |
+          python -m pip install twine
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-*
+
+  Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease
-    needs: [build-windows-x86_64, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: test-opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
@@ -147,16 +183,16 @@ jobs:
           python -m pip install twine
           python -m twine upload --repository testpypi -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} --skip-existing wheelhouse/opencv_*
 
-  release_opencv_python:
+  Release:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    needs: [build-windows-x86_64, test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-release
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
           path: wheelhouse/
diff --git a/find_version.py b/find_version.py
index 6c676b23..274c93e6 100644
--- a/find_version.py
+++ b/find_version.py
@@ -1,11 +1,12 @@
 import sys
-import os
 import subprocess
+from datetime import date
 
 if __name__ == "__main__":
     contrib = sys.argv[1]
     headless = sys.argv[2]
-    ci_build = sys.argv[3]
+    rolling = sys.argv[3]
+    ci_build = sys.argv[4]
 
     opencv_version = ""
     # dig out the version from OpenCV sources
@@ -56,13 +57,19 @@
         # tag identifies the build and should be a sequential revision number
         version = tag[0]
         opencv_version += ".{}".format(version)
+    # rolling has converted into string using get_and_set_info() function in setup.py
+    elif rolling == "True":
+        # rolling version identifier, will be published in a dedicated rolling PyPI repository
+        version = date.today().strftime('%Y%m%d')
+        opencv_version += ".{}".format(version)
     else:
         # local version identifier, not to be published on PyPI
         version = git_hash
-        opencv_version += "+{}".format(version)
+        opencv_version += ".{}".format(version)
 
     with open("cv2/version.py", "w") as f:
         f.write('opencv_version = "{}"\n'.format(opencv_version))
         f.write("contrib = {}\n".format(contrib))
         f.write("headless = {}\n".format(headless))
+        f.write("rolling = {}\n".format(rolling))
         f.write("ci_build = {}".format(ci_build))
diff --git a/scripts/build.sh b/scripts/build.sh
index f48ca066..e5c83d83 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -13,5 +13,6 @@ source multibuild/travis_steps.sh
 # source travis_multibuild_customize.sh
 echo $ENABLE_CONTRIB > contrib.enabled
 echo $ENABLE_HEADLESS > headless.enabled
+echo $ENABLE_ROLLING > rolling.enabled
 set -x
 build_wheel $REPO_DIR $PLAT
diff --git a/scripts/install.sh b/scripts/install.sh
index 6e019d1c..f20080ae 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -13,6 +13,7 @@ source multibuild/travis_steps.sh
 # source travis_multibuild_customize.sh
 echo $ENABLE_CONTRIB > contrib.enabled
 echo $ENABLE_HEADLESS > headless.enabled
+echo $ENABLE_ROLLING > rolling.enabled
 set -x
 install_run $PLAT
 set +x
diff --git a/setup.py b/setup.py
index 11014d6b..dd44ae8f 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ def main():
     build_contrib = get_build_env_var_by_name("contrib")
     build_headless = get_build_env_var_by_name("headless")
     build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
+    build_rolling = get_build_env_var_by_name("rolling")
 
     install_requires = [
         'numpy>=1.13.3; python_version<"3.7"',
@@ -46,17 +47,28 @@ def main():
         g = git.Git()  # NOTE: pip API's are internal, this has to be refactored
 
         g.run_command(["submodule", "sync"])
-        g.run_command(
-            ["submodule", "update", "--init", "--recursive", cmake_source_dir]
-        )
 
-        if build_contrib:
+        if build_rolling:
+            g.run_command(
+                ["submodule", "update", "--init", "--recursive", "--remote", cmake_source_dir]
+            )
+
+            if build_contrib:
+                g.run_command(
+                    ["submodule", "update", "--init", "--recursive", "--remote", "opencv_contrib"]
+                )
+        else:
             g.run_command(
-                ["submodule", "update", "--init", "--recursive", "opencv_contrib"]
+                ["submodule", "update", "--init", "--recursive", cmake_source_dir]
             )
 
-    package_version, build_contrib, build_headless = get_and_set_info(
-        build_contrib, build_headless, is_CI_build
+            if build_contrib:
+                g.run_command(
+                    ["submodule", "update", "--init", "--recursive", "opencv_contrib"]
+                )
+
+    package_version, build_contrib, build_headless, build_rolling = get_and_set_info(
+        build_contrib, build_headless, build_rolling, is_CI_build
     )
 
     # https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode
@@ -73,6 +85,9 @@ def main():
     if build_headless and not build_contrib:
         package_name = "opencv-python-headless"
 
+    if build_rolling:
+        package_name += "-rolling"
+
     long_description = io.open("README.md", encoding="utf-8").read()
 
     packages = ["cv2", "cv2.data"]
@@ -245,14 +260,14 @@ def main():
     skbuild.setup(
         name=package_name,
         version=package_version,
-        url="https://github.com/skvark/opencv-python",
+        url="https://github.com/opencv/opencv-python",
         license="MIT",
         description="Wrapper package for OpenCV python bindings.",
         long_description=long_description,
         long_description_content_type="text/markdown",
         packages=packages,
         package_data=package_data,
-        maintainer="Olli-Pekka Heinisuo",
+        maintainer="OpenCV Team",
         ext_modules=EmptyListWithLength(),
         install_requires=install_requires,
         python_requires=">=3.6",
@@ -446,7 +461,7 @@ def _classify_installed_files_override(
         )
 
 
-def get_and_set_info(contrib, headless, ci_build):
+def get_and_set_info(contrib, headless, rolling, ci_build):
     # cv2/version.py should be generated by running find_version.py
     version = {}
     here = os.path.abspath(os.path.dirname(__file__))
@@ -456,14 +471,14 @@ def get_and_set_info(contrib, headless, ci_build):
     # (in sdists the version.py file already exists)
     if os.path.exists(".git"):
         old_args = sys.argv.copy()
-        sys.argv = ["", str(contrib), str(headless), str(ci_build)]
+        sys.argv = ["", str(contrib), str(headless), str(rolling), str(ci_build)]
         runpy.run_path("find_version.py", run_name="__main__")
         sys.argv = old_args
 
     with open(version_file) as fp:
         exec(fp.read(), version)
 
-    return version["opencv_version"], version["contrib"], version["headless"]
+    return version["opencv_version"], version["contrib"], version["headless"], version["rolling"]
 
 
 def get_build_env_var_by_name(flag_name):

From 60630d15f998a5827c8afaf575e7077c28d378a6 Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Fri, 5 Aug 2022 18:43:33 +0300
Subject: [PATCH 03/65] macOS x86_64 runner change to macos-11 (#701)

---
 .github/workflows/build_wheels_macos.yml | 29 +++---------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 5b110fb7..adc3724d 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -20,30 +20,18 @@ on:
 
 jobs:
   Build:
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11]
         python-version: ['3.6']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
         build_sdist: [0]
-        exclude:
-          - os: macos-10.15
-            python-version: '3.10'
-          - os: macos-11
-            python-version: '3.6'
-          - os: macos-11
-            python-version: '3.7'
-          - os: macos-11
-            python-version: '3.8'
-          - os: macos-11
-            python-version: '3.9'
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
@@ -62,6 +50,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
+      MACOSX_DEPLOYMENT_TARGET: 10.15
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
@@ -108,30 +97,18 @@ jobs:
 
   Test:
     needs: [Build]
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11]
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
         build_sdist: [0]
-        exclude:
-          - os: macos-10.15
-            python-version: '3.10'
-          - os: macos-11
-            python-version: '3.6'
-          - os: macos-11
-            python-version: '3.7'
-          - os: macos-11
-            python-version: '3.8'
-          - os: macos-11
-            python-version: '3.9'
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}

From e65f21f7bc82949d3588eb5b0a059cf4706cb807 Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Sun, 21 Aug 2022 13:07:00 +0300
Subject: [PATCH 04/65] Adapted rolling releases to workflow_dispatch event
 (#708)

---
 .github/workflows/build_wheels_linux.yml     | 7 ++++---
 .github/workflows/build_wheels_linux_arm.yml | 3 ++-
 .github/workflows/build_wheels_macos.yml     | 3 ++-
 .github/workflows/build_wheels_macos_m1.yml  | 3 ++-
 .github/workflows/build_wheels_windows.yml   | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index a0933da5..5a09e933 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -57,7 +57,8 @@ jobs:
       run: |
         if [[ "${{ github.event.pull_request }}" == "true" ]]; then
           echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+        fi
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
@@ -149,7 +150,6 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui || 0 }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib || 0 }}
-      ENABLE_ROLLING: 1
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
@@ -158,7 +158,8 @@ jobs:
       run: |
         if [[ "${{ github.event.pull_request }}" == "true" ]]; then
           echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+        fi
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index d2c5ea35..c6b9b4c5 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -57,7 +57,8 @@ jobs:
       run: |
         if [[ "${{ github.event.pull_request }}" == "true" ]]; then
           echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+        fi
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index adc3724d..1ac459cd 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -59,7 +59,8 @@ jobs:
       run: |
         if [[ "${{ github.event.pull_request }}" == "true" ]]; then
           echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+        fi
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 91d70ff3..3d8f9b62 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -43,7 +43,8 @@ jobs:
       run: |
         if [[ "${{ github.event.pull_request }}" == "true" ]]; then
           echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        elif [[ "${{ github.event_name }}" == "schedule" ]]; then
+        fi
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index f8970768..e6874ffe 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Setup environment
       shell: bash
       run: |
-        if [[ "${{ github.event_name }}" == "schedule" ]]; then
+        if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout

From 7bb3e773c1f07b02da94682ef3340dedb4a7f64e Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Mon, 22 Aug 2022 13:37:11 +0300
Subject: [PATCH 05/65] Remove source packages for rolling packages (#711)

---
 .github/workflows/build_wheels_linux.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 5a09e933..a8cdd34e 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -192,7 +192,7 @@ jobs:
 
   Release_rolling:
     if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-    needs: [Build, Build_sdist, Test]
+    needs: [Build, Test]
     runs-on: ubuntu-20.04
     environment: opencv-python-rolling-release
     defaults:
@@ -206,19 +206,19 @@ jobs:
       - name: Upload wheels for opencv_python_rolling
         run: |
           python -m pip install twine
-          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-* wheelhouse/opencv-python-rolling-[^h]*
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_rolling-*
       - name: Upload wheels for opencv_contrib_python_rolling
         run: |
           python -m pip install twine
-          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-* wheelhouse/opencv-contrib-python-rolling-[^h]*
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_rolling-*
       - name: Upload wheels for opencv_python_headless_rolling
         run: |
           python -m pip install twine
-          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-* wheelhouse/opencv-python-headless-rolling-*
+          python -m twine upload -u ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_python_headless_rolling-*
       - name: Upload wheels for opencv_contrib_python_headless_rolling
         run: |
           python -m pip install twine
-          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-* wheelhouse/opencv-contrib-python-headless-rolling-*
+          python -m twine upload -u ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_USERNAME }} -p ${{ secrets.OPENCV_CONTRIB_PYTHON_HEADLESS_ROLLING_PASSWORD }} --skip-existing wheelhouse/opencv_contrib_python_headless_rolling-*
 
   Pre-release:
     if: github.event_name == 'release' && github.event.release.prerelease

From 379d281600b11842f9fd7495efa313077998082d Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Fri, 26 Aug 2022 15:27:15 +0300
Subject: [PATCH 06/65] Build zlib from the source on Linux with the latest
 version (#715)

* Added zlib build from the source on Linux, handling auditwheel issues

* Removed unused variable

* Removed bzip2 from dependencies for OpenCV Python packages
---
 .github/workflows/build_wheels_linux.yml     | 10 +----
 .github/workflows/build_wheels_linux_arm.yml | 12 +-----
 .github/workflows/build_wheels_macos.yml     |  4 --
 .github/workflows/build_wheels_macos_m1.yml  | 10 -----
 docker/manylinux2014/Dockerfile_aarch64      | 29 +++++++++-----
 docker/manylinux2014/Dockerfile_x86_64       | 29 +++++++++-----
 patch_auditwheel_whitelist.py                | 40 ++++++++++++++++----
 7 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index a8cdd34e..ab377325 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -35,14 +35,13 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220824
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -55,9 +54,6 @@ jobs:
       working-directory: ${{ github.workspace }}
     - name: Setup environment
       run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
@@ -135,7 +131,6 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       PLAT: x86_64
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -156,9 +151,6 @@ jobs:
       working-directory: ${{ github.workspace }}
     - name: Setup environment
       run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index c6b9b4c5..079efbe1 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -35,7 +35,6 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -43,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
@@ -55,9 +54,6 @@ jobs:
       working-directory: ${{ github.workspace }}
     - name: Setup environment
       run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
@@ -97,7 +93,6 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       PLAT: aarch64
-      BUILD_COMMIT: ${{ github.ref }}
       NP_TEST_DEP: numpy==1.19.4
       NP_TEST_DEP_LATEST: numpy==1.21.4
       CONFIG_PATH: travis_config.sh
@@ -107,11 +102,6 @@ jobs:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
-    - name: Setup environment
-      run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
     - name: Checkout
       uses: actions/checkout@v3
       with:
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 1ac459cd..1c2a1614 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -35,7 +35,6 @@ jobs:
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
-      BUILD_COMMIT: ${{ github.ref }}
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -57,9 +56,6 @@ jobs:
       working-directory: ${{ github.workspace }}
     - name: Setup environment
       run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 3d8f9b62..b51801ab 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -30,7 +30,6 @@ jobs:
         without_gui: [0, 1]
         build_sdist: [0]
     env:
-      BUILD_COMMIT: ${{ github.ref }}
       CI_BUILD: 1
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
@@ -41,9 +40,6 @@ jobs:
       working-directory: ${{ github.workspace }}
     - name: Setup environment
       run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
@@ -84,18 +80,12 @@ jobs:
         without_gui: [0, 1]
         build_sdist: [0]
     env:
-      BUILD_COMMIT: ${{ github.ref }}
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
       PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
-    - name: Setup environment
-      run: |
-        if [[ "${{ github.event.pull_request }}" == "true" ]]; then
-          echo "BUILD_COMMIT=${{ github.base_ref }}" >> $GITHUB_ENV
-        fi
     - name: Checkout
       uses: actions/checkout@v3
       with:
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 2679cbbf..48ad3f98 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,4 +1,4 @@
-# Version: 20220628
+# Version: 20220824
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -11,16 +11,28 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1o
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
+ARG ZLIB_VERSION=1.2.12
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
-RUN yum install bzip2-devel curl-devel zlib-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 && \
+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 && \
     yum install openblas-devel -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source
-    yum remove libpng -y
+    yum remove libpng zlib-devel bzip2-devel -y
+
+RUN mkdir ~/zlib_sources && \
+    cd ~/zlib_sources && \
+    curl -O -L https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz && \
+    tar -xf zlib-${ZLIB_VERSION}.tar.gz && \
+    cd zlib-${ZLIB_VERSION} && \
+    ./configure --prefix=/usr/local && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf ~/zlib_sources
 
 RUN mkdir ~/libpng_sources && \
     cd ~/libpng_sources && \
@@ -71,8 +83,8 @@ RUN mkdir ~/openssl_sources && \
 
 RUN mkdir ~/nasm_sources && \
     cd ~/nasm_sources && \
-    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
-    tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
+    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.gz && \
+    tar -xf nasm-${NASM_VERSION}.tar.gz && cd nasm-${NASM_VERSION} && ./autogen.sh && \
     ./configure --prefix="/ffmpeg_build" --bindir="$HOME/bin" && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
     make install && \
@@ -102,8 +114,8 @@ RUN mkdir ~/libvpx_sources && \
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
-    curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
-    tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
+    tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \
     cd ffmpeg-${FFMPEG_VERSION} && \
     PATH=~/bin:$PATH && \
     PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
@@ -111,8 +123,7 @@ RUN mkdir ~/ffmpeg_sources && \
     make install && \
     echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
     ldconfig && \
-    rm -rf ~/ffmpeg_sources && \
-    yum remove bzip2-devel -y
+    rm -rf ~/ffmpeg_sources
 
 RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
     tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 8bb77341..85fc22fd 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,4 +1,4 @@
-# Version: 20220628
+# Version: 20220824
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -11,16 +11,28 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1o
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
+ARG ZLIB_VERSION=1.2.12
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
-RUN yum install bzip2-devel curl-devel zlib-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 && \
+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 && \
     yum install openblas-devel -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source
-    yum remove libpng -y
+    yum remove libpng zlib-devel bzip2-devel -y
+
+RUN mkdir ~/zlib_sources && \
+    cd ~/zlib_sources && \
+    curl -O -L https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz && \
+    tar -xf zlib-${ZLIB_VERSION}.tar.gz && \
+    cd zlib-${ZLIB_VERSION} && \
+    ./configure --prefix=/usr/local && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf ~/zlib_sources
 
 RUN mkdir ~/libpng_sources && \
     cd ~/libpng_sources && \
@@ -71,8 +83,8 @@ RUN mkdir ~/openssl_sources && \
 
 RUN mkdir ~/nasm_sources && \
     cd ~/nasm_sources && \
-    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2 && \
-    tar -xf nasm-${NASM_VERSION}.tar.bz2 && cd nasm-${NASM_VERSION} && ./autogen.sh && \
+    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.gz && \
+    tar -xf nasm-${NASM_VERSION}.tar.gz && cd nasm-${NASM_VERSION} && ./autogen.sh && \
     ./configure --prefix="/ffmpeg_build" --bindir="$HOME/bin" && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
     make install && \
@@ -102,8 +114,8 @@ RUN mkdir ~/libvpx_sources && \
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
-    curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
-    tar -xf ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
+    tar -xf ffmpeg-${FFMPEG_VERSION}.tar.gz && \
     cd ffmpeg-${FFMPEG_VERSION} && \
     PATH=~/bin:$PATH && \
     PKG_CONFIG_PATH="/ffmpeg_build/lib/pkgconfig" ./configure --prefix="/ffmpeg_build" --extra-cflags="-I/ffmpeg_build/include" --extra-ldflags="-L/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
@@ -111,8 +123,7 @@ RUN mkdir ~/ffmpeg_sources && \
     make install && \
     echo "/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
     ldconfig && \
-    rm -rf ~/ffmpeg_sources && \
-    yum remove bzip2-devel -y
+    rm -rf ~/ffmpeg_sources
 
 RUN curl -O -L https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz && \
     tar -xf ccache-${CCACHE_VERSION}.tar.gz && \
diff --git a/patch_auditwheel_whitelist.py b/patch_auditwheel_whitelist.py
index b32da17a..150f97ca 100644
--- a/patch_auditwheel_whitelist.py
+++ b/patch_auditwheel_whitelist.py
@@ -3,13 +3,39 @@
 
 from auditwheel import policy
 
-policies = None
 
-with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json")) as f:
-    policies = json.load(f)
+def add_zlib_versions():
+    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), 'r') as manylinux_policy:
+        manylinux_policy_lines = manylinux_policy.readlines()
 
-for p in policies:
-    p["lib_whitelist"].append("libxcb.so.1")
+    manylinux_policy_data = ""
+    for line in manylinux_policy_lines:
+        if "ZLIB" in line:
+            if len(line) > 22:
+                updated_line = line[:-2] + ', "1.2.9", "1.2.12"]'
+            else:
+                updated_line = line[:-2] + '"1.2.9", "1.2.12"]'
+            manylinux_policy_replacement = line.replace(line, updated_line)
+        else:
+            manylinux_policy_replacement = line
+        manylinux_policy_data = manylinux_policy_data + manylinux_policy_replacement
 
-with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
-    f.write(json.dumps(policies))
+    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), 'w') as manylinux_final_policy:
+        manylinux_final_policy.write(manylinux_policy_data)
+
+def add_whitelisted_libs():
+    policies = None
+
+    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json")) as f:
+        policies = json.load(f)
+
+    for p in policies:
+        p["lib_whitelist"].append("libxcb.so.1")
+
+    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
+        f.write(json.dumps(policies))
+
+
+if __name__ == '__main__':
+    add_zlib_versions()
+    add_whitelisted_libs()

From deb39036bddf23d520b65684a8e698c36a47167c Mon Sep 17 00:00:00 2001
From: Joey Ballentine <34788790+joeyballentine@users.noreply.github.com>
Date: Mon, 29 Aug 2022 02:36:17 -0400
Subject: [PATCH 07/65] Build x64 macOS wheels for 10.13 build target (#716)

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 1c2a1614..584520b2 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -49,7 +49,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
-      MACOSX_DEPLOYMENT_TARGET: 10.15
+      MACOSX_DEPLOYMENT_TARGET: 10.13
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete

From 37258984cf4b7ba64da84c0fb8d2fc326173e505 Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:00:15 +0300
Subject: [PATCH 08/65] Bump numpy version to 1.21.4 for macOS builds (#720)

---
 pyproject.toml | 3 ++-
 setup.py       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ff535e86..5993a2ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,5 +8,6 @@ requires = [
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version>='3.10'"
+  "numpy==1.21.2; python_version>='3.10'",
+  "numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
 ]
diff --git a/setup.py b/setup.py
index dd44ae8f..39b8b9bd 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,8 @@ def main():
         'numpy>=1.19.3; python_version>="3.9"',
         'numpy>=1.21.2; python_version>="3.10"',
         'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
-        'numpy>=1.21.2; python_version>="3.6" and platform_system=="Darwin" and platform_machine=="arm64"',
+        'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
+        'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
     ]
 
     python_version = cmaker.CMaker.get_python_version()

From 3b13ba78fae3276884b73d5f180fe16ba20c257a Mon Sep 17 00:00:00 2001
From: "peter.kovacs" <peter.kovacs@aimotive.com>
Date: Mon, 7 Nov 2022 22:07:13 +0100
Subject: [PATCH 09/65] Add Vulkan license text to LICENSE-3RD-PARTY.txt

---
 LICENSE-3RD-PARTY.txt | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
index caeffe51..1478ae56 100644
--- a/LICENSE-3RD-PARTY.txt
+++ b/LICENSE-3RD-PARTY.txt
@@ -2435,4 +2435,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
\ No newline at end of file
+in this Software without prior written authorization from The Open Group.
+
+------------------------------------------------------------------------------
+Vulkan headers are redistributed within all opencv-python packages.
+This license applies to Vulkan headers in the directory 3rdparty/include/vulkan.
+
+Copyright (c) 2015-2018 The Khronos Group Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

From f6be1c8a13ff66e8074ad497fb3fd7b29ba1e205 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 29 Nov 2022 18:37:02 +0300
Subject: [PATCH 10/65] OpenCV dependnecies update.

---
 docker/manylinux2014/Dockerfile_aarch64 | 4 ++--
 docker/manylinux2014/Dockerfile_i686    | 4 ++--
 docker/manylinux2014/Dockerfile_x86_64  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 2679cbbf..5139fe79 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -4,11 +4,11 @@
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=4.4.1
+ARG FFMPEG_VERSION=5.1.2
 ARG FREETYPE_VERSION=2.12.1
 ARG LIBPNG_VERSION=1.6.37
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1o
+ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 
diff --git a/docker/manylinux2014/Dockerfile_i686 b/docker/manylinux2014/Dockerfile_i686
index 3b866874..c11f6a4d 100644
--- a/docker/manylinux2014/Dockerfile_i686
+++ b/docker/manylinux2014/Dockerfile_i686
@@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
 
 ARG CCACHE_VERSION=3.7.9
 ARG CMAKE_VERSION=3.17.0
-ARG FFMPEG_VERSION=4.4.1
+ARG FFMPEG_VERSION=5.1.2
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1m
+ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 8bb77341..08b0e421 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -4,11 +4,11 @@
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=4.4.1
+ARG FFMPEG_VERSION=5.1.2
 ARG FREETYPE_VERSION=2.12.1
 ARG LIBPNG_VERSION=1.6.37
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1o
+ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 

From 0bff35d06d77bfc2b53a9b84f9bf95ea3c8cbbd6 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 5 Dec 2022 10:39:06 +0300
Subject: [PATCH 11/65] Stick to CMake 3.24 on Windows to work around 3.25
 regression.

---
 .github/workflows/build_wheels_windows.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index e6874ffe..07bb00cc 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -60,10 +60,12 @@ jobs:
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.1
     - name: Build a package
+      # CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version
       run: |
         python --version
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools
+        python -m pip install cmake==3.24.2
         python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
         set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp36 --dist-dir=%cd%\wheelhouse -v
       shell: cmd

From 8f26419d49c214593c62988619f7f427702f0988 Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <andrey.senyaev@gmail.com>
Date: Tue, 13 Dec 2022 00:10:36 +0300
Subject: [PATCH 12/65] Update pypi default index url

---
 .github/workflows/build_wheels_macos_m1.yml | 2 ++
 travis_config.sh                            | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index b51801ab..5e60c47d 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -34,6 +34,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
+      PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
@@ -82,6 +83,7 @@ jobs:
     env:
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
       PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
+      PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
diff --git a/travis_config.sh b/travis_config.sh
index 366d35ad..042cbd43 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -36,6 +36,11 @@ else
   echo "    > Linux environment "
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.0/lib
   export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
+  if [[ $PLAT == 'aarch64' ]]; then
+    # To avoid network issues with pypi.org on OpenCV CN machines
+    export PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
+    echo "Running for linux aarch64"
+  fi
 fi
 
 if [ -n "$IS_OSX" ]; then

From 7da6fce0b06e8692f53d828f087e6fe5db61e098 Mon Sep 17 00:00:00 2001
From: Andrey Senyaev <76472231+asenyaev@users.noreply.github.com>
Date: Tue, 13 Dec 2022 02:09:21 +0300
Subject: [PATCH 13/65] Define arch for all workflows on aarch64

---
 travis_config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/travis_config.sh b/travis_config.sh
index 042cbd43..10182f91 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -36,7 +36,8 @@ else
   echo "    > Linux environment "
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.0/lib
   export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
-  if [[ $PLAT == 'aarch64' ]]; then
+  CURRENT_ARCH=$(uname -m)
+  if [[ $CURRENT_ARCH == 'aarch64' ]]; then
     # To avoid network issues with pypi.org on OpenCV CN machines
     export PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
     echo "Running for linux aarch64"

From 8f71702978de872efea372fc7ba26452eb92a615 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 5 Dec 2022 14:41:55 +0300
Subject: [PATCH 14/65] Pipelines update for FFmpeg 5 and security fixes.

---
 .github/workflows/build_wheels_linux.yml     | 2 +-
 .github/workflows/build_wheels_linux_arm.yml | 2 +-
 .github/workflows/build_wheels_macos.yml     | 2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 4 ++--
 docker/manylinux2014/Dockerfile_x86_64       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index ab377325..ce656ac0 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220824
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20221205
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 079efbe1..3f62a213 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20221205
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 584520b2..579002cf 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -45,7 +45,7 @@ jobs:
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       PLAT: x86_64
-      FFMPEG_FORMULA_VERSION: '@4'
+      FFMPEG_FORMULA_VERSION: '@5'
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 38a7764d..7e02bd60 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,4 +1,4 @@
-# Version: 20220824
+# Version: 20221205
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
-ARG ZLIB_VERSION=1.2.12
+ARG ZLIB_VERSION=1.2.13
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 1302e8aa..a6e6b5cc 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,4 +1,4 @@
-# Version: 20220824
+# Version: 20221205
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -11,7 +11,7 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
-ARG ZLIB_VERSION=1.2.12
+ARG ZLIB_VERSION=1.2.13
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 

From 4510a683dcb1f63d2dc6a539b3193eeae8f857ab Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 8 Dec 2022 14:18:11 +0300
Subject: [PATCH 15/65] Update OpenCV to upstream version to get FFmpeg 5
 fixes.

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 opencv                                   | 2 +-
 opencv_contrib                           | 2 +-
 opencv_extra                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 579002cf..412bd754 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -45,7 +45,7 @@ jobs:
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       PLAT: x86_64
-      FFMPEG_FORMULA_VERSION: '@5'
+      FFMPEG_FORMULA_VERSION: ''
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
diff --git a/opencv b/opencv
index b0dc4741..ab912329 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit b0dc474160e389b9c9045da5db49d03ae17c6a6b
+Subproject commit ab912329b67d3a142a1b399b4bc9fa9b68cd8df6
diff --git a/opencv_contrib b/opencv_contrib
index db16caf6..d6102ef6 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit db16caf6ceee76b43b94c846be276e92a43e9700
+Subproject commit d6102ef65f9ccdb37bba0ea9b8254951eb89dc39
diff --git a/opencv_extra b/opencv_extra
index 936854e2..531785fb 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 936854e2b666853d6d0732a8eabc2d699f4fa3d8
+Subproject commit 531785fb1a42b2665e0e06c8b191de58db6deb10

From 46f21093f2880f75453458f80613d2230b8e236c Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 9 Dec 2022 13:25:35 +0300
Subject: [PATCH 16/65] Added fonts needed for Qt.

---
 docker/manylinux2014/Dockerfile_aarch64 | 2 +-
 docker/manylinux2014/Dockerfile_x86_64  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 7e02bd60..bbb06b72 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
 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 && \
-    yum install openblas-devel -y && \
+    yum install openblas-devel dejavu-sans-fonts -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index a6e6b5cc..89eb353f 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
 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 && \
-    yum install openblas-devel -y && \
+    yum install openblas-devel dejavu-sans-fonts -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source

From d780d933772c0532a4d61374b43161aad8a485d6 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 9 Dec 2022 17:39:34 +0300
Subject: [PATCH 17/65] Reverted some changes from
 602a8be9e21df225a32827a621f15d7be0e5eebd to use default FFmpeg on Mac

---
 .github/workflows/build_wheels_macos.yml | 1 -
 travis_config.sh                         | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 412bd754..6545902e 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -45,7 +45,6 @@ jobs:
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       PLAT: x86_64
-      FFMPEG_FORMULA_VERSION: ''
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
diff --git a/travis_config.sh b/travis_config.sh
index 10182f91..465baf77 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -56,7 +56,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}${FFMPEG_FORMULA_VERSION}")
+        local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}")
         local LFF_FORMULA; LFF_FORMULA="$(dirname "$FF_FORMULA")/${LFF}.rb"
 
         local REGENERATE
@@ -76,9 +76,8 @@ 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 )(FfmpegAT4)(\s.*)/) {$_=$1."FfmpegOpencv".$3."\n"; next;}
+                if (/(^class )(Ffmpeg)(\s.*)/) {$_=$1."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; }

From 2b57f536e626647d82711e656f55db1c332b0d81 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 15 Dec 2022 12:38:45 +0300
Subject: [PATCH 18/65] Use ffmpeg instead of opencv_ffmpeg everywhere.

---
 travis_config.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/travis_config.sh b/travis_config.sh
index 465baf77..e0ba15e1 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -50,12 +50,12 @@ if [ -n "$IS_OSX" ]; then
 
     BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \
         "cmake 15" \
-        "ffmpeg_opencv 10" \
+        "ffmpeg 10" \
     )
 
     function generate_ffmpeg_formula {
         local FF="ffmpeg"
-        local LFF="ffmpeg_opencv"
+        local LFF="ffmpeg"
         local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}")
         local LFF_FORMULA; LFF_FORMULA="$(dirname "$FF_FORMULA")/${LFF}.rb"
 
@@ -117,9 +117,9 @@ function pre_build {
     brew update
     generate_ffmpeg_formula
     brew_add_local_bottles
-    brew install --build-bottle ffmpeg_opencv
+    brew install --build-bottle ffmpeg
     # It needs when we use not the latest ffmpeg formula
-    brew link ffmpeg_opencv
+    brew link ffmpeg
 
     if [ -n "$CACHE_STAGE" ]; then
         brew_go_bootstrap_mode 0

From 339bca572ecd866b56df1f61214cbf03c5f276f2 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Thu, 29 Dec 2022 21:59:32 +0300
Subject: [PATCH 19/65] OpenCV 4.7.0 release preparation

- Python 3.7 as baseline
- Python 3.11 support
- Various updates
---
 .github/workflows/build_wheels_linux.yml     |  8 ++++----
 .github/workflows/build_wheels_linux_arm.yml |  8 ++++----
 .github/workflows/build_wheels_macos.yml     | 16 +++++++++++-----
 .github/workflows/build_wheels_macos_m1.yml  |  4 ++--
 .github/workflows/build_wheels_windows.yml   |  8 ++++----
 multibuild                                   |  2 +-
 opencv                                       |  2 +-
 opencv_contrib                               |  2 +-
 opencv_extra                                 |  2 +-
 patch_auditwheel_whitelist.py                |  5 +++--
 pyproject.toml                               |  2 +-
 setup.py                                     |  2 +-
 travis_config.sh                             |  6 +++---
 13 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index ce656ac0..95e35898 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6']
+        python-version: ['3.7']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -93,7 +93,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.21.2
+      NP_TEST_DEP_LATEST: numpy==1.24.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
     steps:
@@ -106,7 +106,7 @@ jobs:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 3f62a213..b025e285 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6']
+        python-version: ['3.7']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -94,7 +94,7 @@ jobs:
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       PLAT: aarch64
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.21.4
+      NP_TEST_DEP_LATEST: numpy==1.24.0
       CONFIG_PATH: travis_config.sh
       DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
       UNICODE_WIDTH: 32
@@ -108,7 +108,7 @@ jobs:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 6545902e..43f98c7f 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6']
+        python-version: ['3.7']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -58,6 +58,12 @@ jobs:
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
+        # hack for image issue on mac: https://github.com/actions/runner-images/issues/6817
+        rm /usr/local/bin/2to3*
+        rm /usr/local/bin/idle3*
+        rm /usr/local/bin/pydoc3*
+        rm /usr/local/bin/python3*
+        # end hack
     - name: Checkout
       uses: actions/checkout@v3
       with:
@@ -100,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -109,7 +115,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.21.4
+      NP_TEST_DEP_LATEST: numpy==1.24.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
@@ -129,7 +135,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
@@ -146,7 +152,7 @@ jobs:
         python modules/python/test/test.py -v --repo .
     - name: Pylint test
       run: |
-        python -m pip install pylint==2.12.2
+        python -m pip install pylint==2.15.9
         cd ${{ github.workspace }}/tests
         python -m pylint $PYLINT_TEST_FILE
 
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 5e60c47d..8d383088 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -109,7 +109,7 @@ jobs:
         arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
     - name: Pylint test
       run: |
-        arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.12.2
+        arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.15.9
         cd ${{ github.workspace }}/tests
         arch -arm64 python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
 
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index 07bb00cc..b1a98d26 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6']
+        python-version: ['3.7']
         platform: [x86, x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -67,7 +67,7 @@ jobs:
         python -m pip install --upgrade setuptools
         python -m pip install cmake==3.24.2
         python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
-        set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp36 --dist-dir=%cd%\wheelhouse -v
+        set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v
       shell: cmd
     - name: Saving all wheels
       uses: actions/upload-artifact@v3
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         platform: [x86, x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -133,7 +133,7 @@ jobs:
         python modules\python\test\test.py -v --repo .
     - name: Pylint test
       run: |
-        python -m pip install pylint==2.12.2
+        python -m pip install pylint==2.15.9
         cd ${{ github.workspace }}\tests
         python -m pylint $PYLINT_TEST_FILE
 
diff --git a/multibuild b/multibuild
index bce1637e..15fd8770 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit bce1637e202cb52b0e7ea42baa1cccc894b82806
+Subproject commit 15fd8770abe6b12e94c2362ae8f21cd876bd998e
diff --git a/opencv b/opencv
index ab912329..725e440d 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit ab912329b67d3a142a1b399b4bc9fa9b68cd8df6
+Subproject commit 725e440d278aca07d35a5e8963ef990572b07316
diff --git a/opencv_contrib b/opencv_contrib
index d6102ef6..e247b680 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit d6102ef65f9ccdb37bba0ea9b8254951eb89dc39
+Subproject commit e247b680a6bd396f110274b6c214406a93171350
diff --git a/opencv_extra b/opencv_extra
index 531785fb..5abbd7e0 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 531785fb1a42b2665e0e06c8b191de58db6deb10
+Subproject commit 5abbd7e0546bbb34ae7487170383d3e571fb1dd1
diff --git a/patch_auditwheel_whitelist.py b/patch_auditwheel_whitelist.py
index 150f97ca..d1345911 100644
--- a/patch_auditwheel_whitelist.py
+++ b/patch_auditwheel_whitelist.py
@@ -12,9 +12,10 @@ def add_zlib_versions():
     for line in manylinux_policy_lines:
         if "ZLIB" in line:
             if len(line) > 22:
-                updated_line = line[:-2] + ', "1.2.9", "1.2.12"]'
+                updated_line = line[:-2] + ', "1.2.9", "1.2.12", "1.2.13"]'
             else:
-                updated_line = line[:-2] + '"1.2.9", "1.2.12"]'
+                updated_line = line[:-2] + '"1.2.9", "1.2.12", "1.2.13"]'
+            print("auditwheel patch: replace policy line \"%s\" with \"%s\"" % (line, updated_line))
             manylinux_policy_replacement = line.replace(line, updated_line)
         else:
             manylinux_policy_replacement = line
diff --git a/pyproject.toml b/pyproject.toml
index 5993a2ac..e30a76fc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = [
   "setuptools==59.2.0", "wheel==0.37.0", "cmake>=3.1", "pip",
   "scikit-build>=0.13.2",
   "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.14.5; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
+  "numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
diff --git a/setup.py b/setup.py
index 39b8b9bd..a5f5fc0e 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def main():
 
     install_requires = [
         'numpy>=1.13.3; python_version<"3.7"',
-        'numpy>=1.14.5; python_version>="3.7"',
+        'numpy>=1.17.0; python_version>="3.7"', # https://github.com/numpy/numpy/pull/13725
         'numpy>=1.17.3; python_version>="3.8"',
         'numpy>=1.19.3; python_version>="3.9"',
         'numpy>=1.21.2; python_version>="3.10"',
diff --git a/travis_config.sh b/travis_config.sh
index e0ba15e1..b91d63c4 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -16,7 +16,7 @@ function bdist_wheel_cmd {
     local abs_wheelhouse=$1
     # install all required packages in pyproject.toml, because bdist_wheel does not do it
     python${PYTHON_VERSION} -m pip install toml && python${PYTHON_VERSION} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${PYTHON_VERSION} -m pip install -r /dev/stdin
-    CI_BUILD=1 python${PYTHON_VERSION} setup.py bdist_wheel --py-limited-api=cp36 -v
+    CI_BUILD=1 python${PYTHON_VERSION} setup.py bdist_wheel --py-limited-api=cp37 -v
     cp dist/*.whl $abs_wheelhouse
     if [ -z "$IS_OSX" ]; then
       # this path can be changed in the latest manylinux image
@@ -143,7 +143,7 @@ function run_tests {
 
     echo "Running for linux"
 
-    if [ $PYTHON == "python3.6" ]; then
+    if [ $PYTHON == "python3.7" ]; then
       $PYTHON -m pip install -U numpy==1.19.4
     fi
     cd /io/tests
@@ -168,7 +168,7 @@ function pylint_test {
 
     echo "Starting Pylint tests..."
 
-    $PYTHON -m pip install pylint==2.12.2
+    $PYTHON -m pip install pylint==2.15.9
     cd /io/tests
     $PYTHON -m pylint /io/opencv/samples/python/squares.py
 }

From e2ba09d23be35e8c36826e7031dd7ef5081f16e9 Mon Sep 17 00:00:00 2001
From: AlexeySalmin <alexey.salmin@gmail.com>
Date: Thu, 5 Jan 2023 17:26:10 +0100
Subject: [PATCH 20/65] Fix typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d60fcdf2..bd818bc1 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ A: Make sure you have removed old manual installations of OpenCV Python bindings
 
 **Q: Function foo() or method bar() returns wrong result, throws exception or crashes interpreter. What should I do?**
 
-A: The repository contains only OpenCV-Python package build scripts, but not OpenCV itself. Python bindings for OpenCV are developed in official OpenCV repository and it's the best place to report issues. Also please check {OpenCV wiki](https://github.com/opencv/opencv/wiki) and [the official OpenCV forum](https://forum.opencv.org/) before file new bugs.
+A: The repository contains only OpenCV-Python package build scripts, but not OpenCV itself. Python bindings for OpenCV are developed in official OpenCV repository and it's the best place to report issues. Also please check [OpenCV wiki](https://github.com/opencv/opencv/wiki) and [the official OpenCV forum](https://forum.opencv.org/) before file new bugs.
 
 **Q: Why the packages do not include non-free algorithms?**
 

From e33b16b1b3b68ae2853505a1777ca37416c0de35 Mon Sep 17 00:00:00 2001
From: Adam Weeden <adamweeden@gmail.com>
Date: Wed, 11 Jan 2023 15:40:26 -0500
Subject: [PATCH 21/65] fix: Stop trying to use two different numpy on mac with
 python >= 3.10

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e30a76fc..a06416f3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,6 @@ requires = [
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version>='3.10'",
+  "numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin''",
   "numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
 ]

From 736b905a4f61d79d275a4c9bb6efc476cdeaec8e Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Fri, 20 Jan 2023 09:23:55 +0300
Subject: [PATCH 22/65] OpenCV package does not distribute zlib (#780)

Roll back to manylinux version to presume binary compatibility.
Related changes: https://github.com/opencv/opencv-python/pull/715
Address:
- https://github.com/opencv/opencv-python/issues/765
- https://github.com/opencv/opencv-python/issues/772
---
 .github/workflows/build_wheels_linux.yml     |  4 ++--
 .github/workflows/build_wheels_linux_arm.yml |  2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 18 +++------------
 docker/manylinux2014/Dockerfile_x86_64       | 18 +++------------
 patch_auditwheel_whitelist.py                | 23 --------------------
 5 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 95e35898..6fa602fb 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20221205
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index b025e285..ea5e2bb8 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20221205
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230117
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index bbb06b72..6a298f61 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,4 +1,4 @@
-# Version: 20221205
+# Version: 20230117
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -11,28 +11,16 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
-ARG ZLIB_VERSION=1.2.13
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
-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 && \
+RUN yum install zlib-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 && \
     yum install openblas-devel dejavu-sans-fonts -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source
-    yum remove libpng zlib-devel bzip2-devel -y
-
-RUN mkdir ~/zlib_sources && \
-    cd ~/zlib_sources && \
-    curl -O -L https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz && \
-    tar -xf zlib-${ZLIB_VERSION}.tar.gz && \
-    cd zlib-${ZLIB_VERSION} && \
-    ./configure --prefix=/usr/local && \
-    make && \
-    make install && \
-    cd .. && \
-    rm -rf ~/zlib_sources
+    yum remove libpng -y
 
 RUN mkdir ~/libpng_sources && \
     cd ~/libpng_sources && \
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 89eb353f..5cc8251c 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,4 +1,4 @@
-# Version: 20221205
+# Version: 20230117
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -11,28 +11,16 @@ ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1s
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
-ARG ZLIB_VERSION=1.2.13
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
 # epel-release need for aarch64 to get openblas packages
-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 && \
+RUN yum install zlib-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 && \
     yum install openblas-devel dejavu-sans-fonts -y && \
     cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
     curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \
     # libpng will be built from source
-    yum remove libpng zlib-devel bzip2-devel -y
-
-RUN mkdir ~/zlib_sources && \
-    cd ~/zlib_sources && \
-    curl -O -L https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz && \
-    tar -xf zlib-${ZLIB_VERSION}.tar.gz && \
-    cd zlib-${ZLIB_VERSION} && \
-    ./configure --prefix=/usr/local && \
-    make && \
-    make install && \
-    cd .. && \
-    rm -rf ~/zlib_sources
+    yum remove libpng -y
 
 RUN mkdir ~/libpng_sources && \
     cd ~/libpng_sources && \
diff --git a/patch_auditwheel_whitelist.py b/patch_auditwheel_whitelist.py
index d1345911..b396ab55 100644
--- a/patch_auditwheel_whitelist.py
+++ b/patch_auditwheel_whitelist.py
@@ -3,27 +3,6 @@
 
 from auditwheel import policy
 
-
-def add_zlib_versions():
-    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), 'r') as manylinux_policy:
-        manylinux_policy_lines = manylinux_policy.readlines()
-
-    manylinux_policy_data = ""
-    for line in manylinux_policy_lines:
-        if "ZLIB" in line:
-            if len(line) > 22:
-                updated_line = line[:-2] + ', "1.2.9", "1.2.12", "1.2.13"]'
-            else:
-                updated_line = line[:-2] + '"1.2.9", "1.2.12", "1.2.13"]'
-            print("auditwheel patch: replace policy line \"%s\" with \"%s\"" % (line, updated_line))
-            manylinux_policy_replacement = line.replace(line, updated_line)
-        else:
-            manylinux_policy_replacement = line
-        manylinux_policy_data = manylinux_policy_data + manylinux_policy_replacement
-
-    with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), 'w') as manylinux_final_policy:
-        manylinux_final_policy.write(manylinux_policy_data)
-
 def add_whitelisted_libs():
     policies = None
 
@@ -36,7 +15,5 @@ def add_whitelisted_libs():
     with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
         f.write(json.dumps(policies))
 
-
 if __name__ == '__main__':
-    add_zlib_versions()
     add_whitelisted_libs()

From 28b8277e4d1be7264b1689bdba71fb3649894cda Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 24 Jan 2023 11:24:54 +0300
Subject: [PATCH 23/65] Typo fix.

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index a06416f3..fa0c3a32 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,6 @@ requires = [
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin''",
+  "numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin'",
   "numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
 ]

From 876f5e3cc58ef016a88d04a049defd359241b8e5 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 2 Feb 2023 15:04:53 +0300
Subject: [PATCH 24/65] Migrate Mac M1 builds to another host.

---
 .github/workflows/build_wheels_macos_m1.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 8d383088..2aed7d4b 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   Build:
-    runs-on: opencv-cn-mac-arm64
+    runs-on: python-macos11-m1
     strategy:
       fail-fast: false
       matrix:

From 6e097a876e7a0b2f3968bcc849907c4f96c446a0 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 3 Feb 2023 09:38:34 +0300
Subject: [PATCH 25/65] Docs and meta information update for release.

---
 .github/workflows/build_wheels_macos.yml | 2 +-
 README.md                                | 3 ++-
 setup.py                                 | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 43f98c7f..df60217d 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -48,7 +48,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
-      MACOSX_DEPLOYMENT_TARGET: 10.13
+      MACOSX_DEPLOYMENT_TARGET: '11.0'
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
diff --git a/README.md b/README.md
index bd818bc1..78861466 100644
--- a/README.md
+++ b/README.md
@@ -216,11 +216,11 @@ The default ``manylinux2014`` images have been extended with some OpenCV depende
 
 Python 3.x compatible pre-built wheels are provided for the officially supported Python versions (not in EOL):
 
-- 3.6
 - 3.7
 - 3.8
 - 3.9
 - 3.10
+- 3.11
 
 ### Backward compatibility
 
@@ -228,3 +228,4 @@ Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was upda
 
 Starting from 4.3.0 and 3.4.10 builds the Linux build environment was updated from `manylinux1` to `manylinux2014`. This dropped support for old Linux distributions.
 
+Starting from version 4.7.0 the Mac OS Github Actions build environment was update to version 11. Mac OS 10.x support depricated. See https://github.com/actions/runner-images/issues/5583
diff --git a/setup.py b/setup.py
index a5f5fc0e..123bb83a 100644
--- a/setup.py
+++ b/setup.py
@@ -262,7 +262,7 @@ def main():
         name=package_name,
         version=package_version,
         url="https://github.com/opencv/opencv-python",
-        license="MIT",
+        license="Apache 2.0",
         description="Wrapper package for OpenCV python bindings.",
         long_description=long_description,
         long_description_content_type="text/markdown",
@@ -279,7 +279,7 @@ def main():
             "Intended Audience :: Education",
             "Intended Audience :: Information Technology",
             "Intended Audience :: Science/Research",
-            "License :: OSI Approved :: MIT License",
+            "License :: OSI Approved :: Apache 2.0",
             "Operating System :: MacOS",
             "Operating System :: Microsoft :: Windows",
             "Operating System :: POSIX",
@@ -292,6 +292,7 @@ def main():
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
             "Programming Language :: C++",
             "Programming Language :: Python :: Implementation :: CPython",
             "Topic :: Scientific/Engineering",

From 352caf14261e427faf688bc2fe0b7e3d99b88a3f Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 7 Feb 2023 10:09:32 +0300
Subject: [PATCH 26/65] Use default deployment target on Mac OS x64.

---
 .github/workflows/build_wheels_macos.yml | 1 -
 README.md                                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index df60217d..1defd1e5 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -48,7 +48,6 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
-      MACOSX_DEPLOYMENT_TARGET: '11.0'
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
diff --git a/README.md b/README.md
index 78861466..60cdebea 100644
--- a/README.md
+++ b/README.md
@@ -228,4 +228,4 @@ Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was upda
 
 Starting from 4.3.0 and 3.4.10 builds the Linux build environment was updated from `manylinux1` to `manylinux2014`. This dropped support for old Linux distributions.
 
-Starting from version 4.7.0 the Mac OS Github Actions build environment was update to version 11. Mac OS 10.x support depricated. See https://github.com/actions/runner-images/issues/5583
+Starting from version 4.7.0 the Mac OS GitHub Actions build environment was update to version 11. Mac OS 10.x support depricated. See https://github.com/actions/runner-images/issues/5583

From 277cab960f6a349744be2f2bffb8155faed538f7 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 20 Feb 2023 10:46:11 +0300
Subject: [PATCH 27/65] Fixed numpy dependency issue with Python 3.11.

---
 pyproject.toml | 5 +++--
 setup.py       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fa0c3a32..659bbf03 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,7 @@ requires = [
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin'",
-  "numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
+  "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
+  "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
+  "numpy==1.22.0; python_version>='3.11'"
 ]
diff --git a/setup.py b/setup.py
index 123bb83a..e0e3ed31 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ def main():
         'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
         'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
         'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
+        "numpy>=1.22.0; python_version>='3.11'"
     ]
 
     python_version = cmaker.CMaker.get_python_version()

From fdf8fa45bb6e72fac1f54b715a8b288cdbe245cb Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 22 Feb 2023 09:12:40 +0300
Subject: [PATCH 28/65] Renamed license to match Pypi classifier.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e0e3ed31..4e64f230 100644
--- a/setup.py
+++ b/setup.py
@@ -280,7 +280,7 @@ def main():
             "Intended Audience :: Education",
             "Intended Audience :: Information Technology",
             "Intended Audience :: Science/Research",
-            "License :: OSI Approved :: Apache 2.0",
+            "License :: OSI Approved :: Apache Software License",
             "Operating System :: MacOS",
             "Operating System :: Microsoft :: Windows",
             "Operating System :: POSIX",

From e10f83dba27433c035c11eab73a9ebd927b54300 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 15 Mar 2023 15:15:20 +0300
Subject: [PATCH 29/65] Handle setup with and without PYTHON3_LIMITED_API.

---
 setup.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 4e64f230..9f43680d 100644
--- a/setup.py
+++ b/setup.py
@@ -395,8 +395,14 @@ def _classify_installed_files_override(
         # add lines from the old __init__.py file to the config file
         with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
             custom_init_data = custom_init.read()
-        with open('%spython/cv2/config-%s.py'
-        % (cmake_install_dir, sys.version_info[0]), 'w') as opencv_init_config:
+
+        # OpenCV generates config with different name for case with PYTHON3_LIMITED_API=ON
+        config_py = os.path.join(cmake_install_dir, 'python', 'cv2', 'config-%s.%s.py'
+                                 % (sys.version_info[0], sys.version_info[1]))
+        if not os.path.exists(config_py):
+            config_py = os.path.join(cmake_install_dir, 'python', 'cv2', 'config-%s.py' % sys.version_info[0])
+
+        with open(config_py, 'w') as opencv_init_config:
             opencv_init_config.write(custom_init_data)
 
         for package_name, relpaths_re in cls.package_paths_re.items():

From 2a76f21217b48ee1107379bed85bf3849abb1f60 Mon Sep 17 00:00:00 2001
From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de>
Date: Wed, 26 Apr 2023 12:05:36 +0200
Subject: [PATCH 30/65] py38 build requires: update numpy for compatibility
 with OpenCV src

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 659bbf03..7d5fa930 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ requires = [
   "scikit-build>=0.13.2",
   "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
+  "numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
   "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",

From 76e62b2926fdfc1c213770c07d5f50ad9cdf6414 Mon Sep 17 00:00:00 2001
From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de>
Date: Wed, 26 Apr 2023 17:32:53 +0200
Subject: [PATCH 31/65] find_version: use + for git_hash to conform to PEP 440

---
 find_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/find_version.py b/find_version.py
index 274c93e6..13e8003c 100644
--- a/find_version.py
+++ b/find_version.py
@@ -65,7 +65,7 @@
     else:
         # local version identifier, not to be published on PyPI
         version = git_hash
-        opencv_version += ".{}".format(version)
+        opencv_version += "+{}".format(version)
 
     with open("cv2/version.py", "w") as f:
         f.write('opencv_version = "{}"\n'.format(opencv_version))

From 2e44d30e4c3841ca911d50ca18d10770310719eb Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Thu, 27 Apr 2023 11:32:17 -0400
Subject: [PATCH 32/65] fix: handle None case for python library

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9f43680d..0a32520f 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ def main():
     ]
 
     python_version = cmaker.CMaker.get_python_version()
-    python_lib_path = cmaker.CMaker.get_python_library(python_version).replace(
+    python_lib_path = (cmaker.CMaker.get_python_library(python_version) or "").replace(
         "\\", "/"
     )
     python_include_dir = cmaker.CMaker.get_python_include_dir(python_version).replace(

From 46d2ddf7753634ee367a86b89f27835a46c5e284 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Sat, 27 May 2023 18:40:15 +0300
Subject: [PATCH 33/65] Temporary hack to fix build regression with
 Scikit-build 0.17.3 and newer.

---
 setup.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 0a32520f..1556207a 100644
--- a/setup.py
+++ b/setup.py
@@ -36,9 +36,14 @@ def main():
     ]
 
     python_version = cmaker.CMaker.get_python_version()
-    python_lib_path = (cmaker.CMaker.get_python_library(python_version) or "").replace(
-        "\\", "/"
-    )
+    python_lib_path = cmaker.CMaker.get_python_library(python_version) or ""
+    # HACK: For Scikit-build 0.17.3 and newer that returns None or empty sptring for PYTHON_LIBRARY in manylinux2014
+    # A small release related to PYTHON_LIBRARY handling changes in 0.17.2; scikit-build 0.17.3 returns an empty string from get_python_library if no Python library is present (like on manylinux), where 0.17.2 returned None, and previous versions returned a non-existent path. Note that adding REQUIRED to find_package(PythonLibs will fail, but it is incorrect (you must not link to libPython.so) and was really just injecting a non-existent path before.
+    # TODO: Remove the hack when the issue is handled correctly in main OpenCV CMake.
+    if python_lib_path == "":
+        python_lib_path = "libpython%sm.a" % python_version
+    python_lib_path = python_lib_path.replace("\\", "/")
+
     python_include_dir = cmaker.CMaker.get_python_include_dir(python_version).replace(
         "\\", "/"
     )

From ad3e75936fe5a2a04a7fd0f85bf5bbf820c7e605 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 26 May 2023 18:38:27 +0300
Subject: [PATCH 34/65] Force python3 in build procedure to generate python
 stubs.

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 1556207a..26092543 100644
--- a/setup.py
+++ b/setup.py
@@ -162,6 +162,7 @@ def main():
         + [
             # skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
             "-DPYTHON3_EXECUTABLE=%s" % sys.executable,
+            "-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,
             "-DPYTHON3_INCLUDE_DIR=%s" % python_include_dir,
             "-DPYTHON3_LIBRARY=%s" % python_lib_path,
             "-DBUILD_opencv_python3=ON",

From 45e535e34d3dc21cd4b798267bfa94ee7c61e11c Mon Sep 17 00:00:00 2001
From: Tom Sweeting <info@tomsweeting.com>
Date: Wed, 31 May 2023 08:28:54 -0400
Subject: [PATCH 35/65] Fix: numpy version for python 3.11 (#839)

Fix for issue #835

I encountered the same issue today. By updating to require numpy 1.24.3 I was about to build successfully for my environment (python 3.11.3 / macos ventura arm64 / gstreamer support enabled)
---
 pyproject.toml | 2 +-
 setup.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 7d5fa930..4190956f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,5 +10,5 @@ requires = [
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
   "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
-  "numpy==1.22.0; python_version>='3.11'"
+  "numpy==1.23.2; python_version>='3.11'"
 ]
diff --git a/setup.py b/setup.py
index 1556207a..85ff1084 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def main():
         'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
         'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
         'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
-        "numpy>=1.22.0; python_version>='3.11'"
+        "numpy>=1.23.5; python_version>='3.11'"
     ]
 
     python_version = cmaker.CMaker.get_python_version()

From 3dee384cd4ccaba03f7ff86a21916efb97b4cc67 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 1 Jun 2023 13:49:12 +0300
Subject: [PATCH 36/65] Try to add pyi files to package.

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index 203be547..e4aa1066 100644
--- a/setup.py
+++ b/setup.py
@@ -129,6 +129,10 @@ def main():
         +
         [
             r"python/cv2/.*config.*.py"
+        ]
+        +
+        [
+            r"python/cv2/.*\.pyi"
         ],
         "cv2.data": [  # OPENCV_OTHER_INSTALL_PATH
             ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"

From e4da6a05bb3158c44de46425d3b675e9548f3438 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 1 Jun 2023 14:25:58 +0300
Subject: [PATCH 37/65] Update OpenCV to current 4.x to get PR #20370

---
 opencv         |  2 +-
 opencv_contrib |  2 +-
 opencv_extra   |  2 +-
 setup.py       | 19 +++++++++++++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/opencv b/opencv
index 725e440d..2104d61d 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit 725e440d278aca07d35a5e8963ef990572b07316
+Subproject commit 2104d61d4a3fb363e5c7d29a8d14eac038e2b3b2
diff --git a/opencv_contrib b/opencv_contrib
index e247b680..8dfeed73 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit e247b680a6bd396f110274b6c214406a93171350
+Subproject commit 8dfeed73b9389ba09411498dc1e923431d7fe292
diff --git a/opencv_extra b/opencv_extra
index 5abbd7e0..847035ec 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 5abbd7e0546bbb34ae7487170383d3e571fb1dd1
+Subproject commit 847035ec7e1d388def99ecee4905fb9b01d1cabf
diff --git a/setup.py b/setup.py
index e4aa1066..5107e8ea 100644
--- a/setup.py
+++ b/setup.py
@@ -131,9 +131,8 @@ def main():
             r"python/cv2/.*config.*.py"
         ]
         +
-        [
-            r"python/cv2/.*\.pyi"
-        ],
+        [ r"python/cv2/py.typed" ] if sys.version_info >= (3, 6) else []
+        ,
         "cv2.data": [  # OPENCV_OTHER_INSTALL_PATH
             ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
         ],
@@ -396,7 +395,6 @@ def _classify_installed_files_override(
             p.replace(os.path.sep, "/") for p in install_relpaths
         ]
         relpaths_zip = list(zip(fslash_install_relpaths, install_relpaths))
-        del install_relpaths, fslash_install_relpaths
 
         final_install_relpaths = []
 
@@ -415,6 +413,19 @@ def _classify_installed_files_override(
         with open(config_py, 'w') as opencv_init_config:
             opencv_init_config.write(custom_init_data)
 
+        if sys.version_info >= (3, 6):
+            for p in install_relpaths:
+                if p.endswith(".pyi"):
+                    target_rel_path = os.path.relpath(p, "python/cv2")
+                    cls._setuptools_wrap._copy_file(
+                        os.path.join(cmake_install_dir, p),
+                        os.path.join(cmake_install_dir, "cv2", target_rel_path),
+                        hide_listing=False,
+                    )
+                    final_install_relpaths.append(os.path.join("cv2", target_rel_path))
+
+        del install_relpaths, fslash_install_relpaths
+
         for package_name, relpaths_re in cls.package_paths_re.items():
             package_dest_reldir = package_name.replace(".", os.path.sep)
             for relpath_re in relpaths_re:

From e26e6e4611b40ea5344e4e4b6e2467539a07a11f Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 28 Jun 2023 15:07:08 +0300
Subject: [PATCH 38/65] Build environment update on Linux.

---
 .github/workflows/build_wheels_linux.yml     |  4 ++--
 .github/workflows/build_wheels_linux_arm.yml |  2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 10 +++++-----
 docker/manylinux2014/Dockerfile_x86_64       | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 6fa602fb..3176df1a 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index ea5e2bb8..5a9de23f 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230117
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230628
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 6a298f61..26c45e80 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,14 +1,14 @@
-# Version: 20230117
+# Version: 20230628
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.2
-ARG FREETYPE_VERSION=2.12.1
-ARG LIBPNG_VERSION=1.6.37
+ARG FFMPEG_VERSION=5.1.3
+ARG FREETYPE_VERSION=2.13.1
+ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1u
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 5cc8251c..d34f19f5 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,14 +1,14 @@
-# Version: 20230117
+# Version: 20230628
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.2
-ARG FREETYPE_VERSION=2.12.1
-ARG LIBPNG_VERSION=1.6.37
+ARG FFMPEG_VERSION=5.1.3
+ARG FREETYPE_VERSION=2.13.1
+ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1u
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 

From d82d7c2befd1e830287e8c1c125fdab8462836c2 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Tue, 11 Apr 2023 06:17:28 -0700
Subject: [PATCH 39/65] fix: update build system with CMAKE_ARGS from
 scikit-build

---
 pyproject.toml | 8 +++++---
 setup.py       | 9 +--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4190956f..00176366 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,6 @@
 [build-system]
 requires = [
-  "setuptools==59.2.0", "wheel==0.37.0", "cmake>=3.1", "pip",
-  "scikit-build>=0.13.2",
+  "cmake>=3.1",
   "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
@@ -10,5 +9,8 @@ requires = [
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
   "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
-  "numpy==1.23.2; python_version>='3.11'"
+  "numpy==1.22.2; python_version>='3.11'",
+  "pip",
+  "scikit-build>=0.14.0",
+  "setuptools==59.2.0",
 ]
diff --git a/setup.py b/setup.py
index 5107e8ea..b17c11e6 100644
--- a/setup.py
+++ b/setup.py
@@ -256,13 +256,6 @@ def main():
             cmake_args.append("-DWITH_LAPACK=ON")
             cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")
 
-    # https://github.com/scikit-build/scikit-build/issues/479
-    if "CMAKE_ARGS" in os.environ:
-        import shlex
-
-        cmake_args.extend(shlex.split(os.environ["CMAKE_ARGS"]))
-        del shlex
-
     # works via side effect
     RearrangeCMakeOutput(
         rearrange_cmake_output_data, files_outside_package_dir, package_data.keys()
@@ -314,7 +307,7 @@ def main():
     )
 
 
-class RearrangeCMakeOutput(object):
+class RearrangeCMakeOutput:
     """
         Patch SKBuild logic to only take files related to the Python package
         and construct a file hierarchy that SKBuild expects (see below)

From 49505b9654f70006e4611adc5bf9f4536ba4b4c6 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 29 Jun 2023 18:25:32 +0300
Subject: [PATCH 40/65] OpenCV submodules update to 4.8.0.

---
 opencv         | 2 +-
 opencv_contrib | 2 +-
 opencv_extra   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opencv b/opencv
index 2104d61d..f9a59f25 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit 2104d61d4a3fb363e5c7d29a8d14eac038e2b3b2
+Subproject commit f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef
diff --git a/opencv_contrib b/opencv_contrib
index 8dfeed73..f10c84d4 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 8dfeed73b9389ba09411498dc1e923431d7fe292
+Subproject commit f10c84d48b0714f2b408c9e5cccfac1277c8e6cc
diff --git a/opencv_extra b/opencv_extra
index 847035ec..fdd66bfc 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 847035ec7e1d388def99ecee4905fb9b01d1cabf
+Subproject commit fdd66bfcc3ced243d682fe03f0858bf43867656c

From 7f0002bc450a83336a2b6a37382faf370d1443ee Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 29 Jun 2023 19:24:14 +0300
Subject: [PATCH 41/65] Added more licenses for 3rd party components
 distributed with opencv-python.

---
 LICENSE-3RD-PARTY.txt | 581 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 556 insertions(+), 25 deletions(-)

diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
index 1478ae56..e64ea511 100644
--- a/LICENSE-3RD-PARTY.txt
+++ b/LICENSE-3RD-PARTY.txt
@@ -304,7 +304,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -360,7 +360,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
                   GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -407,7 +407,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -465,7 +465,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -516,7 +516,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -578,7 +578,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -619,7 +619,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -671,7 +671,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -893,16 +893,16 @@ are met:
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
-2. The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
    documentation would be appreciated but is not required.
 
 3. Altered source versions must be plainly marked as such, and must
    not be misrepresented as being the original software.
 
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
    permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -1502,8 +1502,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 libopenjp2 is redistributed within opencv-python macOS packages.
 This license applies to libopenjp2 binary in the directory cv2/.
 
-The copyright in this software is being made available under the 2-clauses 
-BSD License, included below. This software may be subject to other third 
+The copyright in this software is being made available under the 2-clauses
+BSD License, included below. This software may be subject to other third
 party and contributor rights, including patent rights, and no such rights
 are granted under this license.
 
@@ -1514,7 +1514,7 @@ Copyright (c) 2003-2009, Francois-Olivier Devaux
 Copyright (c) 2005, Herve Drolon, FreeImage Team
 Copyright (c) 2002-2003, Yannick Verschueren
 Copyright (c) 2001-2003, David Janssens
-Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France
 Copyright (c) 2012, CS Systemes d'Information, France
 
 All rights reserved.
@@ -1659,7 +1659,7 @@ This license applies to libspeex binary in the directory cv2/.
 Copyright 2002-2008   Xiph.org Foundation
 Copyright 2002-2008   Jean-Marc Valin
 Copyright 2005-2007 Analog Devices Inc.
-Copyright 2005-2008 Commonwealth Scientific and Industrial Research 
+Copyright 2005-2008 Commonwealth Scientific and Industrial Research
                         Organisation (CSIRO)
 Copyright 1993, 2002, 2006 David Rowe
 Copyright 2003    EpicGames
@@ -1697,26 +1697,26 @@ libsrt is redistributed within opencv-python macOS packages.
 This license applies to libsrt binary in the directory cv2/.
 
 /*
- *  
+ *
  * Copyright (c) 2001-2017 Cisco Systems, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  *   Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  *   Redistributions in binary form must reproduce the above
  *   copyright notice, this list of conditions and the following
  *   disclaimer in the documentation and/or other materials provided
  *   with the distribution.
- * 
+ *
  *   Neither the name of the Cisco Systems, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -1770,7 +1770,7 @@ This license applies to libsrt binary in the directory cv2/.
     means any form of the work other than Source Code Form.
 
 1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
+    means a work that combines Covered Software with other material, in
     a separate file or files, that is not Covered Software.
 
 1.8. "License"
@@ -2141,7 +2141,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------------------------------------------------------------------------------
-libwebp and libwebpmux are redistributed within opencv-python macOS packages.
+libwebp and libwebpmux are redistributed within all opencv-python packages.
 This license applies to libwebp  and libwebpmux binaries in the directory cv2/.
 
 Copyright (c) 2010, Google Inc. All rights reserved.
@@ -2454,3 +2454,534 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+
+------------------------------------------------------------------------------
+Libjpeg-turbo is redistributed within all opencv-python packages as build option.
+
+libjpeg-turbo Licenses
+======================
+
+libjpeg-turbo is covered by three compatible BSD-style open source licenses:
+
+- The IJG (Independent JPEG Group) License, which is listed in
+  [README.ijg](README.ijg)
+
+  This license applies to the libjpeg API library and associated programs
+  (any code inherited from libjpeg, and any modifications to that code.)
+
+- The Modified (3-clause) BSD License, which is listed below
+
+  This license covers the TurboJPEG API library and associated programs, as
+  well as the build system.
+
+- The [zlib License](https://opensource.org/licenses/Zlib)
+
+  This license is a subset of the other two, and it covers the libjpeg-turbo
+  SIMD extensions.
+
+
+Complying with the libjpeg-turbo Licenses
+=========================================
+
+This section provides a roll-up of the libjpeg-turbo licensing terms, to the
+best of our understanding.
+
+1.  If you are distributing a modified version of the libjpeg-turbo source,
+    then:
+
+    1.  You cannot alter or remove any existing copyright or license notices
+        from the source.
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 1 of the Modified BSD License
+        - Clauses 1 and 3 of the zlib License
+
+    2.  You must add your own copyright notice to the header of each source
+        file you modified, so others can tell that you modified that file (if
+        there is not an existing copyright header in that file, then you can
+        simply add a notice stating that you modified the file.)
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 2 of the zlib License
+
+    3.  You must include the IJG README file, and you must not alter any of the
+        copyright or license text in that file.
+
+        **Origin**
+        - Clause 1 of the IJG License
+
+2.  If you are distributing only libjpeg-turbo binaries without the source, or
+    if you are distributing an application that statically links with
+    libjpeg-turbo, then:
+
+    1.  Your product documentation must include a message stating:
+
+        This software is based in part on the work of the Independent JPEG
+        Group.
+
+        **Origin**
+        - Clause 2 of the IJG license
+
+    2.  If your binary distribution includes or uses the TurboJPEG API, then
+        your product documentation must include the text of the Modified BSD
+        License (see below.)
+
+        **Origin**
+        - Clause 2 of the Modified BSD License
+
+3.  You cannot use the name of the IJG or The libjpeg-turbo Project or the
+    contributors thereof in advertising, publicity, etc.
+
+    **Origin**
+    - IJG License
+    - Clause 3 of the Modified BSD License
+
+4.  The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be
+    free of defects, nor do we accept any liability for undesirable
+    consequences resulting from your use of the software.
+
+    **Origin**
+    - IJG License
+    - Modified BSD License
+    - zlib License
+
+
+The Modified (3-clause) BSD License
+===================================
+
+Copyright (C)2009-2022 D. R. Commander.  All Rights Reserved.<br>
+Copyright (C)2015 Viktor Szathmáry.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+Why Three Licenses?
+===================
+
+The zlib License could have been used instead of the Modified (3-clause) BSD
+License, and since the IJG License effectively subsumes the distribution
+conditions of the zlib License, this would have effectively placed
+libjpeg-turbo binary distributions under the IJG License.  However, the IJG
+License specifically refers to the Independent JPEG Group and does not extend
+attribution and endorsement protections to other entities.  Thus, it was
+desirable to choose a license that granted us the same protections for new code
+that were granted to the IJG for code derived from their software.
+
+------------------------------------------------------------------------------
+Libspng is redistributed within all opencv-python packages as build option.
+
+BSD 2-Clause License
+
+Copyright (c) 2018-2022, Randy <randy408@protonmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------------
+QUIRC library is redistributed within all opencv-python packages.
+
+quirc -- QR-code recognition library
+Copyright (C) 2010-2012 Daniel Beer <dlbeer@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted, provided that the
+above copyright notice and this permission notice appear in all
+copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+------------------------------------------------------------------------------
+Flatbuffers library is redistributed within all opencv-python packages.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+------------------------------------------------------------------------------
+Protobuf library is redistributed within all opencv-python packages.
+
+Copyright 2008 Google Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
+
+------------------------------------------------------------------------------
+OpenJPEG library is redistributed within all opencv-python packages.
+
+/*
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2009, Francois-Olivier Devaux
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France
+ * Copyright (c) 2012, CS Systemes d'Information, France
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+------------------------------------------------------------------------------
+TIFF library is redistributed within all opencv-python packages.
+
+Copyright (c) 1988-1997 Sam Leffler
+Copyright (c) 1991-1997 Silicon Graphics, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee, provided
+that (i) the above copyright notices and this permission notice appear in
+all copies of the software and related documentation, and (ii) the names of
+Sam Leffler and Silicon Graphics may not be used in any advertising or
+publicity relating to the software without the specific, prior written
+permission of Sam Leffler and Silicon Graphics.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+------------------------------------------------------------------------------
+OpenEXR library is redistributed within all opencv-python packages.
+
+Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
+Entertainment Company Ltd.  Portions contributed and copyright held by
+others as indicated.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above
+      copyright notice, this list of conditions and the following
+      disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided with
+      the distribution.
+
+    * Neither the name of Industrial Light & Magic nor the names of
+      any other contributors to this software may be used to endorse or
+      promote products derived from this software without specific prior
+      written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 04bfb4742926498a49cd5d67260b0232b3fc1046 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 29 Jun 2023 22:55:15 +0300
Subject: [PATCH 42/65] Updated wheel location for custom builds.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 60cdebea..95e56be3 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ If some dependency is not enabled in the pre-built wheels, you can also run the
 4. Select the package flavor which you wish to build with `ENABLE_CONTRIB` and `ENABLE_HEADLESS`: i.e. `export ENABLE_CONTRIB=1` if you wish to build `opencv-contrib-python`
 5. Run ``pip wheel . --verbose``. NOTE: make sure you have the latest ``pip`` version, the ``pip wheel`` command replaces the old ``python setup.py bdist_wheel`` command which does not support ``pyproject.toml``.
     - this might take anything from 5 minutes to over 2 hours depending on your hardware
-6. You'll have the wheel file in the `dist` folder and you can do with that whatever you wish
+6. Pip will print fresh will location at the end of build procedure. If you use old approach with `setup.py` file wheel package will be placed in `dist` folder. Package is ready and you can do with that whatever you wish.
     - Optional: on Linux use some of the `manylinux` images as a build hosts if maximum portability is needed and run `auditwheel` for the wheel after build
     - Optional: on macOS use ``delocate`` (same as ``auditwheel`` but for macOS) for better portability
 

From 921bae43ba3fcbc8ae86fada2eb3550df69cda5b Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 5 Jul 2023 10:43:15 +0300
Subject: [PATCH 43/65] Added missing typing/__init__.py to package.

---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index b17c11e6..f6056969 100644
--- a/setup.py
+++ b/setup.py
@@ -150,6 +150,9 @@ def main():
         ],
     }
 
+    if sys.version_info >= (3, 6):
+        rearrange_cmake_output_data["cv2.typing"] = ["python/cv2" + r"/typing/.*\.py"]
+
     # Files in sourcetree outside package dir that should be copied to package.
     # Raw paths relative to sourcetree root.
     files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}

From 5308d0bf5274e07fe306fba411db265341cd0248 Mon Sep 17 00:00:00 2001
From: Nicholas Nadeau <nicholas.nadeau@gmail.com>
Date: Mon, 7 Aug 2023 13:16:30 -0400
Subject: [PATCH 44/65] docs: added TOC to README for easier navigation

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 95e56be3..771fa3dc 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,21 @@
 [![Downloads](http://pepy.tech/badge/opencv-python)](http://pepy.tech/project/opencv-python)
 
+- [OpenCV on Wheels](#opencv-on-wheels)
+  - [Installation and Usage](#installation-and-usage)
+- [Frequently Asked Questions](#frequently-asked-questions)
+- [Documentation for opencv-python](#documentation-for-opencv-python)
+  - [CI build process](#ci-build-process)
+  - [Manual builds](#manual-builds)
+    - [Manual debug builds](#manual-debug-builds)
+    - [Source distributions](#source-distributions)
+  - [Licensing](#licensing)
+  - [Versioning](#versioning)
+  - [Releases](#releases)
+  - [Development builds](#development-builds)
+  - [Manylinux wheels](#manylinux-wheels)
+  - [Supported Python versions](#supported-python-versions)
+  - [Backward compatibility](#backward-compatibility)
+
 ## OpenCV on Wheels
 
 Pre-built CPU-only OpenCV packages for Python.

From ca13925ac4f6536cca3edcb7bdd525bdc09d5f58 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 27 Sep 2023 15:29:32 +0300
Subject: [PATCH 45/65] Update to OpenCV 4.8.1.

---
 opencv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opencv b/opencv
index f9a59f25..51998500 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef
+Subproject commit 5199850039ad23f1f0e6cccea5061a9fea5efca6

From 44939451722fd28f4ecd874d306dc0cd71d15517 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 12 Oct 2023 11:57:06 +0300
Subject: [PATCH 46/65] Docker images update for Python 3.12 and security
 fixes.

---
 .github/workflows/build_wheels_linux.yml     |  4 ++--
 .github/workflows/build_wheels_linux_arm.yml |  2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 11 ++++++-----
 docker/manylinux2014/Dockerfile_x86_64       |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 3176df1a..0bfb6ba3 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20230628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 5a9de23f..0db992cc 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20230628
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231006
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 26c45e80..dc4909f3 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,14 +1,14 @@
-# Version: 20230628
+# Version: 20231006
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
 ARG FFMPEG_VERSION=5.1.3
-ARG FREETYPE_VERSION=2.13.1
+ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1u
+ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 
@@ -33,9 +33,10 @@ RUN mkdir ~/libpng_sources && \
     cd .. && \
     rm -rf ~/libpng_sources
 
+# looks like download.savannah.gnu.org suffers from https://savannah.gnu.org/bugs/?48150 in Manylinux 2014 env on aarch64
 RUN mkdir ~/freetype_sources && \
     cd ~/freetype_sources && \
-    curl -O -L https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
+    curl -O -L https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \
     tar -xf freetype-${FREETYPE_VERSION}.tar.gz && \
     cd freetype-${FREETYPE_VERSION} && \
     ./configure --prefix="/ffmpeg_build" --enable-freetype-config && \
@@ -44,7 +45,7 @@ RUN mkdir ~/freetype_sources && \
     cd .. && \
     rm -rf ~/freetype_sources
 
-RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
+RUN curl -C - -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
     tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
     cd qt-everywhere-src-${QT_VERSION} && \
     export MAKEFLAGS=-j$(nproc) && \
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index d34f19f5..9fd6f0fb 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,14 +1,14 @@
-# Version: 20230628
+# Version: 20231006
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
 ARG FFMPEG_VERSION=5.1.3
-ARG FREETYPE_VERSION=2.13.1
+ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1u
+ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 

From c9145d909193ad3b06b5d300be1e97bd7bb34acf Mon Sep 17 00:00:00 2001
From: Dmitry Kurtaev <dmitry.kurtaev@gmail.com>
Date: Wed, 18 Oct 2023 15:32:00 +0300
Subject: [PATCH 47/65] Update downloads badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 771fa3dc..0984e421 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Downloads](http://pepy.tech/badge/opencv-python)](http://pepy.tech/project/opencv-python)
+[![Downloads](https://static.pepy.tech/badge/opencv-python)](http://pepy.tech/project/opencv-python)
 
 - [OpenCV on Wheels](#opencv-on-wheels)
   - [Installation and Usage](#installation-and-usage)

From 98573cebac8fd08b55d95041fcd9bb77fbe621ce Mon Sep 17 00:00:00 2001
From: Dmitry Kurtaev <dmitry.kurtaev@gmail.com>
Date: Sat, 9 Dec 2023 10:55:25 +0300
Subject: [PATCH 48/65] Change setup.py to trigger GitHub show dependents

---
 setup.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index f6056969..78998a03 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,7 @@
 import re
 import sysconfig
 import platform
-import skbuild
-from skbuild import cmaker
+from skbuild import cmaker, setup
 
 
 def main():
@@ -264,7 +263,7 @@ def main():
         rearrange_cmake_output_data, files_outside_package_dir, package_data.keys()
     )
 
-    skbuild.setup(
+    setup(
         name=package_name,
         version=package_version,
         url="https://github.com/opencv/opencv-python",

From 0da732e80d492c61170ee43ea76c74bf265bce24 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 3 Oct 2023 13:41:12 +0300
Subject: [PATCH 49/65] Python 3.12 support.

---
 .github/workflows/build_wheels_linux.yml     | 6 +++---
 .github/workflows/build_wheels_linux_arm.yml | 8 ++++----
 .github/workflows/build_wheels_macos.yml     | 6 +++---
 .github/workflows/build_wheels_macos_m1.yml  | 2 +-
 .github/workflows/build_wheels_windows.yml   | 2 +-
 docker/manylinux2014/Dockerfile_x86_64       | 2 +-
 multibuild                                   | 2 +-
 setup.py                                     | 4 +++-
 8 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 0bfb6ba3..b880c1f7 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -93,7 +93,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.24.0
+      NP_TEST_DEP_LATEST: numpy==1.26.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
     steps:
@@ -106,7 +106,7 @@ jobs:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 0db992cc..7edb0c91 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231006
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231109
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -94,7 +94,7 @@ jobs:
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       PLAT: aarch64
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.24.0
+      NP_TEST_DEP_LATEST: numpy==1.26.0
       CONFIG_PATH: travis_config.sh
       DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
       UNICODE_WIDTH: 32
@@ -108,7 +108,7 @@ jobs:
         submodules: true
         fetch-depth: 0
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index 1defd1e5..d40c4697 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -105,7 +105,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -114,7 +114,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.24.0
+      NP_TEST_DEP_LATEST: numpy==1.26.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
@@ -134,7 +134,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.platform }}
     - name: Setup Environment variables
-      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
+      run: if [ "3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v3
       with:
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 2aed7d4b..5d638fd8 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index b1a98d26..19470a5d 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         platform: [x86, x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 9fd6f0fb..9233bffa 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,4 +1,4 @@
-# Version: 20231006
+# Version: 20231109
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
diff --git a/multibuild b/multibuild
index 15fd8770..0714f52e 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit 15fd8770abe6b12e94c2362ae8f21cd876bd998e
+Subproject commit 0714f52ea1ea57a0bc33c7f8b74bae457e1fa8e0
diff --git a/setup.py b/setup.py
index f6056969..d8e3c920 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,8 @@ def main():
         'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
         'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
         'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
-        "numpy>=1.23.5; python_version>='3.11'"
+        "numpy>=1.23.5; python_version>='3.11'",
+        "numpy>=1.26.0; python_version>='3.12'"
     ]
 
     python_version = cmaker.CMaker.get_python_version()
@@ -299,6 +300,7 @@ def main():
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12",
             "Programming Language :: C++",
             "Programming Language :: Python :: Implementation :: CPython",
             "Topic :: Scientific/Engineering",

From 984ff7378a3132c35cc52f24645c31f6cd00cac0 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Thu, 21 Dec 2023 13:17:01 +0300
Subject: [PATCH 50/65] Include Intel IPP license text to 3rd party licenses
 list.

---
 LICENSE-3RD-PARTY.txt | 78 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
index e64ea511..f7d91a4f 100644
--- a/LICENSE-3RD-PARTY.txt
+++ b/LICENSE-3RD-PARTY.txt
@@ -2985,3 +2985,81 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------------
+Intel(R) IPP ICV library statically linked within x86 and x86_64 opencv-python packages.
+
+Intel(R) Integrated Performance Primitives 2021 Update 10
+
+Intel Simplified Software License (Version October 2022)
+
+Intel(R) Integrated Performance Primitives (Intel(R) IPP) : Copyright (C) 1997 Intel Corporation
+
+Use and Redistribution. You may use and redistribute the software, which is
+provided in binary form only, (the "Software"), without modification,
+provided the following conditions are met:
+
+* Redistributions must reproduce the above copyright notice and these
+  terms of use in the Software and in the documentation and/or other materials
+  provided with the distribution.
+* Neither the name of Intel nor the names of its suppliers may be used to
+  endorse or promote products derived from this Software without specific
+  prior written permission.
+* No reverse engineering, decompilation, or disassembly of the Software is
+  permitted, nor any modification or alteration of the Software or its operation
+  at any time, including during execution.
+
+No other licenses. Except as provided in the preceding section, Intel grants no
+licenses or other rights by implication, estoppel or otherwise to, patent,
+copyright, trademark, trade name, service mark or other intellectual property
+licenses or rights of Intel.
+
+Third party software.  "Third Party Software" means the files (if any) listed
+in the "third-party-software.txt" or other similarly-named text file that may
+be included with the Software. Third Party Software, even if included with the
+distribution of the Software, may be governed by separate license terms, including
+without limitation, third party license terms, open source software notices and
+terms, and/or other Intel software license terms. These separate license terms
+solely govern Your use of the Third Party Software.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE
+DISCLAIMED. THIS SOFTWARE IS NOT INTENDED FOR USE IN SYSTEMS OR APPLICATIONS
+WHERE FAILURE OF THE SOFTWARE MAY CAUSE PERSONAL INJURY OR DEATH AND YOU AGREE
+THAT YOU ARE FULLY RESPONSIBLE FOR ANY CLAIMS, COSTS, DAMAGES, EXPENSES, AND
+ATTORNEYS' FEES ARISING OUT OF ANY SUCH USE, EVEN IF ANY CLAIM ALLEGES THAT
+INTEL WAS NEGLIGENT REGARDING THE DESIGN OR MANUFACTURE OF THE SOFTWARE.
+
+LIMITATION OF LIABILITY. IN NO EVENT WILL INTEL BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+No support. Intel may make changes to the Software, at any time without notice,
+and is not obligated to support, update or provide training for the Software.
+
+Termination. Your right to use the Software is terminated in the event of your
+breach of this license.
+
+Feedback. Should you provide Intel with comments, modifications, corrections,
+enhancements or other input ("Feedback") related to the Software, Intel will be
+free to use, disclose, reproduce, license or otherwise distribute or exploit the
+Feedback in its sole discretion without any obligations or restrictions of any
+kind, including without limitation, intellectual property rights or licensing
+obligations.
+
+Compliance with laws. You agree to comply with all relevant laws and regulations
+governing your use, transfer, import or export (or prohibition thereof) of the
+Software.
+
+Governing law. All disputes will be governed by the laws of the United States of
+America and the State of Delaware without reference to conflict of law
+principles and subject to the exclusive jurisdiction of the state or federal
+courts sitting in the State of Delaware, and each party agrees that it submits
+to the personal jurisdiction and venue of those courts and waives any
+objections. THE UNITED NATIONS CONVENTION ON CONTRACTS FOR THE INTERNATIONAL
+SALE OF GOODS (1980) IS SPECIFICALLY EXCLUDED AND WILL NOT APPLY TO THE SOFTWARE.

From f5c47b367e3f0e3d1546c8192aae21c6ae52a73d Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 25 Dec 2023 16:18:41 +0300
Subject: [PATCH 51/65] Linux environment update for release 4.9.0

Fixes https://github.com/opencv/opencv-python/issues/926

- FFmpeg update to 5.1.4.
- Stick to lates vpx release 1.13.1 with security fixes.
---
 .github/workflows/build_wheels_linux.yml     | 4 ++--
 .github/workflows/build_wheels_linux_arm.yml | 2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 7 ++++---
 docker/manylinux2014/Dockerfile_i686         | 4 ++--
 docker/manylinux2014/Dockerfile_x86_64       | 7 ++++---
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index b880c1f7..45a38d06 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231006
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 7edb0c91..6371e360 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231109
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231225
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index dc4909f3..196c97bb 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,12 +1,13 @@
-# Version: 20231006
+# Version: 20231225
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.3
+ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
+ARG VPX_VERSION=v1.13.1
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
@@ -93,7 +94,7 @@ RUN mkdir ~/yasm_sources && \
 
 RUN mkdir ~/libvpx_sources && \
     cd ~/libvpx_sources && \
-    git clone --depth 1 https://github.com/webmproject/libvpx.git && \
+    git clone --depth 1 -b ${VPX_VERSION} https://github.com/webmproject/libvpx.git && \
     cd libvpx && \
     ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
     make -j$(getconf _NPROCESSORS_ONLN) && \
diff --git a/docker/manylinux2014/Dockerfile_i686 b/docker/manylinux2014/Dockerfile_i686
index c11f6a4d..1c94b1fc 100644
--- a/docker/manylinux2014/Dockerfile_i686
+++ b/docker/manylinux2014/Dockerfile_i686
@@ -2,9 +2,9 @@ FROM quay.io/pypa/manylinux2014_i686:latest
 
 ARG CCACHE_VERSION=3.7.9
 ARG CMAKE_VERSION=3.17.0
-ARG FFMPEG_VERSION=5.1.2
+ARG FFMPEG_VERSION=5.1.4
 ARG NASM_VERSION=2.15.04
-ARG OPENSSL_VERSION=1_1_1s
+ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
 ARG YASM_VERSION=1.3.0
 
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index 9233bffa..ac28b689 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,12 +1,13 @@
-# Version: 20231109
+# Version: 20231225
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 ARG CCACHE_VERSION=3.7.9
-ARG FFMPEG_VERSION=5.1.3
+ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
 ARG LIBPNG_VERSION=1.6.40
+ARG VPX_VERSION=v1.13.1
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
 ARG QT_VERSION=5.15.0
@@ -92,7 +93,7 @@ RUN mkdir ~/yasm_sources && \
 
 RUN mkdir ~/libvpx_sources && \
     cd ~/libvpx_sources && \
-    git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
+    git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
     cd libvpx && \
     ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
     make -j$(getconf _NPROCESSORS_ONLN) && \

From e7a86f982713d565c211f6059d52d5f200d97813 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 26 Dec 2023 18:44:55 +0300
Subject: [PATCH 52/65] Use native Mac M1 Github Runner for the configuration.

---
 .github/workflows/build_wheels_macos_m1.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 5d638fd8..85f42fb9 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -55,8 +55,8 @@ jobs:
         echo $ENABLE_CONTRIB > contrib.enabled
         echo $ENABLE_HEADLESS > headless.enabled
         export MACOSX_DEPLOYMENT_TARGET=11.0
-        arch -arm64 python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
-        arch -arm64 python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
+        python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
+        python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
         delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
     - name: Saving all wheels
       uses: actions/upload-artifact@v3
@@ -100,18 +100,18 @@ jobs:
         path: wheelhouse/
     - name: Package installation
       run: |
-        arch -arm64 python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
+        python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
         cd ${{ github.workspace }}/tests
-        arch -arm64 python${{ matrix.python-version }} get_build_info.py
+        python${{ matrix.python-version }} get_build_info.py
     - name: Run tests
       run: |
         cd ${{ github.workspace }}/opencv
-        arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
+        python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
     - name: Pylint test
       run: |
-        arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.15.9
+        python${{ matrix.python-version }} -m pip install pylint==2.15.9
         cd ${{ github.workspace }}/tests
-        arch -arm64 python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
+        python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
 
   Release_rolling:
     if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

From 1e1b0ca86ffcbeb9261378707279c4a116381f3b Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 26 Dec 2023 21:23:09 +0300
Subject: [PATCH 53/65] Migrate Mac OS Intel to OSX 12.

---
 .github/workflows/build_wheels_macos.yml |  4 ++--
 travis_osx_brew_cache.sh                 | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index d40c4697..dd3bc654 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   Build:
-    runs-on: macos-11
+    runs-on: macos-12
     defaults:
       run:
         shell: bash
@@ -98,7 +98,7 @@ jobs:
 
   Test:
     needs: [Build]
-    runs-on: macos-11
+    runs-on: macos-12
     defaults:
       run:
         shell: bash
diff --git a/travis_osx_brew_cache.sh b/travis_osx_brew_cache.sh
index 1a2a1c6c..42e71446 100644
--- a/travis_osx_brew_cache.sh
+++ b/travis_osx_brew_cache.sh
@@ -265,14 +265,14 @@ function _brew_parse_bottle_json {
 
     local JSON; JSON="${1:?}"; shift
 
-    local JSON_DATA; JSON_DATA=$(python2.7 -c 'if True:
+    local JSON_DATA; JSON_DATA=$(python3 -c 'if True:
     import sys,json; j=json.load(open(sys.argv[1],"rb")); [name]=j.keys(); [pdata]=j.values()
-    print name
-    print pdata["formula"]["pkg_version"]
-    print pdata["bottle"]["rebuild"]
+    print(name)
+    print(pdata["formula"]["pkg_version"])
+    print(pdata["bottle"]["rebuild"])
     [(tag_name, tag_dict)]=pdata["bottle"]["tags"].items()
-    print tag_name
-    print tag_dict["sha256"]
+    print(tag_name)
+    print(tag_dict["sha256"])
     ' "$JSON")
 
     unset JSON
@@ -292,15 +292,15 @@ function _brew_parse_package_info {
     PACKAGE="${1:?}"; shift
     OS_CODENAME="${1:?}"; shift
 
-    local JSON_DATA; JSON_DATA=$(python2.7 -c 'if True:
+    local JSON_DATA; JSON_DATA=$(python3 -c 'if True:
     import sys, json, subprocess; j=json.loads(subprocess.check_output(("brew","info","--json=v1",sys.argv[1])))
     data=j[0]
     revision=data["revision"]
     # in bottle''s json, revision is included into version; here, they are separate
-    print data["versions"]["stable"]+("_"+str(revision) if revision else "")
+    print(data["versions"]["stable"]+("_"+str(revision) if revision else ""))
     bottle_data=data["bottle"].get("stable",{"rebuild":"","files":{}})
-    print bottle_data["rebuild"]
-    print bottle_data["files"].get(sys.argv[2],{"sha256":"!?"})["sha256"]     #prevent losing trailing blank line to command substitution
+    print(bottle_data["rebuild"])
+    print(bottle_data["files"].get(sys.argv[2],{"sha256":"!?"})["sha256"])     #prevent losing trailing blank line to command substitution
     ' \
     "$PACKAGE" "$OS_CODENAME"); JSON_DATA="${JSON_DATA%\!\?}"  #!? can't occur in a hash
 

From 042e0e04a5e39ddfc6582d13787269916a3f4c06 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Wed, 27 Dec 2023 13:35:35 +0300
Subject: [PATCH 54/65] Submodules update to tag 4.9.0.

---
 opencv         | 2 +-
 opencv_contrib | 2 +-
 opencv_extra   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opencv b/opencv
index 51998500..dad8af6b 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit 5199850039ad23f1f0e6cccea5061a9fea5efca6
+Subproject commit dad8af6b17f8e60d7b95a1203a1b4d22f56574cf
diff --git a/opencv_contrib b/opencv_contrib
index f10c84d4..c7602a8f 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit f10c84d48b0714f2b408c9e5cccfac1277c8e6cc
+Subproject commit c7602a8f74205e44389bd6a4e8d727d32e7e27b4
diff --git a/opencv_extra b/opencv_extra
index fdd66bfc..7f0ba7ad 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit fdd66bfcc3ced243d682fe03f0858bf43867656c
+Subproject commit 7f0ba7adefcbbbe3df7d939f5246ba0382c7c629

From eaa9512a04c8f1c1f7aeb9f093fa948d3542561b Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 29 Dec 2023 13:53:52 +0300
Subject: [PATCH 55/65] Added donation notification.

---
 README.md | 4 ++++
 setup.py  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 0984e421..514143c6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 [![Downloads](https://static.pepy.tech/badge/opencv-python)](http://pepy.tech/project/opencv-python)
 
+### Keep OpenCV Free
+
+OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. [Donate to OpenCV on IndieGoGo](http://igg.me/at/opencv5) to show your support.
+
 - [OpenCV on Wheels](#opencv-on-wheels)
   - [Installation and Usage](#installation-and-usage)
 - [Frequently Asked Questions](#frequently-asked-questions)
diff --git a/setup.py b/setup.py
index 907e3329..766b4bb4 100644
--- a/setup.py
+++ b/setup.py
@@ -310,6 +310,7 @@ def main():
         cmake_source_dir=cmake_source_dir,
     )
 
+    print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on IndieGoGo:\nhttps://www.indiegogo.com/projects/opencv-5-support-non-profit-open-source-cv-ai#/")
 
 class RearrangeCMakeOutput:
     """

From 080da76b1534607cb648b07a6dd5df30beb61f8d Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Fri, 29 Dec 2023 14:03:50 +0300
Subject: [PATCH 56/65] Run Python test on Mac M1 in virtual environment to
 prevent "error: externally-managed-environment".

---
 .github/workflows/build_wheels_macos_m1.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 85f42fb9..4f1f214c 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -98,17 +98,24 @@ jobs:
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
+    - name: Create Venv for test
+      run: |
+        test -d "${{ github.workspace }}/opencv_test" && rm -rf "${{ github.workspace }}/opencv_test"
+        python${{ matrix.python-version }} -m venv ${{ github.workspace }}/opencv_test
     - name: Package installation
       run: |
-        python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
+        source ${{ github.workspace }}/opencv_test/bin/activate
+        python${{ matrix.python-version }} -m pip install --no-cache --force-reinstall wheelhouse/opencv*.whl
         cd ${{ github.workspace }}/tests
         python${{ matrix.python-version }} get_build_info.py
     - name: Run tests
       run: |
+        source ${{ github.workspace }}/opencv_test/bin/activate
         cd ${{ github.workspace }}/opencv
         python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
     - name: Pylint test
       run: |
+        source ${{ github.workspace }}/opencv_test/bin/activate
         python${{ matrix.python-version }} -m pip install pylint==2.15.9
         cd ${{ github.workspace }}/tests
         python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE

From 949b65ea40f5141bdf46f738f7751a16d6309e04 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Sat, 30 Dec 2023 13:13:41 +0300
Subject: [PATCH 57/65] Upgrade pip on Mac M1 before package installation.

---
 .github/workflows/build_wheels_macos_m1.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 4f1f214c..f0e41d3a 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -105,6 +105,7 @@ jobs:
     - name: Package installation
       run: |
         source ${{ github.workspace }}/opencv_test/bin/activate
+        python${{ matrix.python-version }} -m pip install --upgrade pip
         python${{ matrix.python-version }} -m pip install --no-cache --force-reinstall wheelhouse/opencv*.whl
         cd ${{ github.workspace }}/tests
         python${{ matrix.python-version }} get_build_info.py

From fcf02c69070c7b6ee58ceef00e6a54ca8f0e1bc0 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Sun, 31 Dec 2023 11:09:48 +0300
Subject: [PATCH 58/65] Readme update for 4.9.0.

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 514143c6..7f1e3a4c 100644
--- a/README.md
+++ b/README.md
@@ -241,6 +241,7 @@ Python 3.x compatible pre-built wheels are provided for the officially supported
 - 3.9
 - 3.10
 - 3.11
+- 3.12
 
 ### Backward compatibility
 
@@ -249,3 +250,5 @@ Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was upda
 Starting from 4.3.0 and 3.4.10 builds the Linux build environment was updated from `manylinux1` to `manylinux2014`. This dropped support for old Linux distributions.
 
 Starting from version 4.7.0 the Mac OS GitHub Actions build environment was update to version 11. Mac OS 10.x support depricated. See https://github.com/actions/runner-images/issues/5583
+
+Starting from version 4.9.0 the Mac OS GitHub Actions build environment was update to version 12. Mac OS 10.x support depricated by Brew and most of used packages.

From ebd0aee2004dc4e53a2c8b8b70231c718b313769 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 21 May 2024 09:49:15 +0300
Subject: [PATCH 59/65] Use Github sponsor link.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f1e3a4c..aa19f439 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ### Keep OpenCV Free
 
-OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. [Donate to OpenCV on IndieGoGo](http://igg.me/at/opencv5) to show your support.
+OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. [Donate to OpenCV on Github](https://github.com/sponsors/opencv) to show your support.
 
 - [OpenCV on Wheels](#opencv-on-wheels)
   - [Installation and Usage](#installation-and-usage)

From 542cf06b308cdcf3d5e0a32e33482fe6b22997d6 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Thu, 30 May 2024 15:46:29 +0300
Subject: [PATCH 60/65] Dependencies update for 4.10.0 release. (#984)

* Dependences update for 4.10 release.

* Updated docker tags.

* New docker tags in pipelines.

* Fixed Qt version.

* Added QT to LD_LIBRARY_PATH
---
 .github/workflows/build_wheels_linux.yml     |  4 ++--
 .github/workflows/build_wheels_linux_arm.yml |  2 +-
 docker/manylinux2014/Dockerfile_aarch64      | 12 ++++++------
 docker/manylinux2014/Dockerfile_x86_64       | 12 ++++++------
 patches/patchQtPlugins                       |  2 +-
 travis_config.sh                             |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 45a38d06..0e202f63 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -41,7 +41,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       PLAT: x86_64
@@ -139,7 +139,7 @@ jobs:
       NP_TEST_DEP: numpy==1.19.4
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20231225
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
       USE_CCACHE: 1
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 6371e360..4c1fc48e 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -42,7 +42,7 @@ jobs:
       MB_ML_VER: 2014
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20231225
+      DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
       SDIST: ${{ matrix.build_sdist || 0 }}
diff --git a/docker/manylinux2014/Dockerfile_aarch64 b/docker/manylinux2014/Dockerfile_aarch64
index 196c97bb..e19492ff 100644
--- a/docker/manylinux2014/Dockerfile_aarch64
+++ b/docker/manylinux2014/Dockerfile_aarch64
@@ -1,4 +1,4 @@
-# Version: 20231225
+# Version: 20240524
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64
 
 FROM quay.io/pypa/manylinux2014_aarch64:latest
@@ -6,11 +6,11 @@ FROM quay.io/pypa/manylinux2014_aarch64:latest
 ARG CCACHE_VERSION=3.7.9
 ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
-ARG LIBPNG_VERSION=1.6.40
-ARG VPX_VERSION=v1.13.1
+ARG LIBPNG_VERSION=1.6.43
+ARG VPX_VERSION=v1.14.0
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
-ARG QT_VERSION=5.15.0
+ARG QT_VERSION=5.15.13
 ARG YASM_VERSION=1.3.0
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
@@ -46,8 +46,8 @@ RUN mkdir ~/freetype_sources && \
     cd .. && \
     rm -rf ~/freetype_sources
 
-RUN curl -C - -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
+RUN curl -C - -O -L https://download.qt.io/archive/qt/5.15/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
+    tar -xf qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
     cd qt-everywhere-src-${QT_VERSION} && \
     export MAKEFLAGS=-j$(nproc) && \
     ./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
diff --git a/docker/manylinux2014/Dockerfile_x86_64 b/docker/manylinux2014/Dockerfile_x86_64
index ac28b689..eceae25e 100644
--- a/docker/manylinux2014/Dockerfile_x86_64
+++ b/docker/manylinux2014/Dockerfile_x86_64
@@ -1,4 +1,4 @@
-# Version: 20231225
+# Version: 20240524
 # Image name: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64
 
 FROM quay.io/pypa/manylinux2014_x86_64:latest
@@ -6,11 +6,11 @@ FROM quay.io/pypa/manylinux2014_x86_64:latest
 ARG CCACHE_VERSION=3.7.9
 ARG FFMPEG_VERSION=5.1.4
 ARG FREETYPE_VERSION=2.13.2
-ARG LIBPNG_VERSION=1.6.40
-ARG VPX_VERSION=v1.13.1
+ARG LIBPNG_VERSION=1.6.43
+ARG VPX_VERSION=v1.14.0
 ARG NASM_VERSION=2.15.04
 ARG OPENSSL_VERSION=1_1_1w
-ARG QT_VERSION=5.15.0
+ARG QT_VERSION=5.15.13
 ARG YASM_VERSION=1.3.0
 
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
@@ -45,8 +45,8 @@ RUN mkdir ~/freetype_sources && \
     cd .. && \
     rm -rf ~/freetype_sources
 
-RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz && \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz && \
+RUN curl -O -L https://download.qt.io/archive/qt/5.15/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
+    tar -xf qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
     cd qt-everywhere-src-${QT_VERSION} && \
     export MAKEFLAGS=-j$(nproc) && \
     ./configure -prefix /opt/Qt${QT_VERSION} -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
diff --git a/patches/patchQtPlugins b/patches/patchQtPlugins
index a05a5f83..70c6975a 100644
--- a/patches/patchQtPlugins
+++ b/patches/patchQtPlugins
@@ -9,7 +9,7 @@ index 4c0b3880fc..dffa0a4caa 100644
 +      install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
 +    endif()
 +    if(UNIX AND NOT APPLE)
-+      install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
++      install(DIRECTORY /opt/Qt5.15.13/plugins DESTINATION lib/qt)
 +      install(DIRECTORY /usr/share/fonts DESTINATION lib/qt)
 +    endif()
      if(HAVE_QT_OPENGL)
diff --git a/travis_config.sh b/travis_config.sh
index b91d63c4..903ceafb 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -34,7 +34,7 @@ if [ -n "$IS_OSX" ]; then
   export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
 else
   echo "    > Linux environment "
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.0/lib
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.13/lib
   export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
   CURRENT_ARCH=$(uname -m)
   if [[ $CURRENT_ARCH == 'aarch64' ]]; then

From d261ecbd0f4f937dc9cf99ef37be8278534e370e Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 3 Jun 2024 11:14:10 +0300
Subject: [PATCH 61/65] Added license text for OrbbecSDK needed on MacOS ARM64.

---
 LICENSE-3RD-PARTY.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
index f7d91a4f..0462eee3 100644
--- a/LICENSE-3RD-PARTY.txt
+++ b/LICENSE-3RD-PARTY.txt
@@ -3063,3 +3063,28 @@ courts sitting in the State of Delaware, and each party agrees that it submits
 to the personal jurisdiction and venue of those courts and waives any
 objections. THE UNITED NATIONS CONVENTION ON CONTRACTS FOR THE INTERNATIONAL
 SALE OF GOODS (1980) IS SPECIFICALLY EXCLUDED AND WILL NOT APPLY TO THE SOFTWARE.
+
+------------------------------------------------------------------------------
+Orbbec SDK distributed with arm64 MacOS packages.
+
+MIT License
+
+Copyright (c) 2023 OrbbecDeveloper
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 63eed93e6d372795f6b6ca3d90c5d9cefc1b5a77 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:28:02 +0300
Subject: [PATCH 62/65] Update submodules to 4.10.0-pre for testing. (#990)

* Submodules update to tag 4.10.0.
* Update donation link.
* Use 4 digits in OpenCV version since 4.10.0
* Add OrbbecSDK library to package for MacOS ARM. It's aways enabled during library build.
---
 opencv         |  2 +-
 opencv_contrib |  2 +-
 opencv_extra   |  2 +-
 setup.py       | 10 ++++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/opencv b/opencv
index dad8af6b..71d3237a 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit dad8af6b17f8e60d7b95a1203a1b4d22f56574cf
+Subproject commit 71d3237a093b60a27601c20e9ee6c3e52154e8b1
diff --git a/opencv_contrib b/opencv_contrib
index c7602a8f..1ed3dd2c 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit c7602a8f74205e44389bd6a4e8d727d32e7e27b4
+Subproject commit 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87
diff --git a/opencv_extra b/opencv_extra
index 7f0ba7ad..dd1fbd07 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 7f0ba7adefcbbbe3df7d939f5246ba0382c7c629
+Subproject commit dd1fbd0717ef4d83f86899b4144fdd9bc0364a5f
diff --git a/setup.py b/setup.py
index 766b4bb4..48d5a65f 100644
--- a/setup.py
+++ b/setup.py
@@ -110,11 +110,17 @@ def main():
     # Path regexes with forward slashes relative to CMake install dir.
     rearrange_cmake_output_data = {
         "cv2": (
-            [r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if is64 else "")]
+            [r"bin/opencv_videoio_ffmpeg\d{4}%s\.dll" % ("_64" if is64 else "")]
             if os.name == "nt"
             else []
         )
         +
+        (
+            [r"lib/libOrbbecSDK.dylib", r"lib/libOrbbecSDK.\d.\d.dylib", r"lib/libOrbbecSDK.\d.\d.\d.dylib"]
+            if platform.system() == "Darwin" and platform.machine() == "arm64"
+            else []
+        )
+        +
         # In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
         # Naming conventions vary so widely between versions and OSes
         # had to give up on checking them.
@@ -310,7 +316,7 @@ def main():
         cmake_source_dir=cmake_source_dir,
     )
 
-    print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on IndieGoGo:\nhttps://www.indiegogo.com/projects/opencv-5-support-non-profit-open-source-cv-ai#/")
+    print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on GitHub:\nhttps://github.com/sponsors/opencv\n")
 
 class RearrangeCMakeOutput:
     """

From 512209a631c9e4a3b10b17d853de31a89c449612 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 3 Jun 2024 15:38:59 +0300
Subject: [PATCH 63/65] Update Numpy requirements in the project.

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 00176366..7486f132 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,8 @@ requires = [
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
   "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
-  "numpy==1.22.2; python_version>='3.11'",
+  "numpy==1.23.5; python_version=='3.11'",
+  "numpy>=1.26.4; python_version>='3.12'",
   "pip",
   "scikit-build>=0.14.0",
   "setuptools==59.2.0",

From 00e120989b55ba1734db211766344e0237dbd477 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Mon, 17 Jun 2024 12:09:37 +0300
Subject: [PATCH 64/65] Alternative solution to use Numpy 2.0 for Python 3.9+
 packages.

---
 .github/workflows/build_wheels_linux.yml     |  4 ++--
 .github/workflows/build_wheels_linux_arm.yml |  4 ++--
 .github/workflows/build_wheels_macos.yml     |  4 ++--
 .github/workflows/build_wheels_macos_m1.yml  |  2 +-
 .github/workflows/build_wheels_windows.yml   |  2 +-
 pyproject.toml                               | 10 +++-------
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 0e202f63..746395e4 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7']
+        python-version: ['3.9']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -93,7 +93,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.26.0
+      NP_TEST_DEP_LATEST: numpy==2.0.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
     steps:
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 4c1fc48e..928ded7d 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7']
+        python-version: ['3.9']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -94,7 +94,7 @@ jobs:
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       PLAT: aarch64
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.26.0
+      NP_TEST_DEP_LATEST: numpy==2.0.0
       CONFIG_PATH: travis_config.sh
       DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
       UNICODE_WIDTH: 32
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index dd3bc654..97df456e 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7']
+        python-version: ['3.9']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -114,7 +114,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       NP_TEST_DEP: numpy==1.19.4
-      NP_TEST_DEP_LATEST: numpy==1.26.0
+      NP_TEST_DEP_LATEST: numpy==2.0.0
       CONFIG_PATH: travis_config.sh
       PLAT: x86_64
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index f0e41d3a..a3bcac63 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7']
+        python-version: ['3.9']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index 19470a5d..d69f17ec 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7']
+        python-version: ['3.9']
         platform: [x86, x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
diff --git a/pyproject.toml b/pyproject.toml
index 7486f132..71de7f9b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,13 +4,9 @@ requires = [
   "numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
-  "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
-  "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
-  "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
-  "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
-  "numpy==1.23.5; python_version=='3.11'",
-  "numpy>=1.26.4; python_version>='3.12'",
+  "numpy==1.19.3; python_version<'3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
+  "numpy==1.21.0; python_version<'3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
+  "numpy>=2.0.0;  python_version>='3.9'",
   "pip",
   "scikit-build>=0.14.0",
   "setuptools==59.2.0",

From 92204bda0e8cca6a8e76aa25005ca7af5d220131 Mon Sep 17 00:00:00 2001
From: Lukas Hennies <45569834+Gornoka@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:40:52 +0200
Subject: [PATCH 65/65] chore: minor text fixes in readme

found typo while waiting for clone, maybe it saves someone else 2s of confusion.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa19f439..03396b56 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ If some dependency is not enabled in the pre-built wheels, you can also run the
 4. Select the package flavor which you wish to build with `ENABLE_CONTRIB` and `ENABLE_HEADLESS`: i.e. `export ENABLE_CONTRIB=1` if you wish to build `opencv-contrib-python`
 5. Run ``pip wheel . --verbose``. NOTE: make sure you have the latest ``pip`` version, the ``pip wheel`` command replaces the old ``python setup.py bdist_wheel`` command which does not support ``pyproject.toml``.
     - this might take anything from 5 minutes to over 2 hours depending on your hardware
-6. Pip will print fresh will location at the end of build procedure. If you use old approach with `setup.py` file wheel package will be placed in `dist` folder. Package is ready and you can do with that whatever you wish.
+6. Pip will print fresh wheel location at the end of build procedure. If you use old approach with `setup.py` file wheel package will be placed in `dist` folder. Package is ready and you can do with that whatever you wish.
     - Optional: on Linux use some of the `manylinux` images as a build hosts if maximum portability is needed and run `auditwheel` for the wheel after build
     - Optional: on macOS use ``delocate`` (same as ``auditwheel`` but for macOS) for better portability