projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5cecdd
)
test libdcp
author
Carl Hetherington
<cth@carlh.net>
Tue, 25 Jul 2023 20:49:23 +0000
(22:49 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 26 Jul 2023 21:03:43 +0000
(23:03 +0200)
cscript
patch
|
blob
|
history
src/lib/atmos_content.h
patch
|
blob
|
history
src/wx/video_view.h
patch
|
blob
|
history
test/recover_test.cc
patch
|
blob
|
history
test/ssa_subtitle_test.cc
patch
|
blob
|
history
test/test.cc
patch
|
blob
|
history
test/video_mxf_content_test.cc
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 937cecd3c65033d4edc0e17ad086333dcae574b3..0f5daa30845fb176b265430310cef38cee717186 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-506,7
+506,7
@@
def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '
v1.8.74
'))
+ deps.append(('libdcp', '
9f7980e15f14c0d5f6b59e53b9bf939e62df20c9
'))
deps.append(('libsub', 'v1.6.44'))
deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
deps.append(('rtaudio', 'f619b76'))
deps.append(('libsub', 'v1.6.44'))
deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
deps.append(('rtaudio', 'f619b76'))
diff --git
a/src/lib/atmos_content.h
b/src/lib/atmos_content.h
index cfacb9729255adc033f6d6e95fbc5fde6f450bf8..afa3c75a2770cd160250bb7fca673b718483ad05 100644
(file)
--- a/
src/lib/atmos_content.h
+++ b/
src/lib/atmos_content.h
@@
-21,6
+21,7
@@
#include "content_part.h"
#include "types.h"
#include "content_part.h"
#include "types.h"
+#include <dcp/types.h>
class Content;
class Content;
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index b815afb7cc9da251283f21c3170fac3b0d53f1fc..387cca9f6a0a86dda8804fe3e2ad4c92e6d6baf5 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-29,6
+29,7
@@
#include "lib/timer.h"
#include "lib/types.h"
#include <dcp/warnings.h>
#include "lib/timer.h"
#include "lib/types.h"
#include <dcp/warnings.h>
+#include <dcp/types.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
LIBDCP_ENABLE_WARNINGS
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
LIBDCP_ENABLE_WARNINGS
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 9508adca7ef24ef728b5e0b2d98ae01f7d11ed84..5c7ac4f9c0a94ab4d68f9845a3e309b4157456c3 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-32,6
+32,7
@@
#include "lib/ffmpeg_content.h"
#include "lib/video_content.h"
#include "lib/ratio.h"
#include "lib/ffmpeg_content.h"
#include "lib/video_content.h"
#include "lib/ratio.h"
+#include <dcp/equality_options.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <boost/test/unit_test.hpp>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <boost/test/unit_test.hpp>
diff --git
a/test/ssa_subtitle_test.cc
b/test/ssa_subtitle_test.cc
index 8132ba3a0db3aab1283030eaac3c9b3b4034ca2d..2d8102a071c16559b92666864036650ca1ffde34 100644
(file)
--- a/
test/ssa_subtitle_test.cc
+++ b/
test/ssa_subtitle_test.cc
@@
-32,6
+32,7
@@
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "test.h"
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "test.h"
+#include <dcp/equality_options.h>
#include <dcp/interop_subtitle_asset.h>
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
#include <dcp/interop_subtitle_asset.h>
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
diff --git
a/test/test.cc
b/test/test.cc
index ce98bf3a9509be27faca85635d678c61d10554d6..bd23f7522d0c8072b273972df108901e2ee83d4a 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-45,6
+45,7
@@
#include "test.h"
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include "test.h"
#include <dcp/cpl.h>
#include <dcp/dcp.h>
+#include <dcp/equality_options.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/mono_picture_frame.h>
#include <dcp/openjpeg_image.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/mono_picture_frame.h>
#include <dcp/openjpeg_image.h>
diff --git
a/test/video_mxf_content_test.cc
b/test/video_mxf_content_test.cc
index 3ecc2775e23ae97fe60c0ec41fe194baab9eab72..f3766e4afcbe6e731023ee5c669c6a23726b775c 100644
(file)
--- a/
test/video_mxf_content_test.cc
+++ b/
test/video_mxf_content_test.cc
@@
-32,6
+32,7
@@
#include "lib/ratio.h"
#include "lib/video_mxf_content.h"
#include "test.h"
#include "lib/ratio.h"
#include "lib/video_mxf_content.h"
#include "test.h"
+#include <dcp/equality_options.h>
#include <dcp/mono_picture_asset.h>
#include <boost/test/unit_test.hpp>
#include <dcp/mono_picture_asset.h>
#include <boost/test/unit_test.hpp>