X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b9b683f04af2dc11ad6026fbe6549f597d5b932a;hb=a5e9116f3e2ac7dd9f226c5e26673caf3085a781;hp=46e289821c6fb001b60e252407f8f4e6eafc3a3d;hpb=9d8ef746e91d284979e382137c0d538e02f254b3;p=dcpomatic.git

diff --git a/cscript b/cscript
index 46e289821..b9b683f04 100644
--- a/cscript
+++ b/cscript
@@ -243,7 +243,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']:
         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 +253,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 +279,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
-            ('libdcp', 'e33e3b8'),
-            ('libsub', '1e26169'))
+    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+            ('libdcp', '4e38f82'),
+            ('libsub', 'd79b29f'))
 
 def configure_options(target):
     opt = ''
@@ -387,11 +387,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 +403,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')