X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=7d53b4b46049e30d401d5af2531fe5ddaf940211;hb=5baecb091f5f3f956be002668ce74291c7826b95;hp=59a7cdd303ec3e470ee2627996dd3258d5104e7d;hpb=ec9b71e5a2e6b459b0f94bae17aec12b1f4b52f5;p=dcpomatic.git diff --git a/cscript b/cscript index 59a7cdd30..7d53b4b46 100644 --- a/cscript +++ b/cscript @@ -285,6 +285,7 @@ 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) + print('%{_bindir}/dcpomatic2_verify', 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) @@ -325,6 +326,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) @@ -332,13 +335,17 @@ def make_spec(filename, version, target, options, requires=None): print('%build', file=f) 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) - print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % + print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --destdir=/usr %s' % (target.directory, target.directory, configure_options(target, options)), file=f) print('./waf', file=f) print('%install', file=f) 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('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f) print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -360,28 +367,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', 'e78b38b', cpp_lib_options)) - deps.append(('libsub', 'c7e7bf3', cpp_lib_options)) - deps.append(('leqm-nrt', 'carl')) - deps.append(('rtaudio', 'carl')) + deps.append(('libdcp', 'b9c5e3f')) + deps.append(('libsub', '4a1de69')) + 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', '9d20ec5')) + deps.append(('ffcmp', 'a915540')) return deps @@ -407,13 +409,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' @@ -426,7 +421,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 @@ -634,11 +632,13 @@ def make_appimage(target, nice_name, internal_name, version): os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) + target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) + target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: print('#!/bin/bash', file=f) - print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f) print('export PATH=$APPDIR/usr/bin:$PATH', file=f) print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f) print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f) @@ -680,11 +680,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) @@ -737,11 +734,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)