From 1980e121a74eb00534f8ede77234add04c96c801 Mon Sep 17 00:00:00 2001 From: lilac Date: Fri, 11 Nov 2022 04:36:15 +0800 Subject: [PATCH] [lilac] updated to 3103-2 --- .SRCINFO | 12 ++++++------ PKGBUILD | 36 ++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c0dc4e9..e4147c5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = yuzu-early-access pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (early access version) - pkgver = 3100 - pkgrel = 1 + pkgver = 3103 + pkgrel = 2 url = https://yuzu-emu.org/ arch = i686 arch = x86_64 @@ -41,11 +41,11 @@ pkgbase = yuzu-early-access optdepends = qt5-wayland: for Wayland support provides = yuzu conflicts = yuzu - source = https://github.com/pineappleEA/pineapple-src/archive/EA-3100.tar.gz + source = https://github.com/pineappleEA/pineapple-src/archive/EA-3103.tar.gz source = https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml - source = git+https://github.com/yuzu-emu/yuzu-mainline.git - sha256sums = f6dbef5ae6543ed72e4ab644431deed8f62c6798412156fcba2b45cb75d4546a + source = https://github.com/pineappleEA/pineapple-src/releases/download/EA-3103/Windows-Yuzu-EA-3103.zip + sha256sums = 8760b6e9ea01d1a11643ba9b6d14c93ca1a17ffccb1dfbbd94fc9ba1332339e7 sha256sums = e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2 - sha256sums = SKIP + sha256sums = 4a9fab290566211477d2c25061a0edcc2a63bfaa77002dc5899bfd8acc821b3e pkgname = yuzu-early-access diff --git a/PKGBUILD b/PKGBUILD index 818e3c3..97be72c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ _pkgname=yuzu pkgname=$_pkgname-early-access -pkgver=3100 -pkgrel=1 +pkgver=3103 +pkgrel=2 pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access version)" arch=('i686' 'x86_64') url="https://yuzu-emu.org/" @@ -15,16 +15,23 @@ provides=('yuzu') conflicts=('yuzu') source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz" "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml" -"git+https://github.com/yuzu-emu/yuzu-mainline.git") -sha256sums=('f6dbef5ae6543ed72e4ab644431deed8f62c6798412156fcba2b45cb75d4546a' +"https://github.com/pineappleEA/pineapple-src/releases/download/EA-${pkgver}/Windows-Yuzu-EA-${pkgver}.zip") +sha256sums=('8760b6e9ea01d1a11643ba9b6d14c93ca1a17ffccb1dfbbd94fc9ba1332339e7' 'e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2' - 'SKIP') + '4a9fab290566211477d2c25061a0edcc2a63bfaa77002dc5899bfd8acc821b3e') prepare() { - cd "$srcdir/yuzu-mainline" - git submodule update --init --recursive + cd "$srcdir/yuzu-windows-msvc-early-access" + 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}" + for i in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') ; do + rm -rf "$i" + done + 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' {} + @@ -37,19 +44,6 @@ prepare() { sed -i -e 's| (%2)||' src/yuzu/aboutdialog.ui cp -f $srcdir/yuzu.xml dist/yuzu.xml - - cp -R $srcdir/yuzu-mainline/externals/xbyak externals/ - cp -R $srcdir/yuzu-mainline/externals/dynarmic externals/ - cp -R $srcdir/yuzu-mainline/externals/enet externals/ - cp -R $srcdir/yuzu-mainline/externals/mbedtls externals/ - cp -R $srcdir/yuzu-mainline/externals/cubeb externals/ - cp -R $srcdir/yuzu-mainline/externals/discord-rpc externals/ - cp -R $srcdir/yuzu-mainline/externals/sirit externals/ - cp -R $srcdir/yuzu-mainline/externals/inih externals/ - cp -R $srcdir/yuzu-mainline/externals/Vulkan-Headers externals/ - cp -R $srcdir/yuzu-mainline/externals/cpp-httplib externals/ - cp -R $srcdir/yuzu-mainline/externals/cpp-jwt externals/ - cp -R $srcdir/yuzu-mainline/externals/libressl externals/ } build() { cd "$srcdir/pineapple-src-EA-${pkgver}" @@ -83,4 +77,6 @@ build() { package() { cd "$srcdir/pineapple-src-EA-${pkgver}/build" DESTDIR="$pkgdir" ninja install + + rm -rf $pkgdir/usr/lib $pkgdir/usr/include }