X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2386015c0dced7c826ea0ac92207f41d1da4ddc2;hb=6726436b0e9f4f747d76a1de023af0259c1f4946;hp=6b4d534167888a44d5a279ae332e4120da4084cd;hpb=e94b8b6eef58367bf97788d7aed340ab051568fb;p=dcpomatic.git

diff --git a/cscript b/cscript
index 6b4d53416..2386015c0 100644
--- a/cscript
+++ b/cscript
@@ -44,7 +44,8 @@ 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'}
 
 deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libssh-4': '0.6.1-0ubuntu3',
@@ -59,7 +60,8 @@ 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'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
@@ -74,7 +76,9 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libxmlsec1-openssl': '1.2.20-2ubuntu2',
                         'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libcurl3': '7.38.0-3ubuntu2',
-                        'libzip2': '0.11.2-1.2'}
+                        'libzip2': '0.11.2-1.2',
+                        'libwxgtk3.0-0': '3.0.2-1',
+                        'libsamplerate0': '0.1.8-8'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -89,7 +93,10 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libboost-date-time1.49.0': '1.49.0',
                     'libxmlsec1-openssl': '1.2.18',
                     'libcurl3': '7.26.0',
-                    'libzip2': '0.10.1'}
+                    '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'}
 
 deb_depends['8'] = {'libc6': '2.19-18',
                     'libssh-4': '0.6.3-4',
@@ -107,7 +114,8 @@ 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'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -122,8 +130,8 @@ 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'}
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -231,9 +239,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', 'bd17594'),
-            ('libdcp', '1.0'),
-            ('libsub', '1.0'))
+
+    if target.platform == 'linux':
+        ffmpeg_options = { 'shared': False }
+    else:
+        ffmpeg_options = {}
+
+    return (('ffmpeg-cdist', 'b11c05f', ffmpeg_options),
+            ('libdcp', 'v1.2.3'),
+            ('libsub', 'v1.1.4'))
 
 def configure_options(target):
     opt = ''
@@ -248,7 +262,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
 
@@ -324,6 +338,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))