summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x].SRCINFO10
-rw-r--r--[-rwxr-xr-x]PKGBUILD25
2 files changed, 16 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ddeadb90ca9..33a2e1db0a1 100755..100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = citra-canary-git
- pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger
- pkgver = r7944.2cde47c3c
+ pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger written in C++
+ pkgver = r8016.281ef588f
pkgrel = 1
url = https://github.com/citra-emu/citra-canary/tree/master
arch = i686
@@ -8,7 +8,7 @@ pkgbase = citra-canary-git
license = GPL2
makedepends = git
makedepends = cmake
- makedepends = python2
+ makedepends = python
depends = shared-mime-info
depends = desktop-file-utils
depends = sdl2
@@ -16,10 +16,10 @@ pkgbase = citra-canary-git
depends = qt5-multimedia
depends = qt5-tools
depends = libxkbcommon-x11
- depends = libfdk-aac
depends = ffmpeg
+ depends = libfdk-aac
optdepends = qt5-wayland: for Wayland support
- source = citra-canary::git+https://github.com/citra-emu/citra-canary
+ source = citra::git+https://github.com/citra-emu/citra-canary#branch=master
md5sums = SKIP
pkgname = citra-canary-git
diff --git a/PKGBUILD b/PKGBUILD
index 010b14577ad..8d5cf566bf9 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,17 @@
-# Maintainer: bscubed <bscubed@pm.me>
+# Maintainer: Brendan Szymanski <brendan.szymanski1@gmail.com>
-_pkgname=citra-canary
-pkgname=$_pkgname-git
-pkgver=r7944.2cde47c3c
+_pkgname=citra
+pkgname=$_pkgname-canary-git
+pkgver=r8016.281ef588f
pkgrel=1
-pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
+pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger written in C++"
arch=('i686' 'x86_64')
url="https://github.com/citra-emu/citra-canary/tree/master"
license=('GPL2')
-depends=(
- 'shared-mime-info' 'desktop-file-utils' 'sdl2' 'qt5-base'
- 'qt5-multimedia' 'qt5-tools' 'libxkbcommon-x11' 'libfdk-aac' 'ffmpeg'
-)
-makedepends=('git' 'cmake' 'python2')
+depends=('shared-mime-info' 'desktop-file-utils' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-tools' 'libxkbcommon-x11' 'ffmpeg' 'libfdk-aac')
+makedepends=('git' 'cmake' 'python')
optdepends=('qt5-wayland: for Wayland support')
-source=("$_pkgname::git+https://github.com/citra-emu/citra-canary")
+source=("$_pkgname::git+https://github.com/citra-emu/citra-canary#branch=master")
md5sums=('SKIP')
pkgver() {
@@ -38,11 +35,10 @@ build() {
export TRAVIS_REPO_SLUG=citra-emu/citra-canary
export TRAVIS_TAG=$(git describe --tags)
- # Fix for an issue some users are facing when compiling with GCC
+ # Hopefully temporary fix for a compilation error involving fmt
CXXFLAGS+=" -DFMT_USE_USER_DEFINED_LITERALS=0"
- mkdir -p build
- cd build
+ mkdir -p build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -50,6 +46,7 @@ build() {
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON \
+ -DENABLE_SCRIPTING=ON \
-DENABLE_FFMPEG=ON
make
}