Arch Linux User Repository

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.

@mikoxyz I've been trying to figure out how to compile this with Clang for a while Lol

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, and would you happen to know why -stdlib=libc++ -lstdc++ don't work as flags?

I can't seem to get this to compile with Clang no matter what I do when I try to do this :/

#!/hint/bash
#
# /etc/makepkg.conf
#

#########################################################################
# SOURCE ACQUISITION
#########################################################################
#
#-- The download utilities that makepkg should use to acquire sources
#  Format: 'protocol::agent'
DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
          'rsync::/usr/bin/rsync --no-motd -z %u %o'
          'scp::/usr/bin/scp -C %u %o')

# Other common tools:
# /usr/bin/snarf
# /usr/bin/lftpget -c
# /usr/bin/wget
# /usr/bin/axel

#-- The package required by makepkg to download VCS sources
#  Format: 'protocol::package'
VCSCLIENTS=('bzr::bzr'
            'fossil::fossil'
            'git::git'
            'hg::mercurial'
            'svn::subversion')

#########################################################################
# ARCHITECTURE, COMPILE FLAGS
#########################################################################
#
CARCH="x86_64"
CHOST="x86_64-pc-linux-gnu"

#-- Compiler and Linker Flags
export CC=clang
export CXX=clang++

#CPPFLAGS=""
CFLAGS="-march=native -mtune=native -O3 -pipe -fno-plt -minline-all-stringops -stdlib=libc++ -lstdc++ -fexceptions \
        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
        -fstack-clash-protection -fcf-protection"
CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
LDFLAGS="-Wl,-O3,--sort-common,--as-needed,-z,relro,-z,now"
RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
#-- Make Flags: change this for DistCC/SMP systems
MAKEFLAGS="-j$(nproc) -e"
#-- Debugging flags
## The "-fvar-tracking-assignments" flag is for GCC
#DEBUG_CFLAGS="-g -fvar-tracking-assignments"
DEBUG_CLAGS="-g"
#DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
DEBUG_CXXFLAGS="-g"
#DEBUG_RUSTFLAGS="-C debuginfo=2"

#########################################################################
# BUILD ENVIRONMENT
#########################################################################
#
# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
#  A negated environment option will do the opposite of the comments below.
#
#-- distcc:   Use the Distributed C/C++/ObjC compiler
#-- color:    Colorize output messages
#-- ccache:   Use ccache to cache compilation
#-- check:    Run the check() function if present in the PKGBUILD
#-- sign:     Generate PGP signature file
#
BUILDENV=(!distcc color !ccache check !sign)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
#DISTCC_HOSTS=""
#
#-- Specify a directory for package building.
#BUILDDIR=/tmp/makepkg

#########################################################################
# GLOBAL PACKAGE OPTIONS
#   These are default values for the options=() settings
#########################################################################
#
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
#  A negated option will do the opposite of the comments below.
#
#-- strip:      Strip symbols from binaries/libraries
#-- docs:       Save doc directories specified by DOC_DIRS
#-- libtool:    Leave libtool (.la) files in packages
#-- staticlibs: Leave static library (.a) files in packages
#-- emptydirs:  Leave empty directories in packages
#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
#-- purge:      Remove files specified by PURGE_TARGETS
#-- debug:      Add debugging flags as specified in DEBUG_* variables
#-- lto:        Add compile flags for building with link time optimization
#
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)

#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
INTEGRITY_CHECK=(sha256)
#-- Options to be used when stripping binaries. See `man strip' for details.
STRIP_BINARIES="--strip-all"
#-- Options to be used when stripping shared libraries. See `man strip' for details.
STRIP_SHARED="--strip-unneeded"
#-- Options to be used when stripping static libraries. See `man strip' for details.
STRIP_STATIC="--strip-debug"
#-- Manual (man and info) directories to compress (if zipman is specified)
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
#-- Doc directories to remove (if !docs is specified)
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
#-- Files to be removed from all packages (if purge is specified)
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#-- Directory to store source code in for debug packages
DBGSRCDIR="/usr/src/debug"

#########################################################################
# PACKAGE OUTPUT
#########################################################################
#
# Default: put built package and cached source in build directory
#
#-- Destination: specify a fixed directory where all packages will be placed
#PKGDEST=/home/packages
#-- Source cache: specify a fixed directory where source files will be cached
#SRCDEST=/home/sources
#-- Source packages: specify a fixed directory where all src packages will be placed
#SRCPKGDEST=/home/srcpackages
#-- Log files: specify a fixed directory where all log files will be placed
#LOGDEST=/home/makepkglogs
#-- Packager: name/email of the person or organization building packages
#PACKAGER="John Doe <john@doe.com>"
#-- Specify a key to use for package signing
#GPGKEY=""

