use android 23 triplet overlays
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled

This commit is contained in:
Green Sky 2025-03-29 18:36:04 +01:00
parent 34fbf05fb3
commit 98e55e20ce
No known key found for this signature in database
GPG Key ID: DBE05085D874AB4A
3 changed files with 19 additions and 10 deletions

View File

@ -64,11 +64,11 @@ jobs:
strategy:
matrix:
platform:
- vcpkg_toolkit: arm-neon-android
- vcpkg_toolkit: arm-neon-android-23
ndk_abi: armeabi-v7a
- vcpkg_toolkit: arm64-android
- vcpkg_toolkit: arm64-android-23
ndk_abi: arm64-v8a
- vcpkg_toolkit: x64-android
- vcpkg_toolkit: x64-android-23
ndk_abi: x86_64
steps:
@ -76,6 +76,11 @@ jobs:
with:
submodules: recursive
- uses: actions/checkout@v4
with:
repository: 'Green-Sky/vcpkg_android_triplets'
path: 'vcpkg_android_triplets'
- uses: nttld/setup-ndk@v1
id: setup_ndk
with:
@ -101,8 +106,7 @@ jobs:
env:
ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
#run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} --overlay-ports=vcpkg/ports libsodium opus libvpx libpng libjpeg-turbo
run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
run: vcpkg install --overlay-triplets=vcpkg_android_triplets --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
# vcpkg scripts root /usr/local/share/vcpkg/scripts
- name: Configure CMake

View File

@ -43,11 +43,11 @@ jobs:
strategy:
matrix:
platform:
- vcpkg_toolkit: arm-neon-android
- vcpkg_toolkit: arm-neon-android-23
ndk_abi: armeabi-v7a
- vcpkg_toolkit: arm64-android
- vcpkg_toolkit: arm64-android-23
ndk_abi: arm64-v8a
- vcpkg_toolkit: x64-android
- vcpkg_toolkit: x64-android-23
ndk_abi: x86_64
steps:
@ -55,6 +55,11 @@ jobs:
with:
submodules: recursive
- uses: actions/checkout@v4
with:
repository: 'Green-Sky/vcpkg_android_triplets'
path: 'vcpkg_android_triplets'
- uses: nttld/setup-ndk@v1
id: setup_ndk
with:
@ -80,7 +85,7 @@ jobs:
env:
ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}}
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
run: vcpkg install --overlay-triplets=vcpkg_android_triplets --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium opus libvpx libpng libjpeg-turbo freetype
# vcpkg scripts root /usr/local/share/vcpkg/scripts
- name: Configure CMake

View File

@ -45,7 +45,7 @@ struct DebugVideoTapSink : public FrameStream2SinkI<SDLVideoFrame> {
float _v_interval_avg {0.f}; // s
} view;
std::shared_ptr<PushConversionVideoStream<LockedFrameStream2<SDLVideoFrame>>> stream;
std::shared_ptr<FrameStream2I<SDLVideoFrame>> stream;
};
std::vector<Writer> _writers;