浏览代码

patches: enable fribidi, libass, libxml2 and harfbuzz for proper subtitle support

Felix Paul Kühne 12 年之前
父节点
当前提交
b99dc47584

+ 79 - 0
patches/0013-contrib-enable-fribidi-libass-and-libxml2-for-iOS.patch

@@ -0,0 +1,79 @@
+From d46f03dc1615081eeaf4da5044fe9f055363fbef 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:30:04 +0200
+Subject: [PATCH 13/13] contrib: enable fribidi, libass, and libxml2 for iOS
+
+---
+ contrib/src/ass/rules.mak   |  5 +++++
+ extras/package/ios/build.sh | 13 +++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
+index e9470e3..05ad6a6 100644
+--- a/contrib/src/ass/rules.mak
++++ b/contrib/src/ass/rules.mak
+@@ -11,9 +11,14 @@ ifdef HAVE_ANDROID
+ WITH_FONTCONFIG = 0
+ WITH_HARFBUZZ = 0
+ else
++ifdef HAVE_IOS
++WITH_FONTCONFIG = 0
++WITH_HARFBUZZ = 1
++else
+ WITH_FONTCONFIG = 1
+ WITH_HARFBUZZ = 1
+ endif
++endif
+ 
+ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
+ 	$(call download,$(ASS_URL))
+diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
+index fa813c5..636a104 100755
+--- a/extras/package/ios/build.sh
++++ b/extras/package/ios/build.sh
+@@ -191,10 +191,7 @@ fi
+     --enable-small \
+     --disable-sdl \
+     --disable-SDL_image \
+-    --disable-fontconfig \
+-    --disable-ass \
+     --disable-iconv \
+-    --disable-fribidi \
+     --disable-zvbi \
+     --disable-kate \
+     --disable-caca \
+@@ -214,7 +211,11 @@ fi
+     --disable-libmpeg2 \
+     --disable-chromaprint \
+     --disable-mad \
++    --enable-fribidi \
++    --enable-libxml2 \
+     --enable-freetype2 \
++    --enable-ass \
++    --disable-fontconfig \
+     --disable-taglib > ${out}
+ 
+ echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
+@@ -279,7 +280,7 @@ ${VLCROOT}/configure \
+     --disable-faad \
+     --disable-lua \
+     --disable-a52 \
+-    --disable-fribidi \
++    --enable-fribidi \
+     --disable-macosx-audio \
+     --disable-qt --disable-skins2 \
+     --disable-libgcrypt \
+@@ -297,8 +298,8 @@ ${VLCROOT}/configure \
+     --enable-dvbpsi \
+     --enable-swscale \
+     --disable-projectm \
+-    --disable-libass \
+-    --disable-libxml2 \
++    --enable-libass \
++    --enable-libxml2 \
+     --disable-goom \
+     --disable-dvdread \
+     --disable-dvdnav \
+-- 
+1.7.12.4 (Apple Git-37)
+

+ 34 - 0
patches/vlckit/0002-MobileVLCKit-link-against-fribidi-harfbuzz-and-libas.patch

@@ -0,0 +1,34 @@
+From 5ab9b4ba4d901b36d485119e0a604b1826ad2ba8 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:43:02 +0200
+Subject: [PATCH 2/2] MobileVLCKit: link against fribidi, harfbuzz and libass
+
+---
+ MobileVLCKit/MobileVLCKit.xcconfig | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/MobileVLCKit/MobileVLCKit.xcconfig b/MobileVLCKit/MobileVLCKit.xcconfig
+index c31e2e9..2feb5d1 100644
+--- a/MobileVLCKit/MobileVLCKit.xcconfig
++++ b/MobileVLCKit/MobileVLCKit.xcconfig
+@@ -20,6 +20,9 @@ AVCODEC=$(VLC_CONTRIB_DIR)/lib/libavutil.a ${VLC_CONTRIB_DIR}/lib/libavcodec.a $
+ DVBPSI=$(VLC_CONTRIB_DIR)/lib/libdvbpsi.a
+ FLAC=$(VLC_CONTRIB_DIR)/lib/libFLAC.a
+ FREETYPE=$(VLC_CONTRIB_DIR)/lib/libfreetype.a
++FRIBIDI=$(VLC_CONTRIB_DIR)/lib/libfribidi.a
++ASS=$(VLC_CONTRIB_DIR)/lib/libass.a
++HARFBUZZ=$(VLC_CONTRIB_DIR)/lib/libharfbuzz.a
+ LIVE555=$(VLC_CONTRIB_DIR)/lib/libUsageEnvironment.a $(VLC_CONTRIB_DIR)/lib/libBasicUsageEnvironment.a $(VLC_CONTRIB_DIR)/lib/libgroupsock.a $(VLC_CONTRIB_DIR)/lib/libz.a $(VLC_CONTRIB_DIR)/lib/libliveMedia.a
+ LUA=$(VLC_CONTRIB_DIR)/lib/liblua.a
+ MKV=$(VLC_CONTRIB_DIR)/lib/libebml.a $(VLC_CONTRIB_DIR)/lib/libmatroska.a
+@@ -29,5 +32,6 @@ OGG=$(VLC_CONTRIB_DIR)/lib/libogg.a $(VLC_CONTRIB_DIR)/lib/libtheora.a $(VLC_CON
+ PICS=$(VLC_CONTRIB_DIR)/lib/libpng.a $(VLC_CONTRIB_DIR)/lib/libopenjpeg.a
+ SPEEX=$(VLC_CONTRIB_DIR)/lib/libspeex.a $(VLC_CONTRIB_DIR)/lib/libspeexdsp.a
+ XML=$(VLC_CONTRIB_DIR)/lib/libxml2.a
++ZLIB=$(VLC_CONTRIB_DIR)/lib/libz.a
+ 
+-OTHER_LIBTOOLFLAGS=$(AVCODEC) $(DVBPSI) $(FLAC) $(FREETYPE) $(LIVE555) $(LUA) $(MKV) $(MODPLUG) $(OGG) $(OPUS) $(PICS) $(SPEEX) $(XML) $(VLC_INSTALL_DIR)/lib/vlc/libcompat.a  $(VLC_INSTALL_DIR)/lib/libvlc.a $(VLC_INSTALL_DIR)/lib/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)
++OTHER_LIBTOOLFLAGS=$(ASS) $(AVCODEC) $(DVBPSI) $(FLAC) $(FRIBIDI) $(FREETYPE) $(HARFBUZZ) $(LIVE555) $(LUA) $(MKV) $(MODPLUG) $(OGG) $(OPUS) $(PICS) $(SPEEX) $(XML) $(ZLIB) $(VLC_INSTALL_DIR)/lib/vlc/libcompat.a  $(VLC_INSTALL_DIR)/lib/libvlc.a $(VLC_INSTALL_DIR)/lib/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)
+-- 
+1.7.12.4 (Apple Git-37)
+