diff --git a/lutin_ffmpeg-avcodec.py b/lutin_ffmpeg-avcodec.py index a932f93..c19e5d5 100644 --- a/lutin_ffmpeg-avcodec.py +++ b/lutin_ffmpeg-avcodec.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import lutin.module as module -import lutin.tools as tools import lutin.debug as debug +import lutin.tools as tools import os def get_type(): @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -831,8 +826,8 @@ def create(target, module_name): ]) """ my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -888,4 +883,4 @@ def create(target, module_name): my_module.add_depend('pthread') my_module.add_depend('ffmpeg-avswresample') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avdevice.py b/lutin_ffmpeg-avdevice.py index f4c0784..12384fb 100644 --- a/lutin_ffmpeg-avdevice.py +++ b/lutin_ffmpeg-avdevice.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import lutin.module as module -import lutin.tools as tools import lutin.debug as debug +import lutin.tools as tools import os def get_type(): @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -88,8 +83,8 @@ def create(target, module_name): ]) """ my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -145,4 +140,4 @@ def create(target, module_name): my_module.add_depend('pthread') my_module.add_depend('ffmpeg-avfilter') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avfilter.py b/lutin_ffmpeg-avfilter.py index 130eee3..cdc1d5f 100644 --- a/lutin_ffmpeg-avfilter.py +++ b/lutin_ffmpeg-avfilter.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import lutin.module as module -import lutin.tools as tools import lutin.debug as debug +import lutin.tools as tools import os def get_type(): @@ -24,12 +23,7 @@ def get_maintainer(): def get_version(): return "version.txt" - -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -253,8 +247,8 @@ def create(target, module_name): 'ffmpeg/libavfilter/x86/vf_yadif_init.c', ]) my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -312,4 +306,4 @@ def create(target, module_name): 'ffmpeg-avcodec', ]) - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avformat.py b/lutin_ffmpeg-avformat.py index aa47c53..81dbac8 100644 --- a/lutin_ffmpeg-avformat.py +++ b/lutin_ffmpeg-avformat.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -459,8 +454,8 @@ def create(target, module_name): 'ffmpeg/libavformat/yuv4mpegenc.c', ]) my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -518,4 +513,4 @@ def create(target, module_name): my_module.add_depend('arpa') my_module.add_depend('ffmpeg-avcodec') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avswresample.py b/lutin_ffmpeg-avswresample.py index 5a39e77..d334701 100644 --- a/lutin_ffmpeg-avswresample.py +++ b/lutin_ffmpeg-avswresample.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -46,8 +41,8 @@ def create(target, module_name): 'ffmpeg/libswresample/x86/resample_init.c', ]) my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -102,4 +97,4 @@ def create(target, module_name): my_module.add_depend('z') my_module.add_depend('pthread') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avswscale.py b/lutin_ffmpeg-avswscale.py index a829e1e..ca002e8 100644 --- a/lutin_ffmpeg-avswscale.py +++ b/lutin_ffmpeg-avswscale.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -53,8 +48,8 @@ def create(target, module_name): 'ffmpeg/libswscale/yuv2rgb.c', ]) my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -109,4 +104,4 @@ def create(target, module_name): my_module.add_depend('z') my_module.add_depend('pthread') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-avutil.py b/lutin_ffmpeg-avutil.py index 4a11359..53d9654 100644 --- a/lutin_ffmpeg-avutil.py +++ b/lutin_ffmpeg-avutil.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -105,8 +100,8 @@ def create(target, module_name): 'ffmpeg/libavutil/xtea.c', ]) my_module.compile_version("c", 1999, gnu=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg"), export=True) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated"), export=True) + my_module.add_path("ffmpeg", export=True) + my_module.add_path("generated", export=True) my_module.add_flag('c', [ "-D_ISOC99_SOURCE", "-D_FILE_OFFSET_BITS=64", @@ -161,4 +156,4 @@ def create(target, module_name): my_module.add_depend('z') my_module.add_depend('pthread') - return my_module \ No newline at end of file + return True \ No newline at end of file diff --git a/lutin_ffmpeg-libs.py b/lutin_ffmpeg-libs.py index 34ad426..6fbf9b3 100644 --- a/lutin_ffmpeg-libs.py +++ b/lutin_ffmpeg-libs.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -25,11 +24,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # or other user lib: my_module.add_depend([ @@ -42,5 +37,5 @@ def create(target, module_name): 'ffmpeg-avswscale', ]) - return my_module + return True diff --git a/lutin_ffmpeg-play.py b/lutin_ffmpeg-play.py index c5fdba9..9a98291 100644 --- a/lutin_ffmpeg-play.py +++ b/lutin_ffmpeg-play.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -26,11 +25,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -38,13 +33,13 @@ def create(target, module_name): 'ffmpeg/cmdutils.c', ]) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_depend([ 'ffmpeg-libs', 'va', 'SDL', ]) - return my_module + return False diff --git a/lutin_ffmpeg-server.py b/lutin_ffmpeg-server.py deleted file mode 100644 index 8cab8cb..0000000 --- a/lutin_ffmpeg-server.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/python -import lutin.module as module -import lutin.tools as tools -import lutin.debug as debug -import os - -def get_type(): - #return "BINARY_SHARED" - return "BINARY" - -def get_desc(): - return "FFMPEG main application" - -def get_licence(): - return "LGPL-2.1" - -def get_compagny_type(): - return "org" - -def get_compagny_name(): - return "ffmpeg" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) - - # add the file to compile: - my_module.add_src_file([ - 'ffmpeg/ffserver.c', - 'ffmpeg/ffserver_config.c', - 'ffmpeg/cmdutils.c', - ]) - - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) - my_module.add_depend([ - 'ffmpeg-libs', - 'va', - 'vdpau', - ]) - my_module.add_flag('c', [ - "-D_ISOC99_SOURCE", - "-D_FILE_OFFSET_BITS=64", - "-D_LARGEFILE_SOURCE", - "-D_POSIX_C_SOURCE=200112", - "-D_XOPEN_SOURCE=600", - "-DZLIB_CONST", - "-fomit-frame-pointer", - "-D_GNU_SOURCE=1", - "-D_REENTRANT" - ]) - return my_module - - diff --git a/lutin_ffmpeg.py b/lutin_ffmpeg.py index a848544..319e4fc 100644 --- a/lutin_ffmpeg.py +++ b/lutin_ffmpeg.py @@ -1,5 +1,4 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug import os @@ -26,11 +25,7 @@ def get_maintainer(): def get_version(): return "version.txt" -# create the module -# @param[in] target reference on the Target that is currently build -# @param[in] module_name Name of the module that is extract from the file name (to be generic) -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add the file to compile: my_module.add_src_file([ @@ -42,13 +37,13 @@ def create(target, module_name): #'ffmpeg/ffmpeg_vdpau.c', ]) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "ffmpeg")) - my_module.add_path(os.path.join(tools.get_current_path(__file__), "generated")) + my_module.add_path("ffmpeg") + my_module.add_path("generated") my_module.add_depend([ 'ffmpeg-libs', 'va', 'vdpau', ]) - return my_module + return False