X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=897a484662ce047b4e333db70ba5d37c091fd3c6;hb=9b4cf50fc498028e43ce008dacc7057a488bb65a;hp=abb9cb3961f5451de1bb42d9c4013c920d6484d6;hpb=ed42f450f3d5cf0b90ee56c2641d959a9e5a5cf7;p=dcpomatic.git

diff --git a/cscript b/cscript
index abb9cb396..897a48466 100644
--- a/cscript
+++ b/cscript
@@ -237,6 +237,7 @@ def make_spec(filename, version, target):
     print('%{_bindir}/dcpomatic2_server', file=f)
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
     print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
+    print('%{_bindir}/dcpomatic2_player', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@ -251,6 +252,7 @@ def make_spec(filename, version, target):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
         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']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
@@ -263,13 +265,8 @@ def make_spec(filename, version, target):
     print('cd dcpomatic-%s' % version, file=f)
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
 
-    if target.distro == 'centos' and target.version == '5':
-        prefix = 'BUILDROOT/usr'
-    else:
-        prefix = '%{buildroot}/usr'
-
-    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%s --install-prefix=/usr %s' %
-          (target.directory, target.directory, prefix, configure_options(target)), file=f)
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' %
+          (target.directory, target.directory, configure_options(target)), file=f)
     print('./waf', file=f)
     print('%install', file=f)
     print('cd dcpomatic-%s' % version, file=f)
@@ -294,10 +291,10 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'mxe', ffmpeg_options),
-            ('libdcp', 'a6a4c47'),
-            ('libsub', 'a25cc3f'),
-            ('rtaudio-cdist', 'mxe'))
+    return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
+            ('libdcp', '047d8ff'),
+            ('libsub', '678962c'),
+            ('rtaudio-cdist', None))
 
 def configure_options(target):
     opt = ''
@@ -308,11 +305,11 @@ def configure_options(target):
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --static-xmlsec --static-ssh --disable-tests'
+            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
-                opt += ' --workaround-gssapi --static-xmlpp'
+                opt += ' --workaround-gssapi'
 
     # Build Windows debug versions with static linking as I think gdb works better then
     if target.debug and target.platform == 'windows':
@@ -377,6 +374,7 @@ def package_debian(target, cpu, version):
     return debs
 
 def package_rpm(target, cpu, version):
+    print('package_rpm %s %s %s' % (target, cpu, version))
     topdir = os.path.realpath('build/rpmbuild')
     os.makedirs('%s/BUILD' % topdir)
     os.makedirs('%s/RPMS' % topdir)
@@ -391,19 +389,14 @@ def package_rpm(target, cpu, version):
         )
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target)
-    cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
-    if target.distro == 'centos' and target.version == '5':
-        cmd += ' --buildroot %s/BUILD/dcpomatic-%s/BUILDROOT' % (topdir, version)
+    cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
     target.command(cmd)
     rpms = []
 
     if cpu == "amd64":
         cpu = "x86_64"
     else:
-        if target.distro == 'centos' and target.version == '5':
-            cpu = "i386"
-        else:
-            cpu = "i686"
+        cpu = "i686"
 
     print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):