Bump libdcp for asdcplib Debian unstable build fix.

diff --git a/cscript b/cscript
index 86ecd8abcd0c4ff2350bc96cc092d44492cf1359..27fcd3be6333c6cb703f6f8afcfa8704dacfe8e3 100644 (file)
--- a/cscript
+++ b/cscript
@@ -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 24717398f569243c4800f36013e31ccdb41575ea..66f2d4aca48b3f45984acf41c2ddf40882ff94dc 100644 (file)
--- 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;

diff --git a/wscript b/wscript
index 02825572e9da9aba79e52052c0571eaf34575ded..c55395c269cdc04629c3fec78f4046a1379a7133 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)