From 3816b634ad9bb3854246df86c0e13a01ced24c40 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 16 Mar 2018 17:55:26 +0000 Subject: Fix mageia dependency. --- cscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8120e8284..9d89f4962 100644 --- a/cscript +++ b/cscript @@ -220,7 +220,7 @@ def make_control(debian_version, bits, filename, debug): print(' This package contains the debugging symbols for dcpomatic.', file=f) print('', file=f) -def make_spec(filename, version, target): +def make_spec(filename, version, target, requires=None): """Make a .spec file for a RPM build""" f = open(filename, 'w') print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) @@ -230,6 +230,8 @@ def make_spec(filename, version, target): print('License:GPL', file=f) print('Group:Applications/Multimedia', file=f) print('URL:http://dcpomatic.com/', file=f) + if requires is not None: + print('Requires:%s' % requires, file=f) print('', file=f) print('%description', file=f) print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f) @@ -401,7 +403,11 @@ def package_rpm(target, cpu, version): "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) - make_spec('build/platform/linux/dcpomatic2.spec', version, target) + requires = None + if target.distro == 'mageia': + requires = "lib64xmlsec1-devel" + + make_spec('build/platform/linux/dcpomatic2.spec', version, target, requires) cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir target.command(cmd) rpms = [] -- cgit v1.2.3 From 9f74e70740d585632279fd2155405637e02d1e0e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Mar 2018 00:43:44 +0000 Subject: Bump libdcp. --- cscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9d89f4962..2c999540e 100644 --- a/cscript +++ b/cscript @@ -302,8 +302,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', '623e197'), - ('libsub', 'debe9fb'), + ('libdcp', '1215fe2'), + ('libsub', '1899ddd'), ('rtaudio-cdist', '739969e')) def configure_options(target): @@ -406,7 +406,7 @@ def package_rpm(target, cpu, version): requires = None if target.distro == 'mageia': requires = "lib64xmlsec1-devel" - + make_spec('build/platform/linux/dcpomatic2.spec', version, target, requires) cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir target.command(cmd) -- cgit v1.2.3