Update and refactor against upstream dolphin

.git-blame-ignore-revs

@@ -9,3 +9,59 @@
 
 # Reformat Android code
 248ee12aed057acd0bdd310359c328e8d4fd5e5a
+
+# Enum and struct indentation cleanup
+40182a48a56b8e294e126c64f5f37910a40c67cd
+ebb48d019eec1c29a37a406e2db16d7565367faa
+
+# SVN line-ending conversion
+30c883bcfc65761dc9fb61fea16a25fb61a7e220
+3b36e0657140a8f54729f55f94ad108547362ed5
+473cd01181be6c8160ce477f25ca6bd39f8cc083
+49cfded60bb5b444d1828190eacc52bbb49a9cb8
+4a0c8fc0c9b6666e7933683260e2befbc81917ff
+4b5b9ad05c10d95c9af43502ecc6877d6e680c4d
+4b68a543ba30ec18e79c93b742bc6f110ccd4561
+4f889ca1a3cb66ff78f11aa6864edf8ce51b8c93
+578c402d2ce5e6a7b6e42a4c7449d9aeac61e5e2
+5e81298ef0147bf36c4aaafa35accc2700777bd3
+7efbc879e544cba7f205b3eeaeff050f46fd9607
+7f4ebed1ddb7ca9aaa49172946fc1f7dc2dc3c75
+8151b21ec75107b73a5863177f29d6f69b7174fc
+8fca9a8e8d547653581ecb4aac12a09a4311eba3
+901fe7c00fec5e2aaf55d184edbcb6d092345d52
+90bac5731cc4b15f40be9cf3a51a2c88ca6b53bf
+9146b9b261c34f476c9f83934e6da6a463ad51c7
+a41c1b2d0a9fab51f8a75ccdb7dba0890f766820
+a524cecfabbd4e321485e0cbac9325efde2123ef
+ab76cbf2fcf31b059edf10c220800150313ddf18
+bbb98d8e2e8259213cc231041eba922471555eb9
+e6fe5ec42f025a710918c1aaf8643da36a13bb3e
+fc1c7c31a08d55be4c756a1ed599d6afeedd9a11
+
+# Trailing whitespace
+c579637eafb9e9eb7f83711569254bd8da6d09d2
+664c8d30a055f4762a2a60be77c1c8eaec1a5d85
+84ae817c180556badd1a810fceff4c4168672541
+8da425b008b46ef90d649e55c6c0d4a0bc2b556b
+8f7c6286f4d4b3e1dccc7076012fe6e593e78c8b
+
+# Additional reformatting
+40bb9974f21878e64fb03d70e717cb996bf13a29
+
+# Tabs vs spaces
+0e3d8e2e9f1b3eab593b09be986c4ff12a0221e2
+16a74a9557779cd15890b0a3bb2924cb4b00ad6f
+1db10b139cb1f9b92b2e90eb86f236dcd30333b4
+1de39a4a6e6b5ef3ec55bd717d4ba02c02ff8d29
+2316cb6876e6d79584ce0cc50771d2fb8495fe45
+2d4c3c7c918877c844babaa5ac4c23f8a441fb64
+31f037b187525d72c10b83695f780ede1ad9db68
+3c6d0fc7106131098fe1a79d2deb0f39671c5252
+3fd87a7636ff434118a5d7f7334550be8db55c0b
+71ef0a02451393b32fc2304008f87d5b29b61444
+7ab0cca6455830a838b1b1e38e2c3f265e4e5d0b
+d800b5fb74c077522ef7a0752e49968df46e745e
+edd9d0e0ef6898a0528ac6389e93e9fca6132ff6
+ee61bd6f2e4db8df8e92be6f92c02b808aa92234
+ef85b9af45922c6ca364930d40f8aacf1a6dfe64

.gitattributes

@@ -0,0 +1 @@
+*.sln text eol=crlf

.gitignore

@@ -3,8 +3,11 @@ Thumbs.db
 # Ignore Finder view option files created by OS X
 .DS_Store
 # Ignore autogenerated source files
+Externals/mGBA/version.c
 Source/Core/Common/scmrev.h
 # Ignore files output by build
+/cmake-build-debug
+/cmake-build-release
 /[Bb]uild*/
 /[Bb]inary*/
 /obj/
