X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=1e18684d9e0d94d434ae556a6a72ec3945469de9;hb=eb78e6e2c04ceee1d7cff25cd0b5f3486b38a7a5;hp=718562c32a454662a725a4db51034cce0da77359;hpb=0f808c885d010958ff8f1bfefc168d2e5d338a12;p=dcpomatic.git

diff --git a/cscript b/cscript
index 718562c32..1e18684d9 100644
--- a/cscript
+++ b/cscript
@@ -45,7 +45,8 @@ deb_depends['12.04'] = {'libc6': '2.15',
                         'libboost-date-time1.48.0': '1.48.0-3',
                         'libcurl3': '7.22.0-3ubuntu4',
                         'libzip2': '0.10-1ubuntu1',
-                        'libsamplerate0': '0.1.8-4'}
+                        'libsamplerate0': '0.1.8-4',
+                        'libicu48': '4.8.1.1-3'}
 
 deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libssh-4': '0.6.1-0ubuntu3',
@@ -61,7 +62,8 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
                         'libcurl3': '7.35.0-1ubuntu2',
                         'libzip2': '0.10.1-1.2',
-                        'libsamplerate0': '0.1.8-7'}
+                        'libsamplerate0': '0.1.8-7',
+                        'libicu52': '52.1-3'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
@@ -78,7 +80,8 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libcurl3': '7.38.0-3ubuntu2',
                         'libzip2': '0.11.2-1.2',
                         'libwxgtk3.0-0': '3.0.2-1',
-                        'libsamplerate0': '0.1.8-8'}
+                        'libsamplerate0': '0.1.8-8',
+                        'libicu52': '52.1-8'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -96,7 +99,8 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libzip2': '0.10.1',
                     'libcairomm-1.0-1': '1.10.0-1',
                     'libpangomm-1.4-1': '2.28.4-1',
-                    'libsamplerate0': '0.1.8-5'}
+                    'libsamplerate0': '0.1.8-5',
+                    'libicu48': '4.8.1.1-12+deb7u3'}
 
 deb_depends['8'] = {'libc6': '2.19-18',
                     'libssh-4': '0.6.3-4',
@@ -115,7 +119,8 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libwxgtk3.0-0': '3.0.2',
                     'libxcb-xfixes0': '1.10',
                     'libxcb-shape0': '1.10',
-                    'libsamplerate0': '0.1.8-8'}
+                    'libsamplerate0': '0.1.8-8',
+                    'libicu52': '52.1-8+deb8u2'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -131,7 +136,8 @@ deb_depends['unstable'] = {'libc6': '2.13',
                     'libxmlsec1-openssl': '1.2.18',
                     'libcurl3': '7.26.0',
                     'libzip2': '0.10.1',
-                    'libsamplerate0': '0.1.8-8'}
+                    'libsamplerate0': '0.1.8-8',
+                    'libicu52': '52.1-9'}
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -245,9 +251,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
-            ('libdcp', '4a79e6e'),
-            ('libsub', 'v1.1.4'))
+    return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+            ('libdcp', '6a9f369'),
+            ('libsub', '04d92c2'))
 
 def configure_options(target):
     opt = ''
@@ -263,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
 
@@ -318,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)
@@ -328,7 +336,7 @@ def package_centos(target, cpu, version):
 
     target.command('./waf dist')
     shutil.copyfile(
-        "%s/src/dcpomatic2/dcpomatic-%s.tar.bz2" % (target.directory, version),
+        "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version),
         "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
@@ -341,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
@@ -357,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])