X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=d1bc02c05d1d6accad2a98648c97626a74a31273;hp=d848253c664faa493b02d57377e2f3617d15a506;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=5c28b2439dc4e17d7e62ed2c7c184889f46e8c19 diff --git a/cscript b/cscript index d848253c6..d1bc02c05 100644 --- a/cscript +++ b/cscript @@ -37,8 +37,6 @@ deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['19.10'].extend(['libssh-dev']) deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['20.04'].extend(['libssh-dev']) -deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) -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['10'] = copy.deepcopy(deb_build_depends_base) @@ -65,7 +63,7 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libssh-4', 'libx264-148', 'libcurl3', - 'libxerces-c3.2']) + 'libxerces-c3.1']) deb_depends['18.04'] = copy.deepcopy(deb_depends_base) deb_depends['18.04'].extend(['libboost-filesystem1.65.1', @@ -83,7 +81,8 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libx264-152', 'libcurl4', 'libpulse0', - 'libxerces-c3.2']) + 'libxerces-c3.2', + 'libnanomsg4']) deb_depends['19.10'] = copy.deepcopy(deb_depends_base) deb_depends['19.10'].extend(['libboost-filesystem1.67.0', @@ -101,7 +100,8 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0', 'libx264-155', 'libcurl4', 'libpulse0', - 'libxerces-c3.2']) + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['20.04'] = copy.deepcopy(deb_depends_base) deb_depends['20.04'].extend(['libboost-filesystem1.71.0', @@ -119,25 +119,8 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libx264-155', 'libcurl4', 'libpulse0', - 'libxerces-c3.2']) - -deb_depends['8'] = copy.deepcopy(deb_depends_base) -deb_depends['8'].extend(['libboost-filesystem1.55.0', - 'libboost-thread1.55.0', - 'libboost-date-time1.55.0', - 'libboost-regex1.55.0', - 'libxml++2.6-2', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libwxgtk3.0-0', - 'libxcb-xfixes0', - 'libxcb-shape0', - 'libicu52', - 'libnettle4', - 'libssh-4', - 'libx264-142', - 'libcurl3']) + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -154,7 +137,8 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libssh-gcrypt-4', 'libnettle6', 'libx264-148', - 'libcurl3']) + 'libcurl3', + 'libxerces-c3.1']) deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', 'libxcb-xfixes0', @@ -177,7 +161,9 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0', 'libssh-gcrypt-4', 'libnettle6', 'libx264-155', - 'libcurl4']) + 'libcurl4', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', 'libxcb-xfixes0', @@ -196,16 +182,32 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0', 'libicu63', 'libnettle6', 'libx264-155', - 'libcurl4']) + 'libcurl4', + 'libxerces-c3.2']) def can_build_disk(target): # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4 # library. For now, just whitelist good ones here. # - # - Lots of Linux distros don't have a new enough boost (1.64 or above) + # - Lots of Linux distros (including Ubuntu 16.04) don't have a new enough boost (1.64 or above) # - On Centos 6 we can't build lwext4 because it needs a new CMake which Centos 6's g++ is not new enough to build. # - On Centos 7 there is a build error in lwext4 related to __unused - return target.platform == 'windows' or target.platform == 'osx' or (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']) + if target.platform == 'windows': + return True + if target.platform == 'osx': + return True + if target.platform == 'linux': + if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']: + return True + if target.distro == 'debian' and target.version == '10': + return True + if target.detail == 'appimage': + return True + if target.distro == 'fedora' and target.version == '31': + return True + if target.distro == 'centos' and target.version == '8': + return True + return False def packages(name, packages, f): s = '%s: ' % name @@ -296,6 +298,9 @@ def make_spec(filename, version, target, options, requires=None): 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}/applications/dcpomatic2_playlist.desktop', file=f) + if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + print('%{_datadir}/applications/dcpomatic2_disk.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) @@ -316,6 +321,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.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', 'tr_TR', 'ko_KR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) @@ -378,7 +384,7 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', 'carl')) if can_build_disk(target): - deps.append(('lwext4', 'carl2')) + deps.append(('lwext4', '370b3de6')) return deps @@ -665,6 +671,7 @@ def package(target, version, options): 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)) out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version)) + out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version)) return out else: if target.bits == 32: