diff --git a/c++utilities/android-aarch64/PKGBUILD b/c++utilities/android-aarch64/PKGBUILD index c22332ed..d981491a 100644 --- a/c++utilities/android-aarch64/PKGBUILD +++ b/c++utilities/android-aarch64/PKGBUILD @@ -23,7 +23,7 @@ optdepends=("$_pkgname-doc: API documentation") checkdepends=("android-$_pkg_arch-cppunit") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -43,6 +43,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -59,14 +60,14 @@ build() { -DUSE_STANDARD_FILESYSTEM:BOOL=OFF \ -DNO_DOXYGEN:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: run tests with qemu # * currently getting error @@ -76,12 +77,12 @@ check() { #export QEMU_LD_PREFIX=$prefix # use libraries from build directory, prefix and Android NDK #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja tests } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/c++utilities/android-armv7a-eabi/PKGBUILD b/c++utilities/android-armv7a-eabi/PKGBUILD index f87e44a5..b78b59d2 100644 --- a/c++utilities/android-armv7a-eabi/PKGBUILD +++ b/c++utilities/android-armv7a-eabi/PKGBUILD @@ -23,7 +23,7 @@ optdepends=("$_pkgname-doc: API documentation") checkdepends=("android-$_pkg_arch-cppunit") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -43,6 +43,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -59,14 +60,14 @@ build() { -DUSE_STANDARD_FILESYSTEM:BOOL=OFF \ -DNO_DOXYGEN:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: run tests with qemu # * currently getting error @@ -76,12 +77,12 @@ check() { #export QEMU_LD_PREFIX=$prefix # use libraries from build directory, prefix and Android NDK #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/c++utilities/apple-darwin/PKGBUILD b/c++utilities/apple-darwin/PKGBUILD index 7f9fe1fa..529c9b0f 100644 --- a/c++utilities/apple-darwin/PKGBUILD +++ b/c++utilities/apple-darwin/PKGBUILD @@ -13,7 +13,7 @@ pkgdesc='Common C++ classes and routines such as argument parser, IO and convers license=('GPL') depends=('apple-darwin-osxcross') optdepends=("$_name-doc: API documentation") -makedepends=('clang' 'cmake') +makedepends=('clang' 'cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('12330ad7b3f745f91bf37193dc872462fd1e14cc13018094a200d424bf346be6') @@ -49,6 +49,7 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH="/opt/osxcross/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ @@ -57,7 +58,7 @@ build() { -DENABLE_THREAD_LOCAL:BOOL=OFF \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -73,8 +74,8 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" install-binary-strip + DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" ninja install-binary-strip popd done done diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index 322df500..12b5ce16 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -12,7 +12,7 @@ pkgdesc='Common C++ classes and routines such as argument parser, IO and convers license=('GPL') depends=('gcc-libs') optdepends=("$pkgname-doc: API documentation") -makedepends=('cmake') +makedepends=('cmake' 'ninja') checkdepends=('cppunit') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -25,6 +25,7 @@ prepare() { build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -39,5 +40,5 @@ check() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/c++utilities/doc/PKGBUILD b/c++utilities/doc/PKGBUILD index 5a65ae34..f7b6aeae 100644 --- a/c++utilities/doc/PKGBUILD +++ b/c++utilities/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)' license=('GPL') -makedepends=('cmake' 'doxygen' 'dia' 'graphviz') +makedepends=('cmake' 'ninja' 'doxygen' 'dia' 'graphviz') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('31fd1de5279c1267c049bf8d900a85d38af11d3c8757a934e694dab46f52fc56') @@ -19,14 +19,15 @@ sha256sums=('31fd1de5279c1267c049bf8d900a85d38af11d3c8757a934e694dab46f52fc56') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make c++utilities_apidoc + ninja c++utilities_apidoc } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-api-doc + DESTDIR="${pkgdir}" ninja install-api-doc } diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index 9bcc7833..e8e0e005 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-libiconv') optdepends=("$_name-doc: API documentation") checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('31fd1de5279c1267c049bf8d900a85d38af11d3c8757a934e694dab46f52fc56') @@ -45,6 +45,7 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ @@ -53,7 +54,7 @@ build() { -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -66,7 +67,8 @@ check() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check || true + export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all + ninja check || true popd done done @@ -79,7 +81,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/dbus-soundrecorder/default/PKGBUILD b/dbus-soundrecorder/default/PKGBUILD index a5bc8be5..902fd55f 100644 --- a/dbus-soundrecorder/default/PKGBUILD +++ b/dbus-soundrecorder/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Records sound from Pulse Audio using ffmpeg while watching D-Bus to determine tracks and meta data' license=('GPL') depends=('c++utilities' 'qt5-base') -makedepends=('cmake' 'qtutilities') +makedepends=('cmake' 'ninja' 'qtutilities') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('1251ae77a6ffb17d30a43c63729e38db4b7d2c2428f889768677065111bd8320') @@ -19,14 +19,15 @@ sha256sums=('1251ae77a6ffb17d30a43c63729e38db4b7d2c2428f889768677065111bd8320') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/geocoordinatecalculator/default/PKGBUILD b/geocoordinatecalculator/default/PKGBUILD index a279044b..311877b2 100644 --- a/geocoordinatecalculator/default/PKGBUILD +++ b/geocoordinatecalculator/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more' license=('GPL') depends=('c++utilities') -makedepends=('cmake') +makedepends=('cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('b37762f53fd6393d7e80490cb1b47305588319cdd286da947eb306acce80ad73') @@ -19,14 +19,15 @@ sha256sums=('b37762f53fd6393d7e80490cb1b47305588319cdd286da947eb306acce80ad73') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/geocoordinatecalculator/mingw-w64/PKGBUILD b/geocoordinatecalculator/mingw-w64/PKGBUILD index 8bfe48c1..665115c8 100644 --- a/geocoordinatecalculator/mingw-w64/PKGBUILD +++ b/geocoordinatecalculator/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ arch=('any') pkgdesc='Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more (mingw-w64)' license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('b37762f53fd6393d7e80490cb1b47305588319cdd286da947eb306acce80ad73') @@ -44,14 +44,15 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -64,7 +65,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/passwordfile/android-aarch64/PKGBUILD b/passwordfile/android-aarch64/PKGBUILD index 4e3b756e..9e9637de 100644 --- a/passwordfile/android-aarch64/PKGBUILD +++ b/passwordfile/android-aarch64/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="C++ library to read/write passwords from/to encrypted files using AES-2 license=('GPL') depends=("android-$_pkg_arch-c++utilities" "android-$_pkg_arch-openssl") optdepends=("$_pkgname-doc: API documentation") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') checkdepends=("android-$_pkg_arch-cppunit") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") @@ -41,6 +41,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -54,14 +55,14 @@ build() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DNO_DOXYGEN:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: run tests with qemu # * currently getting error @@ -71,12 +72,12 @@ check() { #export QEMU_LD_PREFIX=$prefix # use libraries from build directory, prefix and Android NDK #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/passwordfile/android-armv7a-eabi/PKGBUILD b/passwordfile/android-armv7a-eabi/PKGBUILD index e9f5c3a1..a55d7a7d 100644 --- a/passwordfile/android-armv7a-eabi/PKGBUILD +++ b/passwordfile/android-armv7a-eabi/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="C++ library to read/write passwords from/to encrypted files using AES-2 license=('GPL') depends=("android-$_pkg_arch-c++utilities" "android-$_pkg_arch-openssl") optdepends=("$_pkgname-doc: API documentation") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') checkdepends=("android-$_pkg_arch-cppunit") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") @@ -41,6 +41,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -54,14 +55,14 @@ build() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DNO_DOXYGEN:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: run tests with qemu # * currently getting error @@ -71,12 +72,12 @@ check() { #export QEMU_LD_PREFIX=$prefix # use libraries from build directory, prefix and Android NDK #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/passwordfile/default/PKGBUILD b/passwordfile/default/PKGBUILD index 6e893e51..2b4012af 100644 --- a/passwordfile/default/PKGBUILD +++ b/passwordfile/default/PKGBUILD @@ -12,7 +12,7 @@ pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-2 license=('GPL') depends=('c++utilities' 'openssl') optdepends=("$pkgname-doc: API documentation") -makedepends=('cmake') +makedepends=('cmake' 'ninja') checkdepends=('cppunit') optdepends=("$pkgname-doc: API documentation") install= @@ -23,19 +23,20 @@ sha256sums=('556dc44cc061c57308ba389143eb21a39d6780d7260c0dd8f6382c2bc8aed0f9') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make check + ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/passwordfile/doc/PKGBUILD b/passwordfile/doc/PKGBUILD index ec98c61f..4b1c9844 100644 --- a/passwordfile/doc/PKGBUILD +++ b/passwordfile/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 arch=('any') pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL (API documentation)' license=('GPL') -makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities') +makedepends=('cmake' 'ninja' 'doxygen' 'dia' 'graphviz' 'c++utilities') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('556dc44cc061c57308ba389143eb21a39d6780d7260c0dd8f6382c2bc8aed0f9') @@ -19,14 +19,15 @@ sha256sums=('556dc44cc061c57308ba389143eb21a39d6780d7260c0dd8f6382c2bc8aed0f9') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make ${_name}_apidoc + ninja ${_name}_apidoc } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-api-doc + DESTDIR="${pkgdir}" ninja install-api-doc } diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD index 8625c07a..bbb9487a 100644 --- a/passwordfile/mingw-w64/PKGBUILD +++ b/passwordfile/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl') optdepends=("$_name-doc: API documentation") checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('556dc44cc061c57308ba389143eb21a39d6780d7260c0dd8f6382c2bc8aed0f9') @@ -45,14 +45,15 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -65,7 +66,8 @@ check() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check + export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all + ninja check popd done done @@ -78,7 +80,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/passwordmanager/android-aarch64/PKGBUILD b/passwordmanager/android-aarch64/PKGBUILD index 6e15f64e..45d614b6 100644 --- a/passwordmanager/android-aarch64/PKGBUILD +++ b/passwordmanager/android-aarch64/PKGBUILD @@ -19,7 +19,7 @@ pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (Andro license=('GPL') depends=() makedepends=("android-$_pkg_arch-passwordfile" "android-$_pkg_arch-qtutilities" "android-$_pkg_arch-kirigami2" - 'cmake' 'android-ndk' 'android-sdk' 'android-platform' 'jdk8-openjdk' 'breeze-icons') + 'cmake' 'ninja' 'android-ndk' 'android-sdk' 'android-platform' 'jdk8-openjdk' 'breeze-icons') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -64,6 +64,7 @@ build() { cd build cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -87,8 +88,8 @@ build() { -DANDROID_APK_CXX_STANDARD_LIBRARY="$android_ndk_root/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so" \ .. - make VERBOSE=1 - make DESTDIR="${pkgdir}" passwordmanager_apk + ninja + DESTDIR="${pkgdir}" ninja passwordmanager_apk } package() { diff --git a/passwordmanager/android-armv7a-eabi/PKGBUILD b/passwordmanager/android-armv7a-eabi/PKGBUILD index 011ce565..30a45515 100644 --- a/passwordmanager/android-armv7a-eabi/PKGBUILD +++ b/passwordmanager/android-armv7a-eabi/PKGBUILD @@ -19,7 +19,7 @@ pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (Andro license=('GPL') depends=() makedepends=("android-$_pkg_arch-passwordfile" "android-$_pkg_arch-qtutilities" "android-$_pkg_arch-kirigami2" - 'cmake' 'android-ndk' 'android-sdk' 'android-platform' 'jdk8-openjdk' 'breeze-icons') + 'cmake' 'ninja' 'android-ndk' 'android-sdk' 'android-platform' 'jdk8-openjdk' 'breeze-icons') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -64,6 +64,7 @@ build() { cd build cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ @@ -87,8 +88,8 @@ build() { -DANDROID_APK_CXX_STANDARD_LIBRARY="$android_ndk_root/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so" \ .. - make VERBOSE=1 - make DESTDIR="${pkgdir}" passwordmanager_apk + ninja + DESTDIR="${pkgdir}" ninja passwordmanager_apk } package() { diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD index 4b62c3a7..bd466e28 100644 --- a/passwordmanager/default/PKGBUILD +++ b/passwordmanager/default/PKGBUILD @@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL' license=('GPL') depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils') -makedepends=('cmake' 'qt5-tools' 'mesa' 'kirigami2') +makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa' 'kirigami2') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('e6f6c929a52e6df03f2cfff689a0a2165ecca50d1477f49825b3d574fea2bfc6') @@ -33,5 +33,5 @@ build() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD index b3d23157..f5f117d5 100644 --- a/passwordmanager/mingw-w64/PKGBUILD +++ b/passwordmanager/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ arch=('any') pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)' license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-passwordfile' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('e6f6c929a52e6df03f2cfff689a0a2165ecca50d1477f49825b3d574fea2bfc6') @@ -52,15 +52,16 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ -DQUICK_GUI:BOOL=OFF \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -77,7 +78,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/qtutilities/android-aarch64/PKGBUILD b/qtutilities/android-aarch64/PKGBUILD index ee783efa..d97df0ba 100644 --- a/qtutilities/android-aarch64/PKGBUILD +++ b/qtutilities/android-aarch64/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="Common Qt related C++ classes and routines used by my applications such license=('GPL') depends=("android-$_pkg_arch-c++utilities" "android-$_pkg_arch-qt5") optdepends=("$_pkgname-doc: API documentation") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -33,6 +33,7 @@ prepare() { build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \ @@ -47,10 +48,10 @@ build() { -DWIDGETS_GUI=OFF \ -DQUICK_GUI=ON \ . - make VERBOSE=1 + ninja } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/qtutilities/android-armv7a-eabi/PKGBUILD b/qtutilities/android-armv7a-eabi/PKGBUILD index e9fd3c58..be2cf3bb 100644 --- a/qtutilities/android-armv7a-eabi/PKGBUILD +++ b/qtutilities/android-armv7a-eabi/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="Common Qt related C++ classes and routines used by my applications such license=('GPL') depends=("android-$_pkg_arch-c++utilities" "android-$_pkg_arch-qt5") optdepends=("$_pkgname-doc: API documentation") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -33,6 +33,7 @@ prepare() { build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \ @@ -47,10 +48,10 @@ build() { -DWIDGETS_GUI=OFF \ -DQUICK_GUI=ON \ . - make VERBOSE=1 + ninja } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD index 541910c0..bd60e086 100644 --- a/qtutilities/default/PKGBUILD +++ b/qtutilities/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models' license=('GPL') depends=('c++utilities' 'qt5-base') -makedepends=('cmake' 'qt5-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa') optdepends=("$pkgname-doc: API documentation") url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -20,19 +20,20 @@ sha256sums=('5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make QT_QPA_PLATFORM=offscreen check + QT_QPA_PLATFORM=offscreen ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/qtutilities/doc/PKGBUILD b/qtutilities/doc/PKGBUILD index d4c258f9..98f9a729 100644 --- a/qtutilities/doc/PKGBUILD +++ b/qtutilities/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 arch=('any') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (API documentation)' license=('GPL') -makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities' 'qt5-tools' 'mesa') +makedepends=('cmake' 'ninja' 'doxygen' 'dia' 'graphviz' 'c++utilities' 'qt5-tools' 'mesa') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc') @@ -19,14 +19,15 @@ sha256sums=('5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make ${_name}_apidoc + ninja ${_name}_apidoc } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-api-doc + DESTDIR="${pkgdir}" ninja install-api-doc } diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD index 163bf612..30c14c94 100644 --- a/qtutilities/mingw-w64/PKGBUILD +++ b/qtutilities/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities') optdepends=("$_name-doc: API documentation") checkdepends=('mingw-w64-wine') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('5b5fcf7380dde168c9e4e023b66788dd80c72c59a6e1258e2fdff50366280adc') @@ -48,14 +48,15 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -68,7 +69,8 @@ check() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all QT_QPA_PLATFORM=offscreen check || test "$_cfg" = static + export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all + QT_QPA_PLATFORM=offscreen ninja check || test "$_cfg" = static popd done done @@ -81,7 +83,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/rapidjson/doc/PKGBUILD b/rapidjson/doc/PKGBUILD index a6b41467..4552c3b1 100644 --- a/rapidjson/doc/PKGBUILD +++ b/rapidjson/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgdesc='A fast JSON parser/generator for C++ with both SAX/DOM style API (docum arch=('any') url="https://github.com/miloyip/$_pkgname" license=('MIT') -makedepends=('doxygen' 'cmake') +makedepends=('doxygen' 'cmake' 'ninja') source=($_pkgname-$pkgver.tar.gz::https://github.com/miloyip/$_pkgname/archive/v$pkgver.tar.gz) md5sums=('badd12c511e081fec6c89c43a7027bce') @@ -22,6 +22,7 @@ build () { cd build cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DRAPIDJSON_HAS_STDSTRING=ON \ @@ -29,8 +30,7 @@ build () { -DRAPIDJSON_ENABLE_INSTRUMENTATION_OPT=OFF \ -DDOC_INSTALL_DIR=/usr/share/doc/${_pkgname} \ .. - - make doc + ninja doc } package() { diff --git a/rapidjson/mingw-w64/PKGBUILD b/rapidjson/mingw-w64/PKGBUILD index d1340a6b..c0360de3 100644 --- a/rapidjson/mingw-w64/PKGBUILD +++ b/rapidjson/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc='A fast JSON parser/generator for C++ with both SAX/DOM style API (mingw arch=('any') url='https://github.com/miloyip/rapidjson' license=('MIT') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') checkdepends=('mingw-w64-wine' 'mingw-w64-gtest' 'gtest' 'python') source=($_reponame-$pkgver.tar.gz::https://github.com/miloyip/$_reponame/archive/v$pkgver.tar.gz) md5sums=('badd12c511e081fec6c89c43a7027bce') @@ -33,6 +33,7 @@ build () { for _arch in ${_architectures}; do mkdir -p "build-${_arch}" && pushd "build-${_arch}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DRAPIDJSON_HAS_STDSTRING=ON \ -DRAPIDJSON_BUILD_CXX11=ON \ @@ -40,7 +41,7 @@ build () { -DCMAKE_INSTALL_PREFIX:PATH="/usr/${_arch}" \ -DGTEST_SOURCE_DIR=/usr/src/gtest \ .. - make + ninja popd done } @@ -65,7 +66,7 @@ package() { cd "$_reponame-$pkgver" for _arch in ${_architectures}; do mkdir -p "build-${_arch}" && pushd "build-${_arch}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # remove examples rm -r "${pkgdir}/usr/${_arch}/share" # put cmake files in right directory diff --git a/reflective-rapidjson/default/PKGBUILD b/reflective-rapidjson/default/PKGBUILD index f8151220..bd17d926 100644 --- a/reflective-rapidjson/default/PKGBUILD +++ b/reflective-rapidjson/default/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL') depends=('c++utilities' 'rapidjson' "llvm-libs>=${_llvmver}.0.0" "llvm-libs<$((_llvmver + 1)).0.0" 'clang') optdepends=("boost: use Boost.Hana instead of code generator" "$pkgname-doc: API documentation") -makedepends=('cmake' 'clang-tools-extra' 'llvm') +makedepends=('cmake' 'ninja' 'clang-tools-extra' 'llvm') checkdepends=('cppunit' 'boost') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -23,19 +23,20 @@ sha256sums=('1e253ca0c63c6432ede1b1d7ad6c828b93eeb47eb1843d7bdc09445be7c1bba6') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make check + ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/reflective-rapidjson/doc/PKGBUILD b/reflective-rapidjson/doc/PKGBUILD index 43bd54e0..3baf5293 100644 --- a/reflective-rapidjson/doc/PKGBUILD +++ b/reflective-rapidjson/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 arch=('any') pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (API documentation)' license=('GPL') -makedepends=('c++utilities' 'cmake' 'doxygen' 'dia' 'graphviz' 'clang' 'clang-tools-extra' 'llvm' 'rapidjson') +makedepends=('c++utilities' 'cmake' 'ninja' 'doxygen' 'dia' 'graphviz' 'clang' 'clang-tools-extra' 'llvm' 'rapidjson') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('1e253ca0c63c6432ede1b1d7ad6c828b93eeb47eb1843d7bdc09445be7c1bba6') @@ -19,14 +19,15 @@ sha256sums=('1e253ca0c63c6432ede1b1d7ad6c828b93eeb47eb1843d7bdc09445be7c1bba6') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make reflective_rapidjson_apidoc + ninja reflective_rapidjson_apidoc } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-api-doc + DESTDIR="${pkgdir}" ninja install-api-doc } diff --git a/reflective-rapidjson/mingw-w64/PKGBUILD b/reflective-rapidjson/mingw-w64/PKGBUILD index 4e4efeb5..1df51506 100644 --- a/reflective-rapidjson/mingw-w64/PKGBUILD +++ b/reflective-rapidjson/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-rapidjson' 'reflect optdepends=("mingw-w64-boost: use Boost.Hana instead of code generator" "$_name-doc: API documentation") checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine' 'mingw-w64-boost') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('1e253ca0c63c6432ede1b1d7ad6c828b93eeb47eb1843d7bdc09445be7c1bba6') @@ -46,15 +46,16 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ -DNO_GENERATOR:BOOL=ON \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -67,7 +68,8 @@ check() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check + export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all + ninja check popd done done @@ -80,7 +82,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD index 1fe4fa41..580975bd 100644 --- a/repoindex/default/PKGBUILD +++ b/repoindex/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') pkgdesc='Repository browser for Arch Linux' license=('GPL') depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities') -makedepends=('cmake' 'yuicompressor' 'qtutilities') +makedepends=('cmake' 'ninja' 'yuicompressor' 'qtutilities') backup=("etc/${_reponame}.conf") url="https://github.com/Martchus/${_reponame}" options=(emptydirs) @@ -21,11 +21,12 @@ sha256sums=('SKIP') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWEBVIEW_PROVIDER=webengine \ . - make + ninja } package_repoindex() { @@ -37,7 +38,7 @@ package_repoindex() { # install files cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-binary install-service install-config install-bash-completion + DESTDIR="${pkgdir}" ninja install-binary install-service install-config install-bash-completion rm "$pkgdir/usr/bin/repoindex-gui" # make directories for cache and data @@ -58,7 +59,7 @@ package_repoindex-header() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # install files - make DESTDIR="${pkgdir}" install-header + DESTDIR="${pkgdir}" ninja install-header } package_repoindex-web() { @@ -70,7 +71,7 @@ package_repoindex-web() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # install files - make DESTDIR="${pkgdir}" install-web + DESTDIR="${pkgdir}" ninja install-web } package_repoindex-gui() { @@ -82,7 +83,7 @@ package_repoindex-gui() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # install files - make DESTDIR="${pkgdir}" install-binary install-desktop + DESTDIR="${pkgdir}" ninja install-binary install-desktop rm -r "$pkgdir/usr/lib" rm "$pkgdir/usr/bin/repoindex" } diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD index 84a2f0be..19c7d4be 100644 --- a/repoindex/git/PKGBUILD +++ b/repoindex/git/PKGBUILD @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') pkgdesc='Repository browser for Arch Linux' license=('GPL') depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities-git') -makedepends=('cmake' 'git' 'yuicompressor' 'qtutilities-git') +makedepends=('cmake' 'ninja' 'git' 'yuicompressor' 'qtutilities-git') backup=("etc/${_reponame}.conf") #provides=("${_name}") #conflicts=("${_name}") @@ -29,6 +29,7 @@ pkgver() { build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DCONFIGURATION_NAME:STRING='git' \ @@ -36,7 +37,7 @@ build() { -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } package_repoindex() { @@ -48,7 +49,7 @@ package_repoindex() { # install files cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" - make DESTDIR="${pkgdir}" install-binary install-service install-config install-bash-completion + DESTDIR="${pkgdir}" ninja install-binary install-service install-config install-bash-completion # make directories for cache and data mkdir -p "$pkgdir/var/cache/$_reponame" @@ -70,7 +71,7 @@ package_repoindex-header() { cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" # install files - make DESTDIR="${pkgdir}" install-header + DESTDIR="${pkgdir}" ninja install-header } package_repoindex-web() { @@ -84,7 +85,7 @@ package_repoindex-web() { cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" # install files - make DESTDIR="${pkgdir}" install-web + DESTDIR="${pkgdir}" ninja install-web } package_repoindex-gui() { @@ -97,5 +98,5 @@ package_repoindex-gui() { cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" # install files - make DESTDIR="${pkgdir}" install-binary-gui install-desktop + DESTDIR="${pkgdir}" ninja install-binary-gui install-desktop } diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD index 23032db0..5ca22d46 100644 --- a/syncthingtray/default/PKGBUILD +++ b/syncthingtray/default/PKGBUILD @@ -37,7 +37,7 @@ depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils') [[ $_js_provider == qml ]] && depends+=('qt5-declarative') [[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin') [[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop') -makedepends=('cmake' 'qt5-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa') checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio') [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules') @@ -57,6 +57,7 @@ build() { [[ $_enable_plasmoid ]] || additional_args+=' -DNO_PLASMOID=ON' cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -65,15 +66,15 @@ build() { -DSYSTEMD_SUPPORT=ON \ $additional_args \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 check + SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD index 562ecf53..43c5aa50 100644 --- a/syncthingtray/git/PKGBUILD +++ b/syncthingtray/git/PKGBUILD @@ -38,7 +38,7 @@ depends=('qtutilities-git' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils') [[ $_js_provider == qml ]] && depends+=('qt5-declarative') [[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin') [[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop') -makedepends=('cmake' 'qt5-tools' 'git' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa') checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio') [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules') @@ -90,5 +90,5 @@ check() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD index 4e0043b5..f4744fb0 100644 --- a/syncthingtray/mingw-w64/PKGBUILD +++ b/syncthingtray/mingw-w64/PKGBUILD @@ -26,7 +26,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64- [[ $_webview_provider == webengine ]] && depends+=('mingw-w64-qt5-webengine') [[ $_js_provider == script ]] && depends+=('mingw-w64-qt5-script') [[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg' 'ninja') [[ $_enable_libsyncthing == ON ]] && makedepends+=('git' 'go') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -96,6 +96,7 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ @@ -108,7 +109,7 @@ build() { -DUSE_LIBSYNCTHING:BOOL="${_enable_libsyncthing}" \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -125,7 +126,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/tageditor/cli/PKGBUILD b/tageditor/cli/PKGBUILD index d4139f6b..ea905e68 100644 --- a/tageditor/cli/PKGBUILD +++ b/tageditor/cli/PKGBUILD @@ -17,7 +17,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='A tag editor with command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska (GUI disabled)' license=('GPL') depends=('c++utilities' 'tagparser') -makedepends=('cmake') +makedepends=('cmake' 'ninja') conflicts=("${pkgname%-cli}") provides=("${pkgname%-cli}") [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson') @@ -29,6 +29,7 @@ sha256sums=('475ddab587ab7330d147d881c7020cb4dc09b1978af87bf606d714ea21929a8d') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -37,13 +38,13 @@ build() { -DENABLE_JSON_EXPORT="${_json_export}" \ -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator' \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" if [[ $TEST_FILE_PATH ]]; then - make check + ninja check else msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.' fi @@ -51,5 +52,5 @@ check() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD index a585801e..7ea49f3b 100644 --- a/tageditor/default/PKGBUILD +++ b/tageditor/default/PKGBUILD @@ -25,7 +25,7 @@ depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils') [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine') [[ $_js_provider == script ]] && depends+=('qt5-script') [[ $_js_provider == qml ]] && depends+=('qt5-declarative') -makedepends=('cmake' 'qt5-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa') [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson') checkdepends=('cppunit' 'jq') url="https://github.com/Martchus/${_reponame}" @@ -35,6 +35,7 @@ sha256sums=('6ad8f190ca0f2133c3a0cd508248329a80abc89a20629c20e0c2835329e2812c') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -43,13 +44,13 @@ build() { -DENABLE_JSON_EXPORT="${_json_export}" \ -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator' \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" if [[ $TEST_FILE_PATH ]]; then - make check + ninja check else msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.' fi @@ -57,5 +58,5 @@ check() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD index 24fe16dc..bc92dc74 100644 --- a/tageditor/mingw-w64/PKGBUILD +++ b/tageditor/mingw-w64/PKGBUILD @@ -26,7 +26,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-tagparser') [[ $_webview_provider == webengine ]] && depends+=('mingw-w64-qt5-webengine') [[ $_js_provider == script ]] && depends+=('mingw-w64-qt5-script') [[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg' 'ninja') [[ $_json_export == ON ]] && makedepends+=('mingw-w64-reflective-rapidjson') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") @@ -78,6 +78,7 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ @@ -90,7 +91,7 @@ build() { -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -107,7 +108,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/tagparser/android-aarch64/PKGBUILD b/tagparser/android-aarch64/PKGBUILD index 4e691ad7..79becd23 100644 --- a/tagparser/android-aarch64/PKGBUILD +++ b/tagparser/android-aarch64/PKGBUILD @@ -21,7 +21,7 @@ optdepends=("$_pkgname-doc: API documentation") checkdepends=("android-$_pkg_arch-cppunit" "android-$_pkg_arch-openssl") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') #conflicts=("android-$_pkgname-$_android_arch") #replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -41,6 +41,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \ @@ -54,14 +55,14 @@ build() { -DNO_DOXYGEN=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: see c++utilities @@ -71,12 +72,12 @@ check() { #fi #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/tagparser/android-armv7a-eabi/PKGBUILD b/tagparser/android-armv7a-eabi/PKGBUILD index 5b801df2..ad51055a 100644 --- a/tagparser/android-armv7a-eabi/PKGBUILD +++ b/tagparser/android-armv7a-eabi/PKGBUILD @@ -21,7 +21,7 @@ optdepends=("$_pkgname-doc: API documentation") checkdepends=("android-$_pkg_arch-cppunit" "android-$_pkg_arch-openssl") # FIXME: run tests with qemu #checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker") -makedepends=('cmake' 'android-ndk' 'android-sdk') +makedepends=('cmake' 'ninja' 'android-ndk' 'android-sdk') #conflicts=("android-$_pkgname-$_android_arch") #replaces=("android-$_pkgname-$_android_arch") url="https://github.com/Martchus/${_reponame}" @@ -41,6 +41,7 @@ build() { local include_dir=$_prefix/include cmake \ + -G Ninja \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \ @@ -54,14 +55,14 @@ build() { -DNO_DOXYGEN=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make VERBOSE=1 + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" # can not run the tests so compile them at least - make tests VERBOSE=1 + ninja tests # FIXME: see c++utilities @@ -71,12 +72,12 @@ check() { #fi #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib - #make check VERBOSE=1 + #ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install # add tests to the package for possibly executing them later under Android if [[ -f ${_pkgname}_tests ]]; then diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD index ecaf11b5..5880fd20 100644 --- a/tagparser/default/PKGBUILD +++ b/tagparser/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags' license=('GPL') depends=('c++utilities' 'zlib') -makedepends=('cmake') +makedepends=('cmake' 'ninja') checkdepends=('cppunit' 'openssl') optdepends=("$pkgname-doc: API documentation") url="https://github.com/Martchus/${_reponame}" @@ -21,17 +21,18 @@ sha256sums=('05538d4e034f5f008f1b253b7612b6519bb98d566347045bc3b76d5a3b5a7830') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" if [[ $TEST_FILE_PATH ]]; then - make check + ninja check else msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.' fi @@ -39,5 +40,5 @@ check() { package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/tagparser/doc/PKGBUILD b/tagparser/doc/PKGBUILD index 613c83b5..8b115868 100644 --- a/tagparser/doc/PKGBUILD +++ b/tagparser/doc/PKGBUILD @@ -11,7 +11,7 @@ pkgrel=1 arch=('any') pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (API documentation)' license=('GPL') -makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities') +makedepends=('cmake' 'ninja' 'doxygen' 'dia' 'graphviz' 'c++utilities') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('05538d4e034f5f008f1b253b7612b6519bb98d566347045bc3b76d5a3b5a7830') @@ -19,14 +19,15 @@ sha256sums=('05538d4e034f5f008f1b253b7612b6519bb98d566347045bc3b76d5a3b5a7830') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make ${_name}_apidoc + ninja ${_name}_apidoc } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install-api-doc + DESTDIR="${pkgdir}" ninja install-api-doc } diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD index 4f5ae39c..fdcd67cf 100644 --- a/tagparser/mingw-w64/PKGBUILD +++ b/tagparser/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-c++utilities>=4.5.0' 'mingw-w64-zlib') optdepends=("$_name-doc: API documentation") checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine' 'mingw-w64-openssl') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('05538d4e034f5f008f1b253b7612b6519bb98d566347045bc3b76d5a3b5a7830') @@ -45,14 +45,15 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -71,7 +72,8 @@ check() { for _cfg in 'static'; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check + export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all + ninja check popd done done @@ -84,7 +86,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD index 022d9628..ff93041a 100644 --- a/videodownloader/default/PKGBUILD +++ b/videodownloader/default/PKGBUILD @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)' license=('GPL') depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils') -makedepends=('cmake' 'qt5-tools' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('59adbb242250235d0e580fbb858c3eb30c724f5463defc49330015e2233927ed') @@ -19,14 +19,15 @@ sha256sums=('59adbb242250235d0e580fbb858c3eb30c724f5463defc49330015e2233927ed') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DBUILD_SHARED_LIBS:BOOL=ON \ . - make + ninja } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD index bb572178..c454382e 100644 --- a/videodownloader/mingw-w64/PKGBUILD +++ b/videodownloader/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ arch=('any') pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, mingw-w64)' license=('GPL') depends=('mingw-w64-crt' 'mingw-w64-qtutilities') -makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') +makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('59adbb242250235d0e580fbb858c3eb30c724f5463defc49330015e2233927ed') @@ -52,6 +52,7 @@ build() { msg2 "${_arch}-${_cfg}" mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}" ${_arch}-cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ @@ -59,7 +60,7 @@ build() { -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ - make + ninja popd done done @@ -76,7 +77,7 @@ package() { for _cfg in "${_configurations[@]}"; do msg2 "${_arch}-${_cfg}" pushd "build-${_arch}-${_cfg}" - make DESTDIR="${pkgdir}" install-mingw-w64-strip + DESTDIR="${pkgdir}" ninja install-mingw-w64-strip popd done done