[Armadeus-commitlog] SF.net SVN: armadeus:[831] trunk/buildroot/package/sdl

[<ar...@us...>]

Revision: 831
          http://armadeus.svn.sourceforge.net/armadeus/?rev=831&view=rev
Author:   artemys
Date:     2008-07-17 08:11:14 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
[BUILDROOT] Fixes bug 2019483 (SDL_ttf doesn't compile)

Modified Paths:
--------------
    trunk/buildroot/package/sdl/sdl_ttf.mk

Added Paths:
-----------
    trunk/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch

Added: trunk/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
===================================================================
--- trunk/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch	                        (rev 0)
+++ trunk/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch	2008-07-17 08:11:14 UTC (rev 831)
@@ -0,0 +1,29 @@
+diff -urN -X dontdiff SDL_ttf-2.0.8/SDL_ttf.c SDL_ttf-2.0.8.mod/SDL_ttf.c
+--- SDL_ttf-2.0.8/SDL_ttf.c	2006-05-01 11:26:17.000000000 +0200
++++ SDL_ttf-2.0.8.mod/SDL_ttf.c	2008-07-12 19:56:49.000000000 +0200
+@@ -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;  /* set by FT_Open_Face */
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;

Modified: trunk/buildroot/package/sdl/sdl_ttf.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl_ttf.mk	2008-07-16 10:11:56 UTC (rev 830)
+++ trunk/buildroot/package/sdl/sdl_ttf.mk	2008-07-17 08:11:14 UTC (rev 831)
@@ -17,6 +17,7 @@
 
 $(SDL-TTF_DIR)/.unpacked: $(DL_DIR)/$(SDL-TTF_SOURCE)
 	$(SDL-TTF_CAT) $(DL_DIR)/$(SDL-TTF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(SDL-TTF_DIR) package/sdl sdl_ttf-$(SDL-TTF_VERSION)\*.patch
 	touch $@
 
 $(SDL-TTF_DIR)/.configured: $(SDL-TTF_DIR)/.unpacked
@@ -48,7 +49,7 @@
 
 $(TARGET_DIR)/usr/lib/libSDL_ttf.so: $(STAGING_DIR)/usr/lib/libSDL_ttf.so
 	cp -dpf $(STAGING_DIR)/usr/lib/libSDL_ttf*.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+	-$(STRIPCMD) --strip-unneeded $(TARGET_DIR)/usr/lib/libSDL_ttf.so
 
 SDL_TTF sdl_ttf: uclibc sdl freetype $(TARGET_DIR)/usr/lib/libSDL_ttf.so
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.