Re-add support for OpenJPEG version 1.5.x.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index bb88d5527e9b27025437f6c3c94b20533092b528..dd9fa7603cab149b7074b68756364541358eefc2 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,43 @@
+#
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libdcp.
+#
+#    libdcp is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libdcp is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the
+#    OpenSSL library under certain conditions as described in each
+#    individual source file, and distribute linked combinations
+#    including the two.
+#
+#    You must obey the GNU General Public License in all respects
+#    for all of the code used other than OpenSSL.  If you modify
+#    file(s) with this exception, you may extend this exception to your
+#    version of the file(s), but you are not obligated to do so.  If you
+#    do not wish to do so, delete this exception statement from your
+#    version.  If you delete this exception statement from all source
+#    files in the program, then also delete it here.
+#
+
 import os
 
 def dependencies(target):
-    return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'd2042ad'))
+    if target.platform == 'windows' and target.version == 'xp':
+        return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'd2042ad'))
+    else:
+        return (('libcxml', 'v0.15.1'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', 'd2042ad'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -13,6 +49,9 @@ def build(target, options):
             target.append_with_space('CXXFLAGS', '-std=c++11')
     elif target.platform == 'windows':
         cmd += ' --target-windows --disable-gcov'
+        if target.version == 'xp':
+            # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
+            cmd += ' --jpeg=oj1'
     elif target.platform == 'osx':
         cmd += ' --disable-tests'