projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
746e298
)
Add ubuntu 20.10.
author
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2020 22:22:06 +0000
(
00:22
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2020 22:55:08 +0000
(
00:55
+0200)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index afcad4b3977e9fcf5b9930c0907d98e1af7babbb..6eec02cc03aa49d072c20b44b897adb4ed773bb5 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-33,10
+33,10
@@
deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['16.04'].extend(['libssh-dev'])
deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['18.04'].extend(['libssh-dev'])
deb_build_depends['16.04'].extend(['libssh-dev'])
deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['18.04'].extend(['libssh-dev'])
-deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['19.10'].extend(['libssh-dev'])
deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['20.04'].extend(['libssh-dev'])
deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['20.04'].extend(['libssh-dev'])
+deb_build_depends['20.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['20.10'].extend(['libssh-dev'])
deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
@@
-84,18
+84,18
@@
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
'libxerces-c3.2',
'libnanomsg4'])
'libxerces-c3.2',
'libnanomsg4'])
-deb_depends['
19.10
'] = copy.deepcopy(deb_depends_base)
-deb_depends['
19.10'].extend(['libboost-filesystem1.67
.0',
- 'libboost-thread1.
67
.0',
- 'libboost-regex1.
67
.0',
- 'libboost-date-time1.
67
.0',
+deb_depends['
20.04
'] = copy.deepcopy(deb_depends_base)
+deb_depends['
20.04'].extend(['libboost-filesystem1.71
.0',
+ 'libboost-thread1.
71
.0',
+ 'libboost-regex1.
71
.0',
+ 'libboost-date-time1.
71
.0',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip5',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip5',
- 'libwxgtk3.0-0v5',
- 'libicu6
3
',
- 'libnettle
6
',
+ 'libwxgtk3.0-
gtk3-
0v5',
+ 'libicu6
6
',
+ 'libnettle
7
',
'libssh-4',
'libx264-155',
'libcurl4',
'libssh-4',
'libx264-155',
'libcurl4',
@@
-103,8
+103,8
@@
deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
'libxerces-c3.2',
'libnanomsg5'])
'libxerces-c3.2',
'libnanomsg5'])
-deb_depends['20.
04
'] = copy.deepcopy(deb_depends_base)
-deb_depends['20.
04
'].extend(['libboost-filesystem1.71.0',
+deb_depends['20.
10
'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.
10
'].extend(['libboost-filesystem1.71.0',
'libboost-thread1.71.0',
'libboost-regex1.71.0',
'libboost-date-time1.71.0',
'libboost-thread1.71.0',
'libboost-regex1.71.0',
'libboost-date-time1.71.0',
@@
-197,7
+197,7
@@
def can_build_disk(target):
if target.platform == 'osx':
return True
if target.platform == 'linux':
if target.platform == 'osx':
return True
if target.platform == 'linux':
- if target.distro == 'ubuntu' and target.version in ['18.04', '
19.10', '20.04
']:
+ if target.distro == 'ubuntu' and target.version in ['18.04', '
20.04', '20.10
']:
return True
if target.distro == 'debian' and target.version == '10':
return True
return True
if target.distro == 'debian' and target.version == '10':
return True