From 57b16d8536cd6bdc9c07e534f6bd1fa9b22596e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 10:41:57 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index df2178711..1f8ac0f3e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.96pre' +VERSION = '0.96' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 599233fc9ce3014de2cb522b28a536147fc331dd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 10:41:57 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 1f8ac0f3e..a972daa02 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.96' +VERSION = '0.97pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a6ec1ef3c10f9aab5c983f8d362f6af4a87f35f3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 16:26:38 +0100 Subject: Don't link to lzma on OS X. --- wscript | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index a972daa02..28a8d91fe 100644 --- a/wscript +++ b/wscript @@ -22,6 +22,13 @@ def configure(conf): if conf.options.target_windows: conf.load('winres') + conf.env.TARGET_WINDOWS = conf.options.target_windows + conf.env.DISABLE_GUI = conf.options.disable_gui + conf.env.STATIC = conf.options.static + conf.env.VERSION = VERSION + conf.env.TARGET_OSX = conf.options.osx + conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) @@ -45,16 +52,11 @@ def configure(conf): boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') + + if conf.env.TARGET_LINUX: # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file conf.env.append_value('LIB', 'lzma') - conf.env.TARGET_WINDOWS = conf.options.target_windows - conf.env.DISABLE_GUI = conf.options.disable_gui - conf.env.STATIC = conf.options.static - conf.env.VERSION = VERSION - conf.env.TARGET_OSX = conf.options.osx - conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx - if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) else: -- cgit v1.2.3 From 074180361c006aa68b8c7b0f5981ff363910c881 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 16:28:13 +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 6ef2e52f4..b5a62111c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-07 Carl Hetherington + + * Version 0.97 released. + 2013-06-07 Carl Hetherington * Version 0.96 released. diff --git a/debian/changelog b/debian/changelog index 1f8006b7f..2d7075050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.97-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 07 Jun 2013 16:28:13 +0100 + dvdomatic (0.96-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 28a8d91fe..e501b4418 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.97pre' +VERSION = '0.97' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From bdedd6f68e5a4fbcfabfaf27f83c003b39084e99 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 16:28:13 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index e501b4418..a2183f3b6 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.97' +VERSION = '0.98pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5200435ea61574df5f23cbb53cbefa2dd09742b7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Jun 2013 20:23:54 +0100 Subject: Auto-detect OS X during configure. Try again to fix lzma dep. --- cscript | 2 -- wscript | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 1f43f8936..4ba4eadb9 100644 --- a/cscript +++ b/cscript @@ -14,8 +14,6 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - elif target.platform == 'osx': - cmd += ' --osx' elif target.platform == 'linux': cmd += ' --static' env.command(cmd) diff --git a/wscript b/wscript index a2183f3b6..149ac109c 100644 --- a/wscript +++ b/wscript @@ -15,7 +15,6 @@ def options(opt): opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') - opt.add_option('--osx', action='store_true', default=False, help='build on OS X') def configure(conf): conf.load('compiler_cxx') @@ -26,13 +25,13 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION - conf.env.TARGET_OSX = conf.options.osx - conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx + conf.env.TARGET_OSX = sys.platform == 'darwin' + conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) - if conf.options.target_windows: + if conf.env.TARGET_WINDOWS: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) @@ -53,8 +52,9 @@ def configure(conf): boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') - if conf.env.TARGET_LINUX: - # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file + if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: + # libxml2 seems to be linked against this on Ubuntu and with my build of libxml2 on + # OS X, but it doesn't mention it in its .pc file conf.env.append_value('LIB', 'lzma') if conf.options.enable_debug: @@ -102,8 +102,10 @@ def configure(conf): conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) - if conf.options.target_windows is False: - conf.check_cfg(package = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True) + + if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: + conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) + conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) if conf.options.static: -- cgit v1.2.3 From 4ab7eda8c34a3df06ed2d209fc51150e71ab3d67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Jun 2013 20:39:23 +0100 Subject: Another try with lzma; don't link it on OS X --- wscript | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 149ac109c..054ceafe6 100644 --- a/wscript +++ b/wscript @@ -52,9 +52,8 @@ def configure(conf): boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') - if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: - # libxml2 seems to be linked against this on Ubuntu and with my build of libxml2 on - # OS X, but it doesn't mention it in its .pc file + if conf.env.TARGET_LINUX: + # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file conf.env.append_value('LIB', 'lzma') if conf.options.enable_debug: @@ -103,7 +102,7 @@ def configure(conf): conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) - if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: + if conf.env.TARGET_LINUX: conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) -- cgit v1.2.3 From 8a74ac7a924a69479d336f46fdbc2a6c80169244 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Jun 2013 20:54:08 +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 b5a62111c..e8f9273ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-09 Carl Hetherington + + * Version 0.98 released. + 2013-06-07 Carl Hetherington * Version 0.97 released. diff --git a/debian/changelog b/debian/changelog index 2d7075050..1db230a66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.98-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 09 Jun 2013 20:54:08 +0100 + dvdomatic (0.97-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 054ceafe6..aa8cc4254 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.98pre' +VERSION = '0.98' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6db935ce99e1aac8f11afb023941922265670e6b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Jun 2013 20:54:08 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index aa8cc4254..beb0080d4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.98' +VERSION = '0.99pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a991c734ebfedb5456cec827d5eaf2583fdbb9a1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Jun 2013 12:06:04 +0100 Subject: Detect CPU info on OS X. --- src/lib/cross.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ src/lib/cross.h | 3 +++ src/lib/film.cc | 1 + src/lib/util.cc | 26 -------------------------- src/lib/util.h | 1 - src/tools/dvdomatic.cc | 2 +- src/tools/dvdomatic_batch.cc | 2 +- wscript | 4 ++++ 8 files changed, 53 insertions(+), 29 deletions(-) (limited to 'wscript') diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 2c66ab53a..1f1be907f 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -24,6 +24,12 @@ #ifdef DVDOMATIC_WINDOWS #include "windows.h" #endif +#ifdef DVDOMATIC_OSX +#include +#endif + +using std::pair; +using std::string; void dvdomatic_sleep (int s) @@ -35,3 +41,40 @@ dvdomatic_sleep (int s) Sleep (s * 1000); #endif } + +/** @return A pair containing CPU model name and the number of processors */ +pair +cpu_info () +{ + pair info; + info.second = 0; + +#ifdef DVDOMATIC_LINUX + ifstream f (N_("/proc/cpuinfo")); + while (f.good ()) { + string l; + getline (f, l); + if (boost::algorithm::starts_with (l, N_("model name"))) { + string::size_type const c = l.find (':'); + if (c != string::npos) { + info.first = l.substr (c + 2); + } + } else if (boost::algorithm::starts_with (l, N_("processor"))) { + ++info.second; + } + } +#endif + +#ifdef DVDOMATIC_OSX + size_t N = sizeof (info.second); + sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0); + char buffer[64]; + N = sizeof (buffer); + if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) { + info.first = buffer; + } +#endif + + return info; +} + diff --git a/src/lib/cross.h b/src/lib/cross.h index 110660b16..970bf3e9d 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -17,8 +17,11 @@ */ +#include + #ifdef DVDOMATIC_WINDOWS #define WEXITSTATUS(w) (w) #endif void dvdomatic_sleep (int); +extern std::pair cpu_info (); diff --git a/src/lib/film.cc b/src/lib/film.cc index 5573ee9d2..8aedd7639 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -52,6 +52,7 @@ #include "audio_decoder.h" #include "sndfile_decoder.h" #include "analyse_audio_job.h" +#include "cross.h" #include "i18n.h" diff --git a/src/lib/util.cc b/src/lib/util.cc index b8b60c6f6..4cf57368a 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -942,32 +942,6 @@ still_image_file (string f) return (ext == N_(".tif") || ext == N_(".tiff") || ext == N_(".jpg") || ext == N_(".jpeg") || ext == N_(".png") || ext == N_(".bmp")); } -/** @return A pair containing CPU model name and the number of processors */ -pair -cpu_info () -{ - pair info; - info.second = 0; - -#ifdef DVDOMATIC_POSIX - ifstream f (N_("/proc/cpuinfo")); - while (f.good ()) { - string l; - getline (f, l); - if (boost::algorithm::starts_with (l, N_("model name"))) { - string::size_type const c = l.find (':'); - if (c != string::npos) { - info.first = l.substr (c + 2); - } - } else if (boost::algorithm::starts_with (l, N_("processor"))) { - ++info.second; - } - } -#endif - - return info; -} - string audio_channel_name (int c) { diff --git a/src/lib/util.h b/src/lib/util.h index 3e1d7f4b4..0d745e50c 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -299,7 +299,6 @@ private: extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second); extern bool still_image_file (std::string); -extern std::pair cpu_info (); class LocaleGuard { diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 71207c4ae..de94d0a2f 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -457,7 +457,7 @@ class App : public wxApp return false; } -#ifdef DVDOMATIC_POSIX +#ifdef DVDOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif diff --git a/src/tools/dvdomatic_batch.cc b/src/tools/dvdomatic_batch.cc index 7a3d38d9c..d9ddb9d46 100644 --- a/src/tools/dvdomatic_batch.cc +++ b/src/tools/dvdomatic_batch.cc @@ -197,7 +197,7 @@ class App : public wxApp return false; } -#ifdef DVDOMATIC_POSIX +#ifdef DVDOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif diff --git a/wscript b/wscript index beb0080d4..542c9b640 100644 --- a/wscript +++ b/wscript @@ -55,6 +55,10 @@ def configure(conf): if conf.env.TARGET_LINUX: # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file conf.env.append_value('LIB', 'lzma') + conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_LINUX') + + if conf.env.TARGET_OSX: + conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_OSX') if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) -- cgit v1.2.3 From 40dd9c632ade1510a5db2926de8ad0f37c9c238f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:29:35 +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 e8f9273ca..11f48c244 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-13 Carl Hetherington + + * Version 0.99 released. + 2013-06-09 Carl Hetherington * Version 0.98 released. diff --git a/debian/changelog b/debian/changelog index 1db230a66..8f6ee4915 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.99-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 13 Jun 2013 21:29:35 +0100 + dvdomatic (0.98-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 542c9b640..2219f394b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.99pre' +VERSION = '0.99' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5e74d82782ebe6b10cb465ad456064cb88419a0d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:29:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 2219f394b..5bf0f1cde 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.99' +VERSION = '0.100pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3