projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unnecessary using.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 04c27781eb065b3386d63ec70426006605f6cd9d..043aba64ce9cfbcc95e5415d8f8b03a315059042 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',
@@
-331,17
+323,22
@@
def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '
ee05b1c
'))
- deps.append(('libsub', '
1cf5cdf
'))
+ deps.append(('libdcp', '
7930f76
'))
+ deps.append(('libsub', '
7bf99dc
'))
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 = ''
+
+ if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
+ # Currently we only build tests on Ubuntu 1{6,8}.04
+ opt += ' --disable-tests'
+
if target.debug:
opt += ' --enable-debug'
if target.platform == 'windows':
if target.debug:
opt += ' --enable-debug'
if target.platform == 'windows':
@@
-349,7
+346,6
@@
def configure_options(target, options):
elif target.platform == 'linux':
opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
elif target.platform == 'linux':
opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
- opt += ' --disable-tests'
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
@@
-363,6
+359,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'
@@
-379,11
+378,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,
@@
-594,9
+588,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))