From c99bb18a843164be44688c0e35722c3c8fcda098 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 3 Jan 2023 20:50:47 +0100 Subject: [PATCH] vulkan-loader-android: make package buildable on device By downloading android-ndk zip instead of relying on the toolchain directory. --- packages/vulkan-loader-android/build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/vulkan-loader-android/build.sh b/packages/vulkan-loader-android/build.sh index d52eeef042..ba01e2b9a9 100644 --- a/packages/vulkan-loader-android/build.sh +++ b/packages/vulkan-loader-android/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://source.android.com/devices/graphics/arch-vulkan TERMUX_PKG_DESCRIPTION="Vulkan Loader for Android" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION +TERMUX_PKG_VERSION=25b +TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip +TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 TERMUX_PKG_HOSTBUILD=true -TERMUX_PKG_SKIP_SRC_EXTRACT=true +TERMUX_PKG_BUILD_IN_SRC=true # Desktop Vulkan Loader # https://github.com/KhronosGroup/Vulkan-Loader @@ -38,13 +40,13 @@ termux_step_host_build() { } EOF rm -fr ./vulkan - cp -fr "$NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/vulkan" ./vulkan + cp -fr "$TERMUX_PKG_SRCDIR/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/vulkan" ./vulkan cc vulkan_header_version.c -o vulkan_header_version } termux_step_post_make_install() { install -v -Dm644 \ - "$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libvulkan.so" \ + "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libvulkan.so" \ "$TERMUX_PREFIX/lib/libvulkan.so" local vulkan_loader_version