X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b87730d6370bc9d5cc376ef2b289973cbb054b34;hb=0b33fb112e8ec1eac1d19388422a7194ecd7937c;hp=04ade29247640c3aee35adb77f8f5895f938f64d;hpb=aa269a34a48786edc3710e974ad0fc5000196eb5;p=dcpomatic.git diff --git a/cscript b/cscript index 04ade2924..b87730d63 100644 --- a/cscript +++ b/cscript @@ -28,16 +28,12 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['12.04'].extend(['libssh-dev']) 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['16.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['16.10'].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) deb_build_depends['7'].extend(['libssh-dev']) deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) @@ -81,22 +77,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libssh-4', 'libx264-148']) -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', - 'libssh-4', - 'libx264-148']) - -deb_depends['17.04'] = copy.deepcopy(deb_depends_base) -deb_depends['17.04'].extend(['libboost-filesystem1.62.0', +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', @@ -151,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', @@ -193,9 +184,9 @@ def make_control(debian_version, bits, filename, debug): packages('Depends', deb_depends[debian_version], f) print('Description: Generator of Digital Cinema Packages (DCPs)', 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(' DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f) + print(' sound and subtitle files. You can use it to make content for playback on DCI-compliant', file=f) + print(' cinema projectors.', file=f) if debug: print('', file=f) @@ -253,7 +244,7 @@ def make_spec(filename, version, target): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.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']: + 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', 'ar_LB']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -265,7 +256,7 @@ def make_spec(filename, version, target): print('cd dcpomatic-%s' % version, file=f) print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f) - print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr %s' % + print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)), file=f) print('./waf', file=f) print('%install', file=f) @@ -292,8 +283,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', '047d8ff'), - ('libsub', '678962c'), + ('libdcp', 'a18b9d2'), + ('libsub', 'ad08b7b'), ('rtaudio-cdist', None)) def configure_options(target): @@ -310,6 +301,11 @@ def configure_options(target): opt += ' --static-boost --static-xmlpp' elif target.version == '7': opt += ' --workaround-gssapi' + # Centos 7 ships with glibmm 2.50.0 which requires C++11 + # but its compiler (gcc 4.8.5) defaults to C++97. Go figure. + # I worry that this will cause ABI problems but I don't have + # a better solution. + opt += ' --force-cpp11' # Build Windows debug versions with static linking as I think gdb works better then if target.debug and target.platform == 'windows': @@ -416,7 +412,7 @@ def package(target, version): if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu, version) - elif target.distro == 'centos' or target.distro == 'fedora': + elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory)