summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Szymanski2021-04-25 17:57:26 -0400
committerBrendan Szymanski2021-04-25 17:57:26 -0400
commita83507b5df35774c544e5fcd2c55e54e4e1bb444 (patch)
treea2e0ad98ee5a2f5d04fdec908db2b7e540d7e706
parent11663a3b2f02a0812b69fe3e5a8530109a5f117f (diff)
downloadaur-a83507b5df35774c544e5fcd2c55e54e4e1bb444.tar.gz
Update dependencies, refactor PKGBUILD, return to manual submodule management
-rwxr-xr-x.SRCINFO64
-rwxr-xr-xPKGBUILD145
2 files changed, 161 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3ae33d6051..9a6e11f53d3 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,70 @@
pkgbase = yuzu-git
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger
- pkgver = r16284.4bfa411dd
+ pkgver = r17729.2ff39f6fd
pkgrel = 1
- url = https://github.com/yuzu-emu/yuzu/
+ url = https://github.com/yuzu-emu/yuzu
arch = i686
arch = x86_64
license = GPL2
- makedepends = git
- makedepends = cmake
- makedepends = python2
makedepends = catch2
- makedepends = nlohmann-json
- makedepends = boost
+ makedepends = cmake
makedepends = fmt
- makedepends = ffmpeg
- makedepends = conan
- depends = shared-mime-info
+ makedepends = git
+ makedepends = nlohmann-json
depends = desktop-file-utils
- depends = sdl2
+ depends = glslang
+ depends = libxkbcommon-x11
+ depends = libfdk-aac
+ depends = lz4
+ depends = openssl
depends = qt5-base
depends = qt5-multimedia
depends = qt5-tools
- depends = libxkbcommon-x11
- depends = libfdk-aac
- optdepends = qt5-wayland: for Wayland support
+ depends = qt5-wayland
+ depends = qt5-webengine
+ depends = sdl2
+ depends = shared-mime-info
+ depends = zlib
+ depends = zstd
provides = yuzu
provides = yuzu-cmd
conflicts = yuzu-mainline-git
conflicts = yuzu-canary-git
source = yuzu::git+https://github.com/yuzu-emu/yuzu
+ source = git+https://github.com/benhoyt/inih.git
+ source = git+https://github.com/kinetiknz/cubeb.git
+ source = git+https://github.com/MerryMage/dynarmic.git
+ source = git+https://github.com/citra-emu/ext-soundtouch.git
+ source = libressl::git+https://github.com/citra-emu/ext-libressl-portable.git
+ source = git+https://github.com/libusb/libusb.git
+ source = git+https://github.com/discordapp/discord-rpc.git
+ source = git+https://github.com/KhronosGroup/Vulkan-Headers.git
+ source = git+https://github.com/ReinUsesLisp/sirit
+ source = git+https://github.com/yuzu-emu/mbedtls
+ source = git+https://github.com/nih-at/libzip.git
+ source = git+https://github.com/herumi/xbyak.git
+ source = git+https://github.com/xiph/opus.git
+ source = git+https://git.ffmpeg.org/ffmpeg.git
+ source = git+https://github.com/libsdl-org/SDL.git
+ source = git+https://github.com/arsenm/sanitizers-cmake.git
+ source = git+https://github.com/KhronosGroup/SPIRV-Headers.git
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
pkgname = yuzu-git
diff --git a/PKGBUILD b/PKGBUILD
index cac5b6c11bf..e022bad2873 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,132 @@
# Maintainer: Zion Nimchuk <zionnimchuk@gmail.com>
# Co-maintainer: Brendan Szymanski <bscubed@pm.me>
-_pkgname='yuzu'
-pkgname="$_pkgname-git"
-pkgver=r16284.4bfa411dd
+_pkgname=yuzu
+pkgname=$_pkgname-git
+pkgver=r17729.2ff39f6fd
pkgrel=1
-pkgdesc="An experimental open-source Nintendo Switch emulator/debugger"
+pkgdesc='An experimental open-source Nintendo Switch emulator/debugger'
arch=('i686' 'x86_64')
-url="https://github.com/yuzu-emu/yuzu/"
+url='https://github.com/yuzu-emu/yuzu'
license=('GPL2')
provides=('yuzu' 'yuzu-cmd')
conflicts=('yuzu-mainline-git' 'yuzu-canary-git')
-depends=('shared-mime-info' 'desktop-file-utils' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-tools' 'libxkbcommon-x11' 'libfdk-aac')
-makedepends=('git' 'cmake' 'python2' 'catch2' 'nlohmann-json' 'boost' 'fmt' 'ffmpeg' 'conan')
-optdepends=('qt5-wayland: for Wayland support')
-source=("$_pkgname::git+https://github.com/yuzu-emu/yuzu")
-md5sums=('SKIP')
+depends=('desktop-file-utils'
+ 'glslang'
+ 'libxkbcommon-x11'
+ 'libfdk-aac'
+ 'lz4'
+ 'openssl'
+ 'qt5-base'
+ 'qt5-multimedia'
+ 'qt5-tools'
+ 'qt5-wayland'
+ 'qt5-webengine'
+ 'sdl2'
+ 'shared-mime-info'
+ 'zlib'
+ 'zstd')
+makedepends=('catch2' 'cmake' 'fmt' 'git' 'nlohmann-json')
+source=("$_pkgname::git+https://github.com/yuzu-emu/yuzu"
+ 'git+https://github.com/benhoyt/inih.git'
+ 'git+https://github.com/kinetiknz/cubeb.git'
+ 'git+https://github.com/MerryMage/dynarmic.git'
+ 'git+https://github.com/citra-emu/ext-soundtouch.git'
+ 'libressl::git+https://github.com/citra-emu/ext-libressl-portable.git'
+ 'git+https://github.com/libusb/libusb.git'
+ 'git+https://github.com/discordapp/discord-rpc.git'
+ 'git+https://github.com/KhronosGroup/Vulkan-Headers.git'
+ 'git+https://github.com/ReinUsesLisp/sirit'
+ 'git+https://github.com/yuzu-emu/mbedtls'
+ 'git+https://github.com/nih-at/libzip.git'
+ 'git+https://github.com/herumi/xbyak.git'
+ 'git+https://github.com/xiph/opus.git'
+ 'git+https://git.ffmpeg.org/ffmpeg.git'
+ 'git+https://github.com/libsdl-org/SDL.git'
+ # cubeb dependencies
+ 'git+https://github.com/arsenm/sanitizers-cmake.git'
+ # sirit dependencies
+ 'git+https://github.com/KhronosGroup/SPIRV-Headers.git')
+md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
pkgver() {
- cd "$srcdir/$_pkgname"
- echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+ cd "$srcdir/$_pkgname"
+ echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
prepare() {
- cd "$srcdir/$_pkgname"
+ cd "$srcdir/$_pkgname"
- git submodule init
- git submodule update --init --recursive
+ for submodule in externals/{inih/inih,cubeb,dynarmic,soundtouch,libressl,libusb/libusb,discord-rpc,Vulkan-Headers,sirit,mbedtls,libzip/libzip,xbyak,opus/opus,ffmpeg,SDL}; do
+ git submodule init ${submodule}
+ git config submodule.${submodule}.url "$srcdir/${submodule##*/}"
+ git submodule update
+ done
+
+ cd "$srcdir/$_pkgname"/externals/cubeb
+
+ for submodule in cmake/sanitizers-cmake; do
+ git submodule init ${submodule}
+ git config submodule.${submodule}.url "$srcdir/${submodule##*/}"
+ git submodule update
+ done
+
+ cd "$srcdir/$_pkgname"/externals/sirit
+
+ for submodule in externals/SPIRV-Headers; do
+ git submodule init ${submodule}
+ git config submodule.${submodule}.url "$srcdir/${submodule##*/}"
+ git submodule update
+ done
}
build() {
- # Trick the compiler into thinking we're building from a continuous
- # integration tool so the build number is correctly shown in the title
- cd "$srcdir/$_pkgname"
- export CI=true
- export TRAVIS=true
- export TRAVIS_REPO_SLUG=yuzu-emu/yuzu
- export TRAVIS_TAG=$(git describe --tags)
-
- mkdir -p build && cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DYUZU_USE_BUNDLED_UNICORN=ON \
- -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON \
- -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
- -DUSE_DISCORD_PRESENCE=ON
- make
+ cd "$srcdir/$_pkgname"
+
+ # Trick the compiler into thinking we're building from a continuous
+ # integration tool so the build number is correctly shown in the title
+ export CI=true
+ export TRAVIS=true
+ export TRAVIS_REPO_SLUG=yuzu-emu/yuzu-mainline
+ export TRAVIS_TAG=$(git describe --tags)
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir -p build && cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_QT_TRANSLATION=ON \
+ -DYUZU_USE_BUNDLED_BOOST=ON \
+ -DYUZU_USE_QT_WEB_ENGINE=ON \
+ -DUSE_DISCORD_PRESENCE=ON
+ make
+}
+
+check() {
+ cd "$srcdir/$_pkgname/build"
+ make test
}
package() {
- cd "$srcdir/$_pkgname/build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_pkgname/build"
+ make DESTDIR="$pkgdir/" install
}