SOURCES: SDL_ttf-ft2build_h.patch - updated from freetype.org to k...

[qboosh]

Author: qboosh                       Date: Sun May 21 21:27:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated from freetype.org to kill internal freetype API usage

---- Files affected:
SOURCES:
   SDL_ttf-ft2build_h.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/SDL_ttf-ft2build_h.patch
diff -u SOURCES/SDL_ttf-ft2build_h.patch:1.3 SOURCES/SDL_ttf-ft2build_h.patch:1.4
--- SOURCES/SDL_ttf-ft2build_h.patch:1.3	Sun Jan 16 00:55:25 2005
+++ SOURCES/SDL_ttf-ft2build_h.patch	Sun May 21 23:27:46 2006
@@ -1,26 +1,28 @@
---- SDL_ttf-2.0.7/SDL_ttf.c.orig	2004-12-16 06:39:54.000000000 +0100
-+++ SDL_ttf-2.0.7/SDL_ttf.c	2005-01-16 00:45:34.909519768 +0100
-@@ -43,12 +43,13 @@
+--- SDL_ttf-2.0.8/SDL_ttf.c.orig	2006-05-21 23:23:20.169387000 +0200
++++ SDL_ttf-2.0.8/SDL_ttf.c	2006-05-21 23:24:21.793239000 +0200
+@@ -43,16 +43,6 @@
  #include FT_FREETYPE_H
  #include FT_OUTLINE_H
  #include FT_TRUETYPE_IDS_H
-+#include FT_INTERNAL_OBJECTS_H
- /*
- #include <freetype/freetype.h>
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
+-/*
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
 -*/
- #include <freetype/internal/ftobjs.h>
-+*/
+-#include <freetype/internal/ftobjs.h>
+-
+-#ifndef FT_OPEN_STREAM
+-#define FT_OPEN_STREAM ft_open_stream
+-#endif
  
- #ifndef FT_OPEN_STREAM
- #define FT_OPEN_STREAM ft_open_stream
-@@ -182,7 +183,7 @@
- 	  int          err_code;
- 	  const char*  err_msg;
- 	} ft_errors[] = {
--#include <freetype/fterrors.h>
-+#include FT_ERRORS_H
- 	};
- 	int i;
- 	const char *err_msg;
+ #include "SDL.h"
+ #include "SDL_endian.h"
+@@ -278,7 +268,7 @@
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = library->memory;
++	stream->memory = NULL;  /* set by FT_Open_Face */
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/SDL_ttf-ft2build_h.patch?r1=1.3&r2=1.4&f=u