Use distro's FFmpeg on Arch.
authorCarl Hetherington <cth@carlh.net>
Mon, 10 Sep 2018 19:39:41 +0000 (20:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 10 Sep 2018 21:58:06 +0000 (22:58 +0100)
cscript

diff --git a/cscript b/cscript
index 51c5f214699976c621a67f7995ccf6a59b228c28..6e7ecdbec0bab5fe6c05789f6be90fb268be35d4 100644 (file)
--- a/cscript
+++ b/cscript
@@ -325,8 +325,11 @@ def dependencies(target):
 
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
 
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
-    else:
+    elif target.platform != 'linux' or target.distro != 'arch':
         deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
         deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+    else:
+        # Use distro-provided FFmpeg on Arch
+        deps = []
 
     deps.append(('libdcp', '8940450'))
     deps.append(('libsub', '1bc45ae'))
 
     deps.append(('libdcp', '8940450'))
     deps.append(('libsub', '1bc45ae'))