OS X build fix.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index b6e2a09f5d16e85ed721721649b26b16be2875b1..1e18684d9e0d94d434ae556a6a72ec3945469de9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -251,9 +251,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
-            ('libdcp', 'b3adb83'),
-            ('libsub', 'e959731'))
+    return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+            ('libdcp', '6a9f369'),
+            ('libsub', '04d92c2'))
 
 def configure_options(target):
     opt = ''
@@ -269,6 +269,8 @@ def configure_options(target):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
+        if target.distro == 'debian' and target.version == 'unstable':
+            target.append_with_space('CXXFLAGS', '-std=c++11')
 
     return opt
 
@@ -324,7 +326,7 @@ def package_debian(target, cpu, version):
 
     return debs
 
-def package_centos(target, cpu, version):
+def package_rpm(target, cpu, version):
     topdir = os.path.realpath('build/rpmbuild')
     os.makedirs('%s/BUILD' % topdir)
     os.makedirs('%s/RPMS' % topdir)
@@ -347,7 +349,9 @@ def package_centos(target, cpu, version):
     else:
         cpu = "i686"
 
+    print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
+        print 'found %s' % p
         rpms.append(os.path.abspath(p))
 
     return rpms
@@ -363,8 +367,8 @@ def package(target, version):
 
        if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
-        elif target.distro == 'centos':
-            return package_centos(target, cpu, version)
+        elif target.distro == 'centos' or target.distro == 'fedora':
+            return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
         return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])