@@ -35,6 +38,8 @@ CMakeLists.txt.user
 # Ignore kdevelop files/dirs
 *.kdev4
 # Ignore IDEA/Clion files/dirs
-/.idea/
+.idea/
 # Ignore Visual Studio Code's working dir
 /.vscode/
+# Ignore flatpak-builder's cache dir
+.flatpak-builder

.gitlab-ci.yml

@@ -7,33 +7,42 @@
 # Core definitions
 .core-defs:
   variables:
+    GIT_SUBMODULE_STRATEGY: recursive
     CORENAME: dolphin
     CORE_ARGS: -DLIBRETRO=ON
 
-variables:
-  GIT_SUBMODULE_STRATEGY: normal
-
-.core-linux-defs:
-  extends: .core-defs
-
-.core-windows-defs:
-  extends: .core-defs
-
 # Inclusion templates, required for the build to work
 include:
   ################################## DESKTOPS ################################
   # Windows
   - project: 'libretro-infrastructure/ci-templates'
-    file: '/windows-cmake-msvc19.yml'
+    file: '/windows-cmake-mingw.yml'
 
   # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-cmake.yml'
 
-  # MacOS
+  # MacOS x64
   - project: 'libretro-infrastructure/ci-templates'
     file: 'osx-cmake-x86.yml'
 
+  # MacOS arm64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: 'osx-cmake-arm64.yml'
+
+  ################################## CELLULAR ################################
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-cmake.yml'
+
+  # iOS arm64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-cmake.yml'
+
+  # tvOS arm64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-cmake.yml'
+
 # Stages for building
 stages:
   - build-prepare
@@ -47,19 +56,66 @@ stages:
 # Windows 64-bit
 libretro-build-windows-x64:
   extends:
-    - .libretro-windows-msvc19-cmake-x86_64
-    - .core-windows-defs
-  after_script:
-    - move-Item "Binary\$Env:LIBNAME" "$Env:LIBNAME" -Force -ErrorAction SilentlyContinue
+    - .libretro-windows-cmake-x86_64
+    - .core-defs
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win-cross-cores:mingw12
+  variables:
+    EXTRA_PATH: ../../Binary/x64
+  before_script:
+    - export NUMPROC=$(($(nproc)/5))
+    - if builtin type -P ccache &> /dev/null; then ccache -V &> /dev/null; fi
+    - mv /usr/lib/mxe/usr/x86_64-w64-mingw32.static/lib/libcurl.a .
 
 # Linux 64-bit
 libretro-build-linux-x64:
   extends:
     - .libretro-linux-cmake-x86_64
-    - .core-linux-defs
+    - .core-defs
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:backports
+  variables:
+    CC: /usr/bin/gcc-12
+    CXX: /usr/bin/g++-12
 
 # macOS Intel
 libretro-build-osx-x64:
+  tags:
+    - mac-apple-silicon
   extends:
     - .libretro-osx-cmake-x86
-    - .core-linux-defs
+    - .core-defs
+  variables:
+    CORE_ARGS: -DLIBRETRO=ON -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=x86_64
+
+# macOS arm64
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-cmake-arm64
+    - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-cmake-arm64-v8a
+    - .core-defs
+  variables:
+    ANDROID_NDK_VERSION: 26.2.11394342
+    NDK_ROOT: /android-sdk-linux/ndk/$ANDROID_NDK_VERSION
+
+# iOS arm64
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-cmake-arm64
+    - .core-defs
+  variables:
+    CMAKE_ADDL_COMP_FLAGS: ""
+    IOS_MINVER: 13.0
+
+# tvOS arm64
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-cmake-arm64
+    - .core-defs
+  variables:
+    CMAKE_ADDL_COMP_FLAGS: ""
+    MINVER: 13.0

.gitmodules

