X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4820f73797fbd549a78a4281f216fdad446b20a9;hb=c53c3e9f3d08478a391bfa1989772378609af693;hp=08970fa4fd8d41fca7bcdbad25f4c4eaf7b7e776;hpb=383cc7370a1a9bb64d1778ac0a730177c3f110fc;p=dcpomatic.git diff --git a/cscript b/cscript index 08970fa4f..4820f7379 100644 --- a/cscript +++ b/cscript @@ -28,16 +28,14 @@ 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['18.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['18.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) @@ -47,8 +45,9 @@ deb_build_depends['9'].extend(['libssh-gcrypt-dev']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() +deb_depends_gui = dict() -deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0'] +deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0'] deb_depends['14.04'] = copy.deepcopy(deb_depends_base) deb_depends['14.04'].extend(['libboost-filesystem1.54.0', @@ -63,7 +62,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libicu52', 'libnettle4', 'libssh-4', - 'libx264-142']) + 'libx264-142', + 'libcurl3']) deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', @@ -79,50 +79,56 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libicu55', 'libnettle6', 'libssh-4', - 'libx264-148']) + 'libx264-148', + 'libcurl3']) -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', +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', 'libxml++2.6-2v5', - 'libboost-date-time1.61.0', + 'libboost-date-time1.62.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', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', + 'libx264-148', + 'libcurl3']) + +deb_depends['18.04'] = copy.deepcopy(deb_depends_base) +deb_depends['18.04'].extend(['libboost-filesystem1.65.1', + 'libboost-thread1.65.1', + 'libboost-regex1.65.1', + 'libboost-date-time1.65.1', 'libmagick++-6.q16-7', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', - 'libboost-date-time1.62.0', 'libzip4', 'libwxgtk3.0-0v5', - 'libicu57', + 'libicu60', 'libnettle6', 'libssh-4', - 'libx264-148']) + 'libx264-152', + 'libcurl4']) deb_depends['7'] = copy.deepcopy(deb_depends_base) deb_depends['7'].extend(['libboost-filesystem1.49.0', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libmagick++5', - 'libxml++2.6-2', - 'libboost-date-time1.49.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu48', - 'libnettle4', - 'libnotify4', - 'libx264-123']) + 'libboost-thread1.49.0', + 'libboost-regex1.49.0', + 'libmagick++5', + 'libxml++2.6-2', + 'libboost-date-time1.49.0', + 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', + 'libicu48', + 'libnettle4', + 'libnotify4', + 'libx264-123', + 'libcurl3']) deb_depends['8'] = copy.deepcopy(deb_depends_base) deb_depends['8'].extend(['libboost-filesystem1.55.0', @@ -140,7 +146,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libicu52', 'libnettle4', 'libssh-4', - 'libx264-142']) + 'libx264-142', + 'libcurl3']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -151,9 +158,20 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libxml++2.6-2v5', 'libgtk2.0-0', 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', 'libicu57', + 'libssh-4', + 'libssh-gcrypt-4', 'libnettle6', - 'libx264-148']) + 'libx264-148', + 'libcurl3']) + +deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', + 'libpulse0' ] deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.62.0', @@ -166,7 +184,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.62.0', 'libzip4', 'libicu57', 'libnettle6', - 'libx264-148']) + 'libx264-148', + 'libcurl3']) def packages(name, packages, f): s = '%s: ' % name @@ -174,7 +193,7 @@ def packages(name, packages, f): s += str(p) + ', ' print(s[:-2], file=f) -def make_control(debian_version, bits, filename, debug): +def make_control(debian_version, bits, filename, debug, gui): f = open(filename, 'w') print('Source: dcpomatic', file=f) print('Section: video', file=f) @@ -182,7 +201,7 @@ def make_control(debian_version, bits, filename, debug): print('Maintainer: Carl Hetherington ', file=f) packages('Build-Depends', deb_build_depends[debian_version], f) print('Standards-Version: 3.9.3', file=f) - print('Homepage: http://dcpomatic.com/', file=f) + print('Homepage: https://dcpomatic.com/', file=f) print('', file=f) print('Package: dcpomatic', file=f) if bits == 32: @@ -190,12 +209,16 @@ def make_control(debian_version, bits, filename, debug): else: print('Architecture: amd64', file=f) - packages('Depends', deb_depends[debian_version], f) + pkg = deb_depends[debian_version] + if gui and debian_version in deb_depends_gui: + pkg.extend(deb_depends_gui[debian_version]) + + packages('Depends', pkg, 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) @@ -206,12 +229,12 @@ def make_control(debian_version, bits, filename, debug): print('Architecture: amd64', file=f) print('Section: debug', file=f) print('Priority: extra', file=f) - packages('Depends', deb_depends[debian_version], f) + packages('Depends', pkg, f) print('Description: debugging symbols for dcpomatic', file=f) print(' This package contains the debugging symbols for dcpomatic.', file=f) print('', file=f) -def make_spec(filename, version, target): +def make_spec(filename, version, target, options, requires=None): """Make a .spec file for a RPM build""" f = open(filename, 'w') print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) @@ -220,8 +243,9 @@ def make_spec(filename, version, target): print('Release:1%{?dist}', file=f) print('License:GPL', file=f) print('Group:Applications/Multimedia', file=f) - print('URL:http://dcpomatic.com/', file=f) - print('Requires: ImageMagick-c++, glibmm24, libzip', file=f) + print('URL:https://dcpomatic.com/', file=f) + if requires is not None: + print('Requires:%s' % requires, file=f) print('', file=f) print('%description', file=f) print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f) @@ -242,7 +266,13 @@ def make_spec(filename, version, target): print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_player.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) + print('%{_datadir}/dcpomatic2/snap.png', file=f) + print('%{_datadir}/dcpomatic2/zoom.png', file=f) + print('%{_datadir}/dcpomatic2/zoom_all.png', 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) @@ -253,7 +283,8 @@ 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', 'fi_FI', 'el_GR', 'tr_TR']: 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) @@ -266,7 +297,7 @@ def make_spec(filename, version, target): 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' % - (target.directory, target.directory, configure_options(target)), file=f) + (target.directory, target.directory, configure_options(target, options)), file=f) print('./waf', file=f) print('%install', file=f) print('cd dcpomatic-%s' % version, file=f) @@ -291,12 +322,15 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', 'b663909'), - ('libsub', '39ba87d'), - ('rtaudio-cdist', None)) + return (('ffmpeg-cdist', '5c90508', ffmpeg_options), + ('libdcp', '13a4ee8'), + ('libsub', '6fac211'), + ('rtaudio-cdist', '739969e')) -def configure_options(target): +def option_defaults(): + return { "gui": True } + +def configure_options(target, options): opt = '' if target.debug: opt += ' --enable-debug' @@ -310,6 +344,14 @@ 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' + + if not options['gui']: + opt += ' --disable-gui' # Build Windows debug versions with static linking as I think gdb works better then if target.debug and target.platform == 'windows': @@ -318,7 +360,7 @@ def configure_options(target): return opt def build(target, options): - target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target))) + target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options))) target.command('./waf') if target.platform == 'linux' or target.platform == 'osx': @@ -340,8 +382,8 @@ def package_windows(target): target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier) return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) -def package_debian(target, cpu, version): - make_control(target.version, target.bits, 'debian/control', target.debug) +def package_debian(target, cpu, version, options): + make_control(target.version, target.bits, 'debian/control', target.debug, options['gui']) target.command('./waf dist') f = open('debian/files', 'w') print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f) @@ -357,7 +399,7 @@ def package_debian(target, cpu, version): target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) - target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"') + target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') if target.version in ['7', '14.04']: @@ -373,8 +415,7 @@ def package_debian(target, cpu, version): return debs -def package_rpm(target, cpu, version): - print('package_rpm %s %s %s' % (target, cpu, version)) +def package_rpm(target, cpu, version, options): topdir = os.path.realpath('build/rpmbuild') os.makedirs('%s/BUILD' % topdir) os.makedirs('%s/RPMS' % topdir) @@ -388,7 +429,11 @@ def package_rpm(target, cpu, version): "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) - make_spec('build/platform/linux/dcpomatic2.spec', version, target) + requires = None + if target.distro == 'mageia': + requires = "lib64xmlsec1-devel" + + make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires) cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir target.command(cmd) rpms = [] @@ -405,7 +450,7 @@ def package_rpm(target, cpu, version): return rpms -def package(target, version): +def package(target, version, options): if target.platform == 'windows': return package_windows(target) elif target.platform == 'linux': @@ -415,9 +460,9 @@ def package(target, version): cpu = 'amd64' if target.distro == 'debian' or target.distro == 'ubuntu': - return package_debian(target, cpu, version) - elif target.distro == 'centos' or target.distro == 'fedora': - return package_rpm(target, cpu, version) + return package_debian(target, cpu, version, options) + elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': + return package_rpm(target, cpu, version, options) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]