X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=eb7a817eb88683aa8e385793d444ad6ef8b0cfac;hp=fa82a0d55ae9c912774ad945fdeda58da172ff79;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=7e711c654d804a8c57a81c059a0f0afdb3ec8d90 diff --git a/cscript b/cscript index fa82a0d55..eb7a817eb 100644 --- a/cscript +++ b/cscript @@ -29,16 +29,14 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['14.04'].extend(['libssh-dev']) deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].extend(['libssh-dev']) deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['18.04'].extend(['libssh-dev']) -deb_build_depends['18.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['18.10'].extend(['libssh-dev']) deb_build_depends['19.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['19.04'].extend(['libssh-dev']) +deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['19.10'].extend(['libssh-dev']) deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['7'].extend(['libssh-dev']) deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) @@ -54,21 +52,6 @@ deb_depends_gui = dict() deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0'] -deb_depends['14.04'] = copy.deepcopy(deb_depends_base) -deb_depends['14.04'].extend(['libboost-filesystem1.54.0', - 'libboost-thread1.54.0', - 'libboost-regex1.54.0', - 'libxml++2.6-2', - 'libboost-date-time1.54.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1,' - 'libicu52', - 'libnettle4', - 'libssh-4', - 'libx264-142', - 'libcurl3']) - deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libboost-thread1.58.0', @@ -102,25 +85,25 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libcurl4', 'libpulse0']) -deb_depends['18.10'] = copy.deepcopy(deb_depends_base) -deb_depends['18.10'].extend(['libboost-filesystem1.65.1', - 'libboost-thread1.65.1', - 'libboost-regex1.65.1', - 'libboost-date-time1.65.1', +deb_depends['19.04'] = copy.deepcopy(deb_depends_base) +deb_depends['19.04'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', - 'libzip4', + 'libzip5', 'libwxgtk3.0-0v5', - 'libicu60', + 'libicu63', 'libnettle6', 'libssh-4', - 'libx264-152', + 'libx264-155', 'libcurl4', 'libpulse0']) -deb_depends['19.04'] = copy.deepcopy(deb_depends_base) -deb_depends['19.04'].extend(['libboost-filesystem1.67.0', +deb_depends['19.10'] = copy.deepcopy(deb_depends_base) +deb_depends['19.10'].extend(['libboost-filesystem1.67.0', 'libboost-thread1.67.0', 'libboost-regex1.67.0', 'libboost-date-time1.67.0', @@ -136,21 +119,6 @@ deb_depends['19.04'].extend(['libboost-filesystem1.67.0', 'libcurl4', 'libpulse0']) -deb_depends['7'] = copy.deepcopy(deb_depends_base) -deb_depends['7'].extend(['libboost-filesystem1.49.0', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libxml++2.6-2', - 'libboost-date-time1.49.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu48', - 'libnettle4', - 'libnotify4', - 'libx264-123', - 'libcurl3']) - deb_depends['8'] = copy.deepcopy(deb_depends_base) deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libboost-thread1.55.0', @@ -303,6 +271,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_kdm_cli', file=f) print('%{_bindir}/dcpomatic2_player', file=f) print('%{_bindir}/dcpomatic2_playlist', file=f) + print('%{_bindir}/dcpomatic2_openssl', file=f) if options['variant'] == 'swaroop-studio': print('%{_bindir}/dcpomatic2_ecinema', file=f) print('%{_bindir}/dcpomatic2_uuid', file=f) @@ -344,13 +313,13 @@ 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' % (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('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -381,7 +350,12 @@ def dependencies(target): deps.append(('libdcp', None)) deps.append(('libsub', None)) - deps.append(('rtaudio-cdist', None)) + deps.append(('rtaudio', 'carl')) + # 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')) return deps @@ -433,7 +407,7 @@ def build(target, options): 'buildsystem': 'cmake', 'sources': [{'type': 'archive', 'url': '%s/libzip-1.4.0.tar.xz' % prefix, - 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]}) + 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]}) modules.append({'name': 'libsigc++', 'sources': [{'type': 'archive', 'url': '%s/libsigc++-2.10.0.tar.xz' % prefix, @@ -447,87 +421,87 @@ def build(target, options): 'url': '%s/cairomm-1.12.2.tar.gz' % prefix, 'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]}) modules.append({'name': 'pangomm', - 'sources': [{'type': 'archive', - 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, - 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) - modules.append({'name': 'libxml++', - 'sources': [{'type': 'archive', - 'url': '%s/libxml++-2.40.1.tar.xz' % prefix, - 'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]}) + 'sources': [{'type': 'archive', + 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, + 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) + modules.append({'name': 'libxml++', + 'sources': [{'type': 'archive', + 'url': '%s/libxml++-2.40.1.tar.xz' % prefix, + 'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]}) modules.append({'name': 'xmlsec1', - 'sources': [{'type': 'archive', - 'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix, - 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) - modules.append({'name': 'openjpeg2', - 'buildsystem': 'cmake', - 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]}) - modules.append({'name': 'boost', - 'buildsystem': 'simple', - 'build-commands': [ - './bootstrap.sh --prefix=/app', - './b2 install' - ], - 'sources': [{'type': 'archive', - 'url': '%s/boost_1_66_0.tar.bz2' % prefix, - 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) - modules.append({'name': 'asdcplib', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app --libdir=/app/lib build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-cth')}]}) - modules.append({'name': 'locked_sstream', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]}) - modules.append({'name': 'libcxml', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app --libdir=/app/lib build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]}) - modules.append({'name': 'libdcp', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app --libdir=/app/lib build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]}) - modules.append({'name': 'libsub', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app --libdir=/app/lib build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]}) - modules.append({'name': 'rtaudio', - 'build-options': { - 'config-opts': [ - '--prefix=/app', - '--with-pulse', - '--with-alsa' - ] - }, - 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) - modules.append({'name': 'wxwidgets', - 'sources': [{'type': 'archive', - 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, - 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) - modules.append({'name': 'libssh', - 'buildsystem': 'cmake', - 'builddir': True, - 'sources': [{'type': 'archive', - 'url': '%s/libssh-0.7.5.tar.xz' % prefix, - 'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]}) - modules.append({'name': 'dcpomatic', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app build install' - ], + 'sources': [{'type': 'archive', + 'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix, + 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) + modules.append({'name': 'openjpeg2', + 'buildsystem': 'cmake', + 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]}) + modules.append({'name': 'boost', + 'buildsystem': 'simple', + 'build-commands': [ + './bootstrap.sh --prefix=/app', + './b2 install' + ], + 'sources': [{'type': 'archive', + 'url': '%s/boost_1_66_0.tar.bz2' % prefix, + 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) + modules.append({'name': 'asdcplib', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app --libdir=/app/lib build install' + ], + 'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-carl')}]}) + modules.append({'name': 'locked_sstream', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app build install' + ], + 'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]}) + modules.append({'name': 'libcxml', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app --libdir=/app/lib build install' + ], + 'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]}) + modules.append({'name': 'libdcp', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app --libdir=/app/lib build install' + ], + 'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]}) + modules.append({'name': 'libsub', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app --libdir=/app/lib build install' + ], + 'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]}) + modules.append({'name': 'rtaudio', 'build-options': { - 'build-args': ['--share=network'] + 'config-opts': [ + '--prefix=/app', + '--with-pulse', + '--with-alsa' + ] }, - 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]}) + 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) + modules.append({'name': 'wxwidgets', + 'sources': [{'type': 'archive', + 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, + 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) + modules.append({'name': 'libssh', + 'buildsystem': 'cmake', + 'builddir': True, + 'sources': [{'type': 'archive', + 'url': '%s/libssh-0.7.5.tar.xz' % prefix, + 'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]}) + modules.append({'name': 'dcpomatic', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app build install' + ], + 'build-options': { + 'build-args': ['--share=network'] + }, + 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]}) desc = {'app-id': 'com.dcpomatic.DCP-o-matic', 'runtime': 'org.gnome.Sdk', 'runtime-version': '3.26', @@ -578,6 +552,7 @@ def package_debian(target, cpu, version, options): target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) + target.set('CDIST_DIRECTORY', target.directory) target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') if target.debug: @@ -628,6 +603,9 @@ def make_appimage(target, nice_name, internal_name, version): nice_filename = nice_name.replace(' ', '_') 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('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) + target.command('cp -r %s/share/libdcp/xsd 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) @@ -659,7 +637,7 @@ def package(target, version, options): out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version)) out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version)) out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version)) - out.append(make_appimage(target, 'DCP-o-matic Encode Server ', 'dcpomatic2_server', version)) + out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version)) return out else: if target.bits == 32: @@ -671,8 +649,11 @@ 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': - target.command('bash platform/osx/make_dmg.sh %s' % target.directory) + elif target.platform == 'osx' and target.bits is None: + target.command('bash platform/osx/make_dmg.sh %s %s universal %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)) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] elif target.platform == 'docker': shutil.copyfile(target.deb, 'build/platform/docker')