summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-09-30 00:12:20 +0200
committerCarl Hetherington <cth@carlh.net>2026-04-25 12:53:07 +0200
commitfc41fadcfb3fcf2b4ba20f2d29036043dda71040 (patch)
treee18cd20ecdd7fe0440efd7aec6eea9f403a7897c
parentd71b711220d77cd77b52bcf8316f01c09280537a (diff)
Bump libdcp to get updates to FFmpeg and openjpeg.
openjpeg based on 2.5.4. FFmpeg based on 8.0.
-rw-r--r--cscript4
-rw-r--r--platform/windows/wscript15
2 files changed, 9 insertions, 10 deletions
diff --git a/cscript b/cscript
index ed6f35666..7ae027413 100644
--- a/cscript
+++ b/cscript
@@ -506,7 +506,7 @@ def build_with_cpp17(target):
def dependencies(target, options):
- deps = [('libdcp', 'b47f0559041040495a08eb0b5cc2d62068d83952', {'c++17': build_with_cpp17(target)})]
+ deps = [('libdcp', '1b8d3a2c2f8877e2c2df71be48b03a1d0062936f', {'c++17': build_with_cpp17(target)})]
deps.append(('libsub', 'v1.6.59'))
deps.append(('leqm-nrt', 'd75d0af984d9c14bfefca8f1bdbc215c3bf3a388'))
if target.platform != 'linux' or target.distro != 'arch':
@@ -519,7 +519,7 @@ def dependencies(target, options):
if can_build_disk(target):
deps.append(('lwext4', '5755f8f25aadf18ec49e0350b6daaab3a648b9d7'))
if build_tests(target):
- deps.append(('ffcmp', '26f17612f391'))
+ deps.append(('ffcmp', '11d2e6cafce8c041f034b99d2912c2275b523e47'))
return deps
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 14dfbee8a..ba9a01b0e 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -224,14 +224,13 @@ File "%cdist_deps%/lib/liblwext4.dll"
""", file=f)
print("""
-File "%cdist_deps%/bin/avcodec-61.dll"
-File "%cdist_deps%/bin/avfilter-10.dll"
-File "%cdist_deps%/bin/avformat-61.dll"
-File "%cdist_deps%/bin/avutil-59.dll"
-File "%cdist_deps%/bin/avdevice-61.dll"
-File "%cdist_deps%/bin/postproc-58.dll"
-File "%cdist_deps%/bin/swresample-5.dll"
-File "%cdist_deps%/bin/swscale-8.dll"
+File "%cdist_deps%/bin/avcodec-62.dll"
+File "%cdist_deps%/bin/avfilter-11.dll"
+File "%cdist_deps%/bin/avformat-62.dll"
+File "%cdist_deps%/bin/avutil-60.dll"
+File "%cdist_deps%/bin/avdevice-62.dll"
+File "%cdist_deps%/bin/swresample-6.dll"
+File "%cdist_deps%/bin/swscale-9.dll"
File "%cdist_deps%/bin/dcp-1.0.dll"
File "%cdist_deps%/bin/cxml-0.dll"
File "%cdist_deps%/bin/sub-1.0.dll"