Commit 19340aea authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: use 2.2 repo instead of bleeding-edge, update patches

parent 6ea28be8
From 895ef08988bee7b0c725f4b2c139692d819345ce Mon Sep 17 00:00:00 2001
From eafc3a1447cf15ca03f57416faebcfd142ced253 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/20] arm_neon: added function macro to handle the underscore
......
From d02409a62ad48f853f57fd710385ce0815c72648 Mon Sep 17 00:00:00 2001
From b68216401900be644a53c12644e7de0c02166cce 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/20] arm_neon: use a macro to fix compilation for iOS
......
From 7f1f1eb66e9db3b5c0fc9d4da43114687ced6d1c Mon Sep 17 00:00:00 2001
From c24bff6ceefa18f44c87d9af3a9c487dccff0b45 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/20] deinterlace/merge: use a macro to fix compilation for
......
From da8846eadf83e9f867eb9087072271374a50c47e Mon Sep 17 00:00:00 2001
From 24ec4235595987aeebf0d67bbab59f49159fb781 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 04/20] contrib/ebml+mkv: compile with hidden symbols on iOS
......
From 3443fdc552460190226b23d7e05be63c990764a2 Mon Sep 17 00:00:00 2001
From df32f0d8210940b910720fc2c872abe1bb91cf87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 29 May 2013 13:25:54 +0200
Subject: [PATCH 05/20] libass: fix text rendering on iOS by providing a font
......
From cd01b3d671af8f9243b7b73748ce27682faca7a7 Mon Sep 17 00:00:00 2001
From f71d03b91a678e86906186c60c132cb704f185d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
Date: Sat, 20 Jul 2013 23:35:05 +0200
Subject: [PATCH 06/20] contrib/png: fix ARM assembly for iOS
......@@ -82,7 +82,7 @@ index 0000000..f4b8bc1
+ ldr r12, [r0, #4] @ rowbytes
+ vmov.i8 d3, #0
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 468dd14..24b0b5f 100644
index 2ddfc6a..4c5a959 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
......
From 5c8d3ecadd139afb01c27302804c5e9ad332574a Mon Sep 17 00:00:00 2001
From 6d35e4ff5e822218c089b22aafaeb039ae8120af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:37:59 +0100
Subject: [PATCH 07/20] contrib/speex: fix compilation for non-ARMv7 iOS
......
From 19bab313abb6ddf78870159a7f059c2486d23d9a Mon Sep 17 00:00:00 2001
From 652c14e593b55405b1efe52e131a45e716d22183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 7 Oct 2013 17:05:21 +0200
Subject: [PATCH 08/20] contrib/flac: fix compilation with clang 5.0
......
From cff961452bd498e5596d47519959a4c56ea2b961 Mon Sep 17 00:00:00 2001
From c2a220795002ead5df2f728b3fce2d249a8f5349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 21 Nov 2013 16:26:40 +0100
Subject: [PATCH 09/20] lib/media_player: inherit deinterlace and vbi variables
......@@ -9,7 +9,7 @@ Subject: [PATCH 09/20] lib/media_player: inherit deinterlace and vbi variables
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index 5e8f6b2..cfb64b2 100644
index 5225079..f04e6dc 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -435,10 +435,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
From b59e610cb019bd30e1dfc9cf6336fa5442cd8525 Mon Sep 17 00:00:00 2001
From bd9c4aa32660d935495942835248d680f05b4a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:43:11 +0100
Subject: [PATCH 10/20] contrib/avcodec: deploy libav
......@@ -8,7 +8,7 @@ Subject: [PATCH 10/20] contrib/avcodec: deploy libav
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 4ce4682..bde43c3 100644
index 62bb9e6..9137273 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
......
From 0e191e19286e87a993d35b021e3f659842efbec2 Mon Sep 17 00:00:00 2001
From 848197082069f4dcc5407be33f29ad239c17e5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 15 Jan 2014 15:26:46 +0100
Subject: [PATCH 11/20] contrib/opus disable asm on arm
......
From 704a51c1338959b317f148bfa210fabc6cc476ea Mon Sep 17 00:00:00 2001
From 8c33ce53b28ed8b55b8dc9b69ad696d731a5308c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 09:56:23 +0100
Subject: [PATCH 12/20] contrib/gcrypt: disable asm on iOS
......
From 74a2ff4747e19cf1b96fc3c25a7bcb3b5fcd3edf Mon Sep 17 00:00:00 2001
From 67773206df43b1a66dd42d1a921ea843b10f6356 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 13/20] fix libtool
......
From 7777539a8c592b117b15af0c362880a5c4a08d62 Mon Sep 17 00:00:00 2001
From b5a77e94241f0822f58a75353128efccd7aa2bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 14/20] freetype: added a fake font lookup mechanism for iOS to
......
From ab89706197400d3df45c3384380d9ffa989146fb Mon Sep 17 00:00:00 2001
From 91c85d1b2e73d0d67aba16ae30f1f5511e6cb78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 15:19:43 +0100
Subject: [PATCH 15/20] contrib/speexdsp: disable neon for AArch64
......@@ -8,10 +8,10 @@ Subject: [PATCH 15/20] contrib/speexdsp: disable neon for AArch64
1 file changed, 5 insertions(+)
diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 2244813..84ce8a9 100644
index 7a2bc80..396af52 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -31,6 +31,11 @@ ifeq ($(ARCH),arm)
@@ -29,6 +29,11 @@ ifeq ($(ARCH),arm)
SPEEXDSP_CONF += --enable-arm5e-asm
endif
endif
......
From a90f83c5e102d401163f29fa1b36e8ee652e54ce Mon Sep 17 00:00:00 2001
From 661ecb6fcec9a5243c4d1e2cdc6a3c2a67641851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 3 Oct 2013 18:27:43 +0200
Subject: [PATCH 16/20] contrib: add arch option for platforms where the arch
......@@ -10,7 +10,7 @@ Subject: [PATCH 16/20] contrib: add arch option for platforms where the arch
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 2c755df..b46f536 100755
index b77a9d9..86d4b9e 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
......@@ -65,7 +65,7 @@ index 2c755df..b46f536 100755
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index ae01fea..de82f38 100644
index dd2bd25..2b085ea 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......
From ee7049a59e627ee62184c17d782db24767039a23 Mon Sep 17 00:00:00 2001
From 776afeb0635360332f9c0540a3f04c6ddd60de31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 3 Oct 2013 18:28:26 +0200
Subject: [PATCH 17/20] extras: deploy arch option for iOS
......@@ -8,10 +8,10 @@ Subject: [PATCH 17/20] extras: deploy arch option for iOS
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c3aec25..d82d636 100755
index d3dce3a..da31c8f 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -188,7 +188,7 @@ else
@@ -184,7 +184,7 @@ else
export ASCPP="xcrun as"
fi
......
From db3c7e76872d172ce8e49aefb551f0c30b45f2b3 Mon Sep 17 00:00:00 2001
From ee332ffb09ed6db5a79df01717e1c72a6e8ca86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 12 Mar 2014 14:48:12 +0100
Subject: [PATCH 18/20] contrib/harfbuzz: work-around build system stupidity
......
From 26fd934ffbe0a8052b0087e298ba27620ced73cd Mon Sep 17 00:00:00 2001
From 9ea73113a6aa2cb4bb285212383bd1297b3da10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 31 Oct 2013 20:42:59 +0100
Subject: [PATCH 19/20] contrib/gcrypt: use git version on iOS
......
From 0166690c33c086b44d278547de643264b02c189d Mon Sep 17 00:00:00 2001
From c651cfc2743486e5f51771364953dd7c08e4c74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 20/20] libvlc: add preliminary code path to modify quartztext
......@@ -67,7 +67,7 @@ index c0c66dd..7810ed7 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index cfb64b2..d105c6e 100644
index f04e6dc..801c130 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -464,6 +464,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
......@@ -14,7 +14,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=1aaaece95
TESTEDHASH=9396fb6e4
usage()
{
......@@ -127,8 +127,8 @@ spushd MobileVLCKit/ImportedSources
if [ "$NONETWORK" != "yes" ]; then
if ! [ -e vlc ]; then
git clone git://git.videolan.org/vlc.git vlc
info "Applying patches to vlc.git"
git clone git://git.videolan.org/vlc/vlc-2.2.git vlc
info "Applying patches to vlc-2.2.git"
cd vlc
git checkout -B localBranch ${TESTEDHASH}
git branch --set-upstream-to=origin/master localBranch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment