Commit 766c3b7f authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update libvlc and rebase patches

parent f2407e95
From fd926a04c29b78acd66a125076a80fc52485790b Mon Sep 17 00:00:00 2001
From 1b7813a457f82cc43d71586bf6dc6d6ac494e420 Mon Sep 17 00:00:00 2001
From: David Fuhrmann <david.fuhrmann@googlemail.com>
Date: Tue, 17 Dec 2013 23:03:06 +0100
Subject: [PATCH 01/21] Add secure transport TLS module
Subject: [PATCH 01/19] Add secure transport TLS module
Secure Transport is a TLS library part of the Security framework
(preinstalled on every iOS and MacOS device). This library does
......
From a606e9eb4a993391b7a6ade6bbe1bb38b5f9d946 Mon Sep 17 00:00:00 2001
From 80605cfb37a4f72a3d678f740b351531fb06f2ff 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 02/21] arm_neon: added function macro to handle the underscore
Subject: [PATCH 02/19] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 4cc9a7cc3d42a17a677ee086ed8a583e3b1090ec Mon Sep 17 00:00:00 2001
From 422255f9a2dc557675ab01f2c379415f37ed92c6 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 03/21] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 03/19] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From 8668d8c758af85230a4b4e05181b84e8b2c4a743 Mon Sep 17 00:00:00 2001
From 974a3843da4edff9944a31795302b7b87f926d8c 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 04/21] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 04/19] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From bc5aedbd4e5a9572ef51129c71d3623bde917df2 Mon Sep 17 00:00:00 2001
From f5a2075ab87fcc4dbe37a78a978c274fb1f6cb97 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/21] contrib/ebml+mkv: compile with hidden symbols on iOS
Subject: [PATCH 05/19] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
......
From c6016ee4d98f2f99cfd6d98b7c3446b52e11e1bc Mon Sep 17 00:00:00 2001
From 53cedc1004ef94222f576c0830260841243ce1a4 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 06/21] posix/thread: add a hack to work-around crashes when
Subject: [PATCH 06/19] posix/thread: add a hack to work-around crashes when
using the buggy iOS 6 runtime
---
......
From 6da1ed2b03ba5c7a69a6520f01cd9560719ed961 Mon Sep 17 00:00:00 2001
From 725541f53ade6c99cc485a074e7c3f0f931c8cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jul 2013 18:38:41 +0700
Subject: [PATCH 07/21] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 07/19] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......
From a884d6d16aab195c7337ccca6aee81e3a6e69b79 Mon Sep 17 00:00:00 2001
From fec57e8d111e975d265403845c200e8591863980 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 08/21] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 08/19] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 8ceb0f553c0f7170aa1b6f9a8b9b7c9257ab90a0 Mon Sep 17 00:00:00 2001
From a958845f8feee74d680f91b0445538331fdcb152 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 09/21] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 09/19] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......
From 5ebeceade99c8f1083817479e136f6294553595b Mon Sep 17 00:00:00 2001
From a4dc4209181352dec6262d77b93757ff96f7db49 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 10/21] deinterlace: added a hack to work-around a libtool bug
Subject: [PATCH 10/19] deinterlace: added a hack to work-around a libtool bug
---
modules/video_filter/Modules.am | 4 ++++
......
From cc51fb6198bf6d4560e2f01634476991eed2dda4 Mon Sep 17 00:00:00 2001
From 1ee8245688b61fcd5fcdb81973faac5e8db70a6b 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 11/21] extras: deploy arch option for iOS
Subject: [PATCH 11/19] extras: deploy arch option for iOS
---
extras/package/ios/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index ae65a4b..a42c0fa 100755
index 32536ea..972517c 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -188,7 +188,7 @@ else
@@ -187,7 +187,7 @@ else
export ASCPP="xcrun as"
fi
......
From 6719ef1cee79211e9128ae47554d4da476f029f8 Mon Sep 17 00:00:00 2001
From 16b7b63bc069338e57ba34664ff17e1b88314a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 3 Oct 2013 19:30:01 +0200
Subject: [PATCH 12/21] contrib/speex: fix compilation for arm64
Subject: [PATCH 12/19] contrib/speex: fix compilation for arm64
---
contrib/src/speex/rules.mak | 5 +++++
......
From 13eca8d966cfde9a313dfd8eaa5a4ec49600ec01 Mon Sep 17 00:00:00 2001
From 48a335d022775e27a47170fed79ef16954692989 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 13/21] contrib/flac: fix compilation with clang 5.0
Subject: [PATCH 13/19] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
......
From 793e01eae13938fd9aea1d1e8325707b74a19780 Mon Sep 17 00:00:00 2001
From 449046ffc930020837c351a83244f5c7c4ab110b 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 14/21] contrib/gcrypt: use git version on iOS
Subject: [PATCH 14/19] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......
From 0b18b8cc380363064af90e0861853b9de2f21a8a Mon Sep 17 00:00:00 2001
From d80264398930196d413f7b2f46c295664c8c7ca5 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 15/21] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 15/19] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......
From 38f6edd3578019a7e55e9ed5d2985d18ac62a8b0 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:15:12 +0100
Subject: [PATCH 16/21] contrib: don't try to guess ARCH if it was given as an
argument
---
contrib/src/main.mak | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 23a47e9..352e557 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
ifneq ($(HOST),$(BUILD))
HAVE_CROSS_COMPILE = 1
endif
+ifndef ARCH
ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
+endif
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
1.8.3.4 (Apple Git-47)
From 6e5b1bb00ca1d09d5fc1b8b0690a505e3bfe9fc7 Mon Sep 17 00:00:00 2001
From 5814dff5bf72cf9db81a6aed15bd88f640879812 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 17/21] contrib/opus disable asm on arm
Subject: [PATCH 16/19] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......
From 8b6d6b1a1d6b5de6f7e278457b18a3cc743f58e8 Mon Sep 17 00:00:00 2001
From d2a499204c9700e6d78748b718bb96780e2006bf 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 21/21] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 17/19] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......
From f869132e62564ab7e212ffa0bc8961c50cf87083 Mon Sep 17 00:00:00 2001
From e1fa0747d51da8c2adcfddf1058f1ffe37140b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 23 Jan 2014 14:06:17 +0100
Subject: [PATCH 20/21] contrib: add arch option
Date: Thu, 3 Oct 2013 18:27:43 +0200
Subject: [PATCH 18/19] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
contrib/bootstrap | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
contrib/bootstrap | 16 +++++++++++++++-
contrib/src/main.mak | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 6d5753b..beb8602 100755
index 5e5f935..c5e7abb 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -30,6 +30,7 @@ usage()
......@@ -45,15 +47,37 @@ index 6d5753b..beb8602 100755
#
# Checks
@@ -220,7 +226,7 @@ case "${OS}" in
@@ -219,7 +225,15 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
- if [ "$ARCH" != "x86_64" && "$ARCH" != "i386" ]; then
+ if [ "$ARCH" != "x86_64" -a "$ARCH" != "i386" ]; then
add_make_enabled "HAVE_NEON"
if [ "$ARCH" != "arm64" ]; then
add_make_enabled "HAVE_ARMV7A"
- add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+ add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
+ case "${ARCH}" in
+ *arm*)
+ add_make_enabled "HAVE_NEON"
+ if [ "$ARCH" != "arm64" ]; then
+ add_make_enabled "HAVE_ARMV7A"
+ fi
+ ;;
+ esac
fi
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c261bad..90a822e 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
ifneq ($(HOST),$(BUILD))
HAVE_CROSS_COMPILE = 1
endif
+ifndef ARCH
ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
+endif
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
1.8.3.4 (Apple Git-47)
From a48e9b134a145ab6702b20d21876ea6e3bbb5250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 12:21:12 +0100
Subject: [PATCH 18/21] contrib: fix iOS simulator architecture features
---
contrib/bootstrap | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 5e5f935..6d5753b 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -219,7 +219,13 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
check_ios_sdk
- add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+ add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
+ if [ "$ARCH" != "x86_64" && "$ARCH" != "i386" ]; then
+ add_make_enabled "HAVE_NEON"
+ if [ "$ARCH" != "arm64" ]; then
+ add_make_enabled "HAVE_ARMV7A"
+ fi
+ fi
fi
;;
*bsd*)
--
1.8.3.4 (Apple Git-47)
From b7c261a6249ca9d856e14e5c65ac7ddbfd35b621 Mon Sep 17 00:00:00 2001
From 0f324c8baf4cddaf653080e25477ed4251334641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 4 Feb 2014 12:21:28 +0100
Subject: [PATCH 22/22] contrib/avcodec: deploy libav
Date: Wed, 5 Feb 2014 16:01:33 +0100
Subject: [PATCH 19/19] contrib/avcodec: deploy libav
---
contrib/src/ffmpeg/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 84acdd2..415b6b5 100644
index dd0a74a..d31df45 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,8 +1,8 @@
......@@ -21,7 +21,7 @@ index 84acdd2..415b6b5 100644
+#USE_FFMPEG ?= 1
ifdef USE_FFMPEG
HASH=ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf
HASH=c46faacdf4e17a78a7e7617d5807a759a6a2868a
--
1.8.3.4 (Apple Git-47)
......@@ -12,7 +12,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=6d0b17129
TESTEDHASH=85aca9192
usage()
{
......
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