X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=5f452b5bff24e569cef2fb3587a124465b7e07f5;hp=2366ebdca0f9f0faacb0e91c284b5020c9ec689a;hb=ea3291a70d201cba47d4ee27d51b1e93dd9e3f8d;hpb=5a36b9ab5306bf19bcdf6c5e68556937633159b2 diff --git a/cscript b/cscript index 2366ebdca..5f452b5bf 100644 --- a/cscript +++ b/cscript @@ -33,10 +33,10 @@ 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['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['18.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['18.10'].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) @@ -54,7 +54,6 @@ deb_depends['14.04'] = copy.deepcopy(deb_depends_base) deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libboost-thread1.54.0', 'libboost-regex1.54.0', - 'libmagick++5', 'libxml++2.6-2', 'libboost-date-time1.54.0', 'libzip2', @@ -70,7 +69,6 @@ deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libboost-thread1.58.0', 'libboost-regex1.58.0', - 'libmagick++-6.q16-5v5', 'libxml++2.6-2v5', 'libboost-date-time1.58.0', 'libzip4', @@ -83,27 +81,27 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libx264-148', 'libcurl3']) -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', +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', + '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', - 'libcurl3']) + 'libx264-152', + 'libcurl4']) -deb_depends['18.04'] = copy.deepcopy(deb_depends_base) -deb_depends['18.04'].extend(['libboost-filesystem1.65.1', +deb_depends['18.10'] = copy.deepcopy(deb_depends_base) +deb_depends['18.10'].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', @@ -119,7 +117,6 @@ 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', @@ -136,7 +133,6 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libboost-thread1.55.0', 'libboost-date-time1.55.0', 'libboost-regex1.55.0', - 'libmagick++-6.q16-5', 'libxml++2.6-2', 'libzip2', 'libcairomm-1.0-1', @@ -155,7 +151,6 @@ 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', @@ -179,7 +174,6 @@ 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', 'libzip4', @@ -250,8 +244,7 @@ def make_spec(filename, version, target, options, requires=None): print('', file=f) print('%description', 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('files for presentation on DCI-compliant digital projectors.', file=f) print('', file=f) print('%files', file=f) print('%{_bindir}/dcpomatic2', file=f) @@ -268,12 +261,15 @@ def make_spec(filename, version, target, options, requires=None): 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}/applications/dcpomatic2_playlist.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) print('%{_datadir}/dcpomatic2/select.png', file=f) print('%{_datadir}/dcpomatic2/sequence.png', file=f) print('%{_datadir}/dcpomatic2/snap.png', file=f) print('%{_datadir}/dcpomatic2/zoom.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all.png', file=f) + print('%{_datadir}/dcpomatic2/tick.png', file=f) + print('%{_datadir}/dcpomatic2/no_tick.png', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f) @@ -324,21 +320,29 @@ def dependencies(target): ffmpeg_options = {} if target.platform == 'windows' and target.version == 'xp': - deps = [('ffmpeg-cdist', '65c6d93', ffmpeg_options)] + deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] + elif target.platform != 'linux' or target.distro != 'arch': + deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)] else: - deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)] + # Use distro-provided FFmpeg on Arch + deps = [] - deps.append(('libdcp', '348aaa6')) - deps.append(('libsub', '75d9785')) - deps.append(('rtaudio-cdist', '739969e')) + deps.append(('libdcp', 'a2feb49')) + deps.append(('libsub', '8bb11a3')) + deps.append(('rtaudio-cdist', 'aad62d7')) return deps def option_defaults(): - return { "gui": True } + return { "gui": True, "variant": None } def configure_options(target, options): opt = '' + + if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')): + # Currently we only build tests on Ubuntu 1{6,8}.04 + opt += ' --disable-tests' + if target.debug: opt += ' --enable-debug' if target.platform == 'windows': @@ -346,7 +350,6 @@ def configure_options(target, options): elif target.platform == 'linux': opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': - opt += ' --disable-tests' if target.version == '6.5': opt += ' --static-boost --static-xmlpp' elif target.version == '7': @@ -360,6 +363,9 @@ def configure_options(target, options): if not options['gui']: opt += ' --disable-gui' + if options['variant'] is not None: + opt += ' --variant=%s' % options['variant'] + # Build Windows debug versions with static linking as I think gdb works better then if target.debug and target.platform == 'windows': opt += ' --static-dcpomatic' @@ -369,40 +375,36 @@ 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-10.tar.bz2', - 'sha256': 'f9d99573f8b8d7f90319fdf22a1a41a6764ac247b1c3f6ae08d9a3657ec977a5'}]}) 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', @@ -414,7 +416,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', @@ -457,13 +459,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', @@ -569,9 +571,7 @@ def package_rpm(target, cpu, version, options): else: cpu = "i686" - print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): - print('found %s' % p) rpms.append(os.path.abspath(p)) return rpms @@ -590,9 +590,11 @@ def make_appimage(target, nice_name, internal_name, version): 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('Categories=AudioVideo;', 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('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % 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))