from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.73'
+libdcp_version = '1.8.100'
libsub_version = '1.6.42'
-this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
-last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
+git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
# Python 2/3 compatibility; I don't really understand what's going on here
if not isinstance(this_version, str):
this_version = this_version.decode('utf-8')
-if not isinstance(last_version, str):
- last_version = last_version.decode('utf-8')
+if not isinstance(git_head, str):
+ git_head = git_head.decode('utf-8')
-if this_version == '' or this_version == 'merged-to-main':
- VERSION = '%sdevel' % last_version[1:].strip()
+if this_version == '':
+ VERSION = git_head.strip()
else:
VERSION = this_version[1:].strip()
int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
""",
msg='Checking for boost locale library',
- libpath='/usr/local/lib',
lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_LOCALE')
if conf.env.TARGET_OSX:
conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
- conf.env.append_value('LINKFLAGS', '-llzma')
#
# Dependencies.
mandatory=True,
msg='Checking for libicu',
okmsg='yes',
- libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'],
+ libpath=['/usr/lib', '/usr/lib/x86_64-linux-gnu'],
lib=['icuio', 'icui18n', 'icudata', 'icuuc'],
uselib_store='ICU')
int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
""",
msg='Checking for libjpeg',
- libpath='/usr/local/lib',
lib=['jpeg'],
uselib_store='JPEG')
int main() { ext4_mount("ext4_fs", "/mp/", false); }\n
""",
msg='Checking for lwext4 library',
- libpath='/usr/local/lib',
lib=['lwext4', 'blockdev'],
uselib_store='LWEXT4')
int main() { boost::thread t; }\n
""",
msg='Checking for boost threading library',
- libpath='/usr/local/lib',
lib=[boost_thread, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_THREAD')
int main() { boost::filesystem::copy_file ("a", "b"); }\n
""",
msg='Checking for boost filesystem library',
- libpath='/usr/local/lib',
lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_FILESYSTEM')
int main() { boost::gregorian::day_clock::local_day(); }\n
""",
msg='Checking for boost datetime library',
- libpath='/usr/local/lib',
lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_DATETIME')