Enlightenment CVS committal
Author : mej
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2
Modified Files:
AUTHORS ChangeLog TODO configure.ac configure.in imlib2.pc.in
Log Message:
Sat Jul 12 21:06:14 EDT 2003
(KainX)
Patch from Yuri Hudobin <[EMAIL PROTECTED]>
for Freetype2 support.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/AUTHORS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- AUTHORS 4 Feb 2003 22:06:02 -0000 1.25
+++ AUTHORS 13 Jul 2003 01:09:14 -0000 1.26
@@ -23,3 +23,4 @@
Mark Bainter <[EMAIL PROTECTED]>
Brian Lindholm <[EMAIL PROTECTED]>
Renchi Raju <[EMAIL PROTECTED]>
+Yuri Hudobin <[EMAIL PROTECTED]>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ChangeLog 4 Apr 2003 01:49:41 -0000 1.16
+++ ChangeLog 13 Jul 2003 01:09:15 -0000 1.17
@@ -2974,3 +2974,11 @@
Minor Makefile.am tweak which apparently helps portability.
_______________________________________________
+
+Sat Jul 12 21:06:14 EDT 2003
+(KainX)
+
+Patch from Yuri Hudobin <[EMAIL PROTECTED]>
+for Freetype2 support.
+
+_______________________________________________
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/TODO,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- TODO 25 Sep 2002 09:15:16 -0000 1.7
+++ TODO 13 Jul 2003 01:09:15 -0000 1.8
@@ -1,6 +1,6 @@
* line code doesnt draw nice liens when clipping - fix
* filled polygons can break fill bounds on corner cases - fix
-* imlib2 needs freetype 1.x - shoudl graduate to 2.x
+* go thru TODOs and FIXMEs
-evas2 has fixed code for these 3 in it that work just fine. just need to
+evas2 has fixed code for these 2 in it that work just fine. just need to
port over (should be fairly easy).
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.ac 3 May 2003 08:56:29 -0000 1.16
+++ configure.ac 13 Jul 2003 01:09:15 -0000 1.17
@@ -7,14 +7,30 @@
AM_CONFIG_HEADER(config.h)
-freetype_libs=-lttf
-AC_ARG_WITH(ttf,
- [ --with-ttf=DIR use freetype rooted at <DIR>],
- [freetype_libs="$freetype_libs -L$withval/lib"
- freetype_includes="-I$withval/include"
- CPPFLAGS="$CPPFLAGS $freetype_includes"
- LIBS="$LIBS $freetype_libs"
- ])
+dnl here was freetype stuff (1)
+
+# check for freetype
+
+AC_ARG_WITH(freetype-config,
+ [ --with-freetype-config=FREETYPE_CONFIG use freetype-config specified
],
+ [
+ PROG_CONFIG=$withval;
+ echo "using "$PROG_CONFIG" for freetype-config";
+ ],[
+ PROG="freetype-config";
+ AC_PATH_PROG(PROG_CONFIG, $PROG, "", $PATH)
+ ])
+if [ test -z $PROG_CONFIG ]; then
+ echo $PROG " is not in your \$PATH. Please ensure it is.";
+ echo "You may need to install the librarya and/or development packages";
+ echo "that contain this configure-script.";
+ echo "FATAL ERROR. ABORT.";
+ exit -1;
+fi
+freetype_cflags=`$PROG_CONFIG --cflags`
+freetype_libs=`$PROG_CONFIG --libs`
+
+dnl /here was freetype stuff (1)
mmx=no
AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly
[default=yes]],
@@ -138,47 +154,12 @@
sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
AC_SUBST(LTLIBOBJS)
-AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS=-lttf, [
-echo ""
-echo "ERROR: Imlib 2 needs a system with libttf.so (TrueType Font Library)"
-echo "You can obtain it from:"
-echo "ftp://ftp.enlightenment.org/pub/enlightenment/";
-echo "ftp://www.rasterman.com/pub/enlightenment/";
-echo "You can also obtain it from:"
-echo "http://www.freetype.org/";
-echo "You can obtain some truetype fonts from:"
-echo "http://voyager.cns.ohiou.edu/~sadkins/web_library/fonts/font_archive/";
-echo ""
-AC_MSG_ERROR([Fatal Error: no FreeType detected.])], -lm)
-
-AC_CHECK_HEADERS(freetype.h freetype/freetype.h freetype1/freetype/freetype.h, [
break])
-AC_CHECK_HEADER(freetype.h, [ ftype=yes ], [ ftype=no ])
-AC_CHECK_HEADER(freetype/freetype.h, [ ftype_ftype=yes ], [ ftype_ftype=no ])
-AC_CHECK_HEADER(freetype1/freetype/freetype.h, [ ftype1_ftype=yes ], [
ftype1_ftype=no ])
-
-if test x$ftype = xno; then
-if test x$ftype_ftype = xno; then
-if test x$ftype1_ftype = xno; then
-echo ""
-echo "ERROR: freetype.h not found in freetype.h or freetype/freetype.h include"
-echo "paths. (ie /usr/include, /usr/local/include etc.). You need the freetype"
-echo "header files to build Imlib 2. This may mean you have to install the"
-echo "freetype-devel packages for your distribution or if all else fails"
-echo "find the source for freetype and install that somewhere where Imlib 2"
-echo "can find the header files."
-echo ""
-echo "You can obtain it from:"
-echo "ftp://ftp.enlightenment.org/pub/enlightenment/";
-echo "ftp://www.rasterman.com/pub/enlightenment/";
-echo "You can also obtain it from:"
-echo "http://www.freetype.org/";
-echo "You can obtain some truetype fonts from:"
-echo "http://voyager.cns.ohiou.edu/~sadkins/web_library/fonts/font_archive/";
-echo ""
-AC_MSG_ERROR([Fatal Error: no FreeType header files detected.])
-fi
-fi
-fi
+dnl here was freetype headers checking
+
+
+
+dnl /here was freetype headers checking
+
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
EXTRA_LIBS="-L/usr/local/lib -L/usr/X11R6/lib"
@@ -323,8 +304,11 @@
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
AC_SUBST(dlopen_libs)
+AC_SUBST(freetype_cflags)
AC_SUBST(freetype_libs)
-AC_SUBST(freetype_includes)
+
+dnl AC_SUBST(freetype_libs)
+dnl AC_SUBST(freetype_includes)
AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile
test/Makefile \
filters/Makefile demo/Makefile doc/Makefile \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- configure.in 3 May 2003 08:56:29 -0000 1.61
+++ configure.in 13 Jul 2003 01:09:15 -0000 1.62
@@ -6,14 +6,28 @@
AM_CONFIG_HEADER(config.h)
-freetype_libs=-lttf
-AC_ARG_WITH(ttf,
- [ --with-ttf=DIR use freetype rooted at <DIR>],
- [freetype_libs="$freetype_libs -L$withval/lib"
- freetype_includes="-I$withval/include"
- CPPFLAGS="$CPPFLAGS $freetype_includes"
- LIBS="$LIBS $freetype_libs"
+dnl here was freetype stuff (1)
+
+AC_ARG_WITH(freetype-config,
+ [ --with-freetype-config=FREETYPE_CONFIG use freetype-config specified
],
+ [
+ PROG_CONFIG=$withval;
+ echo "using "$PROG_CONFIG" for freetype-config";
+ ],[
+ PROG="freetype-config";
+ AC_PATH_PROG(PROG_CONFIG, $PROG, "", $PATH)
])
+if [ test -z $PROG_CONFIG ]; then
+ echo $PROG " is not in your \$PATH. Please ensure it is.";
+ echo "You may need to install the librarya and/or development packages";
+ echo "that contain this configure-script.";
+ echo "FATAL ERROR. ABORT.";
+ exit -1;
+fi
+freetype_cflags=`$PROG_CONFIG --cflags`
+freetype_libs=`$PROG_CONFIG --libs`
+
+dnl /here was freetype stuff (1)
mmx=no
AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly
[default=yes]],
@@ -120,45 +134,15 @@
LTLIBOBJS=`echo "$LIBOBJS" | sed 's,.o ,.lo ,g;s,.o$,.lo,'`
AC_SUBST(LTLIBOBJS)
-AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS=-lttf, [
-echo ""
-echo "ERROR: Imlib 2 needs a system with libttf.so (TrueType Font Library)"
-echo "You can obtain it from:"
-echo "ftp://ftp.enlightenment.org/pub/enlightenment/";
-echo "ftp://www.rasterman.com/pub/enlightenment/";
-echo "You can also obtain it from:"
-echo "http://www.freetype.org/";
-echo ""
-AC_MSG_ERROR([Fatal Error: no FreeType detected.])], -lm)
-
-AC_CHECK_HEADERS(freetype.h freetype/freetype.h freetype1/freetype/freetype.h, [
break])
-AC_CHECK_HEADER(freetype.h, [ ftype=yes ], [ ftype=no ])
-AC_CHECK_HEADER(freetype/freetype.h, [ ftype_ftype=yes ], [ ftype_ftype=no ])
-AC_CHECK_HEADER(freetype1/freetype/freetype.h, [ ftype1_ftype=yes ], [
ftype1_ftype=no ])
-
-if test x$ftype = xno; then
-if test x$ftype_ftype = xno; then
-if test x$ftype1_ftype = xno; then
-echo ""
-echo "ERROR: freetype.h not found in freetype.h or freetype/freetype.h include"
-echo "paths. (ie /usr/include, /usr/local/include etc.). You need the freetype"
-echo "header files to build Imlib 2. This may mean you have to install the"
-echo "freetype-devel packages for your distribution or if all else fails"
-echo "find the source for freetype and install that somewhere where Imlib 2"
-echo "can find the header files."
-echo ""
-echo "You can obtain it from:"
-echo "ftp://ftp.enlightenment.org/pub/enlightenment/";
-echo "ftp://www.rasterman.com/pub/enlightenment/";
-echo "You can also obtain it from:"
-echo "http://www.freetype.org/";
-echo "You can obtain some truetype fonts from:"
-echo "http://voyager.cns.ohiou.edu/~sadkins/web_library/fonts/font_archive/";
-echo ""
-AC_MSG_ERROR([Fatal Error: no FreeType header files detected.])
-fi
-fi
-fi
+
+dnl here was freetype headers checking
+
+
+
+dnl /here was freetype headers checking
+
+
+
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
EXTRA_LIBS="-L/usr/local/lib -L/usr/X11R6/lib"
@@ -304,7 +288,10 @@
AC_SUBST(x_libs)
AC_SUBST(dlopen_libs)
AC_SUBST(freetype_libs)
-AC_SUBST(freetype_includes)
+AC_SUBST(freetype_cflags)
+
+dnl AC_SUBST(freetype_libs)
+dnl AC_SUBST(freetype_includes)
AC_OUTPUT(imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile
test/Makefile \
filters/Makefile demo/Makefile doc/Makefile \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2.pc.in 3 May 2003 08:56:29 -0000 1.1
+++ imlib2.pc.in 13 Jul 2003 01:09:15 -0000 1.2
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: @REQUIREMENTS@
Libs: -L${libdir} -lImlib2 @freetype_libs@ -lm @x_libs@ @x_ldflags@ @dlopen_libs@
-Cflags: -I${includedir} @x_includes@ @freetype_includes@
+Cflags: -I${includedir} @x_includes@ @freetype_cflags@
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
