Jelajahi Sumber

patches/libvlc: fixed compiling freetype for iOS

Felix Paul Kühne 12 tahun lalu
induk
melakukan
0fa63a9cf0

+ 64 - 0
patches/0011-freetype-fixed-compilation-for-non-Mac-darwin-platfo.patch

@@ -0,0 +1,64 @@
+From 76c1c80fd8ea4f2d2fae0cdf61a3d4348f872001 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Thu, 2 May 2013 22:23:14 +0100
+Subject: [PATCH 11/11] freetype: fixed compilation for non-Mac darwin
+ platforms
+
+---
+ modules/text_renderer/freetype.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
+index a9787cb..1325d3e 100644
+--- a/modules/text_renderer/freetype.c
++++ b/modules/text_renderer/freetype.c
+@@ -103,7 +103,10 @@
+ 
+ /* apple stuff */
+ #ifdef __APPLE__
++#include <TargetConditionals.h>
++#if !TARGET_OS_IPHONE
+ #include <Carbon/Carbon.h>
++#endif
+ #include <sys/param.h>                         /* for MAXPATHLEN */
+ #undef HAVE_FONTCONFIG
+ #define HAVE_STYLES
+@@ -736,6 +739,7 @@ fail:
+ #endif /* HAVE_WIN32 */
+ 
+ #ifdef __APPLE__
++#if !TARGET_OS_IPHONE
+ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
+                           bool b_bold, bool b_italic, int i_size, int *i_idx )
+ {
+@@ -815,6 +819,7 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
+     return psz_path;
+ }
+ #endif
++#endif
+ 
+ #endif /* HAVE_STYLES */
+ 
+@@ -1997,7 +2002,9 @@ static FT_Face LoadFace( filter_t *p_filter,
+                                           -1,
+                                           &i_idx );
+ #elif defined( __APPLE__ )
++#if !TARGET_OS_IPHONE
+         psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx );
++#endif
+ #elif defined( WIN32 )
+         psz_fontfile = Win32_Select( p_filter,
+                                     p_style->psz_fontname,
+@@ -2911,7 +2918,9 @@ static int Create( vlc_object_t *p_this )
+                                           false, p_sys->i_default_font_size,
+                                           &monofontindex );
+ #elif defined(__APPLE__)
++#if !TARGET_OS_IPHONE
+     psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
++#endif
+ #elif defined(WIN32)
+     psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
+                                  p_sys->i_default_font_size, &fontindex );
+-- 
+1.7.12.4 (Apple Git-37)
+