#########################################################################
# COMPRESSION DEFAULTS
#########################################################################
#
COMPRESSGZ=(gzip -c -f -n)
COMPRESSBZ2=(bzip2 -c -f)
COMPRESSXZ=(xz -c -z --threads=0 -)
COMPRESSZST=(zstd -c -z -q --threads=0 -)
COMPRESSLRZ=(lrzip -q)
COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f)
COMPRESSLZ4=(lz4 -q)
COMPRESSLZ=(lzip -c -f)

#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
PKGEXT='.pkg.tar.zst'
SRCEXT='.src.tar.gz'

#########################################################################
# OTHER
#########################################################################
#
#-- Command used to run pacman as root, instead of trying sudo and su
#PACMAN_AUTH=()

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.

diff --git a/PKGBUILD b/PKGBUILD
index dff4422..b5e8d16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ 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')
+options=('!lto')
 source=("$_pkgbase::git+https://github.com/citra-emu/citra")
 md5sums=('SKIP')

@@ -35,6 +36,11 @@ build() {
        # Fix for an issue some users are facing when compiling with GCC
        CXXFLAGS+=" -DFMT_USE_USER_DEFINED_LITERALS=0"

+       # The build fails with clang if this isn't set
+       if [ $CXX == clang++ ]; then
+               CXXFLAGS+=" -fbracket-depth=649"
+       fi
+
        cmake .. \
          -DCMAKE_INSTALL_PREFIX=/usr \
          -DCMAKE_BUILD_TYPE=Release \

I was able to build this a few weeks ago but now I get this error:

==> Entering fakeroot environment...
==> Starting package_citra-git()...
install: cannot stat '/var/tmp/pamac-build-name/citra-git/src/citra/build/bin/citra': No such file or directory
==> ERROR: A failure occurred in package_citra-git().
    Aborting...

EDIT: Building works after the 2020-07-16 20:04 Update. Thanks.

@timschumi

Thanks! Building with yay works again.

@timschumi

Thank you for the rapid feedback and the fix!

Is it possible to add qt5-multimedia as a package dependency for citra-qt-git and (again) as make dependency for the base package instead?

@Laserentchen

Should be fine now. It was only listed as a build-time dependency before.

qt5-multimedia seems to be a dependency for citra-qt:

citra-qt: error while loading shared libraries: libQt5Multimedia.so.5: cannot open shared object file: No such file or directory

@timschumi Oh, thank you! I should've thought of that. Now it's working!

@cnte No issues here, even on a totally clean environment. However, the error output you posted indicates that a few repositories failed to download/checkout. You might want to try clearing out your src directory.

Build is failing for me with the following error.

==> Starting build()...
-- Target architecture: x86_64
-- Boost 1.66.0 or newer not found, falling back to externals
<FindSDL2.cmake>
</FindSDL2.cmake>
--  Found avcodec: /usr/include /usr/lib/libavcodec.so (version: 58.54.100)
--  Found avdevice: /usr/include /usr/lib/libavdevice.so (version: 58.8.100)
--  Found avfilter: /usr/include /usr/lib/libavfilter.so (version: 7.57.100)
--  Found avformat: /usr/include /usr/lib/libavformat.so (version: 58.29.100)
--  Found avutil: /usr/include /usr/lib/libavutil.so (version: 56.31.100)
--  Found swresample: /usr/include /usr/lib/libswresample.so (version: 3.5.100)
--  Found swscale: /usr/include /usr/lib/libswscale.so (version: 5.5.100)
-- Target architecture: x86_64
-- Version: 6.0.0
-- Build type: Release
-- CXX_STANDARD: 17
-- ZSTD VERSION: 1.4.4
-- CMAKE_INSTALL_PREFIX: /usr
-- CMAKE_INSTALL_LIBDIR: lib
-- ZSTD_LEGACY_SUPPORT not defined!
-- ZSTD_MULTITHREAD_SUPPORT is enabled
-- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) 
CMake Error at externals/CMakeLists.txt:88 (add_subdirectory):
  The source directory

    /home/cnte/.cache/aurutils/sync/citra-git/src/citra/externals/libressl

  does not contain a CMakeLists.txt file.


CMake Error at externals/CMakeLists.txt:89 (target_include_directories):
  Cannot specify include directories for target "ssl" which is not built by
  this project.


CMake Error at externals/CMakeLists.txt:90 (target_compile_definitions):
  Cannot specify compile definitions for target "ssl" which is not built by
  this project.


-- Configuring incomplete, errors occurred!

Dependency to ffmpeg missing.

Huh, I didn't notice that it actually had to be a CMake variable, since its definition is similar to a "normal" compile-time flag. I'll upload a fix in a few minutes.

@timschumi For some weird reason you added it as a "CXXFLAG" and not as cmake variable like described here: https://github.com/citra-emu/citra/wiki/Building-for-Linux#building-citra-in-release-mode-optimized This change also resolves @rharish's issue, check his comment below

@dnandha I'm pretty sure that the flag is already set...

