projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 5d1ab941e2b9270d1f38d31553893dfd7394109e..aa274e8ecef8bf0362e4a97dea2471b9ba4090e9 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-54,7
+54,6
@@
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',
deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
'libboost-thread1.54.0',
'libboost-regex1.54.0',
- 'libmagick++5',
'libxml++2.6-2',
'libboost-date-time1.54.0',
'libzip2',
'libxml++2.6-2',
'libboost-date-time1.54.0',
'libzip2',
@@
-70,7
+69,6
@@
deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
'libboost-thread1.58.0',
'libboost-regex1.58.0',
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
'libboost-thread1.58.0',
'libboost-regex1.58.0',
- 'libmagick++-6.q16-5v5',
'libxml++2.6-2v5',
'libboost-date-time1.58.0',
'libzip4',
'libxml++2.6-2v5',
'libboost-date-time1.58.0',
'libzip4',
@@
-87,7
+85,6
@@
deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
- 'libmagick++-6.q16-7',
'libxml++2.6-2v5',
'libboost-date-time1.62.0',
'libzip4',
'libxml++2.6-2v5',
'libboost-date-time1.62.0',
'libzip4',
@@
-103,7
+100,6
@@
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
'libboost-thread1.65.1',
'libboost-regex1.65.1',
'libboost-date-time1.65.1',
'libboost-thread1.65.1',
'libboost-regex1.65.1',
'libboost-date-time1.65.1',
- 'libmagick++-6.q16-7',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
@@
-119,7
+115,6
@@
deb_depends['7'] = copy.deepcopy(deb_depends_base)
deb_depends['7'].extend(['libboost-filesystem1.49.0',
'libboost-thread1.49.0',
'libboost-regex1.49.0',
deb_depends['7'].extend(['libboost-filesystem1.49.0',
'libboost-thread1.49.0',
'libboost-regex1.49.0',
- 'libmagick++5',
'libxml++2.6-2',
'libboost-date-time1.49.0',
'libzip2',
'libxml++2.6-2',
'libboost-date-time1.49.0',
'libzip2',
@@
-136,7
+131,6
@@
deb_depends['8'].extend(['libboost-filesystem1.55.0',
'libboost-thread1.55.0',
'libboost-date-time1.55.0',
'libboost-regex1.55.0',
'libboost-thread1.55.0',
'libboost-date-time1.55.0',
'libboost-regex1.55.0',
- 'libmagick++-6.q16-5',
'libxml++2.6-2',
'libzip2',
'libcairomm-1.0-1',
'libxml++2.6-2',
'libzip2',
'libcairomm-1.0-1',
@@
-155,7
+149,6
@@
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libboost-date-time1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libboost-date-time1.62.0',
- 'libmagick++-6.q16-7',
'libxml++2.6-2v5',
'libgtk2.0-0',
'libzip4',
'libxml++2.6-2v5',
'libgtk2.0-0',
'libzip4',
@@
-179,7
+172,6
@@
deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libboost-date-time1.62.0',
'libboost-thread1.62.0',
'libboost-regex1.62.0',
'libboost-date-time1.62.0',
- 'libmagick++-6.q16-7',
'libxml++2.6-2v5',
'libgtk2.0-0',
'libzip4',
'libxml++2.6-2v5',
'libgtk2.0-0',
'libzip4',
@@
-325,17
+317,20
@@
def dependencies(target):
if target.platform == 'windows' and target.version == 'xp':
deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
if target.platform == 'windows' and target.version == 'xp':
deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
- el
se
:
+ el
if target.platform != 'linux' or target.distro != 'arch'
:
deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+ else:
+ # Use distro-provided FFmpeg on Arch
+ deps = []
- deps.append(('libdcp', '
5d8a158
'))
- deps.append(('libsub', '7
adea71
'))
+ deps.append(('libdcp', '
7930f76
'))
+ deps.append(('libsub', '7
bf99dc
'))
deps.append(('rtaudio-cdist', '739969e'))
return deps
def option_defaults():
deps.append(('rtaudio-cdist', '739969e'))
return deps
def option_defaults():
- return { "gui": True }
+ return { "gui": True
, "variant": None
}
def configure_options(target, options):
opt = ''
def configure_options(target, options):
opt = ''
@@
-360,6
+355,9
@@
def configure_options(target, options):
if not options['gui']:
opt += ' --disable-gui'
if not options['gui']:
opt += ' --disable-gui'
+ if options['variant'] is not None:
+ opt += ' --variant=%s' % options['variant']
+
# Build Windows debug versions with static linking as I think gdb works better then
if target.debug and target.platform == 'windows':
opt += ' --static-dcpomatic'
# Build Windows debug versions with static linking as I think gdb works better then
if target.debug and target.platform == 'windows':
opt += ' --static-dcpomatic'
@@
-376,11
+374,6
@@
def build(target, options):
'sources': [{'type': 'archive',
'url': '%s/libzip-1.4.0.tar.xz' % prefix,
'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
'sources': [{'type': 'archive',
'url': '%s/libzip-1.4.0.tar.xz' % prefix,
'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
- modules.append({'name': 'imagemagick',
- 'cleanup': ['/bin'],
- 'sources': [{'type': 'archive',
- 'url': '%s/ImageMagick-7.0.8-11.tar.bz2' % prefix,
- 'sha256': 'a1aef96c89a9a9fac51a6e141deffa0b2f8db2062a24f6ba9fe3846dde7491ac'}]})
modules.append({'name': 'libsigc++',
'sources': [{'type': 'archive',
'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
modules.append({'name': 'libsigc++',
'sources': [{'type': 'archive',
'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
@@
-591,9
+584,11
@@
def make_appimage(target, nice_name, internal_name, version):
with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
print('[Desktop Entry]', file=f)
print('Type=Application', file=f)
with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
print('[Desktop Entry]', file=f)
print('Type=Application', file=f)
+ print('Categories=AudioVideo;', file=f)
print('Name=%s' % nice_name, file=f)
print('Icon=%s' % internal_name, file=f)
target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
print('Name=%s' % nice_name, file=f)
print('Icon=%s' % internal_name, file=f)
target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
+ target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename)
target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))
target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))