Fix erroneous libxml++ dependency on Centos 7.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 8ac7cee96bf2dba22fbb6e108d51c73645580210..049c0a842c8d0dd9e2be501fe19dd98f48c29aa7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -238,7 +238,13 @@ def make_spec(filename, version, target):
     print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '1d37f80'),
+
+    if target.platform == 'linux':
+        ffmpeg_options = { 'shared': False }
+    else:
+        ffmpeg_options = {}
+
+    return (('ffmpeg-cdist', 'b11c05f', ffmpeg_options),
             ('libdcp', 'v1.2.3'),
             ('libsub', 'v1.1.4'))
 
@@ -255,7 +261,7 @@ def configure_options(target):
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
-                opt += ' --workaround-gssapi'
+                opt += ' --workaround-gssapi --static-xmlpp'
 
     return opt