update ffmpeg n7.1 (#21)

valord577 · Dec 24, 2024 · 0a038e7 · 0a038e7
1 parent f5b4e3c
commit 0a038e7
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml
@@ -10,10 +10,22 @@ on:
         default: false
         required: false
         type: boolean
-      disable_upload:
+      disable_commit:
         default: false
         required: false
         type: boolean
+      host_executable:
+        default: false
+        required: false
+        type: boolean
+      container_linux:
+        default: "linux310-gcc4"
+        required: false
+        type: string
+      container_linux_vers:
+        default: "07dcb8281c82686f54791e993f5f894360dfa5c9"
+        required: false
+        type: string
       allow_failure:
         default: false
         required: false
@@ -67,19 +79,15 @@ jobs:
           matrix=$(cat .github/matrix.json | jq -c -M "map(. | select($jq_expr) )")
           matrix=$(echo ${matrix} | jq -c -M "map(if ${host_macos} then . + {os: \"macos-15\"} else . end)")
 
-          [ "${{ github.workflow }}" == "llvm" ] && \
+          ${{ inputs.host_executable }} && \
             { matrix=$(echo ${matrix} | jq -c -M 'map(. | select((.platform=="macosx")) )'); }
 
           printf "\e[1m\e[33m%s\e[0m\n" "matrix: $matrix"
           echo "matrix={\"include\":$(echo $matrix)}" >> "$GITHUB_OUTPUT"
       - name: set matrix container
         id: set-matrix-container
         run: |
-          container_linux_vers='07dcb8281c82686f54791e993f5f894360dfa5c9'
-          container_linux="valord577/linux310-gcc4-cross:${container_linux_vers}"
-          [ "${{ github.workflow }}" == "llvm" ] && \
-            { container_linux="valord577/linux310-gcc7-cross:${container_linux_vers}"; }
-
+          container_linux="valord577/${{ inputs.container_linux }}-cross:${{ inputs.container_linux_vers }}"
 
           matrix=$(cat .github/matrix_container.json | jq -c -M "map(. | select($jq_expr) )")
           matrix=$(echo ${matrix} | jq -c -M "map(if .platform == \"linux\" then . + {image: \"${container_linux}\"} else . end)")
@@ -134,7 +142,7 @@ jobs:
           name: ${{ env.PKG_ZIP_NAME }}
           path: ${{ env.PKG_ZIP_NAME }}.tar
       - name: commit to pre-compiled storage
-        if: ${{ github.event_name == 'push' && (! inputs.disable_upload) }}
+        if: ${{ github.event_name == 'push' && (! inputs.disable_commit) }}
         run: |
           zip -ry "${{ env.PKG_ZIP_NAME }}.zip" ${{ github.workflow }}
           ./.github/oss_v4.py push "${{ env.PKG_ZIP_NAME }}.zip" "${{ github.workflow }}/${{ needs._preset.outputs.pkgver }}/${{ env.PKG_ZIP_NAME }}.zip"
@@ -207,7 +215,7 @@ jobs:
           name: ${{ env.PKG_ZIP_NAME }}
           path: ${{ env.PKG_ZIP_NAME }}.tar
       - name: commit to pre-compiled storage
-        if: ${{ github.event_name == 'push' && (! inputs.disable_upload) }}
+        if: ${{ github.event_name == 'push' && (! inputs.disable_commit) }}
         run: |
           zip -ry "${{ env.PKG_ZIP_NAME }}.zip" ${{ github.workflow }}
           ./.github/oss_v4.py push "${{ env.PKG_ZIP_NAME }}.zip" "${{ github.workflow }}/${{ needs._preset.outputs.pkgver }}/${{ env.PKG_ZIP_NAME }}.zip"
diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -33,5 +33,6 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/_matrix.yml
     with:
+      disable_commit: true
       allow_failure: true
-      disable_upload: true
+      host_executable: true
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -33,5 +33,7 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/_matrix.yml
     with:
+      disable_commit: true
       allow_failure: true
-      disable_upload: true
+      host_executable: true
+      container_linux: "linux310-gcc7"
diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml
@@ -29,3 +29,5 @@ jobs:
   build:
     secrets: inherit
     uses: ./.github/workflows/_matrix.yml
+    with:
+      host_executable: true
diff --git a/deps/ffmpeg b/deps/ffmpeg
diff --git a/patches/ffmpeg/09_more_gitignore.patch b/patches/ffmpeg/09_more_gitignore.patch
@@ -0,0 +1,10 @@
+diff --git a/.gitignore b/.gitignore
+index e810d11107..2f530448e4 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -41,3 +41,5 @@
+ /src
+ /mapfile
+ /tools/python/__pycache__/
++
++.cache