diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-09 15:29:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-09 15:29:48 +0000 |
| commit | 1427603608bd89846e363d478547a535eef75943 (patch) | |
| tree | 2810e4f509a1c62793d4267ed6cd6979d4151bc9 | |
| parent | bd049d028cac4c57ccfbb84f35565cf1579eadab (diff) | |
Bump libdcp for asdcplib Debian unstable build fix.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/render_subtitles.cc | 4 | ||||
| -rw-r--r-- | wscript | 24 |
3 files changed, 27 insertions, 3 deletions
@@ -245,7 +245,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '859c062'), + ('libdcp', '6106b2d'), ('libsub', 'v1.2.3')) def configure_options(target): diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc index 24717398f..66f2d4aca 100644 --- a/src/lib/render_subtitles.cc +++ b/src/lib/render_subtitles.cc @@ -281,7 +281,11 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp: context->set_line_width (0); context->move_to (x_offset, y_offset); +#ifdef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT layout->show_in_cairo_context (context); +#else + pango_cairo_show_layout (context->cobj(), layout->gobj()); +#endif int layout_width; int layout_height; @@ -237,19 +237,39 @@ def configure(conf): # cairomm conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) - # See if we have Cairo::ImageSurface::format_stride_for_width + # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not conf.check_cxx(fragment=""" #include <cairomm/cairomm.h> int main(void) { - Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB, 1024);\n + Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n return 0; }\n """, mandatory=False, + cxxflags='-std=c++11', msg='Checking for format_stride_for_width', okmsg='yes', includes=conf.env['INCLUDES_CAIROMM'], + uselib='CAIROMM', define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH') + # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not + conf.check_cxx(fragment=""" + #include <pangomm.h> + int main(void) { + Cairo::RefPtr<Cairo::Context> context; + Glib::RefPtr<Pango::Layout> layout; + layout->show_in_cairo_context (context); + return 0; }\n + """, + mandatory=False, + msg='Checking for show_in_cairo_context', + cxxflags='-std=c++11', + okmsg='yes', + includes=conf.env['INCLUDES_PANGOMM'], + uselib='PANGOMM', + define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT') + + # libcxml if conf.options.static_cxml: conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True) |