[Gnash-commit] gnash ChangeLog Makefile.am configure.ac server...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/14 07:17:12

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        server         : FreetypeGlyphsProvider.cpp Makefile.am 
        server/parser  : Makefile.am 

Log message:
                * Makefile.am, configure.ac: look for freetype2, not freetype
                  (for pkg-config to be effective). Rename _CFLAGS and _LIBS
                  to be FREETYPE2, not FREETYPE
                * server/Makefile.am, server/parser/Makefile.am:
                  Use FREETYPE2_{CFLAGS,LIBS}
                * server/FreetypeGlyphsProvider.cpp: use an FT_CONST macro
                  to switch between constness of Outline walker func between
                  freetype 2.1 (wants non-const) and 2.2 (wants const).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3535&r2=1.3536
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.341&r2=1.342
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3535
retrieving revision 1.3536
diff -u -b -r1.3535 -r1.3536
--- ChangeLog   14 Jun 2007 02:03:17 -0000      1.3535
+++ ChangeLog   14 Jun 2007 07:17:10 -0000      1.3536
@@ -1,3 +1,14 @@
+2007-06-14 Hubert Figuiere <address@hidden>
+
+       * Makefile.am, configure.ac: look for freetype2, not freetype
+         (for pkg-config to be effective). Rename _CFLAGS and _LIBS
+         to be FREETYPE2, not FREETYPE
+       * server/Makefile.am, server/parser/Makefile.am: 
+         Use FREETYPE2_{CFLAGS,LIBS}
+       * server/FreetypeGlyphsProvider.cpp: use an FT_CONST macro
+         to switch between constness of Outline walker func between
+         freetype 2.1 (wants non-const) and 2.2 (wants const).
+
 2007-06-14 Zou Lunkai <address@hidden>
 
        * server/character.h, 

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Makefile.am 13 Jun 2007 09:59:42 -0000      1.77
+++ Makefile.am 14 Jun 2007 07:17:10 -0000      1.78
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.77 2007/06/13 09:59:42 strk Exp $
+# $Id: Makefile.am,v 1.78 2007/06/14 07:17:10 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -193,8 +193,8 @@
        @echo " Z_LIBS is $(Z_LIBS)"
        @echo " LIBXML_CFLAGS is $(LIBXML_CFLAGS)"
        @echo " LIBXML_LIBS is $(LIBXML_LIBS)"
-       @echo " FREETYPE_CFLAGS is $(FREETYPE_CFLAGS)"
-       @echo " FREETYPE_LIBS is $(FREETYPE_LIBS)"
+       @echo " FREETYPE2_CFLAGS is $(FREETYPE2_CFLAGS)"
+       @echo " FREETYPE2_LIBS is $(FREETYPE2_LIBS)"
        @echo " FONTCONFIG_CFLAGS is $(FONTCONFIG_CFLAGS)"
        @echo " FONTCONFIG_LIBS is $(FONTCONFIG_LIBS)"
 if HAVE_DMALLOC

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -b -r1.341 -r1.342
--- configure.ac        13 Jun 2007 17:51:24 -0000      1.341
+++ configure.ac        14 Jun 2007 07:17:11 -0000      1.342
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.341 2007/06/13 17:51:24 strk Exp $
+dnl $Id: configure.ac,v 1.342 2007/06/14 07:17:11 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -708,7 +708,7 @@
 GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
 
 dnl Find freetype and fontconfig
-GNASH_PKG_FIND(freetype, [freetype/freetype.h], [freetype2 font library], 
FT_Load_Char)
+GNASH_PKG_FIND(freetype2, [freetype/freetype.h], [freetype2 font library], 
FT_Load_Char)
 GNASH_PKG_FIND(fontconfig, [fontconfig/fontconfig.h], [fontconfig library], 
FcFontMatch)
 
 AC_PATH_MING

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/FreetypeGlyphsProvider.cpp   13 Jun 2007 16:30:52 -0000      1.2
+++ server/FreetypeGlyphsProvider.cpp   14 Jun 2007 07:17:11 -0000      1.3
@@ -32,6 +32,14 @@
 # include <ft2build.h>
 # include FT_OUTLINE_H
 # include FT_BBOX_H
+// Methods of FT_Outline_Funcs take a 'const FT_Vector*' in 2.2
+// and a non-const one in 2.1, so we use an FT_CONST macro to
+// support both
+# if FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 2
+#  define FT_CONST 
+# else
+#  define FT_CONST const
+# endif
 #endif
 
 #ifdef HAVE_FONTCONFIG_FONTCONFIG_H
@@ -82,7 +90,7 @@
 
        /// Callback function for the move_to member of FT_Outline_Funcs
        static int
