X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=7b593c8cb211f80be86fd54310b4a25f2902a728;hb=3c2e80996f01740175faca63583f4dff33586be1;hp=2ff9a8b6f81af4d4bf7031346812e9a4c7515837;hpb=6a2d3f52915f226efe578d0ac5fb58dd8599c95b;p=dcpomatic.git diff --git a/cscript b/cscript index 2ff9a8b6f..7b593c8cb 100644 --- a/cscript +++ b/cscript @@ -370,8 +370,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'd39880e')) - deps.append(('libsub', 'ee5d2c8')) + deps.append(('libdcp', 'bed820d')) + deps.append(('libsub', '2ac27e6')) deps.append(('leqm-nrt', '131f971')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -407,13 +407,6 @@ def configure_options(target, options): opt += ' --static-boost --static-xmlpp' elif target.version == '7': opt += ' --workaround-gssapi' - # Centos 7 ships with glibmm 2.50.0 which requires C++11 - # but its compiler (gcc 4.8.5) defaults to C++97. Go figure. - # I worry that this will cause ABI problems but I don't have - # a better solution. - opt += ' --force-cpp11' - elif target.platform == 'osx': - opt += ' --force-cpp11' if not options['gui']: opt += ' --disable-gui'