projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91d453e
)
Remove some old deps; add 17.10.
author
Carl Hetherington
<cth@carlh.net>
Sat, 21 Oct 2017 12:59:28 +0000
(13:59 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 21 Oct 2017 12:59:28 +0000
(13:59 +0100)
cscript
patch
|
blob
|
history
run/dcpomatic
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 519e0d8069634d30b6309f2adfb4a8f916dbc6f7..2ba67f157cc6d1b63394de3c98f916f79d958cb0 100644
(file)
--- 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_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['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.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)
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'])
'libssh-4',
'libx264-148'])
-deb_depends['1
6.10
'] = copy.deepcopy(deb_depends_base)
-deb_depends['1
6.10'].extend(['libboost-filesystem1.61
.0',
- 'libboost-thread1.6
1
.0',
- 'libboost-regex1.6
1
.0',
- 'libmagick++-6.q16-
5v5
',
+deb_depends['1
7.04
'] = copy.deepcopy(deb_depends_base)
+deb_depends['1
7.04'].extend(['libboost-filesystem1.62
.0',
+ 'libboost-thread1.6
2
.0',
+ 'libboost-regex1.6
2
.0',
+ 'libmagick++-6.q16-
7
',
'libxml++2.6-2v5',
'libxml++2.6-2v5',
- 'libboost-date-time1.6
1
.0',
+ 'libboost-date-time1.6
2
.0',
'libzip4',
'libwxgtk3.0-0v5',
'libicu57',
'libzip4',
'libwxgtk3.0-0v5',
'libicu57',
@@
-95,8
+93,8
@@
deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
'libssh-4',
'libx264-148'])
'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',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libmagick++-6.q16-7',
diff --git
a/run/dcpomatic
b/run/dcpomatic
index 9c5fc5438e7c8e603b6ca0a6da63acd9ebbc857a..7de6f0291762b2ca84f17e58ab6ddf2f78091ced 100755
(executable)
--- a/
run/dcpomatic
+++ b/
run/dcpomatic
@@
-21,5
+21,5
@@
elif [ "$1" == "--perf" ]; then
shift
perf record build/src/tools/dcpomatic2 $*
else
shift
perf record build/src/tools/dcpomatic2 $*
else
- build/src/tools/dcpomatic2 $*
+
ldd
build/src/tools/dcpomatic2 $*
fi
fi