X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c744ff61c9e075ae18893eb3112d90b84981d705;hb=c140d6ed0ce518db6b5a676ed9ef4a21e5eb4f03;hp=6fdeb8736899741dcedbfa52386daddc9f9fa9ba;hpb=42a30c6c05ffdf00acf44daed07d48388175c7a4;p=dcpomatic.git diff --git a/cscript b/cscript index 6fdeb8736..c744ff61c 100644 --- a/cscript +++ b/cscript @@ -28,20 +28,20 @@ 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) -deb_build_depends['8'].extend(['libssh-dev']) +deb_build_depends['8'].extend(['libssh-gcrypt-dev']) +deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['9'].extend(['libssh-gcrypt-dev']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() @@ -79,13 +79,13 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libssh-4', 'libx264-148']) -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', @@ -93,19 +93,21 @@ deb_depends['16.10'].extend(['libboost-filesystem1.61.0', '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', +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']) deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', @@ -140,16 +142,38 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libssh-4', 'libx264-142']) +deb_depends['9'] = copy.deepcopy(deb_depends_base) +deb_depends['9'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libboost-date-time1.62.0', + 'libmagick++-6.q16-7', + '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', + 'libpulse0']) + deb_depends['unstable'] = copy.deepcopy(deb_depends_base) -deb_depends['unstable'].extend(['libboost-filesystem1.58.0', - 'libboost-thread1.58.0', - 'libboost-regex1.58.0', - 'libmagick++-6.q16-5v5', +deb_depends['unstable'].extend(['libboost-filesystem1.62.0', + 'libboost-thread1.62.0', + 'libboost-regex1.62.0', + 'libboost-date-time1.62.0', + 'libmagick++-6.q16-7', 'libxml++2.6-2v5', 'libgtk2.0-0', - 'libboost-date-time1.58.0', - 'libzip2', - 'libicu52', + 'libzip4', + 'libicu57', 'libnettle6', 'libx264-148']) @@ -178,9 +202,9 @@ def make_control(debian_version, bits, filename, debug): packages('Depends', deb_depends[debian_version], f) print('Description: Generator of Digital Cinema Packages (DCPs)', file=f) - print(' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio', file=f) - print(' files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant', file=f) - print(' digital projectors.', file=f) + print(' DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f) + print(' sound and subtitle files. You can use it to make content for playback on DCI-compliant', file=f) + print(' cinema projectors.', file=f) if debug: print('', file=f) @@ -196,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) @@ -206,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) @@ -222,6 +247,7 @@ def make_spec(filename, version, target): print('%{_bindir}/dcpomatic2_server', file=f) print('%{_bindir}/dcpomatic2_server_cli', file=f) print('%{_bindir}/dcpomatic2_kdm_cli', file=f) + print('%{_bindir}/dcpomatic2_player', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) @@ -236,7 +262,9 @@ def make_spec(filename, version, target): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.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']: + 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', '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) @@ -248,13 +276,8 @@ def make_spec(filename, version, target): print('cd dcpomatic-%s' % version, file=f) print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f) - if target.distro == 'centos' and target.version == '5': - prefix = 'BUILDROOT/usr' - else: - 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) + print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % + (target.directory, target.directory, configure_options(target)), file=f) print('./waf', file=f) print('%install', file=f) print('cd dcpomatic-%s' % version, file=f) @@ -279,10 +302,10 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'd993f38', ffmpeg_options), - ('libdcp', '284f247'), - ('libsub', '424041f'), - ('rtaudio-cdist', None)) + return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), + ('libdcp', '8c852cb'), + ('libsub', '069ca80'), + ('rtaudio-cdist', '739969e')) def configure_options(target): opt = '' @@ -293,11 +316,16 @@ def configure_options(target): elif target.platform == 'linux': opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': - opt += ' --static-xmlsec --static-ssh --disable-tests' + opt += ' --disable-tests' if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': - opt += ' --workaround-gssapi --static-xmlpp' + 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': @@ -348,10 +376,10 @@ def package_debian(target, cpu, version): target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') - if target.version in ['15.04', '15.10', '16.04', '16.10', '17.04', '8', 'unstable']: - target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') - else: + if target.version in ['7', '14.04']: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') + else: + target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') target.command('dpkg-buildpackage -uc -us') @@ -362,6 +390,7 @@ 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) @@ -375,20 +404,19 @@ def package_rpm(target, cpu, version): "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) - make_spec('build/platform/linux/dcpomatic2.spec', version, target) - 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) + 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 = [] if cpu == "amd64": cpu = "x86_64" else: - if target.distro == 'centos' and target.version == '5': - cpu = "i386" - else: - cpu = "i686" + cpu = "i686" print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): @@ -408,7 +436,7 @@ def package(target, version): if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu, version) - elif target.distro == 'centos' or target.distro == 'fedora': + elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory)