Bump ffmpeg for gomp build fix.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index cdb6abac1bcc52e50a97f1db26729cc15e5a3e4c..59b3d7d482ed3fb9c520087cd6a3f0460a323352 100644 (file)
--- a/cscript
+++ b/cscript
@@ -59,7 +59,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',
+                        'libsoxr0': '0.1.1-1'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
@@ -74,7 +75,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',
+                        'libsoxr0': '0.1.1-1'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -89,7 +92,9 @@ 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'}
 
 deb_depends['8'] = {'libc6': '2.19-18',
                     'libssh-4': '0.6.3-4',
@@ -107,7 +112,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',
+                    'libsoxr0': '0.1.1-1'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -122,7 +128,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',
+                    'libsoxr0': '0.1.1-1'}
 
 
 def packages(name, packages, f):
@@ -198,6 +205,7 @@ def make_spec(filename, version, target):
     print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
     print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png'
     print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/splash.png'
     for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
@@ -230,9 +238,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', 'fd7b71b', ffmpeg_options),
+            ('libdcp', 'v1.2.3'),
+            ('libsub', 'v1.1.4'))
 
 def configure_options(target):
     opt = ''
@@ -323,6 +337,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))