[lilac] updated to 1273-2

.SRCINFO

@@ -1,14 +1,14 @@
 pkgbase = yuzu-early-access
-	pkgdesc = An experimental open-source Nintendo Switch emulator/debugger
+	pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version)
-	pkgver = 1267
+	pkgver = 1273
-	pkgrel = 1
+	pkgrel = 2
-	url = https://yuzu-emu.org
+	url = https://yuzu-emu.org/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = p7zip
+	makedepends = git
-	makedepends = cmake
 	makedepends = glslang
+	makedepends = cmake
 	makedepends = ninja
 	makedepends = python2
 	makedepends = graphviz
@@ -18,15 +18,14 @@ pkgbase = yuzu-early-access
 	makedepends = catch2
 	makedepends = nlohmann-json
 	makedepends = rapidjson
+	makedepends = qt5-tools
 	makedepends = desktop-file-utils
-	makedepends = wget
 	depends = boost-libs
 	depends = shared-mime-info
 	depends = hicolor-icon-theme
 	depends = sdl2
 	depends = qt5-base
 	depends = qt5-multimedia
-	depends = qt5-tools
 	depends = qt5-webengine
 	depends = libxkbcommon-x11
 	depends = ffmpeg
@@ -40,14 +39,15 @@ pkgbase = yuzu-early-access
 	depends = zstd
 	optdepends = qt5-wayland: for Wayland support
 	provides = yuzu
+	provides = yuzu-canary-git
+	provides = yuzu-cmd
+	provides = yuzu-mainline
+	provides = yuzu-canary
 	conflicts = yuzu-canary-git
 	conflicts = yuzu-master-git
-	conflicts = yuzu-mainline-git
+	replaces = yuzu-canary-git
-	conflicts = yuzu-git
+	source = yuzu::https://github.com/pineappleEA/pineapple-src/archive/EA-1273.tar.gz
-	conflicts = yuzu-early-access-kiku233-git
+	md5sums = 8e680d2efe6334603e07dd7546b90207
-	conflicts = yuzu-ea-bin
-	source = yuzu.7z::https://cdn-31.anonfiles.com/R5A6f345p0/c78ca2e7-1609336387/YuzuEA-1266.7z
-	md5sums = 7afd4742a0baa898afb0f733f39c83bd
 
 pkgname = yuzu-early-access
 

PKGBUILD

@@ -1,59 +1,35 @@
-# Maintainer: Heavysink <winstonwu91 at gmail>
+# Maintainer: Brendan Szymanski <bscubed@pm.me>
 
 _pkgname=yuzu
-_link="$(curl -s $(curl -s https://raw.githubusercontent.com/pineappleEA/pineappleEA.github.io/master/index.html | head -n -2 | grep -o 'https://.*.7z' | head -n 1) | grep -o 'https://cdn-.*.7z' | head -n 1)"
 pkgname=$_pkgname-early-access
-pkgver=1267
+pkgver=1273
-pkgrel=1
+pkgrel=2
-pkgdesc="An experimental open-source Nintendo Switch emulator/debugger"
+pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version)"
 arch=('i686' 'x86_64')
-url="https://yuzu-emu.org"
+url="https://yuzu-emu.org/"
 license=('GPL2')
-depends=('boost-libs' 'shared-mime-info' 'hicolor-icon-theme' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-tools' 'qt5-webengine' 'libxkbcommon-x11' 'ffmpeg' 'fmt' 'libzip' 'opus' 'libfdk-aac' 'lz4' 'mbedtls' 'openssl' 'zstd')
+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=('p7zip' 'cmake' 'glslang' 'ninja' 'python2' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'desktop-file-utils' 'wget')
+makedepends=('git' 'glslang' 'cmake' 'ninja' 'python2' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils')
 optdepends=('qt5-wayland: for Wayland support')
-provides=('yuzu')
+provides=('yuzu' 'yuzu-canary-git' 'yuzu-cmd' 'yuzu-mainline' 'yuzu-canary')
-conflicts=('yuzu-canary-git' 'yuzu-master-git' 'yuzu-mainline-git' 'yuzu-git' 'yuzu-early-access-kiku233-git' 'yuzu-ea-bin')
+conflicts=('yuzu-canary-git' 'yuzu-master-git')
-source=("$_pkgname.7z::$_link")
+replaces=('yuzu-canary-git')
-md5sums=('7afd4742a0baa898afb0f733f39c83bd')
+source=("$_pkgname::https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz")
-
+md5sums=('8e680d2efe6334603e07dd7546b90207')
-pkgver () {
-  curl -s https://raw.githubusercontent.com/pineappleEA/pineappleEA.github.io/master/index.html | grep -Po 'Yuzu EA \d+' | sed 's/Yuzu EA //' | head -n 1
-}
 
 prepare() {
-	cd "$srcdir"
+  cd "$srcdir/pineapple-src-EA-${pkgver}"
-  mv yuzu-windows-msvc-early-access $_pkgname
+  for i in patches/*.patch; do
-  cd $_pkgname
+    patch -p1 < $i
-
+  done
-  tar -xf yuzu-windows-msvc-source-*
+  find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror$/-W/g' {} +
-  rm yuzu-windows-msvc-source-*.tar.xz 
+  find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} +
-
+  find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} +
-  cd $(ls -d yuzu-windows-msvc-source-*)
+  find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} +
-  find -path ./dist -prune -o -type f -exec sed -i 's/\r$//' {} ';'
-  find . -exec touch {} +
-
-  wget -q https://raw.githubusercontent.com/PineappleEA/Pineapple-Linux/master/inject-git-info.patch
-  wget -q https://raw.githubusercontent.com/PineappleEA/Pineapple-Linux/master/warning-to-warning.patch
-  wget -q https://raw.githubusercontent.com/PineappleEA/Pineapple-Linux/master/disable-shadow-error.patch
-  patch -p1 < inject-git-info.patch
-  patch -p1 < warning-to-warning.patch
-  patch -p1 < disable-shadow-error.patch
-
-  sed -i 's/1.73/1.72/g' CMakeLists.txt
 }
-
 build() {
-	# Trick the compiler into thinking we're building from a continuous
+  cd "$srcdir/pineapple-src-EA-${pkgver}"
-	# integration tool so the build number is correctly shown in the title
+	mkdir -p build && cd build
-	cd "$srcdir/$_pkgname"
-  srcd="$(ls -d yuzu-windows-msvc-source-*)"
-  cd $srcd
-
-  msvc=$(echo "${PWD##*/}"|sed 's/.*-//')
-  
-  mkdir -p build && cd build
-  pwd
   cmake .. -GNinja \
     -DTITLE_BAR_FORMAT_IDLE="yuzu Early Access $pkgver" \
     -DTITLE_BAR_FORMAT_RUNNING="yuzu Early Access $pkgver | {3}" \
@@ -66,21 +42,16 @@ build() {
     -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
     -DYUZU_USE_QT_WEB_ENGINE=ON \
     -DUSE_DISCORD_PRESENCE=ON
+
   ninja
 }
 
 check() {
-  cd "$srcdir/$_pkgname"
+	cd "$srcdir/pineapple-src-EA-${pkgver}/build"
-  cd $(ls -d yuzu-windows-msvc-source-*)
+	ninja test
-  cd build
-
-  ninja test
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+	cd "$srcdir/pineapple-src-EA-${pkgver}/build"
-  cd $(ls -d yuzu-windows-msvc-source-*)
+	DESTDIR="$pkgdir" ninja install
-  cd build
-
-  DESTDIR="$pkgdir" ninja install
 }