X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=52e3fe406103020d2facd382c8a28ba3c01012a8;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=99e8519f1be216725af811e6d70c9d3093511c03;hpb=dfd636556b105775cee4f668d695a9d884ed2125;p=dcpomatic.git diff --git a/cscript b/cscript index 99e8519f1..52e3fe406 100644 --- a/cscript +++ b/cscript @@ -370,8 +370,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'b221efe')) - deps.append(('libsub', 'ad416ec')) + deps.append(('libdcp', 'e5f89bf')) + deps.append(('libsub', '948df33')) 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'