diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg index d65908c..53a952a 160000 --- a/externals/ffmpeg/ffmpeg +++ b/externals/ffmpeg/ffmpeg @@ -1 +1 @@ -Subproject commit d65908c3d416e331e075c3a5ffe7bc670112a018 +Subproject commit 53a952a7313f2c78d93a4f6805abe570fe35f96b diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index d85d802..d059d24 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -25,9 +25,9 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn @Suppress("UnstableApiUsage") android { namespace = "org.yuzu.yuzu_emu" + compileSdk = 34 - compileSdkVersion = "android-34" - ndkVersion = "26.1.10909125" + ndkVersion = "26.2.11394342" buildFeatures { viewBinding = true @@ -161,6 +161,7 @@ android { path = file("../../../CMakeLists.txt") } } + buildToolsVersion = "34.0.0" defaultConfig { externalNativeBuild { @@ -232,7 +233,7 @@ dependencies { implementation("com.google.android.material:material:1.11.0") implementation("androidx.preference:preference-ktx:1.2.1") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") - implementation("io.coil-kt:coil:2.2.2") + implementation("io.coil-kt:coil:2.6.0") implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.window:window:1.2.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") @@ -240,7 +241,7 @@ dependencies { implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") implementation("androidx.navigation:navigation-ui-ktx:2.7.7") implementation("info.debatty:java-string-similarity:2.0.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") } fun runGitCommand(command: List): String { diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index f1184a5..34c4696 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -38,7 +38,7 @@ public: } private: - libusb_context* ctx; + libusb_context* ctx = nullptr; int init_result{}; }; @@ -66,7 +66,7 @@ public: } private: - libusb_device_handle* handle{}; + libusb_device_handle* handle = nullptr; }; GCAdapter::GCAdapter(std::string input_engine_) : InputEngine(std::move(input_engine_)) { @@ -218,8 +218,7 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) { Common::SetCurrentThreadName("ScanGCAdapter"); usb_adapter_handle = nullptr; pads = {}; - while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) { - } + while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) {} } bool GCAdapter::Setup() { diff --git a/src/input_common/drivers/gc_adapter.h b/src/input_common/drivers/gc_adapter.h index 3c2eb37..43c2861 100644 --- a/src/input_common/drivers/gc_adapter.h +++ b/src/input_common/drivers/gc_adapter.h @@ -117,7 +117,7 @@ private: Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const; std::unique_ptr usb_adapter_handle; - std::array pads; + std::array pads{}; std::jthread adapter_input_thread; std::jthread adapter_scan_thread; diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cpp index ade72e1..161db2a 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_buffer_cache.cpp @@ -241,8 +241,8 @@ void BufferCacheRuntime::BindVertexBuffer(u32 index, Buffer& buffer, u32 offset, void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings& bindings) { // TODO: Should HostBindings provide the correct runtime types to avoid these transforms? - std::array buffer_handles; - std::array buffer_strides; + std::array buffer_handles{}; + std::array buffer_strides{}; std::ranges::transform(bindings.buffers, buffer_handles.begin(), [](const Buffer* const buffer) { return buffer->Handle(); }); std::ranges::transform(bindings.strides, buffer_strides.begin(),