From 961423c88b89bd845bee157797114cdb5ce86a9e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Dec 2012 09:23:43 +0000 Subject: [PATCH] Try to make sure that .deb builds know that they have libswresample available. --- wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- 2.30.2