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

[Jan Steffens]

    Date: Saturday, January 13, 2018 @ 00:45:34
  Author: heftig
Revision: 281727

20171215.1.bc414d7-4: Build in pjproject to avoid the lib mess

Modified:
  ring-daemon/trunk/PKGBUILD	(contents, properties)

----------+
 PKGBUILD |   37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-13 00:23:45 UTC (rev 281726)
+++ PKGBUILD	2018-01-13 00:45:34 UTC (rev 281727)
@@ -2,8 +2,9 @@
 
 pkgname=ring-daemon
 pkgver=20171215.1.bc414d7
-pkgrel=3
+pkgrel=4
 epoch=2
+_pjver=2.6
 pkgdesc="Ring is a free and universal communication platform which preserves the users' privacy and freedoms (daemon)"
 arch=("x86_64")
 url="https://ring.cx"
@@ -12,25 +13,39 @@
 depends=('opendht' 'yaml-cpp' 'alsa-lib' 'libpulse' 'jack' 'jsoncpp'
          'libsamplerate' 'libsndfile' 'dbus-c++' 'ffmpeg' 'udev' 'gnutls'
          'expat' 'gsm' 'libupnp' 'libnatpmp' 'libva' 'libvdpau' 'restbed'
-         'libsecp256k1' 'pjproject-savoirfairelinux')
+         'libsecp256k1' 'util-linux' 'alsa-lib' 'libsamplerate' 'opus')
 makedepends=('git' 'boost' 'msgpack-c' 'autoconf-archive')
 #checkdepends=('cppunit')
-source=("git+https://gerrit-ring.savoirfairelinux.com/ring-daemon#commit=d08826f038f6fe9a275ba66ff8d0af60a78a7f88")
-md5sums=('SKIP')
+source=("git+https://gerrit-ring.savoirfairelinux.com/ring-daemon#commit=d08826f038f6fe9a275ba66ff8d0af60a78a7f88"
+        "http://www.pjsip.org/release/${_pjver}/pjproject-${_pjver}.tar.bz2")
+noextract=("pjproject-${_pjver}.tar.bz2")
+sha256sums=('SKIP'
+            '2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4')
 
-build() {
+prepare() {
   cd "${pkgname}"
+  cp ../pjproject-${_pjver}.tar.bz2 contrib/tarballs
+  mkdir contrib/native
+  autoreconf -fvi
+}
 
-  msg2 'Building...'
-  autoreconf --force --install --verbose
+build() {
+  cd "${pkgname}/contrib/native"
+  ../bootstrap \
+      --disable-downloads \
+      --disable-all \
+      --enable-pjproject
+  make DEPS_pjproject=
+
+  cd ../..
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
-    --libexecdir=/usr/bin \
+    --libexecdir=/usr/lib \
     --sysconfdir=/etc \
-    --with-contrib="no" \
     --enable-ipv6
-  DISABLE_CONTRIB_DOWNLOADS="TRUE" make
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
 }
 
 # Disabled because some tests (TURN) use the network.
@@ -43,7 +58,7 @@
   cd "${pkgname}"
 
   msg2 'Installing...'
-  DISABLE_CONTRIB_DOWNLOADS="TRUE" make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
   msg2 'Cleaning up pkgdir...'
   find "$pkgdir" -type d -name .git -exec rm -r '{}' +


Property changes on: ring-daemon/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property