Ubuntu 19.10 also has libnanomsg5.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index c857108775c410431f26368b6f3189384cdaae93..91e24c44949280af2955807a001149b45b5b6c03 100644 (file)
--- a/cscript
+++ b/cscript
@@ -103,7 +103,7 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
-                             'libnanomsg4'])
+                             'libnanomsg5'])
 
 deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
@@ -122,7 +122,7 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
-                             'libnanomsg4'])
+                             'libnanomsg5'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -209,7 +209,7 @@ def can_build_disk(target):
     # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
     # library.  For now, just whitelist good ones here.
     #
-    # - Lots of Linux distros don't have a new enough boost (1.64 or above)
+    # - Lots of Linux distros (including Ubuntu 16.04) don't have a new enough boost (1.64 or above)
     # - On Centos 6 we can't build lwext4 because it needs a new CMake which Centos 6's g++ is not new enough to build.
     # - On Centos 7 there is a build error in lwext4 related to __unused
     if target.platform == 'windows':
@@ -217,7 +217,7 @@ def can_build_disk(target):
     if target.platform == 'osx':
         return True
     if target.platform == 'linux':
-        if target.distro == 'ubuntu' and target.version in ['16.04', '18.04', '19.10', '20.04']:
+        if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']:
             return True
         if target.distro == 'debian' and target.version == '10':
             return True
@@ -318,6 +318,9 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
+    if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+        print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
     print('%{_datadir}/dcpomatic2/select.png', file=f)
     print('%{_datadir}/dcpomatic2/sequence.png', file=f)