Checking Vulkan detection

Javernaut · Apr 19, 2024 · 872682b · 872682b
1 parent 579d62a
commit 872682b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml
@@ -5,18 +5,16 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
+        ffmpeg: [ "6.0.1", "6.1.1", "7.0" ]
+        ndk: [ "26.3.11579264", "27.0.11718014" ]
         abi: [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup the environment
-        run: |
-          sudo pip3 install meson==1.4.0
-          sudo apt-get install nasm ninja-build
-
       - name: Executing the script
         run: |
+          echo "yes" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "ndk;${{ matrix.ndk }}"
           export ANDROID_SDK_HOME=$ANDROID_HOME
-          export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME
-          ./ffmpeg-android-maker.sh -all-free -all-gpl -android=24 -abis=${{ matrix.abi }}
+          export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/${{ matrix.ndk }}
+          ./ffmpeg-android-maker.sh --source-tar=${{ matrix.ffmpeg }} -abis=${{ matrix.abi }}
diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh
@@ -43,7 +43,6 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
   --extra-ldflags="$DEP_LD_FLAGS" \
   --enable-shared \
   --disable-static \
-  --disable-vulkan \
   --pkg-config=${PKG_CONFIG_EXECUTABLE} \
   ${EXTRA_BUILD_CONFIGURATION_FLAGS} \
   $ADDITIONAL_COMPONENTS || exit 1