summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiretza2022-05-15 12:50:27 +0200
committerXiretza2022-05-15 12:51:55 +0200
commit2242884b42c5f50f1fb08e357ca9d48098254604 (patch)
treebdbf46395e2d94b571474734a3d37708e5bcf1eb
parentd8c3ae730d9e87ee2dc4d1dd9e2676c12ce98c84 (diff)
downloadaur-2242884b42c5f50f1fb08e357ca9d48098254604.tar.gz
Use make instead of ninja
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD19
2 files changed, 8 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e0c6c2759ae..8eafadfab136 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = libtg_owt-git
arch = x86_64
license = BSD
makedepends = git
- makedepends = ninja
makedepends = unzip
makedepends = cmake
makedepends = protobuf
diff --git a/PKGBUILD b/PKGBUILD
index 0d8c026668bc..b7493dd38c91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=('x86_64')
url='https://github.com/desktop-app/tg_owt'
license=('BSD')
depends=('protobuf')
-makedepends=('git' 'ninja' 'unzip' 'cmake' 'protobuf' 'libxrandr' 'libxcomposite' 'openssl' 'glibc'
+makedepends=('git' 'unzip' 'cmake' 'protobuf' 'libxrandr' 'libxcomposite' 'openssl' 'glibc'
'ffmpeg' 'libva' 'opus' 'yasm' 'libjpeg-turbo' 'pipewire' 'libxtst' 'abseil-cpp' 'libepoxy')
options=('staticlibs')
source=("tg_owt::git+${url}.git"
@@ -25,7 +25,7 @@ provides=('libtg_owt')
conflicts=('libtg_owt')
pkgver(){
- cd $srcdir/tg_owt
+ cd tg_owt
printf "0.git.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
@@ -39,20 +39,17 @@ prepare() {
}
build() {
- cd tg_owt
# Upstream stated that only static builds are really supported so that's what we'll do.
# https://github.com/desktop-app/tg_owt/issues/75#issuecomment-992061171
- cmake \
- -B build \
- -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
+ cmake -B build -S tg_owt \
+ -DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=OFF
- ninja -C build
+ make -C build
}
package() {
- cd tg_owt
- DESTDIR="${pkgdir}/" ninja -C build install
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ make -C build DESTDIR="${pkgdir}/" install
+
+ install -Dm644 tg_owt/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}