@@ -1,5 +1,112 @@
 [submodule "Externals/Qt"]
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
-	branch = master
+	shallow = true
+[submodule "Externals/mGBA/mgba"]
+	path = Externals/mGBA/mgba
+	url = https://github.com/mgba-emu/mgba.git
+	shallow = true
+[submodule "Externals/FFmpeg-bin"]
+	path = Externals/FFmpeg-bin
+	url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
+	shallow = true
+[submodule "libusb"]
+	path = Externals/libusb/libusb
+	url = https://github.com/libusb/libusb.git
+	shallow = true
+[submodule "Externals/spirv_cross/SPIRV-Cross"]
+	path = Externals/spirv_cross/SPIRV-Cross
+	url = https://github.com/KhronosGroup/SPIRV-Cross.git
+	shallow = true
+[submodule "SDL"]
+	path = Externals/SDL/SDL
+	url = https://github.com/libsdl-org/SDL.git
+	shallow = true
+[submodule "Externals/zlib-ng/zlib-ng"]
+	path = Externals/zlib-ng/zlib-ng
+	url = https://github.com/zlib-ng/zlib-ng.git
+	shallow = true
+[submodule "Externals/libspng/libspng"]
+	path = Externals/libspng/libspng
+	url = https://github.com/randy408/libspng.git
+	shallow = true
+[submodule "Externals/VulkanMemoryAllocator"]
+	path = Externals/VulkanMemoryAllocator
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	shallow = true
+[submodule "Externals/cubeb/cubeb"]
+	path = Externals/cubeb/cubeb
+	url = https://github.com/mozilla/cubeb.git
+	shallow = true
+[submodule "Externals/implot/implot"]
+	path = Externals/implot/implot
+	url = https://github.com/epezent/implot.git
+	shallow = true
+[submodule "Externals/gtest"]
+	path = Externals/gtest
+	url = https://github.com/google/googletest.git
+	shallow = true
+[submodule "Externals/rcheevos/rcheevos"]
+	path = Externals/rcheevos/rcheevos
+	url = https://github.com/RetroAchievements/rcheevos.git
+	shallow = true
+[submodule "Externals/libadrenotools"]
+	path = Externals/libadrenotools
+	url = https://github.com/bylaws/libadrenotools.git
+	shallow = true
+[submodule "Externals/curl/curl"]
+	path = Externals/curl/curl
+	url = https://github.com/curl/curl.git
+	shallow = true
+[submodule "Externals/fmt/fmt"]
+	path = Externals/fmt/fmt
+	url = https://github.com/fmtlib/fmt.git
+	shallow = true
+[submodule "Externals/lz4/lz4"]
+	path = Externals/lz4/lz4
+	url = https://github.com/lz4/lz4.git
+	shallow = true
+[submodule "Externals/xxhash/xxHash"]
+	path = Externals/xxhash/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+	shallow = true
+[submodule "Externals/enet/enet"]
+	path = Externals/enet/enet
+	url = https://github.com/lsalzman/enet.git
+	shallow = true
+[submodule "hidapi-src"]
+	path = Externals/hidapi/hidapi-src
+	url = https://github.com/libusb/hidapi.git
+	shallow = true
+[submodule "Externals/tinygltf/tinygltf"]
+	path = Externals/tinygltf/tinygltf
+	url = https://github.com/syoyo/tinygltf.git
+	shallow = true
+[submodule "Externals/minizip-ng/minizip-ng"]
+	path = Externals/minizip-ng/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git
+	shallow = true
+[submodule "Externals/Vulkan-Headers"]
+	path = Externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+	shallow = true
+[submodule "Externals/watcher/watcher"]
+	path = Externals/watcher/watcher
+	url = https://github.com/e-dant/watcher.git
+	shallow = true
+[submodule "Externals/SFML/SFML"]
+	path = Externals/SFML/SFML
+	url = https://github.com/SFML/SFML.git
+	shallow = true
+[submodule "Externals/zstd/zstd"]
+	path = Externals/zstd/zstd
+	url = https://github.com/facebook/zstd.git
+	shallow = true
+[submodule "Externals/miniupnpc/miniupnp"]
+	path = Externals/miniupnpc/miniupnp
+	url = https://github.com/miniupnp/miniupnp.git
+	shallow = true
+[submodule "Externals/glslang/glslang"]
+	path = Externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git
 	shallow = true

.tx/config

@@ -1,8 +1,8 @@
-[main]
-host = https://www.transifex.com
-
-[dolphin-emu.emulator]
-file_filter = Languages/po/<lang>.po
-source_file = Languages/po/dolphin-emu.pot
-source_lang = en-US
-type = PO
+[main]
+host = https://www.transifex.com
+
+[o:dolphinemu:p:dolphin-emu:r:emulator]
+file_filter = Languages/po/<lang>.po
+source_file = Languages/po/dolphin-emu.pot
+source_lang = en-US
+type        = PO