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'])
+deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
+
+for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python'])
+for v in ['9', '10']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
+for v in ['11']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['unstable'].extend(['python'])
deb_depends = dict()
deb_depends_gui = dict()
'libzip4',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
- 'libwxgtk3.0-0v5',
'libicu55',
'libnettle6',
'libssh-4',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip4',
- 'libwxgtk3.0-0v5',
'libicu60',
'libnettle6',
'libssh-4',
'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['21.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['21.10'].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',
'libcurl3',
'libxerces-c3.1'])
-deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
- 'libxcb-xfixes0',
+deb_depends_gui['9'] = [ 'libxcb-xfixes0',
'libxcb-shape0',
'libasound2',
'libpulse0' ]
'libxerces-c3.2',
'libnanomsg5'])
-deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
- 'libxcb-xfixes0',
+deb_depends_gui['10'] = [ 'libxcb-xfixes0',
+ 'libxcb-shape0',
+ 'libasound2',
+ 'libpulse0' ]
+
+deb_depends['11'] = copy.deepcopy(deb_depends_base)
+deb_depends['11'].extend(['libboost-filesystem1.74.0',
+ 'libboost-thread1.74.0',
+ 'libboost-regex1.74.0',
+ 'libboost-date-time1.74.0',
+ 'libxml++2.6-2v5',
+ 'libzip4',
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libicu67',
+ 'libssh-4',
+ 'libssh-gcrypt-4',
+ 'libnettle8',
+ 'libx264-160',
+ 'libcurl4',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
+
+deb_depends_gui['11'] = [ 'libxcb-xfixes0',
'libxcb-shape0',
'libasound2',
'libpulse0' ]
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
print('Standards-Version: 3.9.3', file=f)
print('Homepage: https://dcpomatic.com/', file=f)
print('', file=f)
- print('Package: dcpomatic', file=f)
+ suffix = '' if gui else '-cli'
+ print(f'Package: dcpomatic{suffix}', file=f)
if bits == 32:
print('Architecture: i386', file=f)
else:
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 not gui:
+ print(' This package contains the command-line tools only.', file=f)
if debug:
print('', file=f)
- print('Package: dcpomatic-dbg', file=f)
+ print(f'Package: dcpomatic{suffix}-dbg', file=f)
if bits == 32:
print('Architecture: i386', file=f)
else:
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)
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)
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)
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)
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', 'bed820d'))
- deps.append(('libsub', '2ac27e6'))
- deps.append(('leqm-nrt', '131f971'))
+ deps.append(('libdcp', 'v1.8.1'))
+ deps.append(('libsub', 'v1.6.1'))
+ 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.
# the appropriate place later
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
- deps.append(('lwext4', '3601ea5'))
- deps.append(('ffcmp', 'a915540'))
+ deps.append(('lwext4', 'cce3730'))
+ deps.append(('ffcmp', '6259cd4'))
return deps
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' and options['gui']:
+ 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)
+ suffix = '' if options['gui'] else '-cli'
+ print(f'dcpomatic{suffix}_{version}-1_{cpu}.deb video extra', file=f)
shutil.rmtree('build/deb', ignore_errors=True)
os.makedirs('build/deb')
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'))
target.set('CDIST_DIRECTORY', target.directory)
target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
+ target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
if target.debug:
- target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
+ target.set('CDIST_DEBUG_PACKAGE_FLAG', f'--dbg-package=dcpomatic{suffix}-dbg')
target.command('dpkg-buildpackage -uc -us')
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
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))
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))
+ lib = 'usr/lib/x86_64-linux-gnu'
+ target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
+ target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
+ 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('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f)
print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)
target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename)
with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as 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 Combiner', 'dcpomatic2_combiner', version))
return out
else:
if target.bits == 32:
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 %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+ 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)
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
os.path.abspath('build/src/tools/dcpomatic.pot')]
def make_manual(target):
+ target.command('make -C doc/manual LIBDCP=../../../libdcp')
os.chdir('doc/manual')
- target.command('make')
target.command('pdflatex colour.tex')
return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
projects / dcpomatic.git / blobdiff