pcr/ring: update to 20171024.1.eadbdeb

1 files changed, 25 insertions, 15 deletions

diff --git a/pcr/ring/PKGBUILD b/pcr/ring/PKGBUILD
index bdb390742..87f530f2e 100644
--- a/pcr/ring/PKGBUILD
+++ b/pcr/ring/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgbase=ring
 pkgname=(ring-daemon ring-lrc ring-client-gnome)
 pkgdesc="The GNU Ring / ring.cx (formerly SFLphone) VoIP system"
-pkgver=20170720.2.5bf0a65
-_SOURCE_DATE_EPOCH=1486011607
+pkgver=20171024.1.eadbdeb
+_SOURCE_DATE_EPOCH=1508858419
 
 # To figure out what the above value of _SOURCE_DATE_EPOCH should be,
 # run
@@ -16,39 +17,44 @@ _SOURCE_DATE_EPOCH=1486011607
 #
 #    git clone https://gerrit-ring.savoirfairelinux.com/ring-project
 
-pkgrel=1.1
+pkgrel=1
 arch=("i686" "x86_64")
 url="https://ring.cx/"
 license=('GPL3')
-source=("http://dl.ring.cx/ring-release/tarballs/${pkgbase}_${pkgver}.tar.gz")
-sha256sums=('92c0f614975544867372c5071ee4c6f63b42d76fa7c81c07c054fff8144bacfa')
+source=("http://dl.ring.cx/ring-release/tarballs/${pkgbase}_${pkgver}.tar.gz"
+        'kashmir.tar.gz::https://github.com/Corvusoft/kashmir-dependency/archive/master.tar.gz')
+noextract=('kashmir.tar.gz')
+sha256sums=('4f58183d7669b2fa06d72828f9fc8ceeec74d598bd656618cdd8cbe6a0ec55c6'
+            '4d2040fae7dea3306580ac5b9c3d60e64314305db1b59d2d14c802a12e45e6f9')
 
 # Get this list by looking at `daemon/contrib/src/*/rules.mak`; look
 # for packages that add themselves to both PKGS and FOUND_PKGS.
 _daemon_contrib=(
-        #boost          # CONTRIB: TODO: IDK: no PKGS_FOUND logic
+        boost           # CONTRIB: TODO: IDK: no PKGS_FOUND logic
         crypto++
         ffmpeg
-        #gnutls         # DUP: ffmpeg->gnutls
+        #gnutls         # DUP: {ffmpeg,opendht}->gnutls
         #gsm            # CONTRIB: TODO: IDK: no PKGS_FOUND logic
+        #jack           # DUP: ffmpeg->jack
         jsoncpp
         msgpack-c
         libnatpmp       # NOTE: force system version; see below
-        #nettle         # DUP: ffmpeg->gnutls->nettle
+        #libsamplerate  # DUP: ffmpeg->jack->libsamplerate
+        #libsndfile     # DUP: ffmpeg->libsamplerate->libsndfile
+        libupnp
+        #libvorbis      # DUP: ffmpeg->libvorbis
         #libogg         # DUP: ffmpeg->{libvorbis,speex}->libogg
+        #nettle         # DUP: {ffmpeg,opendht}->gnutls->nettle
         opendht
         #opus           # DUP: ffmpeg->opus
         #pcre           # DUP: {base,base-devel}->grep->pcre
         #pjproject      # CONTRIB: Added patches for gnutls
         restbed
-        #libsamplerate  # DUP: ffmpeg->jack->libsamplerate
-        #libsndfile     # DUP: ffmpeg->libsamplerate->libsndfile
+        #secp256k1      # CONTRIB: extra crypto, AUR package
         #speex          # DUP: ffmpeg->speex
         #speexdsp       # DUP: ffmpeg->speex->speexdsp
-        libupnp
-        #libvorbis      # DUP: ffmpeg->libvorbis
         yaml-cpp
-        #zlib           # DUP: ffmpeg->zlib
+        #zlib           # DUP: {pcre,ffmpeg,opendht,gnutls}->zlib
 )
 # We may pass several `--disable-X` flags to `../bootstrap` below; to
 # force the system version of dependencies.
@@ -83,13 +89,17 @@ makedepends=(
 _makedepends_ringpy=(autoconf-archive gnome-icon-theme-symbolic
                      libe-book)
 
+prepare() {
+  cp "$srcdir/kashmir.tar.gz" "$srcdir/ring-project/daemon/contrib/tarballs/"
+}
+
 build() {
   cd "$srcdir/ring-project/daemon/contrib"
   mkdir native
   cd native
   ../bootstrap --disable-downloads --disable-natpmp --disable-asio
   make BATCH_MODE=1
-  
+
   cd "$srcdir/ring-project/daemon"
   ./autogen.sh
   ./configure --prefix=/usr
@@ -120,7 +130,7 @@ package_ring-daemon() {
 
   cd "$srcdir/ring-project/daemon"
   make DESTDIR="$pkgdir" install
-}  
+}
 
 package_ring-lrc() {
   pkgdesc="A client library for the GNU Ring / ring.cx (formerly SFLphone) VoIP system"