[MPlayer-dev-eng] [PATCH] Just in case someone cares about poor freetype 2.0 users

[Andreas Hess]

Hi!

I can't see the case in forcing something that actually isn't needed,
as freetype 2.1. I think most distros still come with freetype 2.0
packages and mplayer works just fine with freetype 2.0. So why should
the user be forced to install a new freetype version? This patch
fixes this and a previous error (FT_Library_Version() was introduced
in freetype 2.0.9).


Andreas
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.557
diff -u -r1.557 configure
--- configure   2 Sep 2002 19:51:00 -0000       1.557
+++ configure   2 Sep 2002 21:17:32 -0000
@@ -3244,15 +3244,15 @@
 fi
 echores "$_cdparanoia"

-echocheck "freetype >= 2.1"
+echocheck "freetype 2"
 if test "$_freetype" = yes ; then
     test -z "$_freetypeconfig" && _freetypeconfig='freetype-config'
     if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then
 	cat > $TMPC << EOF
 #include <stdio.h>
 #include <freetype/freetype.h>
-#if !((FREETYPE_MAJOR >= 2) && (FREETYPE_MINOR >= 1))
-#error "Need FreeType 2.1 or newer"
+#if !(FREETYPE_MAJOR >= 2)
+#error "Need FreeType 2.0 or newer"
 #endif
 int main()
 {
@@ -3263,7 +3263,8 @@
 	printf("Couldn't initialize freetype2 lib, err code: %d\n",err);
 	exit(err);
     }
-    FT_Library_Version(library,&major,&minor,&patch); // in v2.1.0+ only :(((
+#if ((FREETYPE_MINOR >= 1) || ((FREETYPE_MINOR == 0) && (FREETYPE_PATCH >= 9)))
+    FT_Library_Version(library,&major,&minor,&patch); // in v2.0.9+ only :(((
     printf("freetype2  header version: %d.%d.%d  library version: %d.%d.%d\n",
 	FREETYPE_MAJOR,FREETYPE_MINOR,FREETYPE_PATCH,
 	(int)major,(int)minor,(int)patch );
@@ -3271,6 +3272,7 @@
 	printf("Library and header version mismatch! Fix it in your distribution!\n");
 	exit(1);
     }
+#endif
     return 0;
 }
 EOF