Missing audio (e.g. for Pokemon X/Y) can be fixed by adding an additional compiler flag to PKGBUILD: @@ -40,6 +40,7 @@ build() { cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_FFMPEG_AUDIO_DECODER=ON \ -DUSE_SYSTEM_CURL=ON make } Tested, works! Reference: https://github.com/citra-emu/citra/wiki/Building-for-Linux#building-citra-in-release-mode-optimized

Citra isn't built with the AAC decoder, which leads to missing audio for Pokemon X/Y, as mentioned here. I've tried to do it myself, but it doesn't work. Could you look into this issue?.

Build is failing for me (using aurutils)

[  3%] Building CXX object externals/dynarmic/src/CMakeFiles/dynarmic.dir/common/fp/fused.cpp.o
In file included from /build/citra-git/src/citra/externals/dynarmic/src/./common/assert.h:9,
                 from /build/citra-git/src/citra/externals/dynarmic/src/common/fp/fused.cpp:7:
/build/citra-git/src/citra/externals/fmt/include/fmt/format.h:3475:55: error: ISO C++ did not adopt string literal operator templates taking an argument pack of characters [-Wpedantic]
 3475 | FMT_CONSTEXPR internal::udl_formatter<Char, CHARS...> operator""_format() {
      |                                                       ^~~~~~~~
compilation terminated due to -Wfatal-errors.
make[2]: *** [externals/dynarmic/src/CMakeFiles/dynarmic.dir/build.make:102: externals/dynarmic/src/CMakeFiles/dynarmic.dir/common/fp/fused.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:235: externals/dynarmic/src/CMakeFiles/dynarmic.dir/all] Error 2
make: *** [Makefile:141: all] Error 2
==> ERROR: A failure occurred in build().
    Aborting...
==> ERROR: Build failed, check /var/lib/aurbuild/x86_64/aurpkgs/build

EDIT: Adding export CXXFLAGS+=" -DFMT_USE_USER_DEFINED_LITERALS=0" in the build section of the PKGBUILD fixed it. I got this from https://github.com/citra-emu/citra/issues/4766

-DCMAKE_INSTALL_LIBDIR=lib

that work for me, thanks.

Just add -DCMAKE_INSTALL_LIBDIR=lib to prevent pacman from complaining

The installation issue is fixed, the symlink /usr/lib64 on the filesystem conflicted with the file /usr/lib64/libdiscord-rpc.so that the package tried to install.

Discord integration has to wait for another time.

Same issue here, using makepkg + pacman -U : erreur : la validation de la transaction a échoué (conflit de fichiers) citra-qt-git : /usr/lib64 est déjà présent dans le système de fichiers (appartenant à filesystem)

Discord integration seems to conflict with Dolphin's.

Experiencing the same issue as @gourdcaptain. Using aurman.

@hcorion Discord integration should now be enabled

@oddworld That issue is fixed now, the build paths have changed

@gourdcaptain I didn't experience such issues. What makepkg command or AUR wrapper did you use to compile the package?

This is giving me the error: "error: failed to commit transaction (conflicting files) citra-qt-git: /usr/lib64 exists in filesystem (owned by filesystem)" on install attempt.

I am unable to build. Below is the error:

=> Starting check()...
Running tests...
Test project /tmp/yaourt-tmp-USERNAME/aur-citra-qt-git/src/citra/build
Start 1: tests
1/1 Test #1: tests ............................   Passed    0.27 sec

100% tests passed, 0 tests failed out of 1

Total Test time (real) =   0.27 sec
==> Entering fakeroot environment...
==> Starting package_citra-git()...
install: cannot stat '/tmp/yaourt-tmp-USERNAME/aur-citra-qt-git/src/citra/build/src/citra/citra': No such file or directory
==> ERROR: A failure occurred in package_citra-git().
Aborting...
==> ERROR: Makepkg was unable to build citra-git.
==> Restart building citra-qt-git ? [y/N]
==> -------------------------------------

Hey, just wondering if we could enable discord rich presence for this package, via -DUSE_DISCORD_PRESENCE=ON ?

@linkmauve

This package needs at least a build-time dependency on "qt5-multimedia" to provide the Qt5MultimediaConfig.cmake configuration file.

Also, please change the "git submodule update" calls to "git submodule update --init --recursive" as already recommended by others (since the package is not buildable in its current state).

As noted by turtlewit in citra-canary-git:

Had to change "git submodule update" to "git submodule update --init --recursive" in PKGBUILD to fix.

Looks like a dependency is missing now. Configure fails with:

CMake Error at externals/cubeb/CMakeLists.txt:27 (message): Could not find sanitizers-cmake: run

If using pacaur and cached the build, and see some message like

xxxx/inih is not a clone of https://github.com/benhoyt/inih

then one needs to remove the inih/ folder and re-build it.

Fixed.

This package no longer builds due to https://github.com/citra-emu/citra/pull/3178

You need to change inih repos.