X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c818229b508825242cf4ad314c57657b51ddfb9f;hb=438aa086ba4c0be8f464ac903d23bcd0efff786b;hp=519e0d8069634d30b6309f2adfb4a8f916dbc6f7;hpb=853e256220b9d8f49cc19555daaf5045d36c9999;p=dcpomatic.git diff --git a/cscript b/cscript index 519e0d806..c818229b5 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2017 Carl Hetherington +# Copyright (C) 2012-2018 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -28,16 +28,14 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['12.04'].extend(['libssh-dev']) deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['14.04'].extend(['libssh-dev']) deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].extend(['libssh-dev']) -deb_build_depends['16.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['16.10'].extend(['libssh-dev']) -deb_build_depends['17.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['17.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) @@ -48,7 +46,7 @@ deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() -deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0'] +deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0'] deb_depends['14.04'] = copy.deepcopy(deb_depends_base) deb_depends['14.04'].extend(['libboost-filesystem1.54.0', @@ -63,7 +61,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libicu52', 'libnettle4', 'libssh-4', - 'libx264-142']) + 'libx264-142', + 'libcurl3']) deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', @@ -79,50 +78,56 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libicu55', 'libnettle6', 'libssh-4', - 'libx264-148']) + 'libx264-148', + 'libcurl3']) -deb_depends['16.10'] = copy.deepcopy(deb_depends_base) -deb_depends['16.10'].extend(['libboost-filesystem1.61.0', - 'libboost-thread1.61.0', - 'libboost-regex1.61.0', - 'libmagick++-6.q16-5v5', +deb_depends['17.10'] = copy.deepcopy(deb_depends_base) +deb_depends['17.10'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libmagick++-6.q16-7', 'libxml++2.6-2v5', - 'libboost-date-time1.61.0', + 'libboost-date-time1.62.0', 'libzip4', 'libwxgtk3.0-0v5', 'libicu57', 'libnettle6', 'libssh-4', - 'libx264-148']) - -deb_depends['17.04'] = copy.deepcopy(deb_depends_base) -deb_depends['17.04'].extend(['libboost-filesystem1.62.0', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', + 'libx264-148', + 'libcurl3']) + +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', - 'libboost-date-time1.62.0', 'libzip4', 'libwxgtk3.0-0v5', - 'libicu57', + 'libicu60', 'libnettle6', 'libssh-4', - 'libx264-148']) + 'libx264-152', + 'libcurl4']) deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libmagick++5', - 'libxml++2.6-2', - 'libboost-date-time1.49.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu48', - 'libnettle4', - 'libnotify4', - 'libx264-123']) + 'libboost-thread1.49.0', + 'libboost-regex1.49.0', + 'libmagick++5', + 'libxml++2.6-2', + 'libboost-date-time1.49.0', + 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', + 'libicu48', + 'libnettle4', + 'libnotify4', + 'libx264-123', + 'libcurl3']) deb_depends['8'] = copy.deepcopy(deb_depends_base) deb_depends['8'].extend(['libboost-filesystem1.55.0', @@ -140,7 +145,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libicu52', 'libnettle4', 'libssh-4', - 'libx264-142']) + 'libx264-142', + 'libcurl3']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -151,9 +157,19 @@ 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', + 'libcurl3']) deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.62.0', @@ -166,7 +182,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.62.0', 'libzip4', 'libicu57', 'libnettle6', - 'libx264-148']) + 'libx264-148', + 'libcurl3']) def packages(name, packages, f): s = '%s: ' % name @@ -211,7 +228,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) @@ -221,7 +238,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) @@ -242,6 +260,7 @@ def make_spec(filename, version, target): print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) @@ -253,7 +272,7 @@ 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', '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) @@ -291,10 +310,10 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', '8b72edd'), - ('libsub', '05c6345'), - ('rtaudio-cdist', None)) + return (('ffmpeg-cdist', 'a92889b', ffmpeg_options), + ('libdcp', 'v1.5.5'), + ('libsub', 'v1.3.5'), + ('rtaudio-cdist', '739969e')) def configure_options(target): opt = '' @@ -310,6 +329,11 @@ def configure_options(target): opt += ' --static-boost --static-xmlpp' elif target.version == '7': opt += ' --workaround-gssapi' + # Centos 7 ships with glibmm 2.50.0 which requires C++11 + # but its compiler (gcc 4.8.5) defaults to C++97. Go figure. + # I worry that this will cause ABI problems but I don't have + # a better solution. + opt += ' --force-cpp11' # Build Windows debug versions with static linking as I think gdb works better then if target.debug and target.platform == 'windows': @@ -374,7 +398,6 @@ def package_debian(target, cpu, version): return debs def package_rpm(target, cpu, version): - print('package_rpm %s %s %s' % (target, cpu, version)) topdir = os.path.realpath('build/rpmbuild') os.makedirs('%s/BUILD' % topdir) os.makedirs('%s/RPMS' % topdir) @@ -388,7 +411,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 = []