Skip to content

Commit 872682b

Browse files
committed
Checking Vulkan detection
1 parent 579d62a commit 872682b

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/workflows/compilability_check.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@ jobs:
55
runs-on: ubuntu-22.04
66
strategy:
77
matrix:
8+
ffmpeg: [ "6.0.1", "6.1.1", "7.0" ]
9+
ndk: [ "26.3.11579264", "27.0.11718014" ]
810
abi: [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ]
911
fail-fast: false
1012
steps:
1113
- uses: actions/checkout@v4
1214

13-
- name: Setup the environment
14-
run: |
15-
sudo pip3 install meson==1.4.0
16-
sudo apt-get install nasm ninja-build
17-
1815
- name: Executing the script
1916
run: |
17+
echo "yes" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "ndk;${{ matrix.ndk }}"
2018
export ANDROID_SDK_HOME=$ANDROID_HOME
21-
export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME
22-
./ffmpeg-android-maker.sh -all-free -all-gpl -android=24 -abis=${{ matrix.abi }}
19+
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/${{ matrix.ndk }}
20+
./ffmpeg-android-maker.sh --source-tar=${{ matrix.ffmpeg }} -abis=${{ matrix.abi }}

scripts/ffmpeg/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
4343
--extra-ldflags="$DEP_LD_FLAGS" \
4444
--enable-shared \
4545
--disable-static \
46-
--disable-vulkan \
4746
--pkg-config=${PKG_CONFIG_EXECUTABLE} \
4847
${EXTRA_BUILD_CONFIGURATION_FLAGS} \
4948
$ADDITIONAL_COMPONENTS || exit 1

0 commit comments

Comments
 (0)