From 0f2b1c2b251854362deedab61b996c6ae2367196 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 2 Jul 2013 16:38:58 +0200 Subject: [PATCH] fix Makefile, update linphone submodule - add missing PayloadType object accessors - SDP fix --- Makefile | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c1258632a..351814a37 100644 --- a/Makefile +++ b/Makefile @@ -100,8 +100,8 @@ prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h prepare-mediastreamer2: @cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/$$$$builddir/./'` && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/$$$$builddir/./'` && \ + eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/\$$(abs_builddir)/./'` && \ + eval `cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/\$$(abs_builddir)/./'` && \ if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \ if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi diff --git a/submodules/linphone b/submodules/linphone index 88d02758b..866bc5c4c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 88d02758b9c7187563d07e4d72e6a1781e366006 +Subproject commit 866bc5c4c0c786f92f078aec36a5f1f9e2115e3c