From 776d8098d5455ae1ae4d771d3abe930fdd17c02e Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Mon, 13 Sep 2021 11:11:21 +0100 Subject: [PATCH 1/3] Fix ffmpeg version --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 70570b0935c..44c1574a449 100644 --- a/setup.py +++ b/setup.py @@ -357,8 +357,8 @@ def get_extensions(): ffmpeg_version_str = str(subprocess.check_output(["ffmpeg", "-version"])) ffmpeg_version = re.split(r"ffmpeg version |\.| |-", ffmpeg_version_str)[1:3] ffmpeg_version = ".".join(ffmpeg_version) - if StrictVersion(ffmpeg_version) >= StrictVersion('4.3'): - print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.2.') + if StrictVersion(ffmpeg_version) < StrictVersion('4.3'): + print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.3.') has_ffmpeg = False except (IndexError, ValueError): print('Error fetching ffmpeg version, ignoring ffmpeg.') From f800db1a6629e24c44407e330b55defb22eaa776 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Tue, 14 Sep 2021 14:12:31 +0100 Subject: [PATCH 2/3] Ignore platforms other than Linux for ffmpeg --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 44c1574a449..a9dcee63eca 100644 --- a/setup.py +++ b/setup.py @@ -351,6 +351,8 @@ def get_extensions(): ffmpeg_exe = distutils.spawn.find_executable('ffmpeg') has_ffmpeg = ffmpeg_exe is not None + if sys.platform != 'linux': + has_ffmpeg = False if has_ffmpeg: try: # this splits on both dots and spaces as the output format differs across versions / platforms @@ -360,7 +362,7 @@ def get_extensions(): if StrictVersion(ffmpeg_version) < StrictVersion('4.3'): print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.3.') has_ffmpeg = False - except (IndexError, ValueError): + except (subprocess.CalledProcessError, IndexError, ValueError): print('Error fetching ffmpeg version, ignoring ffmpeg.') has_ffmpeg = False From 31b72a3f410eae0f0581e20642a964ba8dbbe838 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Tue, 14 Sep 2021 14:13:53 +0100 Subject: [PATCH 3/3] Removed unnecessary changes --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a9dcee63eca..09f951b1090 100644 --- a/setup.py +++ b/setup.py @@ -359,8 +359,8 @@ def get_extensions(): ffmpeg_version_str = str(subprocess.check_output(["ffmpeg", "-version"])) ffmpeg_version = re.split(r"ffmpeg version |\.| |-", ffmpeg_version_str)[1:3] ffmpeg_version = ".".join(ffmpeg_version) - if StrictVersion(ffmpeg_version) < StrictVersion('4.3'): - print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.3.') + if StrictVersion(ffmpeg_version) >= StrictVersion('4.3'): + print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.2.') has_ffmpeg = False except (subprocess.CalledProcessError, IndexError, ValueError): print('Error fetching ffmpeg version, ignoring ffmpeg.')