X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=de4fcb122c76033480411f9ecb06ddcb0b3cc1f9;hb=bf0cebd121a69f87a81e90e2cc64c08f32da6f7c;hp=d4fe2b10639f980dd28bcfac40cf4d37ce10d5d2;hpb=430825272e1a6cf266a184afe5acc0fa9811fff8;p=dcpomatic.git

diff --git a/cscript b/cscript
index d4fe2b106..de4fcb122 100644
--- a/cscript
+++ b/cscript
@@ -29,13 +29,13 @@ 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', '21.10']:
+for v in ['16.04', '18.04', '20.04']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python'])
-for v in ['22.04', '22.10']:
+for v in ['22.04']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
-for v in ['23.04']:
+for v in ['23.04', '23.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
 for v in ['9', '10']:
@@ -145,8 +145,8 @@ deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
                              'libnanomsg5',
                              'libdav1d5'])
 
-deb_depends['22.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['22.10'].extend(['libboost-filesystem1.74.0',
+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',
@@ -154,17 +154,19 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip4',
-                             'libicu71',
+                             'libicu72',
                              'libnettle8',
                              'libssh-4',
                              'libx264-164',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
-                             'libnanomsg5'])
+                             'libnanomsg5',
+                             'libwxgtk3.2-1',
+                             'libwxgtk-gl3.2-1'])
 
-deb_depends['23.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['23.04'].extend(['libboost-filesystem1.74.0',
+deb_depends['23.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['23.10'].extend(['libboost-filesystem1.74.0',
                              'libboost-thread1.74.0',
                              'libboost-regex1.74.0',
                              'libboost-date-time1.74.0',
@@ -501,14 +503,14 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)]
+        deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '03609704034192ae157f6328024989eec58ac1c3'))
+    deps.append(('libdcp', 'v1.8.88'))
     deps.append(('libsub', 'v1.6.44'))
-    deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
+    deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -517,7 +519,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
-    deps.append(('ffcmp', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39'))
+    deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
 
     return deps
 
@@ -727,7 +729,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")
+    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10") else "3.1")
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')