From d35fd52d7888c1dfbbc8ef3a14e976758a260dad Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 14 Oct 2015 21:21:03 +0200
Subject: [PATCH] [DEV] update new lutin 0.8.0

---
 lutin_speex.py           | 39 +++++++++++++++++++++++++++++++--------
 lutin_speextestenc.py    | 27 ++++++++++++++++++---------
 lutin_speextestencuwb.py | 28 +++++++++++++++++++---------
 lutin_speextestencwb.py  | 28 +++++++++++++++++++---------
 4 files changed, 87 insertions(+), 35 deletions(-)

diff --git a/lutin_speex.py b/lutin_speex.py
index afca82f..58025f4 100644
--- a/lutin_speex.py
+++ b/lutin_speex.py
@@ -1,14 +1,29 @@
 #!/usr/bin/python
 import lutin.module as module
 import lutin.tools as tools
+import os
+
+def get_type():
+	return "LIBRARY"
 
 def get_desc():
 	return "Algorithm of speex codec"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex', 'LIBRARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def get_version():
+	return [1,2,"rc2"]
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
+	# add extra compilation flags:
 	my_module.add_extra_compile_flags()
 	# add the file to compile:
 	my_module.add_src_file([
@@ -47,12 +62,20 @@ def create(target):
 		'speex/libspeex/stereo.c',
 		'speex/libspeex/vorbis_psy.c'
 		])
+	my_module.add_header_file([
+		'speex/include/speex/speex_header.h',
+		'speex/include/speex/speex_config_types.h',
+		'speex/include/speex/speex_callbacks.h',
+		'speex/include/speex/speex_types.h',
+		'speex/include/speex/speex.h',
+		'speex/include/speex/speex_stereo.h',
+		'speex/include/speex/speex_bits.h'
+		],
+		destination_path="speex")
 	
-	# name of the dependency
-	#my_module.add_module_depend('speexdsp')
-	
-	my_module.compile_version_CC(1989, gnu=True)
-	my_module.add_export_path(tools.get_current_path(__file__) + "/speex/include")
+
+	my_module.compile_version("c", 1989, gnu=True)
+	my_module.add_path(os.path.join(tools.get_current_path(__file__), "speex/include"))
 	# configure library :
 	
 	# Make use of ARM4 assembly optimizations
diff --git a/lutin_speextestenc.py b/lutin_speextestenc.py
index df5ac07..138ecf0 100644
--- a/lutin_speextestenc.py
+++ b/lutin_speextestenc.py
@@ -2,24 +2,33 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
 	return "Encode test"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speextestenc', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex/libspeex/testenc.c'
 		])
-	
-	my_module.compile_version_CC(1989, gnu=True)
-	# name of the dependency
+	my_module.compile_version('c', 1989, gnu=True)
 	my_module.add_module_depend('speex')
-	
-	# add the currrent module at the 
 	return my_module
 
 
diff --git a/lutin_speextestencuwb.py b/lutin_speextestencuwb.py
index a6b1bd4..fe8456a 100644
--- a/lutin_speextestencuwb.py
+++ b/lutin_speextestencuwb.py
@@ -2,24 +2,34 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: Encode U wide band"
+	return "Encode U wide band"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speextestencuwb', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex/libspeex/testenc_uwb.c'
 		])
 	
-	my_module.compile_version_CC(1989, gnu=True)
-	# name of the dependency
+	my_module.compile_version('c', 1989, gnu=True)
 	my_module.add_module_depend('speex')
-	
-	# add the currrent module at the 
 	return my_module
 
 
diff --git a/lutin_speextestencwb.py b/lutin_speextestencwb.py
index 748eb4e..89af15c 100644
--- a/lutin_speextestencwb.py
+++ b/lutin_speextestencwb.py
@@ -2,24 +2,34 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: Encode wide band"
+	return "Encode wide band"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speextestencwb', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex/libspeex/testenc_wb.c'
 		])
 	
-	my_module.compile_version_CC(1989, gnu=True)
-	# name of the dependency
+	my_module.compile_version('c', 1989, gnu=True)
 	my_module.add_module_depend('speex')
-	
-	# add the currrent module at the 
 	return my_module