X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2bb2b6c28cbfa33aa396da3ca511d3eb9db5d928;hb=53e786582b8b9e873981d12487c9ac49ded59615;hp=ee33987d98baa3d9f855ab6fe047434a952f2c59;hpb=977871b05c41e3e089348b73834ebd0a766b456c;p=dcpomatic.git

diff --git a/cscript b/cscript
index ee33987d9..2bb2b6c28 100644
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -68,24 +68,6 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
-deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
-                        'libssh-4': '0.6.3-3ubuntu3',
-                        'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libsndfile1': '1.0.25-9.1',
-                        'libmagick++-6.q16-5': '8:6.8.9.9-5',
-                        'libxml++2.6-2': '2.36.0-2.1',
-                        'libgtk2.0-0': '2.24.27-0ubuntu1',
-                        'libxmlsec1': '1.2.20-2ubuntu2',
-                        'libxmlsec1-openssl': '1.2.20-2ubuntu2',
-                        'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libcurl3': '7.38.0-3ubuntu2',
-                        'libzip2': '0.11.2-1.2',
-                        'libwxgtk3.0-0': '3.0.2-1',
-                        'libsamplerate0': '0.1.8-8',
-                        'libicu52': '52.1-8'}
-
 deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
                         'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1',
@@ -243,7 +225,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)
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK', 'cs_CZ', 'uk_UA']:
         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)
@@ -253,7 +235,7 @@ def make_spec(filename, version, target):
     print('tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version, file=f)
     print('%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
-    print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:/usr/local/lib/pkgconfig' % target.directory, file=f)
+    print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), 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)
@@ -279,9 +261,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
-            ('libdcp', 'e33e3b8'),
-            ('libsub', '1e26169'))
+    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+            ('libdcp', 'v1.3.1'),
+            ('libsub', 'v1.1.11'))
 
 def configure_options(target):
     opt = ''
@@ -375,9 +357,9 @@ def package_rpm(target, cpu, version):
     else:
         cpu = "i686"
 
-    print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu), file=f)
+    print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
-        print('found %s' % p, file=f)
+        print('found %s' % p)
         rpms.append(os.path.abspath(p))
 
     return rpms
@@ -387,11 +369,11 @@ def package(target, version):
         return package_windows(target)
     elif target.platform == 'linux':
         if target.bits == 32:
-    	    cpu = 'i386'
+            cpu = 'i386'
         else:
-            cpu	= 'amd64'
+            cpu = 'amd64'
 
-	if target.distro == 'debian' or target.distro == 'ubuntu':
+        if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
         elif target.distro == 'centos' or target.distro == 'fedora':
             return package_rpm(target, cpu, version)
@@ -403,7 +385,7 @@ def make_pot(target):
     target.command('./waf pot')
     return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
             os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
-	    os.path.abspath('build/src/tools/dcpomatic.pot')]
+            os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 def make_manual(target):
     os.chdir('doc/manual')