summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-16 16:57:19 +0200
committerwm4 <wm4@nowhere>2014-06-16 18:02:52 +0200
commit973c1fa5701366eed3752666d6035454ae37712c (patch)
tree7820fc512b60482c4fdd5b5ff8c1103747624acc /wscript
parent858d6d93cb3faea7afb347e805f98d52ff5ac12c (diff)
downloadmpv-973c1fa5701366eed3752666d6035454ae37712c.tar.bz2
mpv-973c1fa5701366eed3752666d6035454ae37712c.tar.xz
gl_lcms: use thread-safe lcms API, require lcms2 2.6
The error log callback was not thread-safe and not library-safe. And apparently there were some other details that made it not library-safe, such as a global lcms plugin registry. Switch the the thread-safe API provided by lcms2 starting with 2.6. Remove our approximate thread-safety hacks. Note that lcms basically provides 2 APIs now, the old functions, and the thread-safe alternatives whose names end with THR. Some functions don't change, because they already have a context of some sort. Care must be taken not to accidentally use old APIs.
Diffstat (limited to 'wscript')
-rw-r--r--wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/wscript b/wscript
index 0b4e196823..075e1cf20c 100644
--- a/wscript
+++ b/wscript
@@ -319,7 +319,7 @@ If you really mean to compile without libass support use --disable-libass."
}, {
'name': '--lcms2',
'desc': 'LCMS2 support',
- 'func': check_pkg_config('lcms2'),
+ 'func': check_pkg_config('lcms2', '>= 2.6'),
}, {
'name': '--vapoursynth',
'desc': 'VapourSynth filter bridge',