X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2787aa0e9f4a6761157565c22016af93e7d5fba2;hb=34be58945d13cc8accd3a2e547b6d78e6bbc55b5;hp=a985fa940110a440e3e67a2ad93a01357643819f;hpb=119db8b6f9b8d0bd69d86403d84b4e60aeb86f44;p=dcpomatic.git

diff --git a/cscript b/cscript
index a985fa940..2787aa0e9 100644
--- a/cscript
+++ b/cscript
@@ -33,10 +33,10 @@ 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['17.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['17.10'].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['18.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['18.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,22 +81,24 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libx264-148',
                              'libcurl3'])
 
-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',
+deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
+                             'libboost-thread1.65.1',
+                             'libboost-regex1.65.1',
+                             'libboost-date-time1.65.1',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu57',
+                             'libicu60',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148',
-                             'libcurl3'])
+                             'libx264-152',
+                             'libcurl4'])
 
-deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
+deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
                              'libboost-regex1.65.1',
                              'libboost-date-time1.65.1',
@@ -242,8 +244,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('', file=f)
     print('%description', file=f)
     print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f)
-    print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f)
-    print('digital projectors.', file=f)
+    print('files for presentation on DCI-compliant digital projectors.', file=f)
     print('', file=f)
     print('%files', file=f)
     print('%{_bindir}/dcpomatic2', file=f)
@@ -260,12 +261,15 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     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}/dcpomatic2/dcpomatic2_server_small.png', file=f)
     print('%{_datadir}/dcpomatic2/select.png', file=f)
     print('%{_datadir}/dcpomatic2/sequence.png', file=f)
     print('%{_datadir}/dcpomatic2/snap.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
+    print('%{_datadir}/dcpomatic2/tick.png', file=f)
+    print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@ -318,14 +322,14 @@ def dependencies(target):
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
     elif target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '7930f76'))
-    deps.append(('libsub', '7bf99dc'))
-    deps.append(('rtaudio-cdist', '739969e'))
+    deps.append(('libdcp', '49f9ec2'))
+    deps.append(('libsub', '014bb19'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
 
@@ -334,16 +338,18 @@ def option_defaults():
 
 def configure_options(target, options):
     opt = ''
+
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
+        # Currently we only build tests on Ubuntu 1{6,8}.04
+        opt += ' --disable-tests'
+
     if target.debug:
         opt += ' --enable-debug'
     if target.platform == 'windows':
-        opt += ' --target-windows --disable-tests'
-    elif target.platform == 'osx':
-        opt += ' --disable-tests'
+        opt += ' --target-windows'
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
@@ -565,9 +571,7 @@ def package_rpm(target, cpu, version, options):
     else:
         cpu = "i686"
 
-    print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
-        print('found %s' % p)
         rpms.append(os.path.abspath(p))
 
     return rpms