X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d91f451973343a3d2954767662eb06a01adcf611;hb=ca436a8e96e02f982790d4168ac3dfe1d589451c;hp=3854d29a09984034b6a457ec40d48a383e13a1df;hpb=f6fc903e246ca72856cd842b4888f85cd114e21e;p=dcpomatic.git diff --git a/cscript b/cscript index 3854d29a0..d91f45197 100644 --- a/cscript +++ b/cscript @@ -2,19 +2,20 @@ # # Copyright (C) 2012-2016 Carl Hetherington # -# 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 . # from __future__ import print_function @@ -207,7 +208,7 @@ def make_spec(filename, version, target): if target.distro == 'centos' and target.version == '5': 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 = ''