0013-contrib-enable-fribidi-libass-and-libxml2-for-iOS.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. From d46f03dc1615081eeaf4da5044fe9f055363fbef Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Fri, 3 May 2013 14:30:04 +0200
  4. Subject: [PATCH 13/13] contrib: enable fribidi, libass, and libxml2 for iOS
  5. ---
  6. contrib/src/ass/rules.mak | 5 +++++
  7. extras/package/ios/build.sh | 13 +++++++------
  8. 2 files changed, 12 insertions(+), 6 deletions(-)
  9. diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
  10. index e9470e3..05ad6a6 100644
  11. --- a/contrib/src/ass/rules.mak
  12. +++ b/contrib/src/ass/rules.mak
  13. @@ -11,9 +11,14 @@ ifdef HAVE_ANDROID
  14. WITH_FONTCONFIG = 0
  15. WITH_HARFBUZZ = 0
  16. else
  17. +ifdef HAVE_IOS
  18. +WITH_FONTCONFIG = 0
  19. +WITH_HARFBUZZ = 1
  20. +else
  21. WITH_FONTCONFIG = 1
  22. WITH_HARFBUZZ = 1
  23. endif
  24. +endif
  25. $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
  26. $(call download,$(ASS_URL))
  27. diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
  28. index fa813c5..636a104 100755
  29. --- a/extras/package/ios/build.sh
  30. +++ b/extras/package/ios/build.sh
  31. @@ -191,10 +191,7 @@ fi
  32. --enable-small \
  33. --disable-sdl \
  34. --disable-SDL_image \
  35. - --disable-fontconfig \
  36. - --disable-ass \
  37. --disable-iconv \
  38. - --disable-fribidi \
  39. --disable-zvbi \
  40. --disable-kate \
  41. --disable-caca \
  42. @@ -214,7 +211,11 @@ fi
  43. --disable-libmpeg2 \
  44. --disable-chromaprint \
  45. --disable-mad \
  46. + --enable-fribidi \
  47. + --enable-libxml2 \
  48. --enable-freetype2 \
  49. + --enable-ass \
  50. + --disable-fontconfig \
  51. --disable-taglib > ${out}
  52. echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
  53. @@ -279,7 +280,7 @@ ${VLCROOT}/configure \
  54. --disable-faad \
  55. --disable-lua \
  56. --disable-a52 \
  57. - --disable-fribidi \
  58. + --enable-fribidi \
  59. --disable-macosx-audio \
  60. --disable-qt --disable-skins2 \
  61. --disable-libgcrypt \
  62. @@ -297,8 +298,8 @@ ${VLCROOT}/configure \
  63. --enable-dvbpsi \
  64. --enable-swscale \
  65. --disable-projectm \
  66. - --disable-libass \
  67. - --disable-libxml2 \
  68. + --enable-libass \
  69. + --enable-libxml2 \
  70. --disable-goom \
  71. --disable-dvdread \
  72. --disable-dvdnav \
  73. --
  74. 1.7.12.4 (Apple Git-37)