[arch-commits] Commit in ortp/trunk (PKGBUILD libzrtpcpp2.patch)

[Andrea Scarpino]

    Date: Sunday, July 1, 2012 @ 03:46:26
  Author: andrea
Revision: 162823

upgpkg: ortp 0.20.0.20120701-1

Fix the linphone crash using an ortp snapshot (FS#29953)

Modified:
  ortp/trunk/PKGBUILD
Deleted:
  ortp/trunk/libzrtpcpp2.patch

-------------------+
 PKGBUILD          |   17 +++++-------
 libzrtpcpp2.patch |   69 ----------------------------------------------------
 2 files changed, 7 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-01 07:44:15 UTC (rev 162822)
+++ PKGBUILD	2012-07-01 07:46:26 UTC (rev 162823)
@@ -5,25 +5,22 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=ortp
-pkgver=0.20.0
-pkgrel=2
+pkgver=0.20.0.20120701
+pkgrel=1
 pkgdesc="A Real-time Transport Protocol (RTP) library"
 arch=('i686' 'x86_64')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
-license=('LGPL')
+license=('GPL3')
 depends=('libzrtpcpp' 'libsrtp')
 options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'libzrtpcpp2.patch')
-md5sums=('b3f2f02fc5b7ba7e294806c81d419f3c'
-         'c5d39f9ad14fe252db9a96f616308b0b'
-         'a37392fd9889711ac2f0fed2e388fbd8')
+#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('91b66787c6ac3e8d4d43946beb7611ce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p1 -i "${srcdir}"/libzrtpcpp2.patch
-
+  ./autogen.sh
   ./configure --prefix=/usr \
     --enable-zrtp \
     --disable-strict

Deleted: libzrtpcpp2.patch
===================================================================
--- libzrtpcpp2.patch	2012-07-01 07:44:15 UTC (rev 162822)
+++ libzrtpcpp2.patch	2012-07-01 07:46:26 UTC (rev 162823)
@@ -1,69 +0,0 @@
-Only in ortp-0.20.0.my/build: Makefile
-Only in ortp-0.20.0.my/build/win32native: Makefile
-Only in ortp-0.20.0.my/build/wince: Makefile
-Only in ortp-0.20.0.my/build/winmob: Makefile
-Only in ortp-0.20.0.my: config.log
-Only in ortp-0.20.0.my: config.status
-Only in ortp-0.20.0.my: doc
-Only in ortp-0.20.0.my/include: Makefile
-Only in ortp-0.20.0.my/include/ortp: Makefile
-Only in ortp-0.20.0.my: libtool
-Only in ortp-0.20.0.my: Makefile
-Only in ortp-0.20.0.my: ortp-config.h
-Only in ortp-0.20.0.my: ortp.defs
-Only in ortp-0.20.0.my: ortp.pc
-Only in ortp-0.20.0.my/src: avprofile.lo
-Only in ortp-0.20.0.my/src: b64.lo
-Only in ortp-0.20.0.my/src: .deps
-Only in ortp-0.20.0.my/src: event.lo
-Only in ortp-0.20.0.my/src: jitterctl.lo
-Only in ortp-0.20.0.my/src: libortp.la
-Only in ortp-0.20.0.my/src: .libs
-Only in ortp-0.20.0.my/src: Makefile
-Only in ortp-0.20.0.my/src: netsim.lo
-Only in ortp-0.20.0.my/src: ortp.lo
-Only in ortp-0.20.0.my/src: ortp_srtp.lo
-Only in ortp-0.20.0.my/src: payloadtype.lo
-Only in ortp-0.20.0.my/src: port.lo
-Only in ortp-0.20.0.my/src: posixtimer.lo
-Only in ortp-0.20.0.my/src: rtcp.lo
-Only in ortp-0.20.0.my/src: rtcpparse.lo
-Only in ortp-0.20.0.my/src: rtpparse.lo
-Only in ortp-0.20.0.my/src: rtpsession_inet.lo
-Only in ortp-0.20.0.my/src: rtpsession.lo
-Only in ortp-0.20.0.my/src: rtpsignaltable.lo
-Only in ortp-0.20.0.my/src: rtptimer.lo
-Only in ortp-0.20.0.my/src: scheduler.lo
-Only in ortp-0.20.0.my/src: sessionset.lo
-Only in ortp-0.20.0.my/src: str_utils.lo
-Only in ortp-0.20.0.my/src: stun.lo
-Only in ortp-0.20.0.my/src: stun_udp.lo
-Only in ortp-0.20.0.my/src: telephonyevents.lo
-Only in ortp-0.20.0.my/src/tests: .deps
-Only in ortp-0.20.0.my/src/tests: Makefile
-Only in ortp-0.20.0.my/src/tests/win_receiver: Makefile
-Only in ortp-0.20.0.my/src/tests/win_sender: Makefile
-Only in ortp-0.20.0.my/src: utils.lo
-diff -wbBur ortp-0.20.0/src/zrtp.c ortp-0.20.0.my/src/zrtp.c
---- ortp-0.20.0/src/zrtp.c	2012-02-22 20:19:51.000000000 +0400
-+++ ortp-0.20.0.my/src/zrtp.c	2012-05-16 19:11:25.000000000 +0400
-@@ -837,7 +837,7 @@
- 	userData->session=s;
- 	ortp_zrtp_configure(context);
- 	ortp_message("Initialized ZRTP context");
--	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
-+	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
- 	return ortp_zrtp_configure_context(userData,s,params);
- }
- 
-@@ -867,7 +867,7 @@
- 	userData->session=s;
- 	ortp_zrtp_configure(context);
- 	
--	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
-+	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
- 
- 	ortp_message("setting zrtp_setMultiStrParams");
- 	zrtp_setMultiStrParams(context,multiparams,length);
-Only in ortp-0.20.0.my/src: zrtp.lo
-Only in ortp-0.20.0.my: stamp-h1