summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.SRCINFO3
-rwxr-xr-xPKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 20fdb4d67725..d39c7c85b809 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = yuzu-git
pkgdesc = An experimental open-source Nintendo Switch emulator/debugger
- pkgver = r13224.e3ee017e9
+ pkgver = r13236.560cfbc21
pkgrel = 1
url = https://github.com/yuzu-emu/yuzu/
arch = i686
@@ -20,6 +20,7 @@ pkgbase = yuzu-git
provides = yuzu
provides = yuzu-cmd
conflicts = yuzu-mainline-git
+ conflicts = yuzu-canary-git
source = yuzu::git+https://github.com/yuzu-emu/yuzu
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e81ef4e02d0b..bc12cd6618c2 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
_pkgname='yuzu'
pkgname="$_pkgname-git"
-pkgver=r13224.e3ee017e9
+pkgver=r13236.560cfbc21
pkgrel=1
pkgdesc="An experimental open-source Nintendo Switch emulator/debugger"
arch=('i686' 'x86_64')
url="https://github.com/yuzu-emu/yuzu/"
license=('GPL2')
provides=('yuzu' 'yuzu-cmd')
-conflicts=('yuzu-mainline-git')
+conflicts=('yuzu-mainline-git' 'yuzu-canary-git')
depends=('shared-mime-info'
'desktop-file-utils'
'sdl2'