Merge master.

diff --git a/ChangeLog b/ChangeLog
index 0a1f804b93789b8ac1ad807443f0ba0f33ea22d1..d25196832ee9985848b7f841895e5398dfd4f16d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,14 @@
 
        * Add subtitle view.
 
+2014-08-04  Carl Hetherington  <cth@carlh.net>
+
+       * Add BCC option for KDM emails.
+
+2014-07-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.5 released.
+
 2014-07-17  Carl Hetherington  <cth@carlh.net>
 
        * Fix corrupted text in job descriptions in some cases.

diff --git a/cscript b/cscript
index bdf7dffa44d4eb1ee2578c0a07f6125fc7c59094..86dab4306d15d233fa01c8b934f397c657573add 100644 (file)
--- a/cscript
+++ b/cscript
@@ -217,29 +217,26 @@ def package_debian(target, cpu, version):
     return debs
 
 def package_centos(target, cpu, version):
-    os.makedirs('%s/rpmbuild/BUILD' % target.directory)
-    os.makedirs('%s/rpmbuild/RPMS' % target.directory)
-    os.makedirs('%s/rpmbuild/SOURCES' % target.directory)
-    os.makedirs('%s/rpmbuild/SPECS' % target.directory)
-    os.makedirs('%s/rpmbuild/SRPMS' % target.directory)
-
-    f = open('%s/.rpmmacros' % target.dir_in_chroot, 'w')
-    print >>f,"%%_topdir %srpmbuild" % target.dir_in_chroot
-    f.close()
+    topdir = os.path.realpath('build/rpmbuild')
+    os.makedirs('%s/BUILD' % topdir)
+    os.makedirs('%s/RPMS' % topdir)
+    os.makedirs('%s/SOURCES' % topdir)
+    os.makedirs('%s/SPECS' % topdir)
+    os.makedirs('%s/SRPMS' % topdir)
 
     target.command('./waf dist')
     shutil.copyfile(
         "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version),
-        "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.directory, version)
+        "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
-    target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec')
+    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic.spec' % topdir)
     rpms = []
 
     if cpu == "amd64":
         cpu = "x86_64"
 
-    for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.directory, cpu)):
+    for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
         rpms.append(os.path.abspath(p))
 
     return rpms

