X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=ee483094577e4fd6497df6732ac4b882a3ee4a0c;hp=7b03b0e87bca8b4d01af9c1f7626c6245f223391;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hpb=c6c5e30d75800031b9ad06015f271865e148e538 diff --git a/cscript b/cscript index 7b03b0e87..ee4830945 100644 --- a/cscript +++ b/cscript @@ -29,18 +29,12 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['16.04'].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['20.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['20.04'].extend(['libssh-dev']) -deb_build_depends['20.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['20.10'].extend(['libssh-dev']) -deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['9'].extend(['libssh-gcrypt-dev']) -deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['10'].extend(['libssh-gcrypt-dev']) +for v in ['16.04', '18.04', '20.04', '20.10', '21.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev']) +for v in ['9', '10']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-gcrypt-dev']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() @@ -120,6 +114,25 @@ deb_depends['20.10'].extend(['libboost-filesystem1.71.0', 'libxerces-c3.2', 'libnanomsg5']) +deb_depends['21.04'] = copy.deepcopy(deb_depends_base) +deb_depends['21.04'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu67', + 'libnettle8', + 'libssh-4', + 'libx264-160', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) + + deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -195,15 +208,17 @@ def can_build_disk(target): if target.platform == 'osx': return True if target.platform == 'linux': - if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']: + if target.distro == 'ubuntu' and target.version != '16.04': return True - if target.distro == 'debian' and target.version == '10': + if target.distro == 'debian' and target.version != '9': return True if target.detail == 'appimage': return True - if target.distro == 'fedora' and target.version == '31': + if target.distro == 'fedora' and int(target.version) >= 31: return True - if target.distro == 'centos' and target.version == '8': + if target.distro == 'centos' and target.version != '7': + return True + if target.distro == 'mageia': return True return False @@ -285,9 +300,10 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_playlist', file=f) print('%{_bindir}/dcpomatic2_openssl', file=f) print('%{_bindir}/dcpomatic2_combiner', file=f) + print('%{_bindir}/dcpomatic2_verify', file=f) if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): print('%{_bindir}/dcpomatic2_disk', file=f) - print('%{_bindir}/dcpomatic2_disk_writer', file=f) + print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) @@ -327,6 +343,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) print('%{_datadir}/libdcp/tags/*', file=f) print('%{_datadir}/libdcp/xsd/*', file=f) + print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f) print('', file=f) print('%prep', file=f) print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f) @@ -334,7 +351,7 @@ def make_spec(filename, version, target, options, requires=None): print('%build', file=f) 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 --destdir=/usr %s' % (target.directory, target.directory, configure_options(target, options)), file=f) print('./waf', file=f) print('%install', file=f) @@ -344,6 +361,7 @@ def make_spec(filename, version, target, options, requires=None): print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f) print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f) print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f) + print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f) print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -365,28 +383,23 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', 'e89aa4a', ffmpeg_options)] + deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - # Let's use C++11 mode if we can - cpp_lib_options = {'force-cpp11': True} if ( - (target.platform == 'osx') or - (target.platform == 'windows')) else {} - - deps.append(('libdcp', 'c6665c1', cpp_lib_options)) - deps.append(('libsub', '64eb116', cpp_lib_options)) - deps.append(('leqm-nrt', '131f971')) + deps.append(('libdcp', 'b3cb9c0')) + deps.append(('libsub', '587e475')) + deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. # This dependency is to get that binary, which is added into # the appropriate place later - deps.append(('openssl', '0b7b7f1')) + deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', '01c7d4c')) - deps.append(('ffcmp', 'a915540')) + deps.append(('lwext4', 'cce3730')) + deps.append(('ffcmp', '6259cd4')) return deps @@ -412,13 +425,6 @@ def configure_options(target, options): 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' - elif target.platform == 'osx': - opt += ' --force-cpp11' if not options['gui']: opt += ' --disable-gui' @@ -431,7 +437,10 @@ def configure_options(target, options): opt += ' --static-dcpomatic' if can_build_disk(target): - opt += ' --enable-disk' + opt += ' --enable-disk' + + if target.platform == 'osx' and target.arch == 'arm64': + opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin return opt @@ -573,6 +582,11 @@ def package_windows(target): def package_debian(target, cpu, version, options): make_control(target.version, target.bits, 'debian/control', target.debug, options['gui']) + if target.version != '9' and target.version != '16.04': + with open('debian/postinst', 'w') as f: + print('#!/bin/sh', file=f) + # Get the required capability to write to disks + print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f) target.command('./waf dist') f = open('debian/files', 'w') print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f) @@ -583,6 +597,7 @@ def package_debian(target, cpu, version, options): shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) os.chdir('dcpomatic-%s' % version) + target.set('EMAIL', 'carl@dcpomatic.com') target.command('dch -b -v %s-1 "New upstream release."' % version) target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) @@ -617,7 +632,7 @@ def package_rpm(target, cpu, version, options): requires = None if target.distro == 'mageia': - requires = "lib64xmlsec1-devel" + requires = "lib64xmlsec1-devel lib64canberra-gtk0" make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires) cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir @@ -634,16 +649,24 @@ def package_rpm(target, cpu, version, options): return rpms -def make_appimage(target, nice_name, internal_name, version): +def make_appimage(target, nice_name, internal_name, version, extra_bin=None): nice_filename = nice_name.replace(' ', '_') os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) + if extra_bin: + target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, extra_bin, nice_filename)) target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) + target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) + target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + if internal_name == 'dcpomatic2_disk': + target.command('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename) + target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename)) + with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: print('#!/bin/bash', file=f) - print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f) print('export PATH=$APPDIR/usr/bin:$PATH', file=f) print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f) print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f) @@ -673,7 +696,8 @@ def package(target, version, options): out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version)) out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version)) out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version)) - out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version)) + out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version, "dcpomatic2_disk_writer")) + out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version)) return out else: if target.bits == 32: @@ -685,11 +709,9 @@ def package(target, version, options): 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' and target.bits is None: - target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) - return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] - elif target.platform == 'osx' and target.bits == 64: - target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + elif target.platform == 'osx': + archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets) + target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs)) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) @@ -705,6 +727,8 @@ def package(target, version, options): packages.append((a, "com.dcpomatic.server")) elif x.find("Disk Writer") != -1: packages.append((a, "com.dcpomatic.disk")) + elif x.find("Combiner") != -1: + packages.append((a, "com.dcpomatic.combiner")) else: packages.append((a, "com.dcpomatic")) return packages