Fix openjpeg install names.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 4ce7bea108d3c1152db74b14a4bbd2bfc7529782..f2aecaa9a9f6dd345f1547f2fa964a02cf23b40b 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -96,7 +96,7 @@ universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libsub "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libsub "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"

-universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
+universal_copy_lib $ROOT libopenjp2 "$WORK/$libs"

 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
 universal_copy_lib $ROOT libavfilter "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
 universal_copy_lib $ROOT libavfilter "$WORK/$libs"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index cb0a642651250b6090ebc68b67c6fa04863ed917..b056c9ef68e9528f13b32a37f924c2852750de88 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -134,7 +134,7 @@ File "%cdist_deps%/bin/avdevice-56.dll"
 File "%cdist_deps%/bin/postproc-53.dll"
 File "%cdist_deps%/bin/swresample-1.dll"
 File "%cdist_deps%/bin/dcp-1.0.dll"
 File "%cdist_deps%/bin/postproc-53.dll"
 File "%cdist_deps%/bin/swresample-1.dll"
 File "%cdist_deps%/bin/dcp-1.0.dll"

-File "%cdist_deps%/bin/libopenjpeg-1.dll"
+File "%cdist_deps%/bin/libopenjp2.dll"

 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"
 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"