From 853bcb1046065ad7ac13ceb96ebd9e1e4d7ef996 Mon Sep 17 00:00:00 2001 From: deadcade Date: Mon, 16 Jan 2023 19:34:11 +0100 Subject: [PATCH] Update PKGBUILD to dynamically adjust pkgver, conform to shellcheck standards --- .SRCINFO | 11 ++++++----- PKGBUILD | 36 ++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 62bccfb..688d672 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = yuzu-early-access pkgdesc = An experimental open-source Nintendo Switch emulator/debugger (early access version) - pkgver = 3308 + pkgver = 3310 pkgrel = 1 url = https://yuzu-emu.org/ arch = i686 @@ -21,6 +21,7 @@ pkgbase = yuzu-early-access makedepends = qt5-tools makedepends = desktop-file-utils makedepends = robin-map + makedepends = jq depends = boost-libs depends = shared-mime-info depends = hicolor-icon-theme @@ -41,11 +42,11 @@ pkgbase = yuzu-early-access optdepends = qt5-wayland: for Wayland support provides = yuzu conflicts = yuzu - source = https://github.com/pineappleEA/pineapple-src/archive/EA-3308.tar.gz + source = https://github.com/pineappleEA/pineapple-src/archive/EA-3310.tar.gz + source = https://github.com/pineappleEA/pineapple-src/releases/download/EA-3310/Windows-Yuzu-EA-3310.zip source = https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml - source = https://github.com/pineappleEA/pineapple-src/releases/download/EA-3308/Windows-Yuzu-EA-3308.zip - sha256sums = 2fccac38b14450c69cd681de6d9c927d229877c3b8f11ec3e8c0f20647641f59 - sha256sums = e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2 + sha256sums = SKIP + sha256sums = SKIP sha256sums = 99b593b80efd8ef237b08648099345f6f55d472dd55f44bbf3430fb4857274de pkgname = yuzu-early-access diff --git a/PKGBUILD b/PKGBUILD index 9886fae..e201b03 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,32 +1,35 @@ # Maintainer: 0xDEADCADE <$(base64 -d<< +# shellcheck disable=SC2148,SC2034,SC2154 _pkgname=yuzu pkgname=$_pkgname-early-access -pkgver=3308 +_repo="pineappleEA/pineapple-src" +_releases_gh=$(curl https://api.github.com/repos/${_repo}/releases) +pkgver=$(echo "$_releases_gh" | jq -r .[0].tag_name | cut -d "-" -f 2) pkgrel=1 pkgdesc="An experimental open-source Nintendo Switch emulator/debugger (early access 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=('llvm' 'git' 'glslang' 'cmake' 'ninja' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils' 'robin-map') +makedepends=('llvm' 'git' 'glslang' 'cmake' 'ninja' 'graphviz' 'doxygen' 'clang' 'boost' 'catch2' 'nlohmann-json' 'rapidjson' 'qt5-tools' 'desktop-file-utils' 'robin-map' 'jq') optdepends=('qt5-wayland: for Wayland support') provides=('yuzu') conflicts=('yuzu') source=("https://github.com/pineappleEA/pineapple-src/archive/EA-${pkgver}.tar.gz" -"https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml" -"https://github.com/pineappleEA/pineapple-src/releases/download/EA-${pkgver}/Windows-Yuzu-EA-${pkgver}.zip") -sha256sums=('2fccac38b14450c69cd681de6d9c927d229877c3b8f11ec3e8c0f20647641f59' - 'e76ab2b3566d8135930e570ede5bed3da8f131270b60db818e453d248880bdf2' +"https://github.com/pineappleEA/pineapple-src/releases/download/EA-${pkgver}/Windows-Yuzu-EA-${pkgver}.zip" +"https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/master/yuzu.xml") +sha256sums=('SKIP' + 'SKIP' '99b593b80efd8ef237b08648099345f6f55d472dd55f44bbf3430fb4857274de') prepare() { - cd "$srcdir/yuzu-windows-msvc-early-access" - tar -xvf *.tar.xz - cd $(ls *.tar.xz | sed -e 's/.tar.xz//') - cp -R .git* $srcdir/pineapple-src-EA-${pkgver}/ + cd "$srcdir/yuzu-windows-msvc-early-access" || exit + tar -xvf -- *.tar.xz + cd "$(find ./ -name "*.tar.xz" | sed -e 's/.tar.xz//')" || exit + cp -R .git* "$srcdir/pineapple-src-EA-${pkgver}/" - cd "$srcdir/pineapple-src-EA-${pkgver}" + cd "$srcdir/pineapple-src-EA-${pkgver}" || exit for i in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') ; do rm -rf "$i" done @@ -37,17 +40,18 @@ prepare() { 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 + # shellcheck disable=SC2016 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 sed -i -e 's| (%2)||' src/yuzu/aboutdialog.ui - cp -f $srcdir/yuzu.xml dist/yuzu.xml + cp -f "$srcdir/yuzu.xml" "dist/yuzu.xml" } build() { - cd "$srcdir/pineapple-src-EA-${pkgver}" - mkdir -p build && cd build + cd "$srcdir/pineapple-src-EA-${pkgver}" || exit + mkdir -p build && cd build || exit cmake .. -GNinja \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_C_COMPILER=clang \ @@ -75,8 +79,8 @@ build() { } package() { - cd "$srcdir/pineapple-src-EA-${pkgver}/build" + cd "$srcdir/pineapple-src-EA-${pkgver}/build" || exit DESTDIR="$pkgdir" ninja install - rm -rf $pkgdir/usr/lib $pkgdir/usr/include + rm -rf "$pkgdir/usr/lib" "$pkgdir/usr/include" }