summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHurricanePootis2023-10-24 23:34:32 -0500
committerHurricanePootis2023-10-24 23:34:32 -0500
commit618be6d436c08a610c699fbdc0b0ae93b33d2462 (patch)
tree5660c9893191b1a00b77494ed9f9435c3051f275
parent10f200bf303631715f45beb33ea5497bb33cbea6 (diff)
downloadaur-618be6d436c08a610c699fbdc0b0ae93b33d2462.tar.gz
Make more deps system deps
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD17
2 files changed, 28 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64459f4d2b72..9e51968bbeb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = citra-git
pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger
- pkgver = r9774.43cedf59a
+ pkgver = r9829.45ef11654
pkgrel = 1
url = https://github.com/citra-emu/citra/
arch = i686
@@ -17,6 +17,7 @@ pkgbase = citra-git
makedepends = gcc
makedepends = glslang
makedepends = vulkan-headers
+ makedepends = nlohmann-json
depends = ffmpeg
depends = speexdsp
depends = mbedtls
@@ -27,6 +28,10 @@ pkgbase = citra-git
depends = libfdk-aac
depends = sndio
depends = libbacktrace-git
+ depends = zstd
+ depends = soundtouch
+ depends = fmt
+ depends = libinih
options = lto
options = strip
options = !debug
@@ -112,7 +117,12 @@ pkgname = citra-git
depends = libfdk-aac
depends = sndio
depends = libbacktrace-git
+ depends = zstd
+ depends = soundtouch
+ depends = fmt
+ depends = libinih
depends = sdl2
+ depends = libinih
pkgname = citra-qt-git
depends = ffmpeg
@@ -125,6 +135,10 @@ pkgname = citra-qt-git
depends = libfdk-aac
depends = sndio
depends = libbacktrace-git
+ depends = zstd
+ depends = soundtouch
+ depends = fmt
+ depends = libinih
depends = qt6-base
depends = qt6-multimedia
depends = sdl2
diff --git a/PKGBUILD b/PKGBUILD
index 4e583f7428fc..c6d26ba44ab1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgbase='citra'
pkgbase="$_pkgbase-git"
pkgname=("$_pkgbase-git" "$_pkgbase-qt-git")
-pkgver=r9774.43cedf59a
+pkgver=r9829.45ef11654
pkgrel=1
pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
arch=('i686' 'x86_64')
@@ -24,8 +24,8 @@ else
_enable_lto=off
fi
license=('GPL2')
-depends=('ffmpeg' 'speexdsp' 'mbedtls' 'libusb' 'openssl' 'glibc' 'gcc-libs' 'libfdk-aac' 'sndio' 'libbacktrace-git')
-makedepends=('git' 'cmake' 'python' 'doxygen' 'rapidjson' 'llvm' 'qt6-tools' 'qt6-multimedia' 'gcc' 'glslang' 'vulkan-headers')
+depends=('ffmpeg' 'speexdsp' 'mbedtls' 'libusb' 'openssl' 'glibc' 'gcc-libs' 'libfdk-aac' 'sndio' 'libbacktrace-git' 'zstd' 'soundtouch' 'fmt' 'libinih')
+makedepends=('git' 'cmake' 'python' 'doxygen' 'rapidjson' 'llvm' 'qt6-tools' 'qt6-multimedia' 'gcc' 'glslang' 'vulkan-headers' 'nlohmann-json')
source=("$_pkgbase::git+https://github.com/citra-emu/citra.git"
"boost::git+https://github.com/citra-emu/ext-boost.git"
"nihstro::git+https://github.com/neobrain/nihstro.git"
@@ -131,6 +131,7 @@ prepare() {
cd "$srcdir/$_pkgbase/externals/libadrenotools/"
git config --file=.gitmodules submodule.lib/linkernsbypass.url "$srcdir/liblinkernsbypass"
+ git -c protocol.file.allow=always submodule update --init
}
@@ -159,7 +160,15 @@ build() {
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON \
-DUSE_SYSTEM_BOOST=OFF \
+ -DUSE_SYSTEM_FFMPEG_HEADERS=ON \
+ -DUSE_SYSTEM_FMT=ON \
-DUSE_SYSTEM_SDL2=ON \
+ -DUSE_SYSTEM_JSON=ON \
+ -DUSE_SYSTEM_LIBUSB=ON \
+ -DUSE_SYSTEM_SOUNDTOUCH=ON \
+ -DUSE_SYSTEM_GLSLANG=ON \
+ -DUSE_SYSTEM_INIH=ON \
+ -DUSE_SYSTEM_ZSTD=ON \
-DCMAKE_C_COMPILER=gcc \
-DCMAKE_CXX_COMPILER=g++ \
-DCMAKE_C_FLAGS="$CFLAGS" \
@@ -174,7 +183,7 @@ check() {
}
package_citra-git() {
- depends+=('sdl2')
+ depends+=('sdl2' 'libinih')
if [ $_debug = "false" ]; then
install -Dm755 "$srcdir/build/bin/Release/citra" "$pkgdir/usr/bin/citra"