summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHurricanePootis2023-02-23 11:56:28 -0600
committerHurricanePootis2023-02-23 11:56:28 -0600
commitbf0af89e1a4a239d0876d02365f4f9ff96c148f0 (patch)
tree35421d51d4de13df2cec157f7ac827cc8d8707cc
parentee90682b52d648807273bd85ada52e7948b507e8 (diff)
downloadaur-bf0af89e1a4a239d0876d02365f4f9ff96c148f0.tar.gz
Improve cmake style and depends using namcap
-rwxr-xr-x.SRCINFO18
-rwxr-xr-xPKGBUILD43
2 files changed, 15 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abc59916ef7f..2906bf00debd 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = yuzu-mainline-git
pkgdesc = An experimental open-source emulator for the Nintendo Switch (newest features)
- pkgver = r23233.cd3a0a737
+ pkgver = r23282.7afa8eb0f
pkgrel = 1
url = https://github.com/yuzu-emu/yuzu-mainline
arch = i686
@@ -15,26 +15,14 @@ pkgbase = yuzu-mainline-git
makedepends = git
makedepends = ninja
makedepends = nlohmann-json
+ makedepends = qt5-tools
makedepends = robin-map
- depends = desktop-file-utils
depends = fmt
- depends = glslang
- depends = libfdk-aac
- depends = libusb
- depends = libxkbcommon-x11
- depends = lz4
depends = mbedtls
- depends = openssl
- depends = opus
- depends = qt5-base
+ depends = libinih
depends = qt5-multimedia
- depends = qt5-tools
- depends = qt5-wayland
depends = qt5-webengine
depends = sdl2
- depends = shared-mime-info
- depends = zlib
- depends = zstd
depends = enet
depends = boost-libs
provides = yuzu
diff --git a/PKGBUILD b/PKGBUILD
index 38ebbed63269..790db8741157 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=yuzu
pkgname=$_pkgname-mainline-git
-pkgver=r23233.cd3a0a737
+pkgver=r23282.7afa8eb0f
pkgrel=1
pkgdesc='An experimental open-source emulator for the Nintendo Switch (newest features)'
arch=('i686' 'x86_64')
@@ -12,25 +12,12 @@ license=('GPL2')
provides=('yuzu' 'yuzu-cmd')
conflicts=('yuzu-git' 'yuzu-canary-git' 'yuzu')
options=("!lto") #ThinLTO is already set
-depends=('desktop-file-utils'
- 'fmt'
- 'glslang'
- 'libfdk-aac'
- 'libusb'
- 'libxkbcommon-x11'
- 'lz4'
+depends=('fmt'
'mbedtls'
- 'openssl'
- 'opus'
- 'qt5-base'
+ 'libinih'
'qt5-multimedia'
- 'qt5-tools'
- 'qt5-wayland'
'qt5-webengine'
'sdl2'
- 'shared-mime-info'
- 'zlib'
- 'zstd'
'enet'
'boost-libs')
makedepends=('boost'
@@ -42,6 +29,7 @@ makedepends=('boost'
'git'
'ninja'
'nlohmann-json'
+ 'qt5-tools'
'robin-map')
source=("$_pkgname::git+https://github.com/yuzu-emu/yuzu-mainline"
'git+https://github.com/lsalzman/enet.git'
@@ -116,13 +104,12 @@ prepare() {
}
build() {
- cd "$srcdir/$_pkgname"
+ cd "$srcdir"
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir -p build && cd build
- cmake .. -GNinja \
+ [[ -d build ]] && rm -rf build
+
+ cmake -S $_pkgname -B build \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
@@ -143,17 +130,11 @@ build() {
-DYUZU_USE_BUNDLED_FFMPEG=OFF \
-DYUZU_USE_BUNDLED_QT=OFF \
-DYUZU_TESTS=OFF \
- -DBUILD_TESTS=OFF \
-Wno-dev
- ninja
-}
-
-check() {
- cd "$srcdir/$_pkgname/build"
- ninja test
+ cmake --build build
}
package() {
- cd "$srcdir/$_pkgname/build"
- DESTDIR="$pkgdir" ninja install
+ cd "$srcdir"
+ DESTDIR="$pkgdir" cmake --install build
}