X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c744ff61c9e075ae18893eb3112d90b84981d705;hb=c140d6ed0ce518db6b5a676ed9ef4a21e5eb4f03;hp=e0fe5adb3144bf7ceb89de9aa7218ce7ffa4d9ac;hpb=f67b4515a2c1460666c803670e57a1afd00c69a8;p=dcpomatic.git diff --git a/cscript b/cscript index e0fe5adb3..c744ff61c 100644 --- a/cscript +++ b/cscript @@ -34,6 +34,8 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].extend(['libssh-dev']) deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['17.10'].extend(['libssh-dev']) +deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['18.04'].extend(['libssh-dev']) deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['7'].extend(['libssh-dev']) deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) @@ -91,6 +93,22 @@ deb_depends['17.10'].extend(['libboost-filesystem1.62.0', 'libssh-4', 'libx264-148']) +deb_depends['18.04'] = copy.deepcopy(deb_depends_base) +deb_depends['18.04'].extend(['libboost-filesystem1.65.1', + 'libboost-thread1.65.1', + 'libboost-regex1.65.1', + 'libboost-date-time1.65.1', + 'libmagick++-6.q16-7', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libwxgtk3.0-0v5', + 'libicu60', + 'libnettle6', + 'libssh-4', + 'libx264-152']) + deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', 'libboost-thread1.49.0', @@ -133,9 +151,18 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libxml++2.6-2v5', 'libgtk2.0-0', 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libwxgtk3.0-0v5', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', 'libicu57', + 'libssh-4', + 'libssh-gcrypt-4', 'libnettle6', - 'libx264-148']) + 'libx264-148', + 'libpulse0']) deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.62.0', @@ -193,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) @@ -203,7 +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) - print('Requires: ImageMagick-c++, glibmm24, libzip', 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) @@ -235,7 +263,8 @@ def make_spec(filename, version, target): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) - for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN']: + for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB', 'fi_FI' 'el_GR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -274,9 +303,9 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', '0a47e4c'), - ('libsub', '688c501'), - ('rtaudio-cdist', None)) + ('libdcp', '8c852cb'), + ('libsub', '069ca80'), + ('rtaudio-cdist', '739969e')) def configure_options(target): opt = '' @@ -375,7 +404,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 = []