feat: 更新补丁

Author: wojiushixiaobai

.github/workflows/build-manylinux-images-custom.yml

@@ -93,7 +93,6 @@ jobs:
         run: |
           mkdir -p docker/manylinux2014
           wget -qO docker/manylinux2014/Dockerfile_ppc64le https://github.com/opencv/opencv-python/raw/refs/tags/${version}/docker/manylinux2014/Dockerfile_x86_64
-          patch -p1 < ppc64le.patch
           cd docker/manylinux2014
           sed -i "s@FROM quay.io/pypa/manylinux2014_x86_64@FROM quay.io/pypa/manylinux2014_ppc64le@g" Dockerfile_ppc64le
           image_tag=$(cat Dockerfile_ppc64le | grep "Version:" | sed 's/# Version: //')
@@ -133,7 +132,6 @@ jobs:
         run: |
           mkdir -p docker/manylinux2014
           wget -qO docker/manylinux2014/Dockerfile_s390x https://github.com/opencv/opencv-python/raw/refs/tags/${version}/docker/manylinux2014/Dockerfile_x86_64
-          patch -p1 < s390x.patch
           cd docker/manylinux2014
           sed -i "s@FROM quay.io/pypa/manylinux2014_x86_64@FROM quay.io/pypa/manylinux2014_s390x@g" Dockerfile_s390x
           image_tag=$(cat Dockerfile_s390x | grep "Version:" | sed 's/# Version: //')

.github/workflows/build_wheels_linux.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Check version
         id: check_version
         run: |
-          version=$(curl -s "https://api.github.com/repos/opencv/opencv-python/releases/latest" | jq -r .tag_name)
+          version=$(curl --retry 10 -s "https://api.github.com/repos/opencv/opencv-python/releases/latest" | jq -r .tag_name)
           if [ -z "${version}" ] || [ "${version}" == "null" ]; then
             echo "Failed to get version"
             exit 1
@@ -44,23 +44,28 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9']
-        platform: [x64]
+        platform: [loongarch64]
+        manylinux: [2_38]
         with_contrib: [0, 1]
         without_gui: [0, 1]
         build_sdist: [0]
+        include:
+          - platform: loongarch64
+            manylinux: 2_38
+            DOCKER_IMAGE: ghcr.io/loong64/opencv-python-manylinux_2_38-loongarch64:latest
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
       PROJECT_SPEC: opencv-python
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
-      MB_ML_VER: _2_38
+      MB_ML_VER: ${{ matrix.manylinux }}
       TRAVIS_BUILD_DIR: ${{ github.workspace }}
       CONFIG_PATH: travis_config.sh
-      DOCKER_IMAGE: ghcr.io/loong64/opencv-python-manylinux_2_38-loongarch64:latest
+      DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
       USE_CCACHE: 0
       UNICODE_WIDTH: 32
-      PLAT: loongarch64
+      PLAT: ${{ matrix.platform }}
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -70,20 +75,35 @@ jobs:
       run: find . -mindepth 1 -delete
       working-directory: ${{ github.workspace }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
       with:
         repository: opencv/opencv-python
         ref: ${{ env.VERSION }}
-        submodules: false
+        submodules: true
         fetch-depth: 0
     - name: Setup QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v4
+    - name: Prepare build
+      run: |
+        cd opencv/3rdparty/mlas/lib/loongarch64/
+        if [ ! -f "FgemmKernelCommon.h" ]; then
+          wget https://github.com/microsoft/onnxruntime/raw/refs/heads/main/onnxruntime/core/mlas/lib/loongarch64/FgemmKernelCommon.h
+        fi
+        if [ ! -f "FgemmKernelLsxCommon.h" ]; then
+          wget https://github.com/microsoft/onnxruntime/raw/refs/heads/main/onnxruntime/core/mlas/lib/loongarch64/FgemmKernelLsxCommon.h
+        fi
+        if [ ! -f "FgemmKernelLasxCommon.h" ]; then
+          wget https://github.com/microsoft/onnxruntime/raw/refs/heads/main/onnxruntime/core/mlas/lib/loongarch64/FgemmKernelLasxCommon.h
+        fi
+        if [ ! -f "SgemmKernelCommon.h" ]; then
+          wget https://github.com/microsoft/onnxruntime/raw/refs/heads/main/onnxruntime/core/mlas/lib/loongarch64/SgemmKernelCommon.h
+        fi
     - name: Build a package
       run: source scripts/build.sh
       env:
         DOCKER_DEFAULT_PLATFORM: linux/loong64
     - name: Saving a wheel accordingly to matrix
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/opencv*.whl
@@ -98,7 +118,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           pattern: wheel-*
           path: wheelhouse/

loong64.patch

@@ -2,15 +2,27 @@ diff --git a/docker/manylinux_2_38/Dockerfile_loongarch64 b/docker/manylinux_2_3
 index 3ed3aa4..783ee6a 100644
 --- a/docker/manylinux_2_38/Dockerfile_loongarch64
 +++ b/docker/manylinux_2_38/Dockerfile_loongarch64
-@@ -44,6 +44,7 @@
+@@ -14,9 +14,10 @@
+ ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
+ 
+ # epel-release need for aarch64 to get openblas packages
+-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 && \
++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 -y && \
+     yum install openblas-devel dejavu-sans-fonts ccache yasm nasm ninja-build openssl openssl-devel -y && \
+     # libpng will be built from source
++    cp -R /usr/share/fonts/dejavu-sans-fonts /usr/share/fonts/dejavu && \
+     yum remove libpng -y
+ 
+ RUN mkdir ~/libpng_sources && \
+@@ -44,6 +45,7 @@
  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} && \
 +    sed -i 's/defined(__mips__) || /defined(__mips__) || defined(__loongarch__) || /g' qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h && \
      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 && \
      make && \
-@@ -58,6 +59,8 @@
+@@ -58,6 +60,8 @@
      cd ~/libvpx_sources && \
      git clone --depth 1 -b ${VPX_VERSION} https://chromium.googlesource.com/webm/libvpx.git && \
      cd libvpx && \
@@ -19,7 +31,7 @@ index 3ed3aa4..783ee6a 100644
      ./configure --prefix="/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
      make -j$(getconf _NPROCESSORS_ONLN) && \
      make install && \
-@@ -109,6 +112,7 @@
+@@ -109,6 +113,7 @@
  # Git security vulnerability: https://github.blog/2022-04-12-git-security-vulnerability-announced
  RUN git config --global --add safe.directory /io