Fix merge.

diff --git a/ChangeLog b/ChangeLog
index abf94423bef95c4662024adf64f3a19b21ac4367..2fb4906a142af78434df87a3fbf927e3c70c9b16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-01  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.06 released.
+
 2013-09-19  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.05 released.

diff --git a/cscript b/cscript
index 06b91cba93c85d0e47d9e7091a0a59eb9191dea0..763303f7e2e5fdee0a0b26ad630112f638bed09d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -4,7 +4,7 @@ import os
 
 def dependencies(target):
     return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'),
-            ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265'))
+            ('libdcp', None))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()

diff --git a/debian/changelog b/debian/changelog
index a11f8121b838ada1ea9c75f4dc0773274c82da71..e204ee9b727040f5aa2ef035071112f7b581ed8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.05-1) UNRELEASED; urgency=low
+dcpomatic (1.06-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -9,8 +9,9 @@ dcpomatic (1.05-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 19 Sep 2013 15:18:59 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 01 Oct 2013 16:30:21 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/platform/linux/control-12.04-32 b/platform/linux/control-12.04-32
index 6a02b11088118e17c3f945f52cf20b707283dff4..3a34ac8a9bbdd8242297acf2af7918c207b84894 100644 (file)
--- a/platform/linux/control-12.04-32
+++ b/platform/linux/control-12.04-32
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: i386
-Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libgtk2.0-0 (>= 2.24.10), libxmlsec1 (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1)
+Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libgtk2.0-0 (>= 2.24.10), libxmlsec1 (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1), libcurl3 (>= 7.22.0-3ubuntu4), libzip2 (>= 0.10-1ubuntu1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/platform/linux/control-12.04-64 b/platform/linux/control-12.04-64
index 2140083dd570ccb33236f0e93e2a43c4e5e73eae..157cd00fd8c5d02346be82fbbfd6a2cc85132441 100644 (file)
--- a/platform/linux/control-12.04-64
+++ b/platform/linux/control-12.04-64
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: amd64
-Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libxmlsec1 (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1)
+Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1), libxmlsec1 (>= 1.2.14-1.2build1), libboost-date-time1.46.1 (>= 1.46.1), libcurl3 (>= 7.22.0-3ubuntu4), libzip2 (>= 0.10-1ubuntu1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/platform/linux/control-12.10-32 b/platform/linux/control-12.10-32
index 262657f6b9caeddfa6661eee234d9b972f76380c..3f24eace7b9496b686a404b3ff60fae9105752d8 100644 (file)
--- a/platform/linux/control-12.10-32
+++ b/platform/linux/control-12.10-32
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: i386
-Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0)
+Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.27.0-1ubuntu1), libzip2 (>= 0.10.1-1.1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/platform/linux/control-12.10-64 b/platform/linux/control-12.10-64
index 5c5958d26c9d02522755c8886ae29d0c3d1e7ee8..a00292e461803d81cf11b4cad625725053d03662 100644 (file)
--- a/platform/linux/control-12.10-64
+++ b/platform/linux/control-12.10-64
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: amd64
-Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0)
+Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.27.0-1ubuntu1), libzip2 (>= 0.10.1-1.1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/platform/linux/control-13.04-32 b/platform/linux/control-13.04-32
index 262657f6b9caeddfa6661eee234d9b972f76380c..caa45b073e6cec45789bfe1a977aa4086218a835 100644 (file)
--- a/platform/linux/control-13.04-32
+++ b/platform/linux/control-13.04-32
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: i386
-Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0)
+Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.29.0-1ubuntu3), libzip2 (>= 0.10.1-1.1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/platform/linux/control-13.04-64 b/platform/linux/control-13.04-64
index 5c5958d26c9d02522755c8886ae29d0c3d1e7ee8..84957c00a0ad632abacc9f9241cd3aa823e1fdbd 100644 (file)
--- a/platform/linux/control-13.04-64
+++ b/platform/linux/control-13.04-64
@@ -8,7 +8,7 @@ Homepage: http://dcpomatic.com/
 
 Package: dcpomatic
 Architecture: amd64
-Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0)
+Depends: libc6 (>= 2.15), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.13), libxmlsec1 (>= 1.2.18-2), libboost-date-time1.49.0 (>= 1.49.0), libcurl3 (>= 7.29.0-1ubuntu3), libzip2 (>= 0.10.1-1.1)
 Description: Generator of Digital Cinema Packages (DCPs)
   DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2429cbb3f65998a8aede504674fcc8c19718ffe0..79a7b01f1dd68f4aebf39cb07e5797533926abfa 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -52,7 +52,7 @@ Config* Config::_instance = 0;
 Config::Config ()
        : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
        , _server_port (6192)
