X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=49a07fdb6ee39aef40cd5b9acdeafeea3802706b;hb=f7610c3c202df736c518a826bef21da41df38aa4;hp=d713c383848ef6a335adef90354aeb989805d0ad;hpb=e7f7bf3a63c801a215d4b9832f01b8b27ee8944a;p=dcpomatic.git diff --git a/cscript b/cscript index d713c3838..49a07fdb6 100644 --- a/cscript +++ b/cscript @@ -29,7 +29,7 @@ deb_build_depends = dict() 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']: +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']: @@ -55,7 +55,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libzip4', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', - 'libwxgtk3.0-0v5', 'libicu55', 'libnettle6', 'libssh-4', @@ -72,7 +71,6 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libwxgtk3.0-0v5', 'libicu60', 'libnettle6', 'libssh-4', @@ -136,6 +134,23 @@ deb_depends['21.04'].extend(['libboost-filesystem1.74.0', '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', @@ -155,8 +170,7 @@ deb_depends['9'].extend(['libboost-filesystem1.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' ] @@ -180,8 +194,7 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', - 'libxcb-xfixes0', +deb_depends_gui['10'] = [ 'libxcb-xfixes0', 'libxcb-shape0', 'libasound2', 'libpulse0' ] @@ -204,8 +217,7 @@ deb_depends['11'].extend(['libboost-filesystem1.74.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends_gui['11'] = [ 'libwxgtk3.0-gtk3-0v5', - 'libxcb-xfixes0', +deb_depends_gui['11'] = [ 'libxcb-xfixes0', 'libxcb-shape0', 'libasound2', 'libpulse0' ] @@ -396,6 +408,7 @@ def make_spec(filename, version, target, options, requires=None): print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) + print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f) print('', file=f) print('%postun', file=f) print('if [ $1 -eq 0 ] ; then', file=f) @@ -419,8 +432,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'b3cb9c0')) - deps.append(('libsub', '587e475')) + deps.append(('libdcp', 'v1.8.5')) + deps.append(('libsub', 'v1.6.5')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -682,18 +695,19 @@ def package_rpm(target, cpu, version, options): return rpms -def make_appimage(target, nice_name, internal_name, version, extra_bin=None): +def make_appimage(target, nice_name, internal_name, version): 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)) + 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)) @@ -702,6 +716,7 @@ def make_appimage(target, nice_name, internal_name, version, extra_bin=None): print('#!/bin/bash', 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: @@ -729,7 +744,6 @@ 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, "dcpomatic2_disk_writer")) out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version)) return out else: @@ -791,8 +805,8 @@ def make_pot(target): 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')]