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()
'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',
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 in ['18.04', '20.04', '20.10', '21.04']:
return True
if target.distro == 'debian' and target.version == '10':
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':
return True
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)
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 = []
- deps.append(('libdcp', 'b9c5e3f'))
- deps.append(('libsub', '4a1de69'))
+ deps.append(('libdcp', '6384002'))
+ deps.append(('libsub', '55ebde1'))
deps.append(('leqm-nrt', '131f971'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', '9d20ec5'))
- deps.append(('ffcmp', 'a915540'))
+ deps.append(('ffcmp', '6259cd4'))
return deps
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'))
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 PATH=$APPDIR/usr/bin:$PATH', file=f)
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: