0011-freetype-fixed-compilation-for-non-Mac-darwin-platfo.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. From 76c1c80fd8ea4f2d2fae0cdf61a3d4348f872001 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Thu, 2 May 2013 22:23:14 +0100
  4. Subject: [PATCH 11/11] freetype: fixed compilation for non-Mac darwin
  5. platforms
  6. ---
  7. modules/text_renderer/freetype.c | 9 +++++++++
  8. 1 file changed, 9 insertions(+)
  9. diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
  10. index a9787cb..1325d3e 100644
  11. --- a/modules/text_renderer/freetype.c
  12. +++ b/modules/text_renderer/freetype.c
  13. @@ -103,7 +103,10 @@
  14. /* apple stuff */
  15. #ifdef __APPLE__
  16. +#include <TargetConditionals.h>
  17. +#if !TARGET_OS_IPHONE
  18. #include <Carbon/Carbon.h>
  19. +#endif
  20. #include <sys/param.h> /* for MAXPATHLEN */
  21. #undef HAVE_FONTCONFIG
  22. #define HAVE_STYLES
  23. @@ -736,6 +739,7 @@ fail:
  24. #endif /* HAVE_WIN32 */
  25. #ifdef __APPLE__
  26. +#if !TARGET_OS_IPHONE
  27. static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
  28. bool b_bold, bool b_italic, int i_size, int *i_idx )
  29. {
  30. @@ -815,6 +819,7 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
  31. return psz_path;
  32. }
  33. #endif
  34. +#endif
  35. #endif /* HAVE_STYLES */
  36. @@ -1997,7 +2002,9 @@ static FT_Face LoadFace( filter_t *p_filter,
  37. -1,
  38. &i_idx );
  39. #elif defined( __APPLE__ )
  40. +#if !TARGET_OS_IPHONE
  41. psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx );
  42. +#endif
  43. #elif defined( WIN32 )
  44. psz_fontfile = Win32_Select( p_filter,
  45. p_style->psz_fontname,
  46. @@ -2911,7 +2918,9 @@ static int Create( vlc_object_t *p_this )
  47. false, p_sys->i_default_font_size,
  48. &monofontindex );
  49. #elif defined(__APPLE__)
  50. +#if !TARGET_OS_IPHONE
  51. psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
  52. +#endif
  53. #elif defined(WIN32)
  54. psz_fontfile = Win32_Select( p_filter, psz_fontfamily, false, false,
  55. p_sys->i_default_font_size, &fontindex );
  56. --
  57. 1.7.12.4 (Apple Git-37)