X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=333649a275e8ee640f281a9ce2288ec0065f6ef7;hb=0842dd61d076e78b600dc9ce37d3d66af7f45d95;hp=2041ba43c5a3dfb1c8131fc2cd1d57316bd3e896;hpb=e2e5928f1056cfc555a87060592aaf20fcdbcf4f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 2041ba43c..333649a27 100644
--- a/cscript
+++ b/cscript
@@ -33,8 +33,6 @@ 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)
@@ -83,20 +81,6 @@ 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',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu57',
-                             'libnettle6',
-                             'libssh-4',
-                             'libx264-148',
-                             'libcurl3'])
-
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
@@ -260,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)
@@ -278,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)
@@ -295,7 +281,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
-              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB', 'fi_FI', 'el_GR', 'tr_TR']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'fi_FI']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -334,16 +320,16 @@ def dependencies(target):
         ffmpeg_options = {}
 
     if target.platform == 'windows' and target.version == 'xp':
-        deps = [('ffmpeg-cdist', 'c1224ee', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
     elif target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'c1224ee', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '27e1378'))
-    deps.append(('libsub', '2728525'))
-    deps.append(('rtaudio-cdist', 'b1f0f02'))
+    deps.append(('libdcp', '6a85c30'))
+    deps.append(('libsub', '1c70f3a'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
 
@@ -585,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