From a885784e1249fa7804b242b34659076c7b18f968 Mon Sep 17 00:00:00 2001
From: deadcade <deadcade@noreply.deadca.de>
Date: Sun, 15 Jan 2023 18:43:53 +0100
Subject: [PATCH] Revert last commit and update to 3308

---
 .SRCINFO | 12 +-----------
 PKGBUILD | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 210a6b3..62bccfb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,11 +21,6 @@ pkgbase = yuzu-early-access
 	makedepends = qt5-tools
 	makedepends = desktop-file-utils
 	makedepends = robin-map
-	makedepends = cpp-jwt
-	makedepends = xbyak
-	makedepends = vulkan-headers
-	makedepends = spirv-headers
-	makedepends = dos2unix
 	depends = boost-libs
 	depends = shared-mime-info
 	depends = hicolor-icon-theme
@@ -40,14 +35,9 @@ pkgbase = yuzu-early-access
 	depends = opus
 	depends = libfdk-aac
 	depends = lz4
+	depends = mbedtls
 	depends = openssl
 	depends = zstd
-	depends = cubeb
-	depends = dynarmic
-	depends = enet
-	depends = libinih
-	depends = discord-rpc
-	depends = cpp-httplib
 	optdepends = qt5-wayland: for Wayland support
 	provides = yuzu
 	conflicts = yuzu
diff --git a/PKGBUILD b/PKGBUILD
index b15152a..9886fae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Brendan Szymanski <bscubed@pm.me>
+# Maintainer: 0xDEADCADE <$(base64 -d<<<MHhkZWFkY2FkZUBwcm90b25tYWlsLmNvbQ==)>
 
 _pkgname=yuzu
 pkgname=$_pkgname-early-access
@@ -8,8 +8,8 @@ pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early ac
 arch=('i686' 'x86_64')
 url="https://yuzu-emu.org/"
 license=('GPL2')
-depends=('boost-libs' 'shared-mime-info' 'hicolor-icon-theme' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-webengine' 'libxkbcommon-x11' 'ffmpeg' 'fmt' 'libzip' 'opus' 'libfdk-aac' 'lz4' 'openssl' 'zstd' 'cubeb' 'dynarmic' 'enet' 'libinih' 'discord-rpc' 'cpp-httplib')
-makedepends=('llvm' 'git' 'glslang' 'cmake' 'ninja' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils' 'robin-map' 'cpp-jwt' 'xbyak' 'vulkan-headers' 'spirv-headers' 'dos2unix')
+depends=('boost-libs' 'shared-mime-info' 'hicolor-icon-theme' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-webengine' 'libxkbcommon-x11' 'ffmpeg' 'fmt' 'libzip' 'opus' 'libfdk-aac' 'lz4' 'mbedtls' 'openssl' 'zstd')
+makedepends=('llvm' 'git' 'glslang' 'cmake' 'ninja' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils' 'robin-map')
 optdepends=('qt5-wayland: for Wayland support')
 provides=('yuzu')
 conflicts=('yuzu')
@@ -25,21 +25,17 @@ prepare() {
   tar -xvf *.tar.xz
   cd $(ls *.tar.xz | sed -e 's/.tar.xz//')
   cp -R .git* $srcdir/pineapple-src-EA-${pkgver}/
-  
-  cd $srcdir/pineapple-src-EA-${pkgver}
+
+  cd "$srcdir/pineapple-src-EA-${pkgver}"
   for i in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') ; do
       rm -rf "$i"
   done
-
-  git submodule update --init --remote externals/sirit
-  git submodule update --init --remote externals/mbedtls
+  git submodule update --init --recursive
 
   find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror$/-W/g' {} +
   #find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} +
   find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} +
   find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} +
-  sed -i -e 's/1.3.238/1.3.233/g' CMakeLists.txt
-  sed -i -e '/#define VK_NO_PROTOTYPES/a #define VK_ENABLE_BETA_EXTENSIONS' src/video_core/vulkan_common/vulkan_wrapper.h
   sed -i -e 's/--quiet //g' src/video_core/host_shaders/CMakeLists.txt
   sed -i -e 's#${SPIRV_HEADER_FILE} ${SOURCE_FILE}#${SPIRV_HEADER_FILE} ${SOURCE_FILE} 2>/dev/null#g' src/video_core/host_shaders/CMakeLists.txt
   sed -i -e '/Name=yuzu/ s/$/ Early Access/' dist/yuzu.desktop
@@ -68,16 +64,13 @@ build() {
     -DUSE_DISCORD_PRESENCE=ON \
     -DENABLE_QT_TRANSLATION=ON \
     -DYUZU_USE_BUNDLED_OPUS=OFF \
+    -DDYNARMIC_NO_BUNDLED_FMT=ON \
+    -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON \
     -DYUZU_USE_BUNDLED_FFMPEG=OFF \
     -DYUZU_USE_BUNDLED_LIBUSB=OFF \
     -DYUZU_USE_BUNDLED_QT=OFF \
-    -DYUZU_USE_EXTERNAL_SDL2=OFF \
-    -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON \
-    -DYUZU_CHECK_SUBMODULES=OFF \
-    -DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF \
-    -DYUZU_USE_FASTER_LD=OFF \
-    -DYUZU_USE_PRECOMPILED_HEADERS=OFF \
-	-DYUZU_USE_QT_MULTIMEDIA=ON
+    -DYUZU_USE_EXTERNAL_SDL2=OFF
+
   ninja
 }