Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (5f2ee71baa7310e58faba7224fc036dc249363ab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (5f2ee71baa7310e58faba7224fc036dc249363ab)
  • Date: Mon, 2 Oct 2006 19:01:58 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

libs/sdl_ttf/HISTORY | 4 +++
libs/sdl_ttf/PRE_BUILD | 6 +++++
libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch | 28
+++++++++++++++++++++++++
3 files changed, 38 insertions(+)

New commits:
commit 5f2ee71baa7310e58faba7224fc036dc249363ab
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

sdl_ttf: apply patch if freetype 2.2

diff --git a/libs/sdl_ttf/HISTORY b/libs/sdl_ttf/HISTORY
index 4b72256..2011aeb 100644
--- a/libs/sdl_ttf/HISTORY
+++ b/libs/sdl_ttf/HISTORY
@@ -1,3 +1,7 @@
+2006-10-02 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch if freetype2 2.2.x
+ http://freetype.sourceforge.net/freetype2/freetype-2.2.0.html
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/sdl_ttf/PRE_BUILD b/libs/sdl_ttf/PRE_BUILD
new file mode 100755
index 0000000..ac257f1
--- /dev/null
+++ b/libs/sdl_ttf/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$(installed_version freetype2 | cut -d . -f 1-2)" == "2.2" ]]; then
+ patch -p0 < ${SCRIPT_DIRECTORY}/sdl-ttf-2.0.8-noftinternals.patch
+fi
diff --git a/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
b/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
new file mode 100644
index 0000000..106f3ff
--- /dev/null
+++ b/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
@@ -0,0 +1,28 @@
+--- SDL_ttf.c.orig 2006-10-02 18:49:02.000000000 -0500
++++ SDL_ttf.c 2006-10-02 18:51:21.000000000 -0500
+@@ -43,16 +43,6 @@
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ #include FT_TRUETYPE_IDS_H
+-/*
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
+-*/
+-#include <freetype/internal/ftobjs.h>
+-
+-#ifndef FT_OPEN_STREAM
+-#define FT_OPEN_STREAM ft_open_stream
+-#endif
+
+ #include "SDL.h"
+ #include "SDL_endian.h"
+@@ -278,7 +268,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (5f2ee71baa7310e58faba7224fc036dc249363ab), Robin Cook, 10/02/2006

Archive powered by MHonArc 2.6.24.

Top of Page