X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=wscript;h=2d7116c7af8e18ea0a4e06ffad1809301e3d138a;hb=aa5848e40d002c412832cfeb484617047b131007;hp=2970e8fc555d53dc15edb941a8bc8baad8701677;hpb=74efa45d8cad7e4cf85c85520d093f5d072d7f04;p=dcpomatic.git

diff --git a/wscript b/wscript
index 2970e8fc5..2d7116c7a 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.5devel'
+VERSION = '2.4.1devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -173,7 +173,7 @@ def configure(conf):
                        msg='Checking for libicu',
                        okmsg='yes',
                        libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'],
-                       lib=['icuio', 'icui18n', 'icudata'],
+                       lib=['icuio', 'icui18n', 'icudata', 'icuuc'],
                        uselib_store='ICU')
 
     # libsndfile
@@ -279,7 +279,7 @@ def configure(conf):
 
     # FFmpeg
     if conf.options.static_ffmpeg:
-        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'swresample', 'postproc']
+        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
         for name in names:
             static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
             libs = []
@@ -307,7 +307,6 @@ def configure(conf):
         conf.check_cfg(package='libavcodec', args='--cflags --libs', uselib_store='AVCODEC', mandatory=True)
         conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True)
         conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True)
-        conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True)
         conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True)
 
     # Boost