Mercurial > mplayer.hg
changeset 34352:c535e4a0bd75
Require a fribidi version that defines FriBidiParType.
The workarounds to work with older versions would be getting too ugly.
| author | reimar |
|---|---|
| date | Sun, 11 Dec 2011 21:32:07 +0000 |
| parents | 52a18f850c28 |
| children | deb52aa6ad88 |
| files | configure sub/subreader.c |
| diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Dec 11 18:47:40 2011 +0000 +++ b/configure Sun Dec 11 21:32:07 2011 +0000 @@ -5934,9 +5934,8 @@ if test "$_fribidi" = auto ; then cat > $TMPC << EOF #include <stdlib.h> -/* workaround for fribidi 0.10.4 and below */ -#define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8 #include <fribidi/fribidi.h> +FriBidiParType test; int main(void) { if (fribidi_parse_charset("UTF-8") != FRIBIDI_CHAR_SET_UTF8) exit(1);
--- a/sub/subreader.c Sun Dec 11 18:47:40 2011 +0000 +++ b/sub/subreader.c Sun Dec 11 21:32:07 2011 +0000 @@ -1237,11 +1237,7 @@ */ int do_fribid_log2vis(int charset, const char *in, FriBidiChar *logical, FriBidiChar *visual, int flip_commas) { -#if defined(FRIBIDI_PAR_LTR) || FRIBIDI_INTERFACE_VERSION >= 3 FriBidiParType base = flip_commas ? FRIBIDI_PAR_ON : FRIBIDI_PAR_LTR; -#else - FriBidiCharType base = flip_commas ? FRIBIDI_TYPE_ON : FRIBIDI_TYPE_L; -#endif int len = strlen(in); len = fribidi_charset_to_unicode(charset, in, len, logical); if (!fribidi_log2vis(logical, len, &base, visual, NULL, NULL, NULL))