Bump ffmpeg for gomp build fix.
[dcpomatic.git] / cscript
diff --git a/cscript b/cscript
index 2ac578dc91b6bdbe54ae06005b9502c8a5343bd3..59b3d7d482ed3fb9c520087cd6a3f0460a323352 100644 (file)
--- a/cscript
+++ b/cscript
@@ -35,6 +35,7 @@ deb_depends['12.04'] = {'libc6': '2.15',
                         'libssh-4': '0.5.2',
                         'libboost-filesystem1.48.0': '1.48.0-3',
                         'libboost-thread1.48.0': '1.48.0-3',
+                        'libboost-regex1.48.0': '1.48.0-3',
                         'libsndfile1': '1.0.25',
                         'libmagick++4': '8:6.6.9.7',
                         'libxml++2.6-2': '2.34.1',
@@ -49,6 +50,7 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libssh-4': '0.6.1-0ubuntu3',
                         'libboost-filesystem1.54.0': '1.54.0-4ubuntu3',
                         'libboost-thread1.54.0': '1.54.0-4ubuntu3',
+                        'libboost-regex1.54.0': '1.54.0-4ubuntu3',
                         'libsndfile1': '1.0.25-7ubuntu2',
                         'libmagick++5': '8:6.7.7.10-6ubuntu3',
                         'libxml++2.6-2': '2.36.0-2ubuntu1',
@@ -57,12 +59,14 @@ 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',
                         'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2',
+                        'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libsndfile1': '1.0.25-9.1',
                         'libmagick++-6.q16-5': '8:6.8.9.9-5',
                         'libxml++2.6-2': '2.36.0-2.1',
@@ -71,12 +75,15 @@ 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',
                     'libboost-filesystem1.49.0': '1.49.0',
                     'libboost-thread1.49.0': '1.49.0',
+                    'libboost-regex1.49.0': '1.49.0',
                     'libsndfile1': '1.0.25',
                     'libmagick++5': '8:6.7.7.10',
                     'libxml++2.6-2': '2.34.2',
@@ -85,12 +92,34 @@ 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',
+                    'libboost-filesystem1.55.0': '1.55.0',
+                    'libboost-thread1.55.0': '1.55.0',
+                    'libboost-date-time1.55.0': '1.55.0',
+                    'libboost-regex1.55.0': '1.55.0',
+                    'libsndfile1': '1.0.25-9.1',
+                    'libmagick++-6.q16-5': '8:6.8.9.9-5',
+                    'libxml++2.6-2': '2.36.0',
+                    'libgtk2.0-0': '2.24.25',
+                    'libxmlsec1': '1.2.20',
+                    'libxmlsec1-openssl': '1.2.20',
+                    'libcurl3': '7.38.0',
+                    'libzip2': '0.11.2',
+                    'libwxgtk3.0-0': '3.0.2',
+                    'libxcb-xfixes0': '1.10',
+                    'libxcb-shape0': '1.10',
+                    'libsoxr0': '0.1.1-1'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.55.0': '1.55.0',
                     'libboost-thread1.55.0': '1.55.0',
+                    'libboost-regex1.55.0': '1.55.0',
                     'libsndfile1': '1.0.25',
                     'libmagick++5': '8:6.7.7.10',
                     'libxml++2.6-2': '2.34.2',
@@ -99,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):
@@ -173,10 +203,12 @@ def make_spec(filename, version, target):
     print >>f,'%{_datadir}/applications/dcpomatic2.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
-    print >>f,'%{_datadir}/dcpomatic/taskbar_icon.png'
+    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']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@ -206,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', '0492ad2'),
-            ('libdcp', '484a900'),
-            ('libsub', 'f66b11f'))
+
+    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 = ''
@@ -237,6 +275,7 @@ def build(target, options):
 def package_windows(target):
     shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
     target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+    target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
     target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
     target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, target.bits))
     target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, target.bits))
@@ -251,7 +290,7 @@ def package_debian(target, cpu, version):
     f = open('debian/files', 'w')
     print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
     shutil.rmtree('build/deb', ignore_errors=True)
-    
+
     os.makedirs('build/deb')
     os.chdir('build/deb')
     shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
@@ -265,17 +304,17 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version == '15.04':
+    if target.version == '15.04' or target.version == '8':
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
 
     target.command('dpkg-buildpackage -uc -us')
-    
+
     debs = []
     for p in glob.glob('../*.deb'):
         debs.append(os.path.abspath(p))
-    
+
     return debs
 
 def package_centos(target, cpu, version):
@@ -298,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))
@@ -310,7 +351,7 @@ def package(target, version):
     elif target.platform == 'linux':
         if target.bits == 32:
            cpu = 'i386'
-        else:  
+        else:
             cpu        = 'amd64'
 
        if target.distro == 'debian' or target.distro == 'ubuntu':