summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Szymanski2018-11-11 21:10:05 -0500
committerBrendan Szymanski2018-11-11 21:10:05 -0500
commit13b3cf954c4d5072f990a4acadecf1b82c19e7fd (patch)
tree62fdc38b6f83f9eea93152b350361eb4425501c7
parent7c99bf46dfa1da775d596ecd9c90720ecb7686d7 (diff)
downloadaur-13b3cf954c4d5072f990a4acadecf1b82c19e7fd.tar.gz
Merge QT frontend into this package and force build number in the title bar
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD56
2 files changed, 60 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46007c6a61a..29a3be0b854 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = citra-canary-git
pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger written in C++
- pkgver = r6778.86403f088
+ pkgver = r7214.085f4ee39
pkgrel = 1
url = https://github.com/citra-emu/citra-canary/tree/master
arch = i686
@@ -8,12 +8,14 @@ pkgbase = citra-canary-git
license = GPL2
makedepends = git
makedepends = cmake
+ makedepends = python
depends = shared-mime-info
depends = desktop-file-utils
depends = sdl2
depends = qt5-base
depends = qt5-multimedia
- optdepends = libxkbcommon-x11: for X11 support
+ depends = qt5-tools
+ depends = libxkbcommon-x11
optdepends = qt5-wayland: for Wayland support
source = citra::git+https://github.com/citra-emu/citra-canary#branch=master
source = git+https://github.com/citra-emu/ext-boost
@@ -28,6 +30,16 @@ pkgbase = citra-canary-git
source = git+https://github.com/benhoyt/inih
source = git+https://github.com/citra-emu/ext-libressl-portable
source = git+https://github.com/kinetiknz/cubeb
+ source = git+https://github.com/discordapp/discord-rpc
+ source = git+https://github.com/zeromq/libzmq
+ source = git+https://github.com/zeromq/cppzmq
+ source = git+https://github.com/google/googletest
+ source = git+https://github.com/arsenm/sanitizers-cmake
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5a811fcd196..7482db5e595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,15 @@
_pkgname=citra
pkgname=$_pkgname-canary-git
-pkgver=r6778.86403f088
+pkgver=r7214.085f4ee39
pkgrel=1
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')
-makedepends=('git' 'cmake')
-optdepends=('libxkbcommon-x11: for X11 support'
- 'qt5-wayland: for Wayland support')
+depends=('shared-mime-info' 'desktop-file-utils' 'sdl2' 'qt5-base' 'qt5-multimedia' 'qt5-tools' 'libxkbcommon-x11')
+makedepends=('git' 'cmake' 'python')
+optdepends=('qt5-wayland: for Wayland support')
source=("$_pkgname::git+https://github.com/citra-emu/citra-canary#branch=master"
'git+https://github.com/citra-emu/ext-boost'
'git+https://github.com/neobrain/nihstro'
@@ -24,7 +23,13 @@ source=("$_pkgname::git+https://github.com/citra-emu/citra-canary#branch=master"
'git+https://github.com/lsalzman/enet'
'git+https://github.com/benhoyt/inih'
'git+https://github.com/citra-emu/ext-libressl-portable'
- 'git+https://github.com/kinetiknz/cubeb')
+ 'git+https://github.com/kinetiknz/cubeb'
+ 'git+https://github.com/discordapp/discord-rpc'
+ 'git+https://github.com/zeromq/libzmq'
+ 'git+https://github.com/zeromq/cppzmq'
+ # cubeb dependencies
+ 'git+https://github.com/google/googletest'
+ 'git+https://github.com/arsenm/sanitizers-cmake')
md5sums=('SKIP'
'SKIP'
'SKIP'
@@ -37,6 +42,11 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
'SKIP')
pkgver() {
@@ -46,7 +56,6 @@ pkgver() {
prepare() {
cd "$srcdir/$_pkgname"
- mkdir -p build
git submodule init
git config submodule.boost.url "$srcdir/ext-boost"
@@ -61,15 +70,41 @@ prepare() {
git config submodule.inih.url "$srcdir/inih"
git config submodule.libressl.url "$srcdir/ext-libressl-portable"
git config submodule.cubeb.url "$srcdir/cubeb"
+ git config submodule.discord-rpc.url "$srcdir/discord-rpc"
+ git config submodule.libzmq.url "$srcdir/libzmq"
+ git config submodule.cppzmq.url "$srcdir/cppzmq"
+ git submodule update --init --recursive
+
+ cd externals/dynarmic
+ git config submodule.externals/fmt.url "$srcdir/fmt"
+ git config submodule.externals/xbyak.url "$srcdir/xbyak"
+ git submodule update --init --recursive
+
+ cd ../cubeb
+ git config submodule.googletest.url "$srcdir/googletest"
+ git config submodule.cmake/sanitizers-cmake.url "$srcdir/sanitizers-cmake"
git submodule update --init --recursive
}
build() {
- cd "$srcdir/$_pkgname/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=citra-emu/citra-canary
+ export TRAVIS_TAG=$(git describe --tags)
+
+ mkdir -p build
+ cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DUSE_SYSTEM_CURL=1
+ -DENABLE_QT_TRANSLATION=ON \
+ -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+ -DUSE_DISCORD_PRESENCE=ON \
+ -DENABLE_SCRIPTING=ON
make
}
@@ -79,5 +114,6 @@ check() {
}
package() {
- install -Dm755 "$srcdir/$_pkgname/build/src/citra/citra" "$pkgdir/usr/bin/$_pkgname"
+ cd "$srcdir/$_pkgname/build"
+ make DESTDIR="$pkgdir/" install
}