libzrtpcpp: update to 1.6.0 as sources of 1.5.3 were removed today

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
deleted file mode 100644 (file)
index 87135c4..0000000
--- a/recipes/libzrtpcpp/libzrtpcpp/fix-autotools-foo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/fix-configure.patch b/recipes/libzrtpcpp/libzrtpcpp/fix-configure.patch
new file mode 100644 (file)
index 0000000..5621ed8
--- /dev/null
+++ b/recipes/libzrtpcpp/libzrtpcpp/fix-configure.patch
@@ -0,0 +1,20 @@
+diff -Nurd libzrtpcpp-1.6.0/configure.ac libzrtpcpp-1.6.0/configure.ac
+--- libzrtpcpp-1.6.0/configure.ac      2011-01-14 23:00:26.000000000 +0100
++++ libzrtpcpp-1.6.0/configure.ac      2011-01-14 23:00:26.000000000 +0100
+@@ -151,14 +151,12 @@
+ 
+ if test "x$with_ccrtp" != xno; then
+     PKG_CHECK_MODULES(RTPSTACK, libccrtp1 >= 1.8.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.8.0"
+ fi
+ AM_CONDITIONAL(CCRTP_SUPPORT, test "${with_ccrtp}" = "yes")

diff --git a/recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb b/recipes/libzrtpcpp/libzrtpcpp_1.6.0.bb
similarity index 58%
rename from recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb
rename to recipes/libzrtpcpp/libzrtpcpp_1.6.0.bb
index 8b21a00..5780d32 100644 (file)
--- a/recipes/libzrtpcpp/libzrtpcpp_1.5.3.bb
+++ b/recipes/libzrtpcpp/libzrtpcpp_1.6.0.bb
@@ -4,8 +4,8 @@ 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"
+           file://fix-configure.patch"
+SRC_URI[md5sum] = "6cec342f79ad5ec9497b26945c527b70"
+SRC_URI[sha256sum] = "6b1ea1ed3413c0b4f0f5870632e69ca6e079ba34b6db58b723371fe148f64a9d"
 
 inherit pkgconfig autotools