summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMendel Greenberg2019-08-26 17:46:42 -0700
committerMendel Greenberg2019-08-26 17:46:42 -0700
commit6cdbbc05d60bcea9bdd727e6057b572598e399cc (patch)
tree2255429848383a897e021f55e18b9465a7684316
parent44438fd9874cca9b0751569d9ea31d2a6adbfc1b (diff)
downloadaur-6cdbbc05d60bcea9bdd727e6057b572598e399cc.tar.gz
updated and refractored
-rw-r--r--.SRCINFO36
-rw-r--r--PKGBUILD72
-rwxr-xr-xcitra-qt.bash3
-rwxr-xr-xcitra.bash3
4 files changed, 47 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d5837b35be9..8768919e4a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,28 @@
-pkgbase = citra-nightly-bin
+pkgbase = citra-bin
pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger
- pkgver = 1330_20190812_2f0ea48
+ pkgver = 1343_20190821_8fa6be5
pkgrel = 7
- url = https://github.com/citra-emu/citra-nightly/
+ url = https://github.com/citra-emu/citra-nightly
arch = x86_64
- license = GPL
+ license = GPL2
provides = citra
provides = citra-qt
- source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-1330/citra-linux-20190812-2f0ea48.tar.xz
+ 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
source = https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop
- source = https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.svg
- source = citra.bash
- source = citra-qt.bash
- sha256sums = 77a1305e96a401d8e2671e36cbfed7e5913e9eb0eba35a17a32ee8651ad80e40
+ sha256sums = 14267ac9f9122d2b5fb53984fba124bd3bee059c54d0cbf329beeb84bbe564eb
sha256sums = 93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2
- sha256sums = eeab12f3f13f06db7984d361eebcd977ce500b1f73c9bd7ce726712d477e6e14
- sha256sums = 068409ef70c25e8da3f0430c5ff62609d122f2f857525940da8cd792a228a822
- sha256sums = 61bcee69be306b58fd0bdf6327cdfc88260ba9f9d0694cf54e2d720965bc918b
-pkgname = citra-nightly-bin
+pkgname = citra-bin
+ depends = libsndio-61-compat
depends = sdl2
- depends = libpng
- depends = libpng12
- depends = libcurl-compat
- depends = bash
-pkgname = citra-qt-nightly-bin
- depends = qt5-base
- depends = shared-mime-info
+pkgname = citra-qt-bin
+ depends = qt5-multimedia
+ depends = libsndio-61-compat
+ depends = sdl2
depends = desktop-file-utils
- depends = libcurl-compat
- depends = bash
optdepends = libxkbcommon-x11: for X11 support
optdepends = qt5-wayland: for Wayland support
diff --git a/PKGBUILD b/PKGBUILD
index 29cdc2d2317..06ad8bd8ccc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,46 @@
-# Maintainer: Tom Bebbington <tophattedcoder@gmail.com>
+# Maintainer: Mendel Greenberg <chabad 360 at gmail dot com>
_pkgbase='citra'
-pkgbase="$_pkgbase-nightly-bin"
-pkgname=("$_pkgbase-nightly-bin" "$_pkgbase-qt-nightly-bin")
+pkgbase="$_pkgbase-bin"
+pkgname=("$_pkgbase-bin" "$_pkgbase-qt-bin")
pkgrel=7
-pkgver=1330_20190812_2f0ea48
+replaces=("$_pkgbase-nightly-bin" "$_pkgbase-qt-nightly-bin")
+pkgver=1343_20190821_8fa6be5
pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
provides=('citra' 'citra-qt')
-license=('GPL')
+license=('GPL2')
arch=('x86_64')
-url="https://github.com/citra-emu/citra-nightly/"
+url="https://github.com/citra-emu/citra-nightly"
+
_nightly_id=$(echo $pkgver | cut -d'_' -f1)
_ref="$(echo $pkgver | cut -d'_' -f2)-$(echo $pkgver | cut -d'_' -f3)"
source=(
"https://github.com/citra-emu/citra-nightly/releases/download/nightly-$_nightly_id/citra-linux-$_ref.tar.xz"
- "https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop"
- "https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.svg"
- "citra.bash"
- "citra-qt.bash"
-)
-sha256sums=('77a1305e96a401d8e2671e36cbfed7e5913e9eb0eba35a17a32ee8651ad80e40'
- '93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2'
- 'eeab12f3f13f06db7984d361eebcd977ce500b1f73c9bd7ce726712d477e6e14'
- '068409ef70c25e8da3f0430c5ff62609d122f2f857525940da8cd792a228a822'
- '61bcee69be306b58fd0bdf6327cdfc88260ba9f9d0694cf54e2d720965bc918b')
-
-package_citra-nightly-bin() {
- depends=('sdl2' 'libpng' 'libpng12' 'libcurl-compat' 'bash')
-
- mkdir -p "${pkgdir}/usr/bin"
- cp $srcdir/citra.bash "${pkgdir}/usr/bin/citra"
- cd $srcdir/citra-linux-$_ref
- mkdir -p "${pkgdir}/opt/citra"
- cp citra "${pkgdir}/opt/citra"
+ "https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop")
+
+sha256sums=('14267ac9f9122d2b5fb53984fba124bd3bee059c54d0cbf329beeb84bbe564eb'
+ '93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2')
+
+package_citra-bin() {
+ depends=('libsndio-61-compat' 'sdl2')
+
+ cd "${srcdir}/citra-linux-${_ref}"
+ install -Dm644 -t "${pkgdir}/usr/bin" citra
+ install -Dm644 -t "${pkgdir}/usr/bin" citra-room
+
}
-package_citra-qt-nightly-bin() {
- depends=('qt5-base' 'shared-mime-info' 'desktop-file-utils' 'libcurl-compat' 'bash')
- optdepends=('libxkbcommon-x11: for X11 support'
- 'qt5-wayland: for Wayland support')
-
- mkdir -p $pkgdir/usr/bin
- cp $srcdir/citra-qt.bash "${pkgdir}/usr/bin/citra-qt"
- cd $srcdir/citra-linux-$_ref
- mkdir -p $pkgdir/opt/citra
- mv citra-qt $pkgdir/opt/citra
- mkdir -p $pkgdir/usr/share/applications
- cp $srcdir/citra.desktop $pkgdir/usr/share/applications
- mkdir -p $pkgdir/usr/share/pixmaps
- cp $srcdir/citra.svg $pkgdir/usr/share/pixmaps
+package_citra-qt-bin() {
+ depends=('qt5-multimedia' 'libsndio-61-compat' 'sdl2' 'desktop-file-utils')
+ optdepends=('libxkbcommon-x11: for X11 support'
+ 'qt5-wayland: for Wayland support')
+
+
+ cd "${srcdir}/citra-linux-${_ref}"
+ install -Dm644 -t "${pkgdir}/usr/bin" citra-qt
+ install -Dm644 -t "${pkgdir}/usr/bin" citra-room
+ install -Dm644 -t "${pkgdir}/usr/share/pixmaps" "dist/citra.png"
+
+ cd "${srcdir}"
+ install -Dm644 -t "${pkgdir}/usr/share/applications" "citra.desktop"
}
diff --git a/citra-qt.bash b/citra-qt.bash
deleted file mode 100755
index 0c0f7fbfef5..00000000000
--- a/citra-qt.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-env LD_PRELOAD=/usr/lib/libcurl.so.3 /opt/citra/citra-qt "$@" \ No newline at end of file
diff --git a/citra.bash b/citra.bash
deleted file mode 100755
index 49780cfdf34..00000000000
--- a/citra.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-env LD_PRELOAD=/usr/lib/libcurl.so.3 /opt/citra/citra "$@" \ No newline at end of file