From 4f8f41291a46b772981951c765eeaae0ecf741fb Mon Sep 17 00:00:00 2001 From: Jarrod Norwell Date: Wed, 10 Apr 2024 14:19:46 +0800 Subject: [PATCH 1/2] Fixed cubeb, nx_tdzb and reverted FFmpeg and SDL2 --- .gitmodules | 12 ++++++------ externals/SDL | 2 +- externals/cubeb | 2 +- externals/ffmpeg/ffmpeg | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 650ff26..ac837a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "enet"] path = externals/enet url = https://github.com/lsalzman/enet.git -[submodule "cubeb"] - path = externals/cubeb - url = https://github.com/mozilla/cubeb.git [submodule "dynarmic"] path = externals/dynarmic url = https://github.com/sudachi-emu/dynarmic.git @@ -43,9 +40,6 @@ [submodule "libadrenotools"] path = externals/libadrenotools url = https://github.com/bylaws/libadrenotools.git -[submodule "tzdb_to_nx"] - path = externals/nx_tzdb/tzdb_to_nx - url = https://github.com/lat9nq/tzdb_to_nx.git [submodule "VulkanMemoryAllocator"] path = externals/VulkanMemoryAllocator url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git @@ -64,3 +58,9 @@ [submodule "vcpkg"] path = externals/vcpkg url = https://github.com/microsoft/vcpkg.git +[submodule "externals/nx_tzdb/tzdb_to_nx"] + path = externals/nx_tzdb/tzdb_to_nx + url = https://github.com/lat9nq/tzdb_to_nx.git +[submodule "externals/cubeb"] + path = externals/cubeb + url = https://github.com/mozilla/cubeb.git diff --git a/externals/SDL b/externals/SDL index d79f865..cc016b0 160000 --- a/externals/SDL +++ b/externals/SDL @@ -1 +1 @@ -Subproject commit d79f8652510b8bd1f89c90be2ab65fc8940056eb +Subproject commit cc016b0046d563287f0aa9f09b958b5e70d43696 diff --git a/externals/cubeb b/externals/cubeb index 74d6b05..67db4cb 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 74d6b0546576d9ee13a078ed51f87a6eede62014 +Subproject commit 67db4cbc18581c8a6d8ea935af9854ed9729e7a7 diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg index d65908c..9c1294e 160000 --- a/externals/ffmpeg/ffmpeg +++ b/externals/ffmpeg/ffmpeg @@ -1 +1 @@ -Subproject commit d65908c3d416e331e075c3a5ffe7bc670112a018 +Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c From 05d358ccf28fa383d1e9109ae6ddc6b6cd9eea4d Mon Sep 17 00:00:00 2001 From: Jarrod Norwell Date: Wed, 10 Apr 2024 16:31:16 +0800 Subject: [PATCH 2/2] Updated AGP --- src/android/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index 0a45976..f4cfcfa 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts @@ -3,8 +3,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.3.0" apply false - id("com.android.library") version "8.3.0" apply false + id("com.android.application") version "8.3.1" apply false + id("com.android.library") version "8.3.1" apply false id("org.jetbrains.kotlin.android") version "1.9.20" apply false }