[lilac] updated to 1861-1
This commit is contained in:
lilac
parent
99d838aeaf
commit
86049a6480
9
.SRCINFO
9
.SRCINFO
|
|
@ -1,11 +1,12 @@
|
|||
pkgbase = yuzu-early-access
|
||||
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version)
|
||||
pkgver = 1770
|
||||
pkgver = 1861
|
||||
pkgrel = 1
|
||||
url = https://yuzu-emu.org/
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = GPL2
|
||||
makedepends = conan
|
||||
makedepends = git
|
||||
makedepends = glslang
|
||||
makedepends = cmake
|
||||
|
|
@ -40,7 +41,9 @@ pkgbase = yuzu-early-access
|
|||
optdepends = qt5-wayland: for Wayland support
|
||||
provides = yuzu
|
||||
conflicts = yuzu
|
||||
source = https://github.com/pineappleEA/pineapple-src/archive/EA-1770.tar.gz
|
||||
md5sums = b122e27cb76cec47dde6efcda96a9fef
|
||||
source = https://github.com/pineappleEA/pineapple-src/archive/EA-1861.tar.gz
|
||||
source = inject-git-info.patch
|
||||
md5sums = 1e8ad0ed5ff2778419d1c5d7fd8a77cf
|
||||
md5sums = d45a4d68786e3c115142a55760398070
|
||||
|
||||
pkgname = yuzu-early-access
|
||||
|
|
|
|||
24
PKGBUILD
24
PKGBUILD
|
|
@ -2,29 +2,38 @@
|
|||
|
||||
_pkgname=yuzu
|
||||
pkgname=$_pkgname-early-access
|
||||
pkgver=1770
|
||||
pkgver=1861
|
||||
pkgrel=1
|
||||
pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (mainline GIT version)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://yuzu-emu.org/"
|
||||
license=('GPL2')
|
||||
depends=('boost-libs' 'shared-mime-info' 'hicolor-icon-theme' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-webengine' 'libxkbcommon-x11' 'ffmpeg' 'fmt' 'libzip' 'opus' 'libfdk-aac' 'lz4' 'mbedtls' 'openssl' 'zstd')
|
||||
makedepends=('git' 'glslang' 'cmake' 'ninja' 'python2' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils')
|
||||
makedepends=('conan' 'git' 'glslang' 'cmake' 'ninja' 'python2' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils')
|
||||
optdepends=('qt5-wayland: for Wayland support')
|
||||
provides=('yuzu')
|
||||
conflicts=('yuzu')
|
||||
source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz")
|
||||
md5sums=('b122e27cb76cec47dde6efcda96a9fef')
|
||||
source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz"
|
||||
"inject-git-info.patch")
|
||||
md5sums=('1e8ad0ed5ff2778419d1c5d7fd8a77cf'
|
||||
'd45a4d68786e3c115142a55760398070')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/pineapple-src-EA-${pkgver}"
|
||||
cp $srcdir/inject-git-info.patch patches/
|
||||
|
||||
for i in patches/*.patch; do
|
||||
patch -p1 < $i
|
||||
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' {} +
|
||||
find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} +
|
||||
sed -i -e 's/--quiet //g' src/video_core/host_shaders/CMakeLists.txt
|
||||
sed -i -e 's#${SPIRV_HEADER_FILE} ${SOURCE_FILE}#${SPIRV_HEADER_FILE} ${SOURCE_FILE} 2>/dev/null#g' src/video_core/host_shaders/CMakeLists.txt
|
||||
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
|
||||
}
|
||||
build() {
|
||||
cd "$srcdir/pineapple-src-EA-${pkgver}"
|
||||
|
|
@ -32,15 +41,14 @@ build() {
|
|||
cmake .. -GNinja \
|
||||
-DTITLE_BAR_FORMAT_IDLE="yuzu Early Access $pkgver" \
|
||||
-DTITLE_BAR_FORMAT_RUNNING="yuzu Early Access $pkgver | {3}" \
|
||||
-DGIT_BRANCH="HEAD" \
|
||||
-DGIT_DESC="$msvc" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON \
|
||||
-DYUZU_USE_BUNDLED_UNICORN=ON \
|
||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
||||
-DYUZU_USE_QT_WEB_ENGINE=ON \
|
||||
-DUSE_DISCORD_PRESENCE=ON
|
||||
-DUSE_DISCORD_PRESENCE=ON \
|
||||
-DENABLE_QT_TRANSLATION=ON
|
||||
|
||||
ninja
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
|
||||
--- a/CMakeModules/GenerateSCMRev.cmake
|
||||
+++ b/CMakeModules/GenerateSCMRev.cmake
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
# 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)
|
||||
-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)
|
||||
+#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
|
||||
@@ -113,4 +113,5 @@
|
||||
set(COMBINED "${COMBINED}${TMP}")
|
||||
endforeach()
|
||||
string(MD5 SHADER_CACHE_VERSION "${COMBINED}")
|
||||
+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,12 @@
|
||||
-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
|
||||
# WARNING! It was too much work to try and make a common location for this list,
|
||||
Loading…
Reference in New Issue