[lilac] updated to 2975-2
This commit is contained in:
lilac
parent
3bfd0fc6b2
commit
9b8f326b80
3 changed files with 14 additions and 65 deletions
12
.SRCINFO
12
.SRCINFO
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase = yuzu-early-access
|
||||
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (early access version)
|
||||
pkgver = 2956
|
||||
pkgrel = 1
|
||||
pkgver = 2975
|
||||
pkgrel = 2
|
||||
url = https://yuzu-emu.org/
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
|
|
@ -40,9 +40,9 @@ pkgbase = yuzu-early-access
|
|||
optdepends = qt5-wayland: for Wayland support
|
||||
provides = yuzu
|
||||
conflicts = yuzu
|
||||
source = https://github.com/pineappleEA/pineapple-src/archive/EA-2956.tar.gz
|
||||
source = inject-git-info.patch
|
||||
md5sums = 00944411db18d28390c1bff728991e1a
|
||||
md5sums = 3f0a9f3d79cbe4759e9ef550dbad0baa
|
||||
source = https://github.com/pineappleEA/pineapple-src/archive/EA-2975.tar.gz
|
||||
source = https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml
|
||||
sha256sums = 7e62a9352e6840f2be8570435c4b1ce59364d03c19ac2cf0ba5ea97b155393c9
|
||||
sha256sums = e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2
|
||||
|
||||
pkgname = yuzu-early-access
|
||||
|
|
|
|||
18
PKGBUILD
18
PKGBUILD
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
_pkgname=yuzu
|
||||
pkgname=$_pkgname-early-access
|
||||
pkgver=2956
|
||||
pkgrel=1
|
||||
pkgver=2975
|
||||
pkgrel=2
|
||||
pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access version)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://yuzu-emu.org/"
|
||||
|
|
@ -14,17 +14,12 @@ optdepends=('qt5-wayland: for Wayland support')
|
|||
provides=('yuzu')
|
||||
conflicts=('yuzu')
|
||||
source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz"
|
||||
"inject-git-info.patch")
|
||||
md5sums=('00944411db18d28390c1bff728991e1a'
|
||||
'3f0a9f3d79cbe4759e9ef550dbad0baa')
|
||||
"https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml")
|
||||
sha256sums=('7e62a9352e6840f2be8570435c4b1ce59364d03c19ac2cf0ba5ea97b155393c9'
|
||||
'e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/pineapple-src-EA-${pkgver}"
|
||||
cp $srcdir/inject-git-info.patch patches/
|
||||
|
||||
for i in patches/*.patch; do
|
||||
patch -p1 --verbose --ignore-whitespace < $i
|
||||
done
|
||||
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' {} +
|
||||
|
|
@ -34,8 +29,9 @@ prepare() {
|
|||
sed -i -e '/Name=yuzu/ s/$/ Early Access/' dist/yuzu.desktop
|
||||
sed -i -e '/yuzu %f/a StartupWMClass=yuzu' dist/yuzu.desktop
|
||||
sed -i -e 's_^MimeType=.*_&application/x-nx-nsp;application/x-nx-xci;_' dist/yuzu.desktop
|
||||
sed -i -e 's| (%2)||' src/yuzu/aboutdialog.ui
|
||||
|
||||
curl -s https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml > ./dist/yuzu.xml || curl -s https://gitlab.com/samantas5855/pineapple/-/raw/master/yuzu.xml > ./dist/yuzu.xml
|
||||
cp -f $srcdir/yuzu.xml dist/yuzu.xml
|
||||
}
|
||||
build() {
|
||||
cd "$srcdir/pineapple-src-EA-${pkgver}"
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
|
||||
--- a/CMakeModules/GenerateSCMRev.cmake
|
||||
+++ b/CMakeModules/GenerateSCMRev.cmake
|
||||
@@ -11,16 +11,16 @@ find_package(Git QUIET PATHS "${GIT_EXEC
|
||||
|
||||
# generate git/build information
|
||||
include(GetGitRevisionDescription)
|
||||
-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)
|
||||
+#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
|
||||
@@ -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)
|
||||
+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
|
||||
+++ b/src/common/CMakeLists.txt
|
||||
@@ -28,6 +28,7 @@
|
||||
-DBUILD_TAG=${BUILD_TAG}
|
||||
-DBUILD_ID=${DISPLAY_VERSION}
|
||||
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
|
||||
+ -DBUILD_DATE=${BUILD_DATE}
|
||||
-P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake
|
||||
DEPENDS
|
||||
# WARNING! It was too much work to try and make a common location for this list,
|
||||
Loading…
Reference in a new issue