From 6fe5c1a9ef940372206e37c960f48781aea56f3d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 May 2013 21:05:12 +0100 Subject: Try to make batch converter install work. --- wscript | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 097474563..331ebce8e 100644 --- a/wscript +++ b/wscript @@ -228,6 +228,11 @@ def build(bld): obj.target = 'dvdomatic.desktop' obj.dict = d + obj = bld(features = 'subst') + obj.source = 'dvdomatic_batch.desktop.in' + obj.target = 'dvdomatic_batch.desktop' + obj.dict = d + bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From a94ed2bd9621fe2cd604b0e3d3a7ad2e4dde937a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 May 2013 21:15:34 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 570ad9b4d..e5b7c8776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-04 Carl Hetherington + + * Version 0.89beta1 released. + 2013-05-04 Carl Hetherington * Very simple batch converter added (#127). diff --git a/debian/changelog b/debian/changelog index 76e64d1c8..a513b1144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.89beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sat, 04 May 2013 21:15:34 +0100 + dvdomatic (0.88-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 331ebce8e..9e143074c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.89pre' +VERSION = '0.89beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3e0ede02878b417b3714c95cdaca9c25344920b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 May 2013 21:24:36 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 0111e9638..04161eef3 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), - ('libdcp', 'v0.45')) + ('libdcp', 'v0.49')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() diff --git a/wscript b/wscript index 9e143074c..aa27fe344 100644 --- a/wscript +++ b/wscript @@ -55,7 +55,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', 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) -- cgit v1.2.3 From 900a4dbd941845c67f5ac4cd271cf9163cf4cbc2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 5 May 2013 13:10:17 +0100 Subject: Missing install file for batch converter. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index aa27fe344..2a3f86fb1 100644 --- a/wscript +++ b/wscript @@ -233,7 +233,7 @@ def build(bld): obj.target = 'dvdomatic_batch.desktop' obj.dict = d - bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop') + bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop', 'dvdomatic_batch.desktop.in') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From 0db03a5d06f72ede633fb7ef32f0a340b2c34fed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 5 May 2013 13:36:33 +0100 Subject: Fix previous. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 2a3f86fb1..68be08909 100644 --- a/wscript +++ b/wscript @@ -233,7 +233,7 @@ def build(bld): obj.target = 'dvdomatic_batch.desktop' obj.dict = d - bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop', 'dvdomatic_batch.desktop.in') + bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop.in']) for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From b0718baa1118bdc297c664734135c5e9964bf450 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 May 2013 00:59:49 +0100 Subject: Another typo. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 68be08909..5c7ba53d2 100644 --- a/wscript +++ b/wscript @@ -233,7 +233,7 @@ def build(bld): obj.target = 'dvdomatic_batch.desktop' obj.dict = d - bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop.in']) + bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop']) for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3 From 42a3da099dc91e3b11746c3c76611fc19a887955 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 May 2013 02:03:25 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index ff10e095f..4e411a750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-06 Carl Hetherington + + * Version 0.89 released. + 2013-05-04 Carl Hetherington * Version 0.89beta1 released. diff --git a/debian/changelog b/debian/changelog index a513b1144..a10ba5d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.89-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 06 May 2013 02:03:25 +0100 + dvdomatic (0.89beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 5c7ba53d2..bcaca02d3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.89beta1' +VERSION = '0.89' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e089ceff103306f269cbac857b128fc641c6ec3c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 May 2013 02:03:25 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index bcaca02d3..51a2ad04d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.89' +VERSION = '0.90pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c22c118458b3eafd0b71cf61f9edb33e9770802e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 May 2013 13:12:15 +0100 Subject: Fix build. --- src/lib/stack.cpp | 10 ++++++++-- src/lib/wscript | 2 +- wscript | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/src/lib/stack.cpp b/src/lib/stack.cpp index b3479b1bb..24668dfe7 100644 --- a/src/lib/stack.cpp +++ b/src/lib/stack.cpp @@ -11,13 +11,15 @@ #include #include -#include "dbg/stack.hpp" +#include "stack.hpp" #if defined(_WIN32) # include # include # if defined(__MINGW32__) +# define PACKAGE 1 +# define PACKAGE_VERSION 1 # include // link against libbfd and libiberty # include // link against psapi # include @@ -192,7 +194,7 @@ namespace public: explicit windows_dll(const std::string &libname) : name_(libname), - lib_(LoadLibrary(name_.c_str())) + lib_(LoadLibraryA(name_.c_str())) { if (!lib_) throw std::runtime_error("Failed to load dll " + name_); } @@ -329,7 +331,11 @@ namespace if (func.empty()) { +#if defined(_WIN64) + DWORD64 dummy = 0; +#else DWORD dummy = 0; +#endif BOOL got_symbol = SymGetSymFromAddr(process, frame.AddrPC.Offset, &dummy, symbol); func = got_symbol ? symbol->Name : unknown_function; } diff --git a/src/lib/wscript b/src/lib/wscript index 129b8d9fb..dcf44a7e8 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -68,7 +68,7 @@ def build(bld): SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA """ if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2' + obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY' obj.source = sources + ' stack.cpp' else: obj.source = sources diff --git a/wscript b/wscript index 51a2ad04d..35a55213e 100644 --- a/wscript +++ b/wscript @@ -32,6 +32,9 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-mconsole']) conf.env.append_value('LINKFLAGS', ['-mconsole']) conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2") + conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd") + conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp") + conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' else: -- cgit v1.2.3 From 8a465e8ebabf1a5da44ad61d2d6d5a03192e8f47 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 May 2013 16:29:58 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 14a5bb581..1c1881989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-17 Carl Hetherington + + * Version 0.90 released. + 2013-05-17 Carl Hetherington * Write backtrace files when Windows diff --git a/debian/changelog b/debian/changelog index a10ba5d92..6a714b253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.90-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 17 May 2013 16:29:58 +0100 + dvdomatic (0.89-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 35a55213e..f3ba128a5 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.90pre' +VERSION = '0.90' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9c147ad53d90987d8ac3953233b6276d002a38b9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 May 2013 16:29:58 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f3ba128a5..43df5d50a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.90' +VERSION = '0.91pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3eabe5d9ffe8c16f732d72ff0ee0a342fb80ce56 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 00:11:52 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 1c1881989..29f6ab938 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-19 Carl Hetherington + + * Version 0.91 released. + 2013-05-17 Carl Hetherington * Version 0.90 released. diff --git a/debian/changelog b/debian/changelog index 6a714b253..82afdef8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.91-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 19 May 2013 00:11:52 +0100 + dvdomatic (0.90-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 43df5d50a..83fef36f7 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.91pre' +VERSION = '0.91' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0b35b9b4e7a0fc50641f0379e2d62fe6ad8cd1fc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 00:11:52 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 83fef36f7..fd838dd1e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.91' +VERSION = '0.92pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6dc92bf6c98a7cb8084f713f941a9b9a60233cd5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 12:35:52 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index f1a8bb76c..e269bf550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-19 Carl Hetherington + + * Version 0.92 released. + 2013-05-19 Carl Hetherington * Version 0.91 released. diff --git a/debian/changelog b/debian/changelog index 82afdef8c..9035ca116 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.92-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 19 May 2013 12:35:52 +0100 + dvdomatic (0.91-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index fd838dd1e..abbf279bd 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.92pre' +VERSION = '0.92' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b650eba5103a5b924774d3db947cb704ea9d1879 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 12:35:52 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index abbf279bd..d730ac84a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.92' +VERSION = '0.93pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9d760338e1d947a2aed5b9d12d65bd4f7513e054 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 May 2013 13:32:29 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 183e4be9c..0dd326ecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-20 Carl Hetherington + + * Version 0.93 released. + 2013-05-20 Carl Hetherington * Fix another crash on still images with diff --git a/debian/changelog b/debian/changelog index 9035ca116..eb6061bdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.93-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 20 May 2013 13:32:29 +0100 + dvdomatic (0.92-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index d730ac84a..b8366481c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.93pre' +VERSION = '0.93' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 47e6b6725168213f2a7db24c2965cfa173f755b4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 May 2013 13:32:29 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b8366481c..0682e2674 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.93' +VERSION = '0.94pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3