X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=3bc8dff5ef457043bb462e7a5f63c72ce4ae2f05;hb=92dfe9454ef49363f49c19a7c7c4825c4a18771b;hp=c9eed0f301887d910a8c1211c0f608cdbe02ed30;hpb=61977e845475f9a2bf667cd4f888d5df959eaea5;p=dcpomatic.git diff --git a/cscript b/cscript index c9eed0f30..3bc8dff5e 100644 --- a/cscript +++ b/cscript @@ -66,6 +66,18 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libicu55', 'libnettle6']) +deb_depends['16.10'] = copy.deepcopy(deb_depends_base) +deb_depends['16.10'].extend(['libboost-filesystem1.61.0', + 'libboost-thread1.61.0', + 'libboost-regex1.61.0', + 'libmagick++-6.q16-5v5', + 'libxml++2.6-2v5', + 'libboost-date-time1.61.0', + 'libzip4', + 'libwxgtk3.0-0v5', + 'libicu57', + 'libnettle6']) + deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', 'libboost-thread1.49.0', @@ -233,8 +245,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '4545c55'), - ('libsub', '3db5052')) + ('libdcp', 'v1.4.0'), + ('libsub', 'v1.2.0')) def configure_options(target): opt = '' @@ -300,7 +312,7 @@ def package_debian(target, cpu, version): target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') - if target.version in ['15.04', '15.10', '16.04', '8']: + if target.version in ['15.04', '15.10', '16.04', '16.10', '8']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') @@ -364,7 +376,7 @@ def package(target, version): return package_rpm(target, cpu, version) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory) - return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) + return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] def make_pot(target): target.command('./waf pot')