-       walkMoveTo(FT_Vector* to, void* ptr)
+       walkMoveTo(FT_CONST FT_Vector* to, void* ptr)
        {
                OutlineWalker* walker = static_cast<OutlineWalker*>(ptr);
                return walker->moveTo(to);
@@ -90,7 +98,7 @@
 
        /// Callback function for the line_to member of FT_Outline_Funcs
        static int
-       walkLineTo(FT_Vector* to, void* ptr)
+       walkLineTo(FT_CONST FT_Vector* to, void* ptr)
        {
                OutlineWalker* walker = static_cast<OutlineWalker*>(ptr);
                return walker->lineTo(to);
@@ -98,7 +106,7 @@
 
        /// Callback function for the conic_to member of FT_Outline_Funcs
        static int
-       walkConicTo(FT_Vector* ctrl, FT_Vector* to, void* ptr)
+       walkConicTo(FT_CONST FT_Vector* ctrl, FT_CONST FT_Vector* to, void* ptr)
        {
                OutlineWalker* walker = static_cast<OutlineWalker*>(ptr);
                return walker->conicTo(ctrl, to);
@@ -110,7 +118,7 @@
        /// falling in the middle of the two control points.
        ///
        static int
-       walkCubicTo(FT_Vector* ctrl1, FT_Vector* ctrl2, FT_Vector* to, void* 
ptr)
+       walkCubicTo(FT_CONST FT_Vector* ctrl1, FT_CONST FT_Vector* ctrl2, 
FT_CONST FT_Vector* to, void* ptr)
        {
                OutlineWalker* walker = static_cast<OutlineWalker*>(ptr);
                return walker->cubicTo(ctrl1, ctrl2, to);
@@ -122,7 +130,7 @@
 
        float _scale;
 
-       int moveTo(FT_Vector* to)
+       int moveTo(const FT_Vector* to)
        {
 #ifdef DEBUG_OUTLINE_DECOMPOSITION 
                log_debug("moveTo: %ld,%ld", to->x, to->y);
@@ -132,7 +140,7 @@
        }
 
        int
-       lineTo(FT_Vector* to)
+       lineTo(const FT_Vector* to)
        {
 #ifdef DEBUG_OUTLINE_DECOMPOSITION 
                log_debug("lineTo: %ld,%ld", to->x, to->y);
@@ -142,7 +150,7 @@
        }
 
        int
-       conicTo(FT_Vector* ctrl, FT_Vector* to)
+       conicTo(const FT_Vector* ctrl, const FT_Vector* to)
        {
 #ifdef DEBUG_OUTLINE_DECOMPOSITION 
                log_debug("conicTo: %ld,%ld %ld,%ld", ctrl->x, ctrl->y, to->x, 
to->y);
@@ -152,7 +160,7 @@
        }
 
        int
-       cubicTo(FT_Vector* ctrl1, FT_Vector* ctrl2, FT_Vector* to)
+       cubicTo(const FT_Vector* ctrl1, const FT_Vector* ctrl2, const 
FT_Vector* to)
        {
 #ifdef DEBUG_OUTLINE_DECOMPOSITION 
                log_debug("cubicTo: %ld,%ld %ld,%ld %ld,%ld", ctrl1->x, 
ctrl1->y, ctrl2->x, ctrl2->y, to->x, to->y);

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- server/Makefile.am  13 Jun 2007 15:17:30 -0000      1.118
+++ server/Makefile.am  14 Jun 2007 07:17:11 -0000      1.119
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.118 2007/06/13 15:17:30 strk Exp $
+# $Id: Makefile.am,v 1.119 2007/06/14 07:17:11 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -48,7 +48,7 @@
        $(GSTREAMER_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       $(FREETYPE_CFLAGS) \
+       $(FREETYPE2_CFLAGS) \
        $(FONTCONFIG_CFLAGS) \
        $(NULL)
 
@@ -172,7 +172,7 @@
        $(LIBXML_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
-       $(FREETYPE_LIBS) \
+       $(FREETYPE2_LIBS) \
        $(FONTCONFIG_LIBS) \
        $(NULL)
 

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/parser/Makefile.am   12 Jun 2007 12:33:22 -0000      1.35
+++ server/parser/Makefile.am   14 Jun 2007 07:17:12 -0000      1.36
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.35 2007/06/12 12:33:22 strk Exp $
+# $Id: Makefile.am,v 1.36 2007/06/14 07:17:12 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -41,7 +41,7 @@
        $(PTHREAD_CFLAGS) \
        $(DMALLOC_CFLAGS) \
         $(BOOST_CFLAGS) \
-       $(FREETYPE_CFLAGS) \
+       $(FREETYPE2_CFLAGS) \
        $(NULL)
 
 libgnashparser_la_SOURCES = \