mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prepare.py&submodules: allow compilation of X264 and OpenH264 by refactoring cmake builder submodule

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-08-31 16:51:38 +02:00
parent 0ecdc1c5aa
commit 961aa3b445
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
prepare.py
View file

@ -498,7 +498,7 @@ def main(argv=None):
argparser.add_argument(
'-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true')
argparser.add_argument(
'--disable-gpl-third-parties', help="Disable GPL third parties such as FFMpeg, x264.", action='store_false')
'--disable-gpl-third-parties', help="Disable GPL third parties such as FFMpeg, x264.", action='store_true')
argparser.add_argument(
'--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
argparser.add_argument(
@ -525,9 +525,12 @@ def main(argv=None):
if check_tools() != 0:
return 1
additional_args += ["-DENABLE_DEBUG_LOGS={}".format("YES" if args.debug_verbose else "NO")]
additional_args += ["-DENABLE_NON_FREE_CODECS={}".format("YES" if args.enable_non_free_codecs else "NO")]
additional_args += ["-DENABLE_GPL_THIRD_PARTIES={}".format("NO" if args.disable_gpl_third_parties else "YES")]
if args.debug_verbose is True:
additional_args += ["-DENABLE_DEBUG_LOGS=YES"]
if args.enable_non_free_codecs is True:
additional_args += ["-DENABLE_NON_FREE_CODECS=YES"]
if args.disable_gpl_third_parties is True:
additional_args += ["-DENABLE_GPL_THIRD_PARTIES=NO"]
if args.tunnel or os.path.isdir("submodules/tunnel"):
if not os.path.isdir("submodules/tunnel"):

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit e7195fe050bd4191f2c389170d8851260ba47f8d
Subproject commit 93910b55774ca708cc6c16c41c6a705630176ae1

2
submodules/msx264

@ -1 +1 @@
Subproject commit 2abff23629257c3f6f46b8d7b3a483efd0eb4342
Subproject commit e8fd6adb59e9015c1bfe58e364565016ef26122c