X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=14d1829f115705dfb95f91d79bca075e3625b17c;hb=a8a3d3759e5104a36e6d4b36f3a572b0bf672470;hp=4de388b6bd9836939d80df96e0a543f16f46c98f;hpb=88816c72895b90f29083235cc0f111c893b15d93;p=dcpomatic.git diff --git a/cscript b/cscript index 4de388b6b..14d1829f1 100644 --- a/cscript +++ b/cscript @@ -37,6 +37,8 @@ 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['19.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['19.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) @@ -115,6 +117,23 @@ deb_depends['18.10'].extend(['libboost-filesystem1.65.1', 'libcurl4', 'libpulse0']) +deb_depends['19.04'] = copy.deepcopy(deb_depends_base) +deb_depends['19.04'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip5', + 'libwxgtk3.0-0v5', + 'libicu63', + 'libnettle6', + 'libssh-4', + 'libx264-155', + 'libcurl4', + 'libpulse0']) + deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', 'libboost-thread1.49.0', @@ -273,6 +292,7 @@ def make_spec(filename, version, target, options, requires=None): 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/me.jpg', 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) @@ -331,9 +351,9 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.6')) - deps.append(('libsub', 'v1.4.6')) - deps.append(('rtaudio-cdist', 'aad62d7')) + deps.append(('libdcp', 'v1.6.7')) + deps.append(('libsub', 'v1.4.7')) + deps.append(('rtaudio-cdist', 'bf0fc23')) return deps @@ -508,7 +528,7 @@ def package_windows(target): target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier)) target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier)) - target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier)) + target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier)) target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier) target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier)