summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-01 23:51:51 +0200
committerwm4 <wm4@nowhere>2015-08-02 00:03:29 +0200
commita74914a05762f03422b492c8d3b2f9e35840708f (patch)
treefd19d12459ea926930ef9d5808be99f9f5cd2eec /TOOLS
parent11f2be2bcc264aa4f24cdad036231e34d09f5630 (diff)
downloadmpv-a74914a05762f03422b492c8d3b2f9e35840708f.tar.bz2
mpv-a74914a05762f03422b492c8d3b2f9e35840708f.tar.xz
charset_conv: add uchardet support
For now, it needs to be explicitly selected. ENCA is still the default. This assumes uchardet returns iconv names. This doesn't seem to be always the case, and the result are lots of iconv errors. So explicitly check for this situation, and print a warning if it occurs. It's entirely possible that uchardet support is actually useless, because names are not necessarily iconv-compatible (but uchardet doesn't seem to document whether it attempts to return iconv-compatible names if possible). Fixes #908.
Diffstat (limited to 'TOOLS')
-rwxr-xr-xTOOLS/old-configure2
1 files changed, 2 insertions, 0 deletions
diff --git a/TOOLS/old-configure b/TOOLS/old-configure
index 68805fe331..5751903d95 100755
--- a/TOOLS/old-configure
+++ b/TOOLS/old-configure
@@ -176,6 +176,7 @@ options_state_machine() {
opt_yes_no _dvdread "libdvdread"
opt_yes_no _dvdnav "libdvdnav"
opt_yes_no _enca "ENCA charset oracle library"
+ opt_yes_no _uchardet "uchardet charset detection library"
opt_yes_no _libass "subtitle rendering with libass"
opt_yes_no _libavdevice "libavdevice demuxers"
opt_yes_no _libavfilter "libavfilter"
@@ -732,6 +733,7 @@ echo "LIBASS_OSD = $_libass" >> $CONFIG_MAK
echo "DUMMY_OSD = $_dummy_osd" >> $CONFIG_MAK
check_pkg_config "ENCA" $_enca ENCA 'enca'
+check_pkg_config "uchardet" $_uchardet UCHARDET 'uchardet'
check_pkg_config "zlib" auto ZLIB 'zlib'
test $(defretval) = no && die "Unable to find development files for zlib."