X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4c223a169356ca3322be1a1bbe09882ee8718b25;hb=0059d70d39d257132bcf9837eeb017307f2abaac;hp=a07ae8be3197c1e5b1a3310d4a7ba518c50a4da0;hpb=1887baa719c0e496ed34b208749ca2e62ff8f49b;p=dcpomatic.git diff --git a/cscript b/cscript index a07ae8be3..4c223a169 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', @@ -201,7 +214,7 @@ def can_build_disk(target): 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 @@ -328,6 +341,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) @@ -367,13 +381,13 @@ 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 = [] - deps.append(('libdcp', '546094a')) - deps.append(('libsub', '3ee4328')) + deps.append(('libdcp', '5e1ce36')) + deps.append(('libsub', 'cf5c3db')) deps.append(('leqm-nrt', '131f971')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -383,7 +397,7 @@ def dependencies(target, options): deps.append(('openssl', '7f29dd5')) if can_build_disk(target): deps.append(('lwext4', '9d20ec5')) - deps.append(('ffcmp', 'a915540')) + deps.append(('ffcmp', '6259cd4')) return deps @@ -576,6 +590,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')) @@ -637,6 +652,10 @@ def make_appimage(target, nice_name, internal_name, version): 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) @@ -669,6 +688,7 @@ def package(target, version, options): 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: