X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e969a523614b349f9911d4f6fb43564bb2872636;hb=93d57d46e52e0050efda894fc3089a6410d55754;hp=e59c8933f4eb7e17d38749bd877e3c6af5fd6c8a;hpb=802528ae46befd81bde9f3fb87210d9b79d5207d;p=dcpomatic.git

diff --git a/cscript b/cscript
index e59c8933f..e969a5236 100644
--- a/cscript
+++ b/cscript
@@ -203,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)
@@ -228,9 +235,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', 'f0a6d7b'),
-            ('libsub', 'b9fb00d'))
+    return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
+            ('libdcp', '043d382'),
+            ('libsub', 'b082fb6'))
 
 def configure_options(target):
     opt = ''
@@ -288,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')
@@ -316,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":