X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=04c27781eb065b3386d63ec70426006605f6cd9d;hp=e9317b0ade41b709a3edff240430385f97ac2ad8;hb=234bca29f70aeeba4fffd67f987de876ff89b6cc;hpb=4e10d277c6b052c18ec4e4aae14c26b0b9cb87af diff --git a/cscript b/cscript index e9317b0ad..04c27781e 100644 --- a/cscript +++ b/cscript @@ -323,10 +323,19 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '5c90508', ffmpeg_options), - ('libdcp', '13a4ee8'), - ('libsub', '6fac211'), - ('rtaudio-cdist', '739969e')) + if target.platform == 'windows' and target.version == 'xp': + deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] + elif target.platform != 'linux' or target.distro != 'arch': + deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)] + else: + # Use distro-provided FFmpeg on Arch + deps = [] + + deps.append(('libdcp', 'ee05b1c')) + deps.append(('libsub', '1cf5cdf')) + deps.append(('rtaudio-cdist', '739969e')) + + return deps def option_defaults(): return { "gui": True } @@ -363,40 +372,41 @@ def configure_options(target, options): def build(target, options): if target.platform == 'flatpak': target.checkout_dependencies() + prefix = 'https://dcpomatic.com/deps' modules = [] modules.append({'name': 'libzip', 'buildsystem': 'cmake', 'sources': [{'type': 'archive', - 'url': 'https://libzip.org/download/libzip-1.4.0.tar.xz', + 'url': '%s/libzip-1.4.0.tar.xz' % prefix, 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]}) modules.append({'name': 'imagemagick', 'cleanup': ['/bin'], 'sources': [{'type': 'archive', - 'url': 'https://www.imagemagick.org/download/ImageMagick-7.0.8-8.tar.bz2', - 'sha256': 'bc678d7fe5fc7e22af0d0268fabc6559a3052a589220cec50d3da0c842de17c3'}]}) + 'url': '%s/ImageMagick-7.0.8-11.tar.bz2' % prefix, + 'sha256': 'a1aef96c89a9a9fac51a6e141deffa0b2f8db2062a24f6ba9fe3846dde7491ac'}]}) modules.append({'name': 'libsigc++', 'sources': [{'type': 'archive', - 'url': 'https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz', + 'url': '%s/libsigc++-2.10.0.tar.xz' % prefix, 'sha256': 'f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81'}]}) modules.append({'name': 'glibmm', 'sources': [{'type': 'archive', - 'url': 'http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.48/glibmm-2.48.1.tar.xz', + 'url': '%s/glibmm-2.48.1.tar.xz' % prefix, 'sha256': 'dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf'}]}) modules.append({'name': 'cairomm', 'sources': [{'type': 'archive', - 'url': 'https://www.cairographics.org/releases/cairomm-1.12.2.tar.gz', + 'url': '%s/cairomm-1.12.2.tar.gz' % prefix, 'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]}) modules.append({'name': 'pangomm', 'sources': [{'type': 'archive', - 'url': 'http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz', + 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) modules.append({'name': 'libxml++', 'sources': [{'type': 'archive', - 'url': 'https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-2.40.1.tar.xz', + 'url': '%s/libxml++-2.40.1.tar.xz' % prefix, 'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]}) modules.append({'name': 'xmlsec1', 'sources': [{'type': 'archive', - 'url': 'http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.25.tar.gz', + 'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix, 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) modules.append({'name': 'openjpeg2', 'buildsystem': 'cmake', @@ -408,7 +418,7 @@ def build(target, options): './b2 install' ], 'sources': [{'type': 'archive', - 'url': 'https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2', + 'url': '%s/boost_1_66_0.tar.bz2' % prefix, 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) modules.append({'name': 'asdcplib', 'buildsystem': 'simple', @@ -451,13 +461,13 @@ def build(target, options): 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) modules.append({'name': 'wxwidgets', 'sources': [{'type': 'archive', - 'url': 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2', + 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) modules.append({'name': 'libssh', 'buildsystem': 'cmake', 'builddir': True, 'sources': [{'type': 'archive', - 'url': 'https://www.libssh.org/files/0.7/libssh-0.7.5.tar.xz', + 'url': '%s/libssh-0.7.5.tar.xz' % prefix, 'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]}) modules.append({'name': 'dcpomatic', 'buildsystem': 'simple', @@ -469,7 +479,7 @@ def build(target, options): }, 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]}) desc = {'app-id': 'com.dcpomatic.DCP-o-matic', - 'runtime': 'org.gnome.Platform', + 'runtime': 'org.gnome.Sdk', 'runtime-version': '3.26', 'sdk': 'org.gnome.Sdk', 'command': 'dcpomatic2', @@ -570,20 +580,49 @@ def package_rpm(target, cpu, version, options): return rpms +def make_appimage(target, nice_name, internal_name, version): + nice_filename = nice_name.replace(' ', '_') + os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) + target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) + with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: + print('#!/bin/bash', file=f) + print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f) + print('export PATH=$APPDIR/usr/bin:$PATH', file=f) + print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f) + print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f) + target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename) + with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f: + print('[Desktop Entry]', file=f) + print('Type=Application', file=f) + print('Name=%s' % nice_name, file=f) + print('Icon=%s' % internal_name, file=f) + target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename)) + target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename) + target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version)) + return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version)) + def package(target, version, options): """version: DCP-o-matic version string""" if target.platform == 'windows': return package_windows(target) elif target.platform == 'linux': - if target.bits == 32: - cpu = 'i386' + if target.detail == 'appimage': + out = [] + out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version)) + out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version)) + out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version)) + out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version)) + return out else: - cpu = 'amd64' - - if target.distro == 'debian' or target.distro == 'ubuntu': - return package_debian(target, cpu, version, options) - elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': - return package_rpm(target, cpu, version, options) + if target.bits == 32: + cpu = 'i386' + else: + cpu = 'amd64' + + if target.distro == 'debian' or target.distro == 'ubuntu': + return package_debian(target, cpu, version, options) + elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': + return package_rpm(target, cpu, version, options) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]