From 1c7bec03853dfd03caf082322df76e211e574ee0 Mon Sep 17 00:00:00 2001 From: lilac Date: Thu, 23 Dec 2021 04:27:20 +0800 Subject: [PATCH] [lilac] updated to 2335-2 --- .SRCINFO | 10 +++++----- PKGBUILD | 8 ++++---- inject-git-info.patch | 39 +++++++++++++++++++++++---------------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6aae0a4..40d475f 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 = 2331 - pkgrel = 1 + pkgver = 2335 + pkgrel = 2 url = https://yuzu-emu.org/ arch = i686 arch = x86_64 @@ -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-2331.tar.gz + source = https://github.com/pineappleEA/pineapple-src/archive/EA-2335.tar.gz source = inject-git-info.patch - md5sums = 6ebbf1bde6b81df903ce7ad9b2877286 - md5sums = bf79f6d0b474b9bedcf010e127272bdc + md5sums = 5999ecdc465004a959347f251a915f8f + md5sums = 3f0a9f3d79cbe4759e9ef550dbad0baa pkgname = yuzu-early-access diff --git a/PKGBUILD b/PKGBUILD index d491a53..ccd0d52 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ _pkgname=yuzu pkgname=$_pkgname-early-access -pkgver=2331 -pkgrel=1 +pkgver=2335 +pkgrel=2 pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access version)" arch=('i686' 'x86_64') url="https://yuzu-emu.org/" @@ -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=('6ebbf1bde6b81df903ce7ad9b2877286' - 'bf79f6d0b474b9bedcf010e127272bdc') +md5sums=('5999ecdc465004a959347f251a915f8f' + '3f0a9f3d79cbe4759e9ef550dbad0baa') prepare() { cd "$srcdir/pineapple-src-EA-${pkgver}" diff --git a/inject-git-info.patch b/inject-git-info.patch index 3924fc4..145da1d 100644 --- a/inject-git-info.patch +++ b/inject-git-info.patch @@ -1,22 +1,34 @@ diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake --- a/CMakeModules/GenerateSCMRev.cmake +++ b/CMakeModules/GenerateSCMRev.cmake -@@ -11,10 +11,10 @@ - +@@ -11,16 +11,16 @@ find_package(Git QUIET PATHS "${GIT_EXEC + # generate git/build information include(GetGitRevisionDescription) --get_git_head_revision(GIT_REF_SPEC GIT_REV) --git_describe(GIT_DESC --always --long --dirty) --git_branch_name(GIT_BRANCH) +-if(NOT GIT_REF_SPEC) +- get_git_head_revision(GIT_REF_SPEC GIT_REV) +-endif() +-if(NOT GIT_DESC) +- git_describe(GIT_DESC --always --long --dirty) +-endif() +-if (NOT GIT_BRANCH) +- git_branch_name(GIT_BRANCH) +-endif() -get_timestamp(BUILD_DATE) -+#get_git_head_revision(GIT_REF_SPEC GIT_REV) -+#git_describe(GIT_DESC --always --long --dirty) -+#git_branch_name(GIT_BRANCH) ++#if(NOT GIT_REF_SPEC) ++# get_git_head_revision(GIT_REF_SPEC GIT_REV) ++#endif() ++#if(NOT GIT_DESC) ++# git_describe(GIT_DESC --always --long --dirty) ++#endif() ++#if (NOT GIT_BRANCH) ++# git_branch_name(GIT_BRANCH) ++#endif() +#get_timestamp(BUILD_DATE) - + # 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 -@@ -50,4 +50,5 @@ endif() +@@ -56,4 +56,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) @@ -25,15 +37,10 @@ diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cma diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt -@@ -28,6 +28,12 @@ +@@ -28,6 +28,7 @@ -DBUILD_TAG=${BUILD_TAG} -DBUILD_ID=${DISPLAY_VERSION} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -+ -DGIT_REF_SPEC=${GIT_REF_SPEC} -+ -DGIT_REV=${GIT_REV} -+ -DGIT_DESC=${GIT_DESC} -+ -DGIT_BRANCH=${GIT_BRANCH} -+ -DBUILD_FULLNAME=${BUILD_FULLNAME} + -DBUILD_DATE=${BUILD_DATE} -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake DEPENDS