Date: Friday, March 18, 2022 @ 11:43:13 Author: archange Revision: 1158417
upgpkg: jami-daemon 20220317-1 Switch to meson now that upstream uses it in CI. Modified: jami-daemon/trunk/PKGBUILD ----------+ PKGBUILD | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-18 11:42:49 UTC (rev 1158416) +++ PKGBUILD 2022-03-18 11:43:13 UTC (rev 1158417) @@ -2,8 +2,8 @@ # Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org> pkgname=jami-daemon -pkgver=20220209 -pkgrel=3 +pkgver=20220317 +pkgrel=1 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (daemon component)" arch=(x86_64) url="https://jami.net"; @@ -14,10 +14,9 @@ libupnp libnatpmp openssl webrtc-audio-processing systemd-libs libarchive) # portaudio needs a not-yet-upstream patch https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/650 -makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd autoconf-archive) -#makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd meson) +makedepends=(git cmake perl asio msgpack-c msgpack-cxx restinio systemd meson) checkdepends=(cppunit) -_commit=7634487e9f568ae727f2d4cffbb735d23fa0324c +_commit=f6f8a83754351d640b90026d1c6b59b2b6ed1393 _pjprojectver=e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a source=(git+https://git.jami.net/savoirfairelinux/${pkgname}.git#commit=${_commit} https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz) @@ -33,7 +32,6 @@ cd ${pkgname} cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs mkdir contrib/native - autoreconf -fvi } build() { @@ -45,32 +43,18 @@ --enable-pjproject make DEPS_pjproject= - cd ../.. - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make - -# https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/651 -# cd "${srcdir}" -# arch-meson ${pkgname} build -D interfaces=library,dbus -D opensl=disabled -D portaudio=disabled -D tests=true \ -# -D pkg_config_path="${PWD}/${pkgname}/contrib/$(cc -dumpmachine)/lib/pkgconfig" -# meson compile -C build + cd "${srcdir}" + arch-meson ${pkgname} build -D interfaces=library,dbus -D opensl=disabled -D portaudio=disabled \ + $( ((CHECKFUNC)) && echo -D tests=true) \ + -D pkg_config_path="${PWD}/${pkgname}/contrib/$(cc -dumpmachine)/lib/pkgconfig" + meson compile -C build } #check() { -# https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/651 -# cd ${pkgname} -# make -k check # https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/649 # meson test -C build --print-errorlogs #} package() { - cd ${pkgname} - make DESTDIR="${pkgdir}" install - #meson install -C build --destdir "${pkgdir}" + meson install -C build --destdir "${pkgdir}" }
