Update for new libdcp (signals2 instead of sigc).

diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index 2bb0e1ba0c49fa637518042a2caec09fa41eb2d5..bf01119e4995d9bb520adc30348cea9765e5dfdd 100644 (file)
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -90,7 +90,7 @@ MakeDCPJob::run ()
        }
        
        libdcp::DCP dcp (_film->dir (_film->dcp_name()));
-       dcp.Progress.connect (sigc::mem_fun (*this, &MakeDCPJob::dcp_progress));
+       dcp.Progress.connect (boost::bind (&MakeDCPJob::dcp_progress, this, _1));
 
        shared_ptr<libdcp::CPL> cpl (
                new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, rint (_film->frames_per_second()))
@@ -101,7 +101,7 @@ MakeDCPJob::run ()
        descend (0.9);
        shared_ptr<libdcp::MonoPictureAsset> pa (
                new libdcp::MonoPictureAsset (
-                       sigc::mem_fun (*this, &MakeDCPJob::j2c_path),
+                       boost::bind (&MakeDCPJob::j2c_path, this, _1),
                        _film->dir (_film->dcp_name()),
                        "video.mxf",
                        &dcp.Progress,
@@ -120,7 +120,7 @@ MakeDCPJob::run ()
                descend (0.1);
                sa.reset (
                        new libdcp::SoundAsset (
-                               sigc::mem_fun (*this, &MakeDCPJob::wav_path),
+                               boost::bind (&MakeDCPJob::wav_path, this, _1),
                                _film->dir (_film->dcp_name()),
                                "audio.mxf",
                                &dcp.Progress,

diff --git a/src/lib/wscript b/src/lib/wscript
index 4f1fa06364a3d9896576beee0ed5770082deb08d..497af6e5cb303bc099444b9c8357d1bc156dcaa2 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -2,7 +2,7 @@ def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.name = 'libdvdomatic'
     obj.export_includes = ['.']
-    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP GLIB'
+    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB'
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
     obj.source = """

diff --git a/wscript b/wscript
index 56ece35b8b89c7fbb30b7b391188dfff15c97a84..0e4df8efb6116d523bb462f0d3588c795dc4807b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -51,7 +51,6 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O3')
 
-    conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
     conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
     conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
     conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@ -104,6 +103,13 @@ def configure(conf):
                               lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                               uselib_store = 'BOOST_DATETIME')
 
+    conf.check_cxx(fragment = """
+                             #include <boost/signals2.hpp>\n
+                             int main() { boost::signals2::signal<void (int)> x; }\n
+                             """,
+                              msg = 'Checking for boost signals2 library',
+                              uselib_store = 'BOOST_SIGNALS2')
+
     conf.check_cc(fragment = """
                              #include <glib.h>
                              int main() { g_format_size (1); }