-       , _tms_path (N_("."))
+       , _tms_path (".")
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
        , _default_still_length (10)
        , _default_container (Ratio::from_id ("185"))
@@ -151,7 +151,7 @@ Config::read ()
 void
 Config::read_old_metadata ()
 {
-       ifstream f (file(true).c_str ());
+       ifstream f (file(true).string().c_str ());
        string line;
 
        while (getline (f, line)) {

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index caa37c211b896c03918c148b8ee307f644555970..5e8fb5b7a020bdf4be553d8bb65a005e80b5ac8f 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,13 +19,12 @@
 
 #include <fstream>
 #include <cerrno>
+#include <libdcp/mono_picture_asset.h>
+#include <libdcp/stereo_picture_asset.h>
 #include <libdcp/sound_asset.h>
-#include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
 #include <libdcp/dcp.h>
 #include <libdcp/cpl.h>
-#include <libdcp/mono_picture_asset.h>
-#include <libdcp/stereo_picture_asset.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 86886ed9e294e184e45407f4f3f1c258966e1bfb..7646d5ebedeb14587fe42998cd6b92d51d6c0db3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -502,7 +502,7 @@ private:
                                        
                                        boost::filesystem::path zip_file = boost::filesystem::temp_directory_path ();
                                        zip_file /= boost::filesystem::unique_path().string() + ".zip";
-                                       struct zip* zip = zip_open (zip_file.c_str(), ZIP_CREATE | ZIP_EXCL, 0);
+                                       struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, 0);
                                        if (!zip) {
                                                throw FileError ("could not create ZIP file", zip_file);
                                        }
@@ -540,7 +540,7 @@ private:
                                        boost::algorithm::replace_all (body, "$DCP_NAME", film->dcp_name ());
                                        
                                        quickmail_set_body (mail, body.c_str());
-                                       quickmail_add_attachment_file (mail, zip_file.c_str());
+                                       quickmail_add_attachment_file (mail, zip_file.string().c_str());
                                        char const* error = quickmail_send (mail, Config::instance()->mail_server().c_str(), 25, "", "");
                                        if (error) {
                                                quickmail_destroy (mail);

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 1a409fa6cef18fb4168495ab3b58fb55c2ea8109..60a95a9f26ed8c5166849f114ee7cb3c87220ba1 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -27,7 +27,7 @@ using std::cout;
 using boost::shared_ptr;
 
 enum {
-       ID_repeat,
+       ID_repeat = 1,
        ID_remove
 };
 

diff --git a/wscript b/wscript
index 95b0768e8f182d1b3af7901984d8c3b83ff22e3d..cd08261f3474b2198a18c81b13a51867035c5242 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.06pre'
+VERSION = '1.07pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -86,7 +86,7 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.78', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.81', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
     conf.check_cfg(package='libcxml',       atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
@@ -126,9 +126,9 @@ def configure(conf):
                             int main(void) { quickmail_initialize (); }
                             """,
                        mandatory=True,
-                       msg='Checking for quickmail',
+                       msg='Checking for libquickmail',
                        libpath='/usr/local/lib',
-                       lib='quickmail',
+                       lib=['quickmail', 'curl'],
                        uselib_store='QUICKMAIL')
 
     # Dependencies which are always dynamically linked
@@ -137,15 +137,7 @@ def configure(conf):
     conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
     conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True)
     conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
-
-    conf.check_cxx(fragment="""
-                            #include <zip.h>
-                            int main(void) { zip_open ("foo", 0, 0); }
-                            """,
-                   mandatory=True,
-                   msg='Checking for libzip',
-                   lib='zip',
-                   uselib_store='ZIP')
+    conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n