X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d91f451973343a3d2954767662eb06a01adcf611;hb=7c521e59e0e5c9160babf6b12d0c13cc3785dce1;hp=60c825780201fed04163acf7a1276944d7e4dc28;hpb=d9773e457718204a376a21423920819fd71b3d1f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 60c825780..d91f45197 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
@@ -205,9 +206,9 @@ def make_spec(filename, version, target):
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
 
     if target.distro == 'centos' and target.version == '5':
-        prefix = './usr'
+        prefix = 'BUILDROOT/usr'
     else:
-        prefix = '%%{buildroot}/usr'
+        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)
@@ -235,9 +236,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
-            ('libdcp', '4e6b78d'),
-            ('libsub', 'b082fb6'))
+    return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
+            ('libdcp', '5591a50'),
+            ('libsub', 'a06e701'))
 
 def configure_options(target):
     opt = ''
@@ -323,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":