Arch Linux User Repository

Fair enough. Some other jobs seem to run parallel fine but citra in particular only runs on one thread. Will have to look at local stuff more closely, thanks.

@Epsilon That is probably something that should be discussed with upstream. For now I removed the leftover files from the package manually.

@RinSystem There is already a setting in /etc/makepkg.conf that allows for changing that. Individual PKGBUILD files should not hardcode any settings for parallel compilation.

The makepkg for this seems to run on one thread by default. Is this intentional? Could this be run with 'make -j' instead?

This should rely upon robin-map instead of compiling and including it's own causing issues with other packages that rely upon robin-map.

The dynarmic submodule causes a compilation error

Need to fix submodule fetching, wont build.

Fix fetching source when insteadOf is set to ssh in gitconfig

diff --git a/PKGBUILD b/PKGBUILD
index 5d78069..568f576 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ license=('GPL2')
 depends=('ffmpeg')
 makedepends=('git' 'cmake' 'sdl2' 'qt5-base' 'shared-mime-info' 'desktop-file-utils' 'qt5-multimedia')
 source=("$_pkgbase::git+https://github.com/citra-emu/citra"
-        "boost::git+https://github.com/citra-emu/ext-boost/"
+        "boost::git+https://github.com/citra-emu/ext-boost"
         "catch::git+https://github.com/catchorg/Catch2"
         "cpp-jwt::git+https://github.com/arun11299/cpp-jwt"
         "cubeb::git+https://github.com/mozilla/cubeb"

Patch to comply with https://wiki.archlinux.org/title/VCS_package_guidelines#Git_submodules

diff --git a/PKGBUILD b/PKGBUILD
index 76fb6a3..fe765fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,60 @@
 # Maintainer: Tim Schumacher <timschumi@gmx.de>
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 # Contributor: ceri
-
+# Contributor: Imperator Storm <30777770+ImperatorStorm@users.noreply.github.com>
 _pkgbase='citra'
 pkgbase="$_pkgbase-git"
 pkgname=("$_pkgbase-git" "$_pkgbase-qt-git")
-pkgver=r9037.c40871f12
-pkgrel=1
+pkgver=r9079.5a7d80172
+pkgrel=2
 pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
 arch=('i686' 'x86_64')
 url="https://github.com/citra-emu/citra/"
 license=('GPL2')
 depends=('ffmpeg')
 makedepends=('git' 'cmake' 'sdl2' 'qt5-base' 'shared-mime-info' 'desktop-file-utils' 'qt5-multimedia')
-source=("$_pkgbase::git+https://github.com/citra-emu/citra")
-md5sums=('SKIP')
+source=("$_pkgbase::git+https://github.com/citra-emu/citra"
+        "boost::git+https://github.com/citra-emu/ext-boost/"
+        "catch::git+https://github.com/catchorg/Catch2"
+        "cpp-jwt::git+https://github.com/arun11299/cpp-jwt"
+        "cubeb::git+https://github.com/mozilla/cubeb"
+        "discord-rpc::git+https://github.com/discord/discord-rpc"
+        "dynarmic::git+https://github.com/citra-emu/dynarmic"
+        "enet::git+https://github.com/lsalzman/enet"
+        "fmt::git+https://github.com/fmtlib/fmt"
+        "libressl::git+https://github.com/citra-emu/ext-libressl-portable"
+        "nihistro::git+https://github.com/neobrain/nihstro"
+        "soundtouch::git+https://github.com/citra-emu/ext-soundtouch"
+        "teakra::git+https://github.com/wwylele/teakra"
+        "xbyak::git+https://github.com/herumi/xbyak"
+        "zstd::git+https://github.com/facebook/zstd"
+        "inih::git+https://github.com/benhoyt/inih"
+        "libusb::git+https://github.com/libusb/libusb"
+        "cryptopp::git+https://github.com/weidai11/cryptopp"
+        "lodepng::git+https://github.com/lvandeve/lodepng"
+        "sanitizers-cmake::git+https://github.com/arsenm/sanitizers-cmake"
+        "googletest::git+https://github.com/google/googletest")
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')

 # Clang generates weird object files when LTO is enabled, breaking static libraries (.a).
 # Force-disable LTO if we are using clang.
@@ -29,10 +69,22 @@ pkgver() {

 prepare() {
    cd "$srcdir/$_pkgbase"
-   mkdir -p build
-
+   if [[ -d build ]]; then
+      rm -rf build
+    fi
+    mkdir build
    git submodule init
-   git submodule update --init --recursive
+   for external in boost catch cpp-jwt cubeb discord-rpc dynarmic enet fmt libressl nihistro soundtouch teakra xbyak zstd inih libusb cryptopp lodepng
+   do
+   git config submodule.$external.url "$srcdir/$external"
+   done
+   git submodule update
+   # agh, submodule has submodules
+    cd externals/cubeb
+    git submodule init
+    git config submodule.cmake/sanitizers-cmake.url "$srcdir/sanitizers-cmake"
+    git config submodule.googletest.url "$srcdir/googletest"
+    git submodule update
 }

 build() {

This patch fixes clang builds and builds for those who have lto enabled in their makepkg.conf. The clang fix consists of increasing the bracket-depth in the CXXFLAGS, whilst the lto fix consists of just disabling lto.

I kind of marked the E-Mail notification as read and forgot about it five minutes later. Sorry for that.

I'll look into it and apply the patch if necessary.

Does !lto or lto in makepkg.conf mean it's enabled (doesn't say in the wiki), MUST it be included in the PKGBUILD when used

"lto" means that LTO is enabled, and "!lto" ("not lto") means that it's disabled.