summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-09-30 00:12:20 +0200
committerCarl Hetherington <cth@carlh.net>2025-11-30 00:42:40 +0100
commitf5a1704e7e969d7605f8917d1a6edca0864870e3 (patch)
treecd5723de61f415dce2afafcd66158408222580e3
parente30a2d522f0a5e29ed13254e8cac0c0b3e91cedc (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 757663691..cafcded1d 100644
--- a/cscript
+++ b/cscript
@@ -502,7 +502,7 @@ def build_with_cpp17(target):
def dependencies(target, options):
- deps = [('libdcp', 'v1.10.41', {'c++17': build_with_cpp17(target)})]
+ deps = [('libdcp', 'cbccdb4b600de0aa323b0a80b84c17f94ca0a45a', {'c++17': build_with_cpp17(target)})]
deps.append(('libsub', 'v1.6.58'))
deps.append(('leqm-nrt', 'd75d0af984d9c14bfefca8f1bdbc215c3bf3a388'))
if target.platform != 'linux' or target.distro != 'arch':
@@ -515,7 +515,7 @@ def dependencies(target, options):
if can_build_disk(target):
deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
if build_tests(target):
- deps.append(('ffcmp', '3fe689acaa71e6a355eb03d59f76d4c3dbf1d5b9'))
+ deps.append(('ffcmp', '11d2e6cafce8c041f034b99d2912c2275b523e47'))
return deps
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 5495eb765..83b4380da 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"