From 961423c88b89bd845bee157797114cdb5ce86a9e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 09:23:43 +0000 Subject: Try to make sure that .deb builds know that they have libswresample available. --- wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index ad46d8188..fd35f051e 100644 --- a/wscript +++ b/wscript @@ -61,7 +61,7 @@ def configure(conf): conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) else: # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things - # statically and some dynamically, or things get horribly confused the dynamic linker (I think) + # statically and some dynamically, or things get horribly confused and the dynamic linker (I think) # crashes horribly. These calls do what the check_cfg calls would have done, but specify the # different bits as static or dynamic as required. It'll break if you look at it funny, but # I think anyone else who builds would do so dynamically. @@ -84,6 +84,10 @@ def configure(conf): conf.env.HAVE_POSTPROC = 1 conf.env.STLIB_POSTPROC = ['postproc'] + # This doesn't seem to be set up, and we need it otherwise resampling support + # won't be included. Hack upon a hack, obviously + conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1']) + 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) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) -- cgit v1.2.3 From c09dba22fd923df38a517cf8eb00658af16e1fec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 09:25:02 +0000 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 6524aa3ed..36b304768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-12-18 Carl Hetherington + + * Version 0.65 released. + 2012-12-13 Carl Hetherington * Version 0.64 released. diff --git a/debian/changelog b/debian/changelog index f517e8bc4..1c7cd8842 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.65-1) unstable; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 18 Dec 2012 09:24:56 +0000 + dvdomatic (0.64-1) unstable; urgency=low * New upstream release. diff --git a/wscript b/wscript index fd35f051e..80c5f50b1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.65pre' +VERSION = '0.65' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b1b551d63592854810318d3202cb3d024dd93dba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 09:25:03 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 80c5f50b1..86025002e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.65' +VERSION = '0.66pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8f1af8cbd46fb0e03908f3348de688465b91f24e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 11:29:08 +0000 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 36b304768..1b53dd8ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-12-18 Carl Hetherington + + * Version 0.66 released. + 2012-12-18 Carl Hetherington * Version 0.65 released. diff --git a/debian/changelog b/debian/changelog index 1c7cd8842..07727f86c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.66-1) unstable; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 18 Dec 2012 11:29:04 +0000 + dvdomatic (0.65-1) unstable; urgency=low * New upstream release. diff --git a/wscript b/wscript index 86025002e..b13aa59e4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.66pre' +VERSION = '0.66' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 174d9a2d2b1ca5a9c2c0f39c6b0ebad6e24d6216 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 11:29:13 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b13aa59e4..769560937 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.66' +VERSION = '0.67pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From dc948db769b60fd4ccb2f2fde497832f15ff62b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 23:49:54 +0000 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 8f21ff999..25f30294a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-12-18 Carl Hetherington + + * Version 0.67 released. + 2012-12-18 Carl Hetherington * Support non-planar float and signed diff --git a/debian/changelog b/debian/changelog index 07727f86c..83439be72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.67-1) unstable; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 18 Dec 2012 23:49:27 +0000 + dvdomatic (0.66-1) unstable; urgency=low * New upstream release. diff --git a/wscript b/wscript index 769560937..a74bb50d4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.67pre' +VERSION = '0.67' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6b5a3e9543ccf6fd209877b44e43aaf3604ac693 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 23:49:56 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index a74bb50d4..aa27717ad 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.67' +VERSION = '0.68pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3