X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b6e2a09f5d16e85ed721721649b26b16be2875b1;hb=ac2cfae5356809bea66ff6a614f96193f6d86da2;hp=1bed820fecb89e16e514b498cb20e82b888b8541;hpb=82be73bbfd7a81b57bff02671f88b41f38e65f58;p=dcpomatic.git

diff --git a/cscript b/cscript
index 1bed820fe..b6e2a09f5 100644
--- a/cscript
+++ b/cscript
@@ -44,7 +44,9 @@ deb_depends['12.04'] = {'libc6': '2.15',
                         'libxmlsec1-openssl': '1.2.14-1.2build1',
                         'libboost-date-time1.48.0': '1.48.0-3',
                         'libcurl3': '7.22.0-3ubuntu4',
-                        'libzip2': '0.10-1ubuntu1'}
+                        'libzip2': '0.10-1ubuntu1',
+                        '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',
@@ -59,7 +61,9 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libxmlsec1-openssl': '1.2.18-2ubuntu1',
                         'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
                         'libcurl3': '7.35.0-1ubuntu2',
-                        'libzip2': '0.10.1-1.2'}
+                        'libzip2': '0.10.1-1.2',
+                        'libsamplerate0': '0.1.8-7',
+                        'libicu52': '52.1-3'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
@@ -75,7 +79,9 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libcurl3': '7.38.0-3ubuntu2',
                         'libzip2': '0.11.2-1.2',
-                        'libwxgtk3.0-0': '3.0.2-1'}
+                        'libwxgtk3.0-0': '3.0.2-1',
+                        'libsamplerate0': '0.1.8-8',
+                        'libicu52': '52.1-8'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -92,7 +98,9 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libcurl3': '7.26.0',
                     'libzip2': '0.10.1',
                     'libcairomm-1.0-1': '1.10.0-1',
-                    'libpangomm-1.4-1': '2.28.4-1'}
+                    'libpangomm-1.4-1': '2.28.4-1',
+                    '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',
@@ -110,7 +118,9 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libzip2': '0.11.2',
                     'libwxgtk3.0-0': '3.0.2',
                     'libxcb-xfixes0': '1.10',
-                    'libxcb-shape0': '1.10'}
+                    'libxcb-shape0': '1.10',
+                    'libsamplerate0': '0.1.8-8',
+                    'libicu52': '52.1-8+deb8u2'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -125,8 +135,9 @@ deb_depends['unstable'] = {'libc6': '2.13',
                     'libboost-date-time1.55.0': '1.55.0',
                     'libxmlsec1-openssl': '1.2.18',
                     'libcurl3': '7.26.0',
-                    'libzip2': '0.10.1'}
-
+                    'libzip2': '0.10.1',
+                    'libsamplerate0': '0.1.8-8',
+                    'libicu52': '52.1-9'}
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -234,9 +245,15 @@ 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'),
-            ('libdcp', 'v1.2.3'),
-            ('libsub', 'v1.1.4'))
+
+    if target.platform == 'linux':
+        ffmpeg_options = { 'shared': False }
+    else:
+        ffmpeg_options = {}
+
+    return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
+            ('libdcp', 'b3adb83'),
+            ('libsub', 'e959731'))
 
 def configure_options(target):
     opt = ''
@@ -251,7 +268,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
 
@@ -317,7 +334,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)
         )
 
@@ -327,6 +344,8 @@ def package_centos(target, cpu, version):
 
     if cpu == "amd64":
         cpu = "x86_64"
+    else:
+        cpu = "i686"
 
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
         rpms.append(os.path.abspath(p))