浏览代码

patches: update fake-font-lookup patch

Gleb Pinigin 12 年之前
父节点
当前提交
be63e18eff
共有 1 个文件被更改,包括 12 次插入12 次删除
  1. 12 12
      patches/0007-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

+ 12 - 12
patches/0007-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,15 +1,15 @@
-From 6a3762687d7c0e44e0a321c8a614bbe16ec1740e Mon Sep 17 00:00:00 2001
+From b2f5ba57d4d16b11d6e0016fd1f1d93d86743878 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Fri, 3 May 2013 14:21:19 +0200
-Subject: [PATCH 7/8] freetype: added a fake font lookup mechanism for iOS to
- use the packaged demo fonts
+Date: Fri, 19 Jul 2013 18:38:41 +0700
+Subject: [PATCH] freetype: added a fake font lookup mechanism for iOS to use
+ the packaged demo fonts
 
 ---
- modules/text_renderer/freetype.c |   42 ++++++++++++++++++++++++++++++++++++++
+ modules/text_renderer/freetype.c | 42 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index 1325d3e..a070edd 100644
+index cdc9243..bc0a535 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
 @@ -106,6 +106,9 @@
@@ -22,7 +22,7 @@ index 1325d3e..a070edd 100644
  #endif
  #include <sys/param.h>                         /* for MAXPATHLEN */
  #undef HAVE_FONTCONFIG
-@@ -818,6 +821,40 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
+@@ -807,6 +810,40 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
  
      return psz_path;
  }
@@ -63,16 +63,16 @@ index 1325d3e..a070edd 100644
  #endif
  #endif
  
-@@ -2004,6 +2041,8 @@ static FT_Face LoadFace( filter_t *p_filter,
+@@ -1988,6 +2025,8 @@ static FT_Face LoadFace( filter_t *p_filter,
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
          psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx );
 +#else
 +        psz_fontfile = iOSFake_Select( p_filter, false, false, false );
  #endif
- #elif defined( WIN32 )
+ #elif defined( _WIN32 )
          psz_fontfile = Win32_Select( p_filter,
-@@ -2920,6 +2959,9 @@ static int Create( vlc_object_t *p_this )
+@@ -2889,6 +2928,9 @@ static int Create( vlc_object_t *p_this )
  #elif defined(__APPLE__)
  #if !TARGET_OS_IPHONE
      psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
@@ -80,8 +80,8 @@ index 1325d3e..a070edd 100644
 +    psz_fontfile = iOSFake_Select( p_filter, false, false, false );
 +    psz_monofontfile = iOSFake_Select( p_filter, true, false, false );
  #endif
- #elif defined(WIN32)
+ #elif defined(_WIN32)
      psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
 -- 
-1.7.10.2 (Apple Git-33)
+1.7.12.4 (Apple Git-37)