summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Szymanski2020-07-24 10:26:23 -0400
committerBrendan Szymanski2020-07-24 10:26:23 -0400
commitd4206dc7c8cb90c94f8d929615ebd021590a04e8 (patch)
treed162ebc6b6e309485b1b9eba05141735048a0476
parent96951fb5c7b04374a0d0707b4fb8c744c3fb66df (diff)
downloadaur-d4206dc7c8cb90c94f8d929615ebd021590a04e8.tar.gz
Temporarily added conan so builds can compile until fmt is updated
-rwxr-xr-x.SRCINFO5
-rwxr-xr-xPKGBUILD6
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ab5b0ca73c1..7d712b03f482 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = yuzu-git
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger
- pkgver = r14738.058ec2278
+ pkgver = r15307.e5abf1118
pkgrel = 1
url = https://github.com/yuzu-emu/yuzu/
arch = i686
@@ -12,6 +12,8 @@ pkgbase = yuzu-git
makedepends = catch2
makedepends = nlohmann-json
makedepends = boost
+ makedepends = fmt
+ makedepends = conan
depends = shared-mime-info
depends = desktop-file-utils
depends = sdl2
@@ -20,7 +22,6 @@ pkgbase = yuzu-git
depends = qt5-tools
depends = libxkbcommon-x11
depends = libfdk-aac
- depends = fmt
optdepends = qt5-wayland: for Wayland support
provides = yuzu
provides = yuzu-cmd
diff --git a/PKGBUILD b/PKGBUILD
index 26961dc620df..42db067ea679 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname='yuzu'
pkgname="$_pkgname-git"
-pkgver=r14738.058ec2278
+pkgver=r15307.e5abf1118
pkgrel=1
pkgdesc="An experimental open-source Nintendo Switch emulator/debugger"
arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ 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' 'fmt')
-makedepends=('git' 'cmake' 'python2' 'catch2' 'nlohmann-json' 'boost')
+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' 'conan')
optdepends=('qt5-wayland: for Wayland support')
source=("$_pkgname::git+https://github.com/yuzu-emu/yuzu")
md5sums=('SKIP')