main/asterisk: remove incompatible packaging changes

 * do not split dahdi, speex or alsa as that might break setups
 * do not build srtp as libsrtp is not in 2.6-stable

1 files changed, 2 insertions, 9 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 46cce3b923..37f4b1ec8f 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -14,13 +14,12 @@ makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
         postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar
         freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev
         libresample sqlite-dev wget speex-dev libogg-dev bluez-dev curl-dev
-        libedit-dev libsrtp-dev util-linux-dev"
+        libedit-dev util-linux-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
         $pkgname-tds $pkgname-fax $pkgname-sample-config:sample
         $pkgname-sounds-moh:sound_moh $pkgname-sounds-en:sound_en
-        $pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
-        $pkgname-speex $pkgname-alsa"
+        $pkgname-mobile $pkgname-curl:_curl"
 
 _download="http://downloads.asterisk.org/pub/telephony/asterisk/releases"
 _z=${pkgver##*.}
@@ -97,7 +96,6 @@ build() {
                 --with-bluetooth \
                 --with-libcurl \
                 --with-libedit \
-                --with-srtp \
                 || return 1
 
         # and figure out which modules to build
@@ -190,11 +188,6 @@ _curl() {
         _find_and_move '*_curl*'
 }
 
-srtp() { _find_and_move '*_srtp*'; }
-dahdi() { _find_and_move '*_dahdi*'; }
-speex() { _find_and_move '*_speex*'; }
-alsa() { _find_and_move '*_alsa*'; }
-
 sample() {
         arch="noarch"
         pkgdesc="Sample configuration files for asterisk"