Disallow referencing of Interop DCPs in SMPTE films, and vice versa (#804).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 905eb392a169cdffdfc740fdb8b0110572177082..e969a523614b349f9911d4f6fb43564bb2872636 100644 (file)
--- a/cscript
+++ b/cscript
@@ -62,8 +62,19 @@ deb_depends['15.10'].extend(['libboost-filesystem1.58.0',
                              'libwxgtk3.0-0v5',
                              'libicu55'])
 
-deb_depends['15.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['15.10'].extend(['libboost-filesystem1.49.0',
+deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
+                             'libboost-thread1.58.0',
+                             'libboost-regex1.58.0',
+                             'libmagick++-6.q16-5v5',
+                             'libxml++2.6-2v5',
+                             'libboost-date-time1.58.0',
+                             'libzip4',
+                             'libwxgtk3.0-0v5',
+                             'libicu55'])
+
+deb_depends['7'] = copy.deepcopy(deb_depends_base)
+deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libboost-thread1.49.0',
                              'libboost-regex1.49.0',
                              'libmagick++5',
@@ -192,7 +203,14 @@ def make_spec(filename, version, target):
     print('%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
-    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)), file=f)
+
+    if target.distro == 'centos' and target.version == '5':
+        prefix = 'BUILDROOT/usr'
+    else:
+        prefix = '%%{buildroot}/usr'
+
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%s --install-prefix=/usr %s' %
+          (target.directory, target.directory, prefix, configure_options(target)), file=f)
     print('./waf', file=f)
     print('%install', file=f)
     print('cd dcpomatic-%s' % version, file=f)
@@ -217,9 +235,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', 'v1.3.2'),
-            ('libsub', 'b9fb00d'))
+    return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
+            ('libdcp', '043d382'),
+            ('libsub', 'b082fb6'))
 
 def configure_options(target):
     opt = ''
@@ -277,7 +295,7 @@ 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 in ['15.04', '15.10', '8']:
+    if target.version in ['15.04', '15.10', '16.04', '8']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
@@ -305,7 +323,10 @@ def package_rpm(target, cpu, version):
         )
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target)
-    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
+    cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
+    if target.distro == 'centos' and target.version == '5':
+        cmd += ' --buildroot %s/BUILD/dcpomatic-%s/BUILDROOT' % (topdir, version)
+    target.command(cmd)
     rpms = []
 
     if cpu == "amd64":