diff --git a/debian/changelog b/debian/changelog
index 5bc42201adadffd8ee358fc6410b22fd78944b0f..5527b56e754aab4844803d1eb50acc6c5878cb67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.72.4-1) UNRELEASED; urgency=low
+dcpomatic (1.72.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -169,8 +169,9 @@ dcpomatic (1.72.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@107.191.37.242.vultr.com>  Wed, 16 Jul 2014 16:10:58 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 29 Jul 2014 23:33:50 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index dee7fe052893b1c023eb383063e96609fdcee725..851a7793d9358d63781d7f56fd265f365a75ea5f 100644 (file)
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -1195,7 +1195,7 @@ more modern of the two).
 
 <para>
 Finally, the <guilabel>Scaler</guilabel> is the method that will be used to scale up
-your content to the required size for the DCP, if required.  Bicubic is a fine choice in
+your content for the DCP, if required.  Bicubic is a fine choice in
 most situations.
 </para>
 

diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
index f39c2cbd8dbca8befbd515ac74bd645f56bf6609..da179628c76d0e12125fdc0d10c93d457369d195 100644 (file)
--- a/platform/linux/dcpomatic.spec.in
+++ b/platform/linux/dcpomatic.spec.in
@@ -53,8 +53,8 @@ rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@
 tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2
 %build
 cd dcpomatic-@VERSION@
-export PKG_CONFIG_PATH=/home/carl/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
+export PKG_CONFIG_PATH=@INSTALL_PREFIX@/lib/pkgconfig:/usr/local/lib/pkgconfig
+CXXFLAGS="-I@INSTALL_PREFIX@/include" LDFLAGS="-L@INSTALL_PREFIX@/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
 ./waf
 %install
 cd dcpomatic-@VERSION@

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 1fd4792c3bbf80f6d721a190264f4479b7659793..14539044d2eb53b11f2465ea4e753e75a0ab1f93 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -201,6 +201,7 @@ Config::read ()
        _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME"));
        _kdm_from = f.string_child ("KDMFrom");
        _kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
+       _kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or ("");
        _kdm_email = f.string_child ("KDMEmail");
 
        _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
@@ -341,6 +342,7 @@ Config::write () const
        root->add_child("KDMSubject")->add_child_text (_kdm_subject);
        root->add_child("KDMFrom")->add_child_text (_kdm_from);
        root->add_child("KDMCC")->add_child_text (_kdm_cc);
+       root->add_child("KDMBCC")->add_child_text (_kdm_bcc);
        root->add_child("KDMEmail")->add_child_text (_kdm_email);
 
        root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0");

diff --git a/src/lib/config.h b/src/lib/config.h
index d8ac75beddd48e79fc98b3653d9f75f6c1b15c96..310d3c6f5e2ca4624761c1b22ab44fa95e85ebc6 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -185,6 +185,10 @@ public:
        std::string kdm_cc () const {
                return _kdm_cc;
        }
+
+       std::string kdm_bcc () const {
+               return _kdm_bcc;
+       }
        
        std::string kdm_email () const {
                return _kdm_email;
@@ -363,6 +367,11 @@ public:
                _kdm_cc = f;
                changed ();
        }
+
+       void set_kdm_bcc (std::string f) {
+               _kdm_bcc = f;
+               changed ();
+       }
        
        void set_kdm_email (std::string e) {
                _kdm_email = e;
@@ -461,6 +470,7 @@ private:
        std::string _kdm_subject;
        std::string _kdm_from;
        std::string _kdm_cc;
+       std::string _kdm_bcc;
        std::string _kdm_email;
        boost::shared_ptr<const dcp::Signer> _signer;
        dcp::Certificate _decryption_certificate;

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 0593881bc696498b1ec401ae7d6537a2df300d20..a2ed1be73498dd924752f998fa154e479ae18cb9 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -250,6 +250,9 @@ email_kdms (
                if (!Config::instance()->kdm_cc().empty ()) {
                        quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ());
                }
+               if (!Config::instance()->kdm_bcc().empty ()) {
+                       quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ());
+               }
                
                string body = Config::instance()->kdm_email().c_str();
                boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 9c7857c1e72c1dc6fddb8d6465446b651bc625fd..1d9b038997542374bd34f128921447cee8822671 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -124,6 +124,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Cinema Clarici"));
        supported_by.Add (wxT ("Adam Colt"));
        supported_by.Add (wxT ("Matthias Damm"));
+       supported_by.Add (wxT ("Alexey Derevyanko"));
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
@@ -151,6 +152,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Lasse Salling"));
        supported_by.Add (wxT ("Mike Stiebing"));
        supported_by.Add (wxT ("Randy Stankey"));
+       supported_by.Add (wxT ("Bruce Taylor"));
        supported_by.Add (wxT ("Wolfgang Woehl"));
        supported_by.Add (wxT ("Wolfram Weber"));
        supported_by.Add (wxT ("Frank de Wulf"));

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 8e27dc540856829651788014866674e54a335112..175ed94ade131a754781e69476f9d6d6f4f3a534 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1006,6 +1006,10 @@ public:
                add_label_to_sizer (table, panel, _("CC address"), true);
                _kdm_cc = new wxTextCtrl (panel, wxID_ANY);
                table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+
+               add_label_to_sizer (table, panel, _("BCC address"), true);
+               _kdm_bcc = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
                
                _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
                s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
@@ -1026,6 +1030,8 @@ public:
                _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
                _kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
                _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
+               _kdm_bcc->SetValue (std_to_wx (config->kdm_bcc ()));
+               _kdm_bcc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
                _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
                _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
                _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
@@ -1063,6 +1069,11 @@ private:
        {
                Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ()));
        }
+
+       void kdm_bcc_changed ()
+       {
+               Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
+       }
        
        void kdm_email_changed ()
        {
@@ -1081,6 +1092,7 @@ private:
        wxTextCtrl* _kdm_subject;
        wxTextCtrl* _kdm_from;
        wxTextCtrl* _kdm_cc;
+       wxTextCtrl* _kdm_bcc;
        wxTextCtrl* _kdm_email;
        wxButton* _reset_kdm_email;
 };