[arch-commits] Commit in jami-daemon/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Saturday, September 26, 2020 @ 00:00:12
  Author: archange
Revision: 712355

upgpkg: jami-daemon 20200925-1

Modified:
  jami-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-25 23:35:35 UTC (rev 712354)
+++ PKGBUILD	2020-09-26 00:00:12 UTC (rev 712355)
@@ -1,11 +1,10 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
 # Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Baptiste Jonglez <baptiste--aur at jonglez dot org>
 
-_pkgname=ring-daemon
 pkgname=jami-daemon
-pkgver=20190813
-pkgrel=5
-_pjprojectver=5dfa75be7d69047387f9b0436dd9492bbbf03fe4
+pkgver=20200925
+pkgrel=1
+_pjprojectver=2.10
 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (daemon component)"
 arch=(x86_64)
 url="https://jami.net"
@@ -12,25 +11,19 @@
 license=(GPL3)
 groups=(jami)
 depends=(opendht yaml-cpp alsa-lib libpulse jack jsoncpp dbus-c++ ffmpeg gnutls
-         expat libupnp libnatpmp libva libvdpau restbed libsecp256k1 util-linux
-         opus libjsoncpp.so)
-makedepends=(git boost msgpack-c autoconf-archive)
+         expat libupnp libnatpmp libva libvdpau libsecp256k1 util-linux opus
+         openssl asio fmt http-parser libarchive)
+makedepends=(git boost msgpack-c restinio autoconf-archive)
 #checkdepends=(cppunit)
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-replaces=(${_pkgname})
-_commit=26b35255a94aa9a13cbf3b3aa530d4b282a79565
+_commit=b97ab28033a63673e99b2060fb3220a7d6f2ba33
 source=("git+https://git.jami.net/savoirfairelinux/ring-daemon.git#commit=${_commit}"
-        "https://github.com/pjsip/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz")
+        https://github.com/pjsip/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz)
 noextract=("pjproject-${_pjprojectver}.tar.gz")
 sha512sums=('SKIP'
-            'a9433b47294434288d61524dea556687fb02137ed56a10e8e2ba85d7888a2ca2a5bea4ae4a9ad008a4c208c5ec53fe364b10ed14481700d6aa8b9b6137e5e9ee')
+            'a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893')
 
 prepare() {
-  cd ${_pkgname}
-
-  git cherry-pick -n 14deb3d34bde107744bf27e34de0608e7801f4d2 # Fix build with GCC 10
-
+  cd ring-daemon
   cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs
   mkdir contrib/native
   autoreconf -fvi
@@ -37,7 +30,7 @@
 }
 
 build() {
-  cd ${_pkgname}/contrib/native
+  cd ring-daemon/contrib/native
   ../bootstrap \
       --disable-downloads \
       --disable-all \
@@ -49,8 +42,7 @@
     --prefix=/usr \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
-    --sysconfdir=/etc \
-    --enable-ipv6
+    --sysconfdir=/etc
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -57,11 +49,11 @@
 
 # Disabled because some tests (TURN) use the network.
 #check() {
-#  cd ${_pkgname}
+#  cd ring-daemon
 #  make -k check
 #}
 
 package() {
-  cd ${_pkgname}
+  cd ring-daemon
   make DESTDIR="${pkgdir}" install
 }