X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=1d99e27c9153d74f377af8976b29c919d324e134;hb=918124fb0b2fdf05bf98aee2c74c85387f1d8638;hp=180c27bd13ad0c2cef92651246642d51135c040f;hpb=29623e179bfcb9c1e0dc7b2cb74dc9898953e4b6;p=dcpomatic.git diff --git a/cscript b/cscript index 180c27bd1..1d99e27c9 100644 --- a/cscript +++ b/cscript @@ -32,8 +32,6 @@ 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.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['17.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['7'] = copy.deepcopy(deb_build_depends_base) @@ -79,20 +77,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libssh-4', 'libx264-148']) -deb_depends['17.04'] = copy.deepcopy(deb_depends_base) -deb_depends['17.04'].extend(['libboost-filesystem1.62.0', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', - 'libmagick++-6.q16-7', - 'libxml++2.6-2v5', - 'libboost-date-time1.62.0', - 'libzip4', - 'libwxgtk3.0-0v5', - 'libicu57', - 'libnettle6', - 'libssh-4', - 'libx264-148']) - deb_depends['17.10'] = copy.deepcopy(deb_depends_base) deb_depends['17.10'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -149,9 +133,18 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libxml++2.6-2v5', 'libgtk2.0-0', 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libwxgtk3.0-0v5', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', 'libicu57', + 'libssh-4', + 'libssh-gcrypt-4', 'libnettle6', - 'libx264-148']) + 'libx264-148', + 'libpulse0']) deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.62.0', @@ -290,8 +283,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', '1daf081'), - ('libsub', '567a711'), + ('libdcp', '0a47e4c'), + ('libsub', '688c501'), ('rtaudio-cdist', None)) def configure_options(target):