summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTércio Martins2021-02-01 18:27:55 -0300
committerTércio Martins2021-02-01 18:27:55 -0300
commitbf92225afd06579caa2608b702522942a4094e65 (patch)
tree1220447db86112fb3044513592bc5184a374b4fe
parent30474da384ca7522e680e68c9a2d0bcd0c36a0aa (diff)
downloadaur-bf92225afd06579caa2608b702522942a4094e65.tar.gz
Change build system to Ninja
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD26
2 files changed, 17 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a21eefdec07a..5689d466efde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = olive-git
pkgdesc = Free non-linear video editor
- pkgver = continuous.r263.g32055edd
+ pkgver = continuous.r370.g19eabf28
pkgrel = 1
url = https://www.olivevideoeditor.org/
arch = i686
@@ -9,9 +9,10 @@ pkgbase = olive-git
license = GPL3
makedepends = cmake
makedepends = git
+ makedepends = ninja
makedepends = qt5-tools
depends = ffmpeg
- depends = openimageio-git
+ depends = openimageio
depends = qt5-multimedia
provides = olive
conflicts = olive
diff --git a/PKGBUILD b/PKGBUILD
index 93ca079db2a4..4eaedeea8ee1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Tércio Martins <echo dGVyY2lvd2VuZGVsQGdtYWlsLmNvbQo= | base64 -d>
pkgname=olive-git
-_pkgname=olive
-pkgver=continuous.r263.g32055edd
+_pkgname=${pkgname%-*}
+pkgver=continuous.r370.g19eabf28
pkgrel=1
arch=('i686' 'pentium4' 'x86_64')
pkgdesc="Free non-linear video editor"
url="https://www.olivevideoeditor.org/"
license=('GPL3')
-depends=('ffmpeg' 'openimageio-git' 'qt5-multimedia')
-makedepends=('cmake' 'git' 'qt5-tools')
+depends=('ffmpeg' 'openimageio' 'qt5-multimedia')
+makedepends=('cmake' 'git' 'ninja' 'qt5-tools')
# Temporarily, the "olive-git" package is incompatible
# with the dependency "olive-community-effects-git".
@@ -23,19 +23,21 @@ source=('git+https://github.com/olive-editor/olive.git')
sha512sums=('SKIP')
pkgver() {
- cd "$_pkgname"
+ cd $_pkgname
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- mkdir -p build && cd build
- cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- ../$_pkgname
- cmake --build .
+ cd $_pkgname
+ cmake -GNinja \
+ -Bbuild \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ ninja -C build
}
package() {
- cd build
- make DESTDIR="$pkgdir/" install
+ cd $_pkgname
+ DESTDIR="$pkgdir" ninja -C build install
+ #make DESTDIR="$pkgdir/" install
}