Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

6 files changed, 26 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a14ccd3d..83bd20986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-01  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.106beta1 released.
+
 2013-06-28  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.105 released.
diff --git a/debian/changelog b/debian/changelog
index 7ccc2bf84..4ea303219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.106beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Mon, 01 Jul 2013 16:18:29 +0100
+
 dvdomatic (0.105-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 217673a7f..1d4d050bc 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -695,7 +695,7 @@ Film::read_metadata ()
 		
 	_dirty = false;
 
-	_log->log (String::compose ("Loaded film with use_content_audio = %1", use_content_audio ()));
+	_log->log (String::compose ("Loaded film with use_content_audio = %1", _use_content_audio));
 }
 
 libdcp::Size
diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
index 1ec9e2a5b..99f04793f 100644
--- a/src/lib/trimmer.cc
+++ b/src/lib/trimmer.cc
@@ -62,8 +62,15 @@ Trimmer::Trimmer (
 	   the current set of regression tests).  This could be
 	   removed if a) the regression tests are regenerated and b) I
 	   can work out what DCP length should be.
+
+	   There is also a problem whereby black video frames inserted
+	   at the start of the output by the matcher are not taken into account,
+	   so if black frames are inserted it means more gets trimmed off the
+	   end than should be.  Hack around this in similar fashion with the
+	   _video_end = INT_MAX line.
 	*/
 	if (video_trim_end == 0) {
+		_video_end = INT_MAX;
 		_audio_end = INT64_MAX;
 	}
 }
diff --git a/src/tools/wscript b/src/tools/wscript
index 386aa452e..20a92cad2 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -16,6 +16,8 @@ def build(bld):
         for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']:
             obj = bld(features = 'cxx cxxprogram')
             obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
+            if bld.env.STATIC:
+                obj.uselib += ' GTK'
             obj.includes = ['..']
             obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
             obj.source = '%s.cc' % t
diff --git a/wscript b/wscript
index e8f6240d3..93db7d3ee 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.106pre'
+VERSION = '0.106beta1'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -112,8 +112,11 @@ def configure(conf):
 
     if conf.env.TARGET_LINUX:
         conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
-        # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
-        conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
+        if conf.env.STATIC:
+            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+        else:
+            # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
+            conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
 
     conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)