From a41afc0c60f52d9d0d6f21dc9fa0b3badae74db7 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 3 Apr 2012 11:33:26 +0200 Subject: [PATCH] Update linphone and 'prepare_sources.sh' script --- prepare_sources.sh | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prepare_sources.sh b/prepare_sources.sh index 1871fe2af..aefa8e754 100755 --- a/prepare_sources.sh +++ b/prepare_sources.sh @@ -34,8 +34,8 @@ cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MED cd $topdir/submodules/linphone/mediastreamer2/src/ # extract rules to build shader files -vs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.vs` -fs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.fs` +vs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/$$builddir/./'` +fs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/$$builddir/./'` eval $vs_rule # verify vs file creation if ! [ -e yuv2rgb.vs.h ] diff --git a/submodules/linphone b/submodules/linphone index 0a21e2c32..6e0a681c9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0a21e2c322aad67fe75a6f42d6c7dd535946dfff +Subproject commit 6e0a681c9ebabf88ef55c49b3db79cdf68dd7f76