deadcade/yuzu-early-access
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[lilac] updated to 2335-2

Browse source
This commit is contained in:
lilac 2021-12-23 04:27:20 +08:00
parent 901384a473
commit 1c7bec0385
3 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = yuzu-early-access pkgbase = yuzu-early-access
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (early access version) pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (early access version)
pkgver = 2331 pkgver = 2335
pkgrel = 1 pkgrel = 2
url = https://yuzu-emu.org/ url = https://yuzu-emu.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@ -39,9 +39,9 @@ pkgbase = yuzu-early-access
optdepends = qt5-wayland: for Wayland support optdepends = qt5-wayland: for Wayland support
provides = yuzu provides = yuzu
conflicts = 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 source = inject-git-info.patch
md5sums = 6ebbf1bde6b81df903ce7ad9b2877286 md5sums = 5999ecdc465004a959347f251a915f8f
md5sums = bf79f6d0b474b9bedcf010e127272bdc md5sums = 3f0a9f3d79cbe4759e9ef550dbad0baa
pkgname = yuzu-early-access pkgname = yuzu-early-access

8
PKGBUILD
View file

@ -2,8 +2,8 @@
_pkgname=yuzu _pkgname=yuzu
pkgname=$_pkgname-early-access pkgname=$_pkgname-early-access
pkgver=2331 pkgver=2335
pkgrel=1 pkgrel=2
pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access version)" pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access version)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://yuzu-emu.org/" url="https://yuzu-emu.org/"
@ -15,8 +15,8 @@ provides=('yuzu')
conflicts=('yuzu') conflicts=('yuzu')
source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz" source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz"
"inject-git-info.patch") "inject-git-info.patch")
md5sums=('6ebbf1bde6b81df903ce7ad9b2877286' md5sums=('5999ecdc465004a959347f251a915f8f'
'bf79f6d0b474b9bedcf010e127272bdc') '3f0a9f3d79cbe4759e9ef550dbad0baa')
prepare() { prepare() {
cd "$srcdir/pineapple-src-EA-${pkgver}" cd "$srcdir/pineapple-src-EA-${pkgver}"

39
inject-git-info.patch
View file

@ -1,22 +1,34 @@
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
--- a/CMakeModules/GenerateSCMRev.cmake --- a/CMakeModules/GenerateSCMRev.cmake
+++ b/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 # generate git/build information
include(GetGitRevisionDescription) include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REF_SPEC GIT_REV) -if(NOT GIT_REF_SPEC)
-git_describe(GIT_DESC --always --long --dirty) - get_git_head_revision(GIT_REF_SPEC GIT_REV)
-git_branch_name(GIT_BRANCH) -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_timestamp(BUILD_DATE)
+#get_git_head_revision(GIT_REF_SPEC GIT_REV) +#if(NOT GIT_REF_SPEC)
+#git_describe(GIT_DESC --always --long --dirty) +# get_git_head_revision(GIT_REF_SPEC GIT_REV)
+#git_branch_name(GIT_BRANCH) +#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_timestamp(BUILD_DATE)
# Generate cpp with Git revision from template # 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 # 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 # The variable SRC_DIR must be passed into the script
# (since it uses the current build directory for all values of CMAKE_*_DIR) # (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 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
--- a/src/common/CMakeLists.txt --- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt
@@ -28,6 +28,12 @@ @@ -28,6 +28,7 @@
-DBUILD_TAG=${BUILD_TAG} -DBUILD_TAG=${BUILD_TAG}
-DBUILD_ID=${DISPLAY_VERSION} -DBUILD_ID=${DISPLAY_VERSION}
-DGIT_EXECUTABLE=${GIT_EXECUTABLE} -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} + -DBUILD_DATE=${BUILD_DATE}
-P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake
DEPENDS DEPENDS