diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:32:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:32:36 +0000 |
| commit | 4579bd65a4ce8f50c5facc441542dac8c71c1f87 (patch) | |
| tree | 1c37c973babfb28db0f511994c6d27f01900ac89 | |
| parent | 9d7bfc875d8855ce3c5dbcefbd68e4c0b3535101 (diff) | |
| parent | 5177f060bd19951342359b9e0df8017678bea842 (diff) | |
Merge.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/lib/encoder.cc | 1 | ||||
| -rw-r--r-- | src/wx/wscript | 5 | ||||
| -rw-r--r-- | wscript | 2 |
5 files changed, 23 insertions, 5 deletions
@@ -2,6 +2,14 @@ * Allow still-image DCPs to have external audio added to them (#13). +2012-12-19 Carl Hetherington <cth@carlh.net> + + * Version 0.68beta2 released. + +2012-12-19 Carl Hetherington <cth@carlh.net> + + * Version 0.68beta1 released. + 2012-12-18 Carl Hetherington <cth@carlh.net> * Alter film viewer so that it is much quicker, responds instantly diff --git a/debian/changelog b/debian/changelog index 83439be72..d03978d7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +dvdomatic (0.68beta2-1) unstable; urgency=low + + * New upstream release. + + -- Carl Hetherington <carl@houllier.lan> Wed, 19 Dec 2012 11:22:58 +0000 + +dvdomatic (0.68beta1-1) unstable; urgency=low + + * New upstream release. + + -- Carl Hetherington <carl@houllier.lan> Wed, 19 Dec 2012 10:11:13 +0000 + dvdomatic (0.67-1) unstable; urgency=low * New upstream release. diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 7a475a859..16bf62408 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -21,6 +21,7 @@ * @brief Parent class for classes which can encode video and audio frames. */ +#include <iostream> #include <boost/filesystem.hpp> #include <boost/lexical_cast.hpp> #include "encoder.h" diff --git a/src/wx/wscript b/src/wx/wscript index b4a6092a6..4dbb04eea 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,8 +1,5 @@ def configure(conf): - if bld.env.TARGET_WINDOWS: - conf.check_cfg(package = '', atleast_version = '2.9.4', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True) - else: - conf.check_cfg(package = '', atleast_version = '2.8.12', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True) + conf.check_cfg(package = '', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True) def build(bld): if bld.env.STATIC: @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.68pre' +VERSION = '0.68beta2' def options(opt): opt.load('compiler_cxx') |