From c0e96beb4d83f108ec66d4338ef6531271645aab Mon Sep 17 00:00:00 2001
From: ZLangJIT <root@no.email.yet.com>
Date: Sat, 5 Oct 2024 18:50:12 +0000
Subject: [PATCH] update to riscv-kernel-6.11.0 v15

---
 libmedia.patch | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/libmedia.patch b/libmedia.patch
index 73a2e65..700fb37 100644
--- a/libmedia.patch
+++ b/libmedia.patch
@@ -125543,10 +125543,10 @@ index 00000000..ab21814b
 +#endif
 diff --git a/app/src/main/java/libengine/build_root.cmake b/app/src/main/java/libengine/build_root.cmake
 new file mode 100644
-index 00000000..5047acb0
+index 00000000..42bb6909
 --- /dev/null
 +++ b/app/src/main/java/libengine/build_root.cmake
-@@ -0,0 +1,820 @@
+@@ -0,0 +1,813 @@
 +macro(build_root_message str)
 +  if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt)
 +    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt "BUILD_ROOT LOG      : ${str}\n")
@@ -125873,8 +125873,7 @@ index 00000000..5047acb0
 +
 +  if(ANDROID)
 +    build_root_exec(ls -l ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin)
-+    set(BUILD_ROOT_____________android_toolchain_suffix linux-android)
-+    set(BUILD_ROOT_____________android_compiler_suffix linux-android${CMAKE_SYSTEM_VERSION})
++    set(BUILD_ROOT_____________android_compiler_suffix linux-${ANDROID_PLATFORM})
 +    set(BUILD_ROOT_____________cross_rc "")
 +    # NDK 25 specifies the following, see ./ndk_25_bin.txt in this repo
 +    if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
@@ -125882,36 +125881,30 @@ index 00000000..5047acb0
 +      set(BUILD_ROOT_____________android_machine_family x86)
 +      set(BUILD_ROOT_____________cross_host "--host=x86_64-linux-android")
 +      set(BUILD_ROOT_____________android_compiler_prefix x86_64)
-+      set(BUILD_ROOT_____________android_toolchain_prefix x86_64)
 +      set(BUILD_ROOT_____________NBBY 8)
 +    elseif(CMAKE_ANDROID_ARCH_ABI MATCHES x86)
 +      set(BUILD_ROOT_____________android_machine i686)
 +      set(BUILD_ROOT_____________android_machine_family x86)
 +      set(BUILD_ROOT_____________cross_host "--host=i686-linux-android")
 +      set(BUILD_ROOT_____________android_compiler_prefix i686)
-+      set(BUILD_ROOT_____________android_toolchain_prefix i686)
 +      set(BUILD_ROOT_____________NBBY 4)
 +    elseif(CMAKE_ANDROID_ARCH_ABI MATCHES armeabi-v7a)
 +      set(BUILD_ROOT_____________android_machine armv7)
 +      set(BUILD_ROOT_____________android_machine_family armeabi)
 +      set(BUILD_ROOT_____________cross_host "--host=armv7a-linux-androideabi")
 +      set(BUILD_ROOT_____________android_compiler_prefix armv7a)
-+      set(BUILD_ROOT_____________android_compiler_suffix linux-androideabi${CMAKE_SYSTEM_VERSION})
-+      set(BUILD_ROOT_____________android_toolchain_prefix arm)
-+      set(BUILD_ROOT_____________android_toolchain_suffix linux-androideabi)
 +      set(BUILD_ROOT_____________NBBY 4)
 +    elseif(CMAKE_ANDROID_ARCH_ABI MATCHES arm64-v8a)
 +      set(BUILD_ROOT_____________android_machine aarch64)
 +      set(BUILD_ROOT_____________android_machine_family armv8)
-+      set(BUILD_ROOT_____________cross_host "--host=aarch64-linux-android")
 +      set(BUILD_ROOT_____________android_compiler_prefix aarch64)
-+      set(BUILD_ROOT_____________android_toolchain_prefix aarch64)
 +      set(BUILD_ROOT_____________NBBY 8)
 +    else()
 +      build_root_fatal("unknown android arch: ${CMAKE_ANDROID_ARCH_ABI}")
 +    endif()
-+    set(BUILD_ROOT_____________deps_cc "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________android_compiler_prefix}-${BUILD_ROOT_____________android_compiler_suffix}-clang")
-+    set(BUILD_ROOT_____________deps_cxx "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________android_compiler_prefix}-${BUILD_ROOT_____________android_compiler_suffix}-clang++")
++    set(BUILD_ROOT_____________cross_host "--host=${BUILD_ROOT_____________android_compiler_prefix}-${BUILD_ROOT_____________android_compiler_suffix}")
++    set(BUILD_ROOT_____________deps_cc "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________cross_host}-clang")
++    set(BUILD_ROOT_____________deps_cxx "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________cross_host}-clang++")
 +    set(BUILD_ROOT_____________deps_ld "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld")
 +    set(BUILD_ROOT_____________deps_ranlib "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib")
 +    set(BUILD_ROOT_____________deps_as "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as")