From 0a0f30367f80a5d9c9eb193f5d3642ec24fc8691 Mon Sep 17 00:00:00 2001 From: lilac Date: Fri, 30 Jul 2021 12:25:50 +0800 Subject: [PATCH] [lilac] updated to 1943-1 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- inject-git-info.patch | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cb4c05b..79797d9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = yuzu-early-access pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version) - pkgver = 1893 + pkgver = 1943 pkgrel = 1 url = https://yuzu-emu.org/ arch = i686 @@ -39,9 +39,9 @@ pkgbase = yuzu-early-access optdepends = qt5-wayland: for Wayland support provides = yuzu conflicts = yuzu - source = https://github.com/pineappleEA/pineapple-src/archive/EA-1893.tar.gz + source = https://github.com/pineappleEA/pineapple-src/archive/EA-1943.tar.gz source = inject-git-info.patch - md5sums = 4e1e2bbcceb55e4f88d25ec4c6ee1d70 - md5sums = d45a4d68786e3c115142a55760398070 + md5sums = 64e5a970eb3f702c21eaee21c7f45e97 + md5sums = bf79f6d0b474b9bedcf010e127272bdc pkgname = yuzu-early-access diff --git a/PKGBUILD b/PKGBUILD index bee8548..e1d9080 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=yuzu pkgname=$_pkgname-early-access -pkgver=1893 +pkgver=1943 pkgrel=1 pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version)" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ provides=('yuzu') conflicts=('yuzu') source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz" "inject-git-info.patch") -md5sums=('4e1e2bbcceb55e4f88d25ec4c6ee1d70' - 'd45a4d68786e3c115142a55760398070') +md5sums=('64e5a970eb3f702c21eaee21c7f45e97' + 'bf79f6d0b474b9bedcf010e127272bdc') prepare() { cd "$srcdir/pineapple-src-EA-${pkgver}" diff --git a/inject-git-info.patch b/inject-git-info.patch index c8ed903..3924fc4 100644 --- a/inject-git-info.patch +++ b/inject-git-info.patch @@ -16,11 +16,11 @@ diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cma # Generate cpp with Git revision from template # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well -@@ -113,4 +113,5 @@ - set(COMBINED "${COMBINED}${TMP}") - endforeach() - string(MD5 SHADER_CACHE_VERSION "${COMBINED}") -+set(BUILD_FULLNAME ${BUILD_FULLNAME}) +@@ -50,4 +50,5 @@ endif() + + # The variable SRC_DIR must be passed into the script + # (since it uses the current build directory for all values of CMAKE_*_DIR) ++set(BUILD_FULLNAME "${BUILD_FULLNAME} ") configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt --- a/src/common/CMakeLists.txt