X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=519e0d8069634d30b6309f2adfb4a8f916dbc6f7;hb=f7ccae9cf646b53f57fffd9637cffae1cd26bb6c;hp=6fbe957847ccbe1df5fa542684d09aea8566f6b6;hpb=e7a005206b5649c9ae9b8b28f9ced04431369149;p=dcpomatic.git diff --git a/cscript b/cscript index 6fbe95784..519e0d806 100644 --- a/cscript +++ b/cscript @@ -41,7 +41,7 @@ deb_build_depends['17.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) @@ -193,9 +193,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) @@ -237,6 +237,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) @@ -251,6 +252,7 @@ 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) + 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']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) @@ -263,13 +265,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) @@ -294,9 +291,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'd993f38', ffmpeg_options), - ('libdcp', 'a1d530b'), - ('libsub', '117c4d9'), + return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), + ('libdcp', '8b72edd'), + ('libsub', '05c6345'), ('rtaudio-cdist', None)) def configure_options(target): @@ -308,11 +305,11 @@ 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' # Build Windows debug versions with static linking as I think gdb works better then if target.debug and target.platform == 'windows': @@ -363,7 +360,7 @@ 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 ['14.04']: + 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') @@ -377,6 +374,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) @@ -391,19 +389,14 @@ def package_rpm(target, cpu, 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) + 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)): @@ -423,7 +416,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)