Add libsamplerate dll instead of libsoxr.

diff --git a/cscript b/cscript
index 049c0a842c8d0dd9e2be501fe19dd98f48c29aa7..2386015c0dced7c826ea0ac92207f41d1da4ddc2 100644 (file)
--- a/cscript
+++ b/cscript
@@ -44,7 +44,8 @@ deb_depends['12.04'] = {'libc6': '2.15',
                         'libxmlsec1-openssl': '1.2.14-1.2build1',
                         'libboost-date-time1.48.0': '1.48.0-3',
                         'libcurl3': '7.22.0-3ubuntu4',
-                        'libzip2': '0.10-1ubuntu1'}
+                        'libzip2': '0.10-1ubuntu1',
+                        'libsamplerate0': '0.1.8-4'}
 
 deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libssh-4': '0.6.1-0ubuntu3',
@@ -60,7 +61,7 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
                         'libcurl3': '7.35.0-1ubuntu2',
                         'libzip2': '0.10.1-1.2',
-                        'libsoxr0': '0.1.1-1'}
+                        'libsamplerate0': '0.1.8-7'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
@@ -77,7 +78,7 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libcurl3': '7.38.0-3ubuntu2',
                         'libzip2': '0.11.2-1.2',
                         'libwxgtk3.0-0': '3.0.2-1',
-                        'libsoxr0': '0.1.1-1'}
+                        'libsamplerate0': '0.1.8-8'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -94,7 +95,8 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libcurl3': '7.26.0',
                     'libzip2': '0.10.1',
                     'libcairomm-1.0-1': '1.10.0-1',
-                    'libpangomm-1.4-1': '2.28.4-1'}
+                    'libpangomm-1.4-1': '2.28.4-1',
+                    'libsamplerate0': '0.1.8-5'}
 
 deb_depends['8'] = {'libc6': '2.19-18',
                     'libssh-4': '0.6.3-4',
@@ -113,7 +115,7 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libwxgtk3.0-0': '3.0.2',
                     'libxcb-xfixes0': '1.10',
                     'libxcb-shape0': '1.10',
-                    'libsoxr0': '0.1.1-1'}
+                    'libsamplerate0': '0.1.8-8'}
 
 deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -129,8 +131,7 @@ deb_depends['unstable'] = {'libc6': '2.13',
                     'libxmlsec1-openssl': '1.2.18',
                     'libcurl3': '7.26.0',
                     'libzip2': '0.10.1',
-                    'libsoxr0': '0.1.1-1'}
-
+                    'libsamplerate0': '0.1.8-8'}
 
 def packages(name, packages, f):
     s = '%s: ' % name

diff --git a/platform/windows/wscript b/platform/windows/wscript
index b309dab544b81f09ca1982e719c7795ceed3f2f1..b76dd5553ae48605594e690937a5e2a11cfb66b5 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -119,7 +119,7 @@ File "%static_deps%/bin/libzip-2.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/pango-querymodules.exe"
-File "%static_deps%/bin/libsoxr.dll"
+File "%static_deps%/bin/libsamplerate-0.dll"
 
 File "%cdist_deps%/bin/asdcp-libdcp-1.0.dll"
 File "%cdist_deps%/bin/kumu-libdcp-1.0.dll"