X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=56a555fa0bed00e389179a5270b5f8a29aa5d8a8;hb=fe8f27d177a93fa51f91e27a2b11c064f03a570b;hp=e62188d3084222a8face6a77fd298cd21bf944de;hpb=450063921e66534da362ac5dab08ff9d67e2bdbe;p=dcpomatic.git

diff --git a/cscript b/cscript
index e62188d30..56a555fa0 100644
--- a/cscript
+++ b/cscript
@@ -2,19 +2,20 @@
 #
 #    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    DCP-o-matic is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 from __future__ import print_function
@@ -203,7 +204,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 +236,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', '3bf3aad'),
-            ('libsub', 'b9fb00d'))
+    return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
+            ('libdcp', '702a013'),
+            ('libsub', 'f0b58ee'))
 
 def configure_options(target):
     opt = ''
@@ -316,7 +324,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":