From a95f6b73d4b86bd998e2ea8e50f9c186d51a4f22 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 29 Mar 2017 21:11:48 +0200
Subject: [PATCH] [DEV] update to a complex manifest

---
 default.xml         | 8 ++++++--
 generic-library.xml | 9 +++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/default.xml b/default.xml
index 67e7a24..49f299e 100644
--- a/default.xml
+++ b/default.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 	<!--<remote name="origin" fetch="https://github.com/"/>-->
-	<remote name="origin" fetch="ssh://heero@192.168.0.156/git/"/>
+	<remote name="origin" fetch="../../">
+		<mirror name="github" fetch="https://github.com/"/>
+		<mirror name="gitlab" fetch="https://gitlab.com/"/>
+		<mirror name="bitbucket" fetch="https://bitbucket.com/"/>
+	</remote>
 	<default revision="master" remote="origin" sync-s="true"/>
-        <include name="atria-soft.xml"/>
+	<include name="atria-soft.xml"/>
 	<include name="musicdsp.xml"/>
 	<include name="generic-library.xml"/>
 </manifest>
diff --git a/generic-library.xml b/generic-library.xml
index f6b14d5..2e8b739 100644
--- a/generic-library.xml
+++ b/generic-library.xml
@@ -6,7 +6,9 @@
 	<project name="generic-library/speex-dsp-lutin.git"      path="generic-library/speex-dsp-lutin"/>
 	<project name="generic-library/ogg-lutin.git"            path="generic-library/ogg-lutin"/>
 	<project name="generic-library/freetype-lutin.git"       path="generic-library/freetype-lutin"/>
-	<project name="generic-library/ffmpeg-lutin.git"         path="generic-library/ffmpeg-lutin"/>
+	<project name="generic-library/ffmpeg-lutin.git"         path="generic-library/ffmpeg-lutin">
+		<upstream_submodule path="ffmpeg" name="source" fetch="https://github.com/FFmpeg/FFmpeg.git"/>
+	</project>
 	<project name="generic-library/z-lutin.git"              path="generic-library/z-lutin"/>
 	<project name="generic-library/gtest-lutin.git"          path="generic-library/gtest-lutin"/>
 	<project name="generic-library/glew-lutin.git"           path="generic-library/glew-lutin"/>
@@ -23,10 +25,9 @@
 	<project name="generic-library/opencv-lutin.git"         path="generic-library/opencv-lutin"/>
 	<project name="generic-library/zxing-cpp-lutin.git"      path="generic-library/zxing-cpp-lutin"/>
 	<project name="generic-library/fdk-aac-lutin.git"        path="generic-library/fdk-aac-lutin"/>
-        <project name="generic-library/jpeg-lutin.git"           path="generic-library/jpeg-lutin"/>
-        <project name="generic-library/openjpeg-lutin.git"       path="generic-library/openjpeg-lutin"/>
+	<project name="generic-library/jpeg-lutin.git"           path="generic-library/jpeg-lutin"/>
+	<project name="generic-library/openjpeg-lutin.git"       path="generic-library/openjpeg-lutin"/>
 	<!--<project name="generic-library/cxx-lutin.git"            path="generic-library/cxx-lutin"/>-->
-	
 	<!-- tools -->
 	<project name="generic-library/ios-deploy.git"  path="tools/ios-deploy"/>
 </manifest>