From 5b2e3126602d508498a99bce256f5f465f095d43 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 Nov 2023 00:46:00 +0100 Subject: Support playback of MPEG2 DCPs. --- cscript | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 2b1c57c95..b971ff2ea 100644 --- a/cscript +++ b/cscript @@ -533,19 +533,7 @@ def make_spec(filename, version, target, options, requires=None): print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target, options): - - if target.platform == 'linux': - ffmpeg_options = { 'shared': False } - else: - ffmpeg_options = {} - - if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg', '0b73d2f5e70a04a67aa902902c42e3025ef3bb77', ffmpeg_options)] - else: - # Use distro-provided FFmpeg on Arch - deps = [] - - deps.append(('libdcp', '816365d20e0c6ef37b6bf499a42a0d3ecad22c05', {'c++17': target.platform == 'osx'})) + deps = [('libdcp', 'v1.9.6', {'c++17': target.platform == 'osx'})] deps.append(('libsub', 'v1.6.47')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) -- cgit v1.2.3 From f1ab501ede5c421ed9a561774a912e7d4d0d6cd3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 6 Apr 2024 21:16:41 +0200 Subject: Remove unused Windows identifier stuff (removed from cdist). --- cscript | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index b971ff2ea..5c3e5e2b1 100644 --- a/cscript +++ b/cscript @@ -717,10 +717,7 @@ def build(target, options, for_package): target.command('./waf install') def package_windows(target): - identifier = '' - if target.version is not None: - identifier = '%s.' % target.version - identifier += '%d' % target.bits + identifier = '%d' % target.bits shutil.copyfile('build/platform/windows/installer.%s.nsi' % identifier, 'build/platform/windows/installer2.%s.nsi' % identifier) target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) -- cgit v1.2.3