summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-10-21 13:59:28 +0100
committerCarl Hetherington <cth@carlh.net>2017-10-21 13:59:28 +0100
commit0ef63a2dccc449c4e165d9aabd10dba6c463e660 (patch)
tree5e48b80e9481798a7f2cfebc3ee66c9fdde4117f
parent91d453e6ea4c959ab11f68184172929ef863d158 (diff)
Remove some old deps; add 17.10.
-rw-r--r--cscript22
-rwxr-xr-xrun/dcpomatic2
2 files changed, 11 insertions, 13 deletions
diff --git a/cscript b/cscript
index 519e0d806..2ba67f157 100644
--- a/cscript
+++ b/cscript
@@ -28,16 +28,14 @@ deb_build_depends = dict()
deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
-deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['12.04'].extend(['libssh-dev'])
deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['14.04'].extend(['libssh-dev'])
deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['16.04'].extend(['libssh-dev'])
-deb_build_depends['16.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['16.10'].extend(['libssh-dev'])
deb_build_depends['17.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['17.04'].extend(['libssh-dev'])
+deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['17.10'].extend(['libssh-dev'])
deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['7'].extend(['libssh-dev'])
deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
@@ -81,13 +79,13 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
'libssh-4',
'libx264-148'])
-deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
- 'libboost-thread1.61.0',
- 'libboost-regex1.61.0',
- 'libmagick++-6.q16-5v5',
+deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
+ 'libboost-thread1.62.0',
+ 'libboost-regex1.62.0',
+ 'libmagick++-6.q16-7',
'libxml++2.6-2v5',
- 'libboost-date-time1.61.0',
+ 'libboost-date-time1.62.0',
'libzip4',
'libwxgtk3.0-0v5',
'libicu57',
@@ -95,8 +93,8 @@ deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
'libssh-4',
'libx264-148'])
-deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
+deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libmagick++-6.q16-7',
diff --git a/run/dcpomatic b/run/dcpomatic
index 9c5fc5438..7de6f0291 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -21,5 +21,5 @@ elif [ "$1" == "--perf" ]; then
shift
perf record build/src/tools/dcpomatic2 $*
else
- build/src/tools/dcpomatic2 $*
+ ldd build/src/tools/dcpomatic2 $*
fi