- updated from freetype.org to kill internal freetype API usage

[packages/SDL_ttf.git] / SDL_ttf-ft2build_h.patch

diff --git a/SDL_ttf-ft2build_h.patch b/SDL_ttf-ft2build_h.patch
index cfcc358b6341bf81aafe6872dd56b02e13441649..bbdfa8ebc1002a88720c189906175b8d72b2e3ce 100644 (file)
--- a/SDL_ttf-ft2build_h.patch
+++ b/SDL_ttf-ft2build_h.patch
@@ -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;