pjsua: 2.4 -> 2.6

pjsua/.signature

@@ -1,7 +1,6 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39rMfMY0qai4EoP2FWC3zLekw3K2hXjwrBVDzlRIhsvYJOptpiQYSMrjNAdJA+K4NWHu2PzGmDZSv7EQEOMbnA8=
-SHA256 (Pkgfile) = be941454592aa4ca17a76c2f98903032db175394f99ec2643a069ca0a1735d65
+untrusted comment: verify with /etc/ports/alan.pub
+RWSHHtGdlW9unGarDPp96kI7fNLDPV4YAbnKWemVIr7bBlsI+11p6LpAnbk5/oTKv1U6dda1rcqXvEha9xD1Qgh7uI/gK3Wy+wo=
+SHA256 (Pkgfile) = 43e10065bd24e7aee6480a449be303c75887db7a13a8fcd95bf5b285855e8c98
 SHA256 (.footprint) = 6d1a04bb5133176434b03f3bca387a46b0ea84f759a937aa5e5bb9a53108d9dd
-SHA256 (pjproject-2.4.tar.bz2) = 108015aeda8dce20d182ec9b4fc277026d2b1796e82947da106eeb406eb02059
-SHA256 (pjmedia-libsamplerate.patch) = cdcf8d48e6871521db3195e5c3406533fbc9a884a232116242cee485fcf3df0e
+SHA256 (pjproject-2.6.tar.bz2) = 2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
 SHA256 (config_site.h) = ed96788ee5309c9be6decb20bd5e8f53224a75fee59d8dcfce2f746207a3fd05

pjsua/Pkgfile

@@ -1,15 +1,13 @@
-# Description:	Command line SIP phone
+# Description:	Multimedia communication library
 # URL:		http://www.pjsip.org/
 # Packager:	Alan Mizrahi, alan at mizrahi dot com dot ve
 # Depends on:	pjproject
 
 name=pjsua
-version=2.4
-release=3
-
+version=2.6
+release=2
 source=(
 http://www.pjsip.org/release/$version/pjproject-$version.tar.bz2
-pjmedia-libsamplerate.patch
 config_site.h
 )
 
@@ -26,7 +24,6 @@ build() {
 	# pjsua will be dynamically linked as long as pjproject is installed beforehand.
 	# otherwise it will be statically linked.
 	./configure \
-		--enable-shared"$([ -f /usr/lib/libpjsua.so ] || echo =no)" \
 		--prefix=/usr \
 		--with-external-pa \
 		--with-external-gsm \
@@ -35,13 +32,11 @@ build() {
 		--with-sdl=/usr \
 		--disable-openh264 \
 		--enable-libsamplerate \
-		--disable-resample_dll
+		--disable-resample_dll \
+		$( [ -f /usr/lib/libpjsua.so ] && echo --enable-shared )
 
 	cp $SRC/config_site.h pjlib/include/pj/config_site.h
 
-	# use system's libsamplerate
-	patch -p1 -i $SRC/pjmedia-libsamplerate.patch
-
 	make dep
 
 	# would be nice if something like this worked:
@@ -51,5 +46,5 @@ build() {
 	make
 
 	# install pjsua only
-	install -D -m755 pjsip-apps/bin/pjsua-* $PKG/usr/bin/pjsua
+	install -D -m755 pjsip-apps/bin/pjsua-`./config.guess` $PKG/usr/bin/pjsua
 }