# HG changeset patch
# User reimar
# Date 1323639127 0
# Node ID c535e4a0bd75f7dfc71851caefa747e0fda63904
# Parent  52a18f850c28bf36b098a7c717fab4a0b581cc2a
Require a fribidi version that defines FriBidiParType.
The workarounds to work with older versions would be getting too ugly.

diff -r 52a18f850c28 -r c535e4a0bd75 configure
--- 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);
diff -r 52a18f850c28 -r c535e4a0bd75 sub/subreader.c
--- 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))