X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b59075801e062fd69f4081e346d9e6d5f4513eaa;hb=565490c24a46d0aa941f75cf2a03b195246008b4;hp=8e3cc7733f6bbea0161aa942ff15d17cc597773c;hpb=413bad26254a7c48671ed2ed9f7341d928086da0;p=dcpomatic.git

diff --git a/cscript b/cscript
index 8e3cc7733..b59075801 100644
--- a/cscript
+++ b/cscript
@@ -99,6 +99,8 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libboost-regex1.65.1',
                              'libboost-date-time1.65.1',
                              'libmagick++-6.q16-7',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip4',
                              'libwxgtk3.0-0v5',
@@ -218,7 +220,7 @@ def make_control(debian_version, bits, filename, debug):
         print('  This package contains the debugging symbols for dcpomatic.', file=f)
         print('', file=f)
 
-def make_spec(filename, version, target):
+def make_spec(filename, version, target, requires=None):
     """Make a .spec file for a RPM build"""
     f = open(filename, 'w')
     print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f)
@@ -228,7 +230,8 @@ def make_spec(filename, version, target):
     print('License:GPL', file=f)
     print('Group:Applications/Multimedia', file=f)
     print('URL:http://dcpomatic.com/', file=f)
-    print('Requires: ImageMagick-c++, glibmm24, libzip', file=f)
+    if requires is not None:
+        print('Requires:%s' % requires, file=f)
     print('', file=f)
     print('%description', file=f)
     print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f)
@@ -249,6 +252,7 @@ def make_spec(filename, version, target):
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     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}/dcpomatic2/dcpomatic2_server_small.png', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
@@ -260,7 +264,8 @@ def make_spec(filename, version, target):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         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']:
+    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']:
         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)
@@ -298,10 +303,10 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '04f3857'),
-            ('libsub', '8658ca9'),
-            ('rtaudio-cdist', None))
+    return (('ffmpeg-cdist', '5c90508', ffmpeg_options),
+            ('libdcp', None),
+            ('libsub', None),
+            ('rtaudio-cdist', '739969e'))
 
 def configure_options(target):
     opt = ''
@@ -400,7 +405,11 @@ def package_rpm(target, cpu, version):
         "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
-    make_spec('build/platform/linux/dcpomatic2.spec', version, target)
+    requires = None
+    if target.distro == 'mageia':
+        requires = "lib64xmlsec1-devel"
+
+    make_spec('build/platform/linux/dcpomatic2.spec', version, target, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
     target.command(cmd)
     rpms = []