Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
22dd303d
Commit
22dd303d
authored
May 02, 2013
by
Felix Paul Kühne
Browse files
patches: enable freetype module in libvlc
parent
cd5643e0
Changes
10
Hide whitespace changes
Inline
Side-by-side
patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
View file @
22dd303d
From
d93255b9e7c661f953e446dfb1f4f63aeb48d192
Mon Sep 17 00:00:00 2001
From
1d816363fdeb48c5c3e7aa398d2599b008f380ab
Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/10] arm_neon: added function macro to handle the
...
...
patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch
View file @
22dd303d
From
f14f3ae2e751adf56485a18ef9953c9936af6991
Mon Sep 17 00:00:00 2001
From
bac6f36e8e76d149c3f4df993b6e13f443555cb9
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:01:49 +0200
Subject: [PATCH 02/10] arm_neon: use a macro to fix compilation for iOS
...
...
patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
View file @
22dd303d
From
84731850fde69dba7626c5e833cec838b7407677
Mon Sep 17 00:00:00 2001
From
1ba34f66bf7f73358069e7ba9d6022be08e47bf6
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 03/10] deinterlace/merge: use a macro to fix compilation for
...
...
patches/0004-deinterlace-added-a-hack-to-work-around-a-libtool-bu.patch
View file @
22dd303d
From
b75f05262d588dd6d7c9a43cfa7f6cc910ebc062
Mon Sep 17 00:00:00 2001
From
8fb3cb11dcc6ddb6bc1520b0ca856a837eeff5d8
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:33 +0200
Subject: [PATCH 04/10] deinterlace: added a hack to work-around a libtool bug
...
...
@@ -8,7 +8,7 @@ Subject: [PATCH 04/10] deinterlace: added a hack to work-around a libtool bug
1 file changed, 4 insertions(+)
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index
7e500f1..d44908e
100644
index
9810c21..eeb752d
100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -1,3 +1,7 @@
...
...
patches/0005-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch
View file @
22dd303d
From
d2660459eea1c67a1aa243c7ff86bcc887b9ff34
Mon Sep 17 00:00:00 2001
From
2ddc656d08a49df7c16a12ccd143e96c584c104f
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 11 Aug 2012 13:29:25 +0200
Subject: [PATCH 05/10] contrib/ebml+mkv: compile with hidden symbols on iOS
...
...
patches/0006-contrib-ebml-fix-CXXFLAG-visibility-hack.patch
View file @
22dd303d
From
4dc4c72304446e736a0e209f2fcc180331b
b7
2
4a Mon Sep 17 00:00:00 2001
From
f6f81f5294e0ec195901599404d0d47127
b7
f
4a
9
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 13 Sep 2012 01:36:39 +0200
Subject: [PATCH 06/10] contrib/ebml: fix CXXFLAG visibility hack
...
...
patches/0007-vout_ios-respond-to-HUD-visiblity-changes-by-adaptin.patch
View file @
22dd303d
From
5
5b
f6943338a9d6c9e7bf9e381ee18eea3b8566a
Mon Sep 17 00:00:00 2001
From
e
5b
2b9413079dc71f6df3c06c36d702f69776ac0
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 26 Sep 2012 19:23:24 +0200
Subject: [PATCH 07/10] vout_ios: respond to HUD visiblity changes by adapting
...
...
@@ -9,10 +9,10 @@ Subject: [PATCH 07/10] vout_ios: respond to HUD visiblity changes by adapting
1 file changed, 11 insertions(+)
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index
b513911..53c8216
100644
index
2dc0929..5ca8cea
100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -34
4
,12 +34
4
,15 @@
static void OpenglSwap(vlc_gl_t *gl)
@@ -34
8
,12 +34
8
,15 @@
static void OpenglSwap(vlc_gl_t *gl)
_framebufferDirty = NO;
[self setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
...
...
@@ -28,7 +28,7 @@ index b513911..53c8216 100644
[_context release];
[super dealloc];
}
@@ -36
5
,6 +3
68
,14 @@
static void OpenglSwap(vlc_gl_t *gl)
@@ -36
9
,6 +3
72
,14 @@
static void OpenglSwap(vlc_gl_t *gl)
}
}
...
...
patches/0008-posix-thread-add-a-hack-to-work-around-crashes-when-.patch
View file @
22dd303d
From
5fd96f258ad64fb72618207acc231c458865f7cc
Mon Sep 17 00:00:00 2001
From
a07116b26e2ba8a937bfb068fc0d1ab33609568a
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Oct 2012 18:38:17 +0200
Subject: [PATCH 08/10] posix/thread: add a hack to work-around crashes when
...
...
patches/00
14
-ios_vout2-fix-crash-when-trying-to-draw-OpenGL-chang.patch
→
patches/00
09
-ios_vout2-fix-crash-when-trying-to-draw-OpenGL-chang.patch
View file @
22dd303d
From
5480de322f8f0c78c8a9da060c94a652e1d445a6
Mon Sep 17 00:00:00 2001
From
759c080826b69637c06d51b38b3c53dd6e97608e
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 28 Mar 2013 12:34:46 +0100
Subject: [PATCH
1/2
] ios_vout2: fix crash when trying to draw OpenGL
changes
while the app is in the background
Subject: [PATCH
09/10
] ios_vout2: fix crash when trying to draw OpenGL
changes
while the app is in the background
---
modules/video_output/ios2.m | 25 +++++++++++++++++++++----
...
...
patches/0010-ios-enable-freetype.patch
0 → 100644
View file @
22dd303d
From 32011da1639d30338878d02ecbea9bf67bfeb1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 2 May 2013 20:30:35 +0100
Subject: [PATCH 10/10] ios: enable freetype
---
extras/package/ios/build.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 6d1b9c3..fa813c5 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -193,7 +193,6 @@
fi
--disable-SDL_image \
--disable-fontconfig \
--disable-ass \
- --disable-freetype2 \
--disable-iconv \
--disable-fribidi \
--disable-zvbi \
@@ -215,6 +214,7 @@
fi
--disable-libmpeg2 \
--disable-chromaprint \
--disable-mad \
+ --enable-freetype2 \
--disable-taglib > ${out}
echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
@@ -317,7 +317,7 @@
${VLCROOT}/configure \
--enable-theora \
--enable-flac \
--disable-screen \
- --disable-freetype \
+ --enable-freetype \
--disable-taglib \
--disable-mmx \
--disable-mad > ${out} # MMX and SSE support requires llvm which is broken on Simulator
--
1.7.12.4 (Apple Git-37)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment