X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c62056558418e3e2501a2ba87bf8a8897138e45a;hb=00734ea5fe3f6946de02e6d9ec3e786c67bae4da;hp=98b242ef56dd6dba583f64fcfd6d414f47d24194;hpb=778bf902e3a6cc5dcffa144fb2a1243388ca028c;p=dcpomatic.git

diff --git a/cscript b/cscript
index 98b242ef5..c62056558 100644
--- a/cscript
+++ b/cscript
@@ -35,6 +35,9 @@ for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
 for v in ['22.04', '22.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
+for v in ['23.04']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
@@ -157,6 +160,25 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0',
                              'libxerces-c3.2',
                              'libnanomsg5'])
 
+deb_depends['23.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['23.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',
+                             'libicu72',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-164',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5',
+                             'libwxgtk3.2-1',
+                             'libwxgtk-gl3.2-1'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -355,6 +377,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_combiner', file=f)
     print('%{_bindir}/dcpomatic2_verify', file=f)
     print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
+    print('%{_bindir}/dcpomatic2_map', file=f)
     if can_build_disk(target):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -452,13 +475,13 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
+        deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.58'))
-    deps.append(('libsub', 'v1.6.42'))
+    deps.append(('libdcp', 'v1.8.72'))
+    deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -467,8 +490,8 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'b98f55b806f9dfe9e9374faceed99b689c29f28e'))
-    deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
+        deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
+    deps.append(('ffcmp', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39'))
 
     return deps
 
@@ -678,6 +701,7 @@ def package_debian(target, cpu, version, options):
 
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
     target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+    target.set('CDIST_WX_VERSION', "3.2" if target.version == "23.04" else "3.1")
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
 
@@ -722,7 +746,7 @@ 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_binaries=None):
     nice_filename = nice_name.replace(' ', '_')
     appdir = f'build/{nice_filename}.AppDir'
     os.makedirs(f'{appdir}/usr/bin')
@@ -730,6 +754,9 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
     target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
     target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
+    if extra_binaries:
+        for bin in extra_binaries:
+            target.command(f'cp {target.directory}/bin/{bin} {appdir}/usr/bin')
     target.command(f'mkdir -p {appdir}/usr/share/libdcp')
     target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
     target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
@@ -779,7 +806,7 @@ def package(target, version, options):
     elif target.platform == 'linux':
         if target.detail == 'appimage':
             out = []
-            out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
+            out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version, ('dcpomatic2_map', 'dcpomatic2_cli')))
             out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
             out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version))
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))