X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=52e3fe406103020d2facd382c8a28ba3c01012a8;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=88719cfee99f1756e1715561c3f269c4ae2f8d62;hpb=d13bf7c8c311b12140c757ab9ed4454f6a16421e;p=dcpomatic.git

diff --git a/cscript b/cscript
index 88719cfee..52e3fe406 100644
--- a/cscript
+++ b/cscript
@@ -285,9 +285,6 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
-    if options['variant'] == 'swaroop-studio':
-        print('%{_bindir}/dcpomatic2_ecinema', file=f)
-        print('%{_bindir}/dcpomatic2_uuid', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -328,6 +325,8 @@ def make_spec(filename, version, target, options, requires=None):
         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)
+    print('%{_datadir}/libdcp/tags/*', file=f)
+    print('%{_datadir}/libdcp/xsd/*', file=f)
     print('', file=f)
     print('%prep', file=f)
     print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
@@ -342,6 +341,9 @@ def make_spec(filename, version, target, options, requires=None):
     print('cd dcpomatic-%s' % version, file=f)
     print('./waf install', file=f)
     print('/bin/cp %s/src/openssl/apps/openssl %%{buildroot}/usr/bin/dcpomatic2_openssl' % target.directory, file=f)
+    print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
+    print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+    print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
@@ -363,28 +365,23 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'e89aa4a', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    # Let's use C++11 mode if we can
-    cpp_lib_options = {'force-cpp11': True} if (
-            (target.platform == 'osx' and target.bits == 64) or
-            (target.platform == 'windows')) else {}
-
-    deps.append(('libdcp', 'd08f689', cpp_lib_options))
-    deps.append(('libsub', '8f67794', cpp_lib_options))
-    deps.append(('leqm-nrt', 'carl'))
-    deps.append(('rtaudio', 'carl'))
+    deps.append(('libdcp', 'e5f89bf'))
+    deps.append(('libsub', '948df33'))
+    deps.append(('leqm-nrt', '131f971'))
+    deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
     # This dependency is to get that binary, which is added into
     # the appropriate place later
-    deps.append(('openssl', 'carl'))
+    deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', '370b3de6'))
-    deps.append(('ffcmp', None))
+        deps.append(('lwext4', '3601ea5'))
+    deps.append(('ffcmp', 'a915540'))
 
     return deps
 
@@ -410,13 +407,6 @@ def configure_options(target, options):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi'
-                # Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                opt += ' --force-cpp11'
-    elif target.platform == 'osx' and target.bits == 64:
-        opt += ' --force-cpp11'
 
     if not options['gui']:
         opt += ' --disable-gui'
@@ -429,7 +419,10 @@ def configure_options(target, options):
         opt += ' --static-dcpomatic'
 
     if can_build_disk(target):
-       opt += ' --enable-disk'
+        opt += ' --enable-disk'
+
+    if target.platform == 'osx' and target.arch == 'arm64':
+        opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
 
     return opt
 
@@ -683,11 +676,8 @@ def package(target, version, options):
                 return package_debian(target, cpu, version, options)
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
-    elif target.platform == 'osx' and target.bits is None:
-        target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
-        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
-    elif target.platform == 'osx' and target.bits == 64:
-        target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+    elif target.platform == 'osx':
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)
@@ -740,11 +730,11 @@ def make_manual(target):
 def test(target, options, test):
     target.set('LC_ALL', 'C')
     if target.platform == 'windows':
-        cmd = 'run\\tests'
+        cmd = 'run\\tests '
     else:
         cmd = 'run/tests '
     if target.debug:
         cmd += '--backtrace '
     if test is not None:
-        cmd += '--run_test=%s' % test
+        cmd += '-t %s' % test
     target.command(cmd)