summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez2016-07-01 15:16:24 +0200
committerBaptiste Jonglez2016-07-01 15:16:24 +0200
commit0eb3a581debbc53ee5cf509c4d6907e4f62ee2e2 (patch)
tree72b95465fe0349511e48eeb24f8f1f41686d1032
parent6cd4877790bd9ff10b70186f103b5be75484ded0 (diff)
downloadaur-0eb3a581debbc53ee5cf509c4d6907e4f62ee2e2.tar.gz
ring-daemon-git: depend on pjproject-savoirfairelinux instead of building it locally
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD14
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c3b57aba105..b0de99506d10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Apr 24 21:18:51 UTC 2016
+# Fri Jul 1 13:16:29 UTC 2016
pkgbase = ring-daemon-git
pkgdesc = A secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user (formerly known as SFLphone)
- pkgver = 20160422
+ pkgver = 20160630
pkgrel = 1
url = http://ring.cx
arch = i686
@@ -31,6 +31,7 @@ pkgbase = ring-daemon-git
depends = opus
depends = libupnp
depends = libsrtp
+ depends = pjproject-savoirfairelinux
conflicts = ring-daemon
source = git+https://gerrit-ring.savoirfairelinux.com/ring-daemon
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a80d853d6a6c..a99c4d4766b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
pkgname=ring-daemon-git
-pkgver=20160422
+pkgver=20160630
pkgrel=1
pkgdesc="A secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user (formerly known as SFLphone)"
arch=("i686" "x86_64")
@@ -9,7 +9,8 @@ license=('GPL3')
groups=("ring")
depends=('opendht-git' 'yaml-cpp' 'alsa-lib' 'libpulse' 'jack' 'jsoncpp'
'libsamplerate' 'libsndfile' 'dbus-c++' 'ffmpeg' 'udev' 'gnutls'
- 'expat' 'gsm' 'speex' 'speexdsp' 'opus' 'libupnp' 'libsrtp')
+ 'expat' 'gsm' 'speex' 'speexdsp' 'opus' 'libupnp' 'libsrtp'
+ 'pjproject-savoirfairelinux')
makedepends=('git' 'boost' 'msgpack-c')
conflicts=('ring-daemon')
source=("git+https://gerrit-ring.savoirfairelinux.com/ring-daemon")
@@ -23,16 +24,7 @@ pkgver() {
build() {
cd "${pkgname%-git}"
- msg2 'Building pjproject...'
- # Build the customised version of pjproject (heavily patched...)
- mkdir -p contrib/native
- cd contrib/native
- ../bootstrap
- make .pjproject
-
- cd ../..
msg2 'Building...'
- # Build dring
./autogen.sh
./configure \
--prefix=/usr \