libzrtpcpp: update to 1.5.3 as 1.4.6 doesn't compile anymore

Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>

diff --git a/recipes/libzrtpcpp/libzrtpcpp/fix-autotools-foo.patch b/recipes/libzrtpcpp/libzrtpcpp/fix-autotools-foo.patch
new file mode 100644 (file)
index 0000000..87135c4
--- /dev/null
+++ b/recipes/libzrtpcpp/libzrtpcpp/fix-autotools-foo.patch
@@ -0,0 +1,32 @@
+diff -Nurd libzrtpcpp-1.5.3/configure.ac libzrtpcpp-1.5.3/configure.ac
+--- libzrtpcpp-1.5.3/configure.ac      2010-12-06 19:03:03.000000000 +0100
++++ libzrtpcpp-1.5.3/configure.ac      2011-01-13 21:33:29.000000000 +0100
+@@ -151,14 +151,12 @@
+ 
+ if test "x$with_ccrtp" != xno; then
+     PKG_CHECK_MODULES(RTPSTACK, libccrtp1 >= 1.5.0, [
+-        RTPSTACK_LIBPATH=`pkg-config --variable=libdir libccrtp1`
+-        LIBS="-L$RTPSTACK_LIBPATH $RTPSTACK_LIBS $LIBS"
++        LIBS="$RTPSTACK_LIBS $LIBS"
+         CCXX_FLAGS="$CXXFLAGS $RTPSTACK_CFLAGS"
+     ])
+     PKG_CHECK_MODULES(COMMON, libccgnu2 >= $REQUIRES)
+     CXXFLAGS="$CXXFLAGS $COMMON_CFLAGS"
+-    COMMON_LIBPATH=`pkg-config --variable=libdir libccgnu2`
+-    LIBS="-L$COMMON_LIBPATH $COMMON_LIBS $LIBS"
++    LIBS="$COMMON_LIBS $LIBS"
+     CRYPTOBACKEND="$CRYPTOBACKEND libccrtp1 >= 1.5.0"
+ fi
+ AM_CONDITIONAL(CCRTP_SUPPORT, test "${with_ccrtp}" = "yes")
+diff -Nurd libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am
+--- libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am        2010-12-05 19:17:43.000000000 +0100
++++ libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am        2011-01-13 21:33:29.000000000 +0100
+@@ -13,7 +13,7 @@
+ 
+ if CCRTP_SUPPORT
+ ccrtp_noinst = 
+-ccrtp_inst = ZrtpQueue.h ZrtpUserCallback.h zrtpccrtp.h TimeoutProvider.h
++ccrtp_inst = ZrtpQueue.h zrtpccrtp.h TimeoutProvider.h
+ endif
+ 
+ zrtpinclude_HEADERS = ZrtpCodes.h ZrtpCallback.h ZrtpUserCallback.h ZrtpConfigure.h ZrtpCWrapper.h $(ccrtp_inst)

diff --git a/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb b/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb
deleted file mode 100644 (file)
index 04c23bf..0000000
--- a/recipes/libzrtpcpp/libzrtpcpp_1.4.6.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "GNU ZRTP C++"
-HOMEPAGE = "http://www.gnutelephony.org/index.php/GNU_ZRTP"
-LICENSE = "GPL"
-DEPENDS = "ccrtp libgcrypt libgpg-error"
-
-inherit pkgconfig autotools
-
-PR = "r1"
-
-EXTRA_OECONF += "\
-    --with-libgcrypt-prefix=${STAGING_LIBDIR} \
-    --with-libtool-sysroot=${STAGING_LIBDIR} \
-    "
-
-SRC_URI = "http://ftp.gnu.org/pub/gnu/ccrtp/libzrtpcpp-${PV}.tar.gz"
-SRC_URI[md5sum] = "83157d4eba394d27b06b7ec753fe31de"
-SRC_URI[sha256sum] = "1ea5ce5a283095a7bf2fe491a8a7571ef21b3dbe6cf815d3df76e6de1e811dba"

diff --git a/recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb b/recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb
new file mode 100644 (file)
index 0000000..8b21a00
--- /dev/null
+++ b/recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "GNU ZRTP C++"
+HOMEPAGE = "http://www.gnutelephony.org/index.php/GNU_ZRTP"
+LICENSE = "GPL"
+DEPENDS = "ccrtp libgcrypt libgpg-error"
+
+SRC_URI = "http://www.gnutelephony.org/dist/tarballs/libzrtpcpp-${PV}.tar.gz \
+           file://fix-autotools-foo.patch"
+SRC_URI[md5sum] = "48ab943615491fc45b886af3172b6d9d"
+SRC_URI[sha256sum] = "a1d0ac304ae09f5ed55684721e11fdfd45b505d65b879aa730803310aa0ad3bb"
+
+inherit pkgconfig autotools