summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMendel Greenberg2019-08-27 18:47:19 -0700
committerMendel Greenberg2019-08-27 18:47:19 -0700
commit24ad9ce765a1cee727ca2a896f23747c33ab31c7 (patch)
treeea3a7b5efdb4e7fc2f0d1b801adbca01cc2f4c00
parenta6111bff68ca4dc853e39555cedbed4a5a8235d2 (diff)
downloadaur-24ad9ce765a1cee727ca2a896f23747c33ab31c7.tar.gz
fixed a few spelling, permission, and deps issues
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
2 files changed, 15 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c491237af9..a3ed5331826 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,6 +5,12 @@ pkgbase = citra-bin
url = https://citra-emu.org
arch = x86_64
license = GPL2
+ conflicts = citra-git
+ conflicts = citra-qt-git
+ conflicts = citra-nightly-bin
+ conflicts = citra-qt-nightly-bin
+ conflicts = citra-bin
+ conflicts = citra-qt
replaces = citra-nightly-bin
replaces = citra-qt-nightly-bin
source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-1343/citra-linux-20190821-8fa6be5.tar.xz
@@ -13,11 +19,13 @@ pkgbase = citra-bin
sha256sums = 93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2
pkgname = citra-bin
+ depends = ffmpeg-compat-57
depends = libsndio-61-compat
depends = sdl2
provides = citra
pkgname = citra-qt-bin
+ depends = ffmpeg-compat-57
depends = qt5-multimedia
depends = libsndio-61-compat
depends = sdl2
diff --git a/PKGBUILD b/PKGBUILD
index c19b0ea2bf2..9cbdbaf0093 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('citra-bin' 'citra-qt-bin')
pkgrel=8
pkgver=1343_20190821_8fa6be5
pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
-confilcts=('citra-git' 'citra-qt-git' 'citra-nightly-bin' 'citra-qt-nightly-bin')
+conflicts=('citra-git' 'citra-qt-git' 'citra-nightly-bin' 'citra-qt-nightly-bin' 'citra-bin' 'citra-qt')
replaces=("citra-nightly-bin" "citra-qt-nightly-bin")
license=('GPL2')
arch=('x86_64')
@@ -21,25 +21,25 @@ sha256sums=('14267ac9f9122d2b5fb53984fba124bd3bee059c54d0cbf329beeb84bbe564eb'
'93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2')
package_citra-bin() {
- depends=('libsndio-61-compat' 'sdl2')
+ depends=('ffmpeg-compat-57' 'libsndio-61-compat' 'sdl2')
provides=('citra')
cd "${srcdir}/citra-linux-${_ref}"
- install -Dm644 -t "${pkgdir}/usr/bin" citra
- install -Dm644 -t "${pkgdir}/usr/bin" citra-room
+ install -Dm755 -t "${pkgdir}/usr/bin" citra
+ install -Dm755 -t "${pkgdir}/usr/bin" citra-room
}
package_citra-qt-bin() {
- depends=('qt5-multimedia' 'libsndio-61-compat' 'sdl2' 'desktop-file-utils')
+ depends=('ffmpeg-compat-57' 'qt5-multimedia' 'libsndio-61-compat' 'sdl2' 'desktop-file-utils')
optdepends=('libxkbcommon-x11: for X11 support'
'qt5-wayland: for Wayland support')
provides=('citra-qt')
cd "${srcdir}/citra-linux-${_ref}"
- install -Dm644 -t "${pkgdir}/usr/bin" citra-qt
- install -Dm644 -t "${pkgdir}/usr/bin" citra-room
+ install -Dm755 -t "${pkgdir}/usr/bin" citra-qt
+ install -Dm755 -t "${pkgdir}/usr/bin" citra-room
install -Dm644 -t "${pkgdir}/usr/share/pixmaps" "dist/citra.png"
cd "${srcdir}"