Commit 161ec265 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update libvlc 2.1 to the latest hash with various merged patches

parent 39e59da2
From 64482a17f5ebbc0fa2945635d236047ebff7016f Mon Sep 17 00:00:00 2001
From fd926a04c29b78acd66a125076a80fc52485790b 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/18] Add secure transport TLS module
Subject: [PATCH 01/21] 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 8117aa88c245d291083935a251578c5bb109d0ad Mon Sep 17 00:00:00 2001
From a606e9eb4a993391b7a6ade6bbe1bb38b5f9d946 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/18] arm_neon: added function macro to handle the underscore
Subject: [PATCH 02/21] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From ab21e0bc57d1e92fad355c92a48e8664138ba587 Mon Sep 17 00:00:00 2001
From 4cc9a7cc3d42a17a677ee086ed8a583e3b1090ec 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/18] arm_neon: use a macro to fix compilation for iOS
Subject: [PATCH 03/21] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From 2cdacf653548fb5fb401b8bf230f92a77c269439 Mon Sep 17 00:00:00 2001
From 8668d8c758af85230a4b4e05181b84e8b2c4a743 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/18] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 04/21] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 8d29c02c05507c2181bdc5c477a5f8a94b4aa140 Mon Sep 17 00:00:00 2001
From bc5aedbd4e5a9572ef51129c71d3623bde917df2 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/18] contrib/ebml+mkv: compile with hidden symbols on iOS
Subject: [PATCH 05/21] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
......
From a07f4a447e56ea6e459c5503a73b87eb8897e9dd Mon Sep 17 00:00:00 2001
From c6016ee4d98f2f99cfd6d98b7c3446b52e11e1bc 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/18] posix/thread: add a hack to work-around crashes when
Subject: [PATCH 06/21] posix/thread: add a hack to work-around crashes when
using the buggy iOS 6 runtime
---
......
From 54f927c0d90cfa26ff4b92a35fcadfee87e3d45c Mon Sep 17 00:00:00 2001
From 6da1ed2b03ba5c7a69a6520f01cd9560719ed961 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/18] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 07/21] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
modules/text_renderer/freetype.c | 42 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
modules/text_renderer/freetype.c | 44 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index c27ec45..93beba8 100644
index c27ec45..4bac64d 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -107,6 +107,9 @@
......@@ -22,7 +22,7 @@ index c27ec45..93beba8 100644
#endif
#include <sys/param.h> /* for MAXPATHLEN */
#undef HAVE_FONTCONFIG
@@ -808,6 +811,40 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
@@ -808,6 +811,42 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
return psz_path;
}
......@@ -41,6 +41,8 @@ index c27ec45..93beba8 100644
+ CFSTR("OpenSans-Regular.ttf") : CFSTR("SourceCodePro-Regular.ttf"),
+ NULL,
+ NULL);
+ if (!fileURL)
+ return NULL;
+ CFStringRef urlString = CFURLCopyFileSystemPath(fileURL, kCFURLPOSIXPathStyle);
+ CFRelease(fileURL);
+
......@@ -63,7 +65,7 @@ index c27ec45..93beba8 100644
#endif
#endif
@@ -1989,6 +2026,8 @@ static FT_Face LoadFace( filter_t *p_filter,
@@ -1989,6 +2028,8 @@ static FT_Face LoadFace( filter_t *p_filter,
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
psz_fontfile = MacLegacy_Select( p_filter, p_style->psz_fontname, false, false, -1, &i_idx );
......@@ -72,7 +74,7 @@ index c27ec45..93beba8 100644
#endif
#elif defined( _WIN32 )
psz_fontfile = Win32_Select( p_filter,
@@ -2895,6 +2934,9 @@ static int Create( vlc_object_t *p_this )
@@ -2895,6 +2936,9 @@ static int Create( vlc_object_t *p_this )
#elif defined(__APPLE__)
#if !TARGET_OS_IPHONE
psz_fontfile = MacLegacy_Select( p_filter, psz_fontfamily, false, false, 0, &fontindex );
......
From 3d2cbaf8b17f1e7d526883d1529fcab0f5d06139 Mon Sep 17 00:00:00 2001
From a884d6d16aab195c7337ccca6aee81e3a6e69b79 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/18] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 08/21] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 6ed3110b140d3de05a307f1c90896cdae8e8dc72 Mon Sep 17 00:00:00 2001
From 8ceb0f553c0f7170aa1b6f9a8b9b7c9257ab90a0 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 11/18] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 09/21] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
contrib/src/png/rules.mak | 3 +++
2 files changed, 69 insertions(+)
contrib/src/png/rules.mak | 14 +++++++++-
2 files changed, 79 insertions(+), 1 deletion(-)
create mode 100644 contrib/src/png/ios.patch
diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
......@@ -82,10 +82,26 @@ 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 d1adc34..701e3a8 100644
index d1adc34..4f12595 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -17,6 +17,9 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
PKGS_FOUND += png
endif
+PNGCONF =
+ifdef HAVE_IOS
+ifdef HAVE_ARMV7A
+PNGCONF = --enable-arm-neon=yes
+else
+PNGCONF = --enable-arm-neon=no
+endif
+endif
+
$(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
$(call download,$(PNG_URL))
@@ -17,12 +26,15 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
$(APPLY) $(SRC)/png/winrt.patch
$(APPLY) $(SRC)/png/bins.patch
$(APPLY) $(SRC)/png/automake.patch
......@@ -95,6 +111,13 @@ index d1adc34..701e3a8 100644
$(MOVE)
DEPS_png = zlib $(DEPS_zlib)
.png: png
$(RECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(PNGCONF)
cd $< && $(MAKE) install
touch $@
--
1.8.3.4 (Apple Git-47)
From 4a3b920ee5f164528143cffabbfb854d272371e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 21 Jul 2013 18:18:33 +0200
Subject: [PATCH 09/18] freetype: fix corner-case crash
---
modules/text_renderer/freetype.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 93beba8..4bac64d 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -826,6 +826,8 @@ static char *iOSFake_Select( filter_t *p_filter, bool b_monospace, bool b_bold,
CFSTR("OpenSans-Regular.ttf") : CFSTR("SourceCodePro-Regular.ttf"),
NULL,
NULL);
+ if (!fileURL)
+ return NULL;
CFStringRef urlString = CFURLCopyFileSystemPath(fileURL, kCFURLPOSIXPathStyle);
CFRelease(fileURL);
--
1.8.3.4 (Apple Git-47)
From c2145ffd6b949d2e101c9cfed42f22b94d20cd97 Mon Sep 17 00:00:00 2001
From 5ebeceade99c8f1083817479e136f6294553595b 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/18] deinterlace: added a hack to work-around a libtool bug
Subject: [PATCH 10/21] deinterlace: added a hack to work-around a libtool bug
---
modules/video_filter/Modules.am | 4 ++++
......
From 87a452b8817c149ed5cb3367b33cfc2d46c675df Mon Sep 17 00:00:00 2001
From cc51fb6198bf6d4560e2f01634476991eed2dda4 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 13/18] extras: deploy arch option for iOS
Subject: [PATCH 11/21] 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 1766cf9..dc3fb94 100755
index ae65a4b..a42c0fa 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -183,7 +183,7 @@ else
export ASCPP="xcrun as"
@@ -188,7 +188,7 @@ else
export ASCPP="xcrun as"
fi
-../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
+../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
-../bootstrap --host=x86_64-apple-darwin11 --build=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
+../bootstrap --host=x86_64-apple-darwin11 --build=${TARGET} --arch=${ARCH} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
--disable-disc --disable-sout \
--disable-sdl \
--disable-SDL_image \
......
From 431dd60c4a7e9bf2278eeaed4f8cbeb3fb79878d Mon Sep 17 00:00:00 2001
From 6719ef1cee79211e9128ae47554d4da476f029f8 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 15/18] contrib/speex: fix compilation for arm64
Subject: [PATCH 12/21] contrib/speex: fix compilation for arm64
---
contrib/src/speex/rules.mak | 5 +++++
......
From e328be72442e31d54c894ebb2a6ab808413432b4 Mon Sep 17 00:00:00 2001
From 13eca8d966cfde9a313dfd8eaa5a4ec49600ec01 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 16/18] contrib/flac: fix compilation with clang 5.0
Subject: [PATCH 13/21] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
......
From 1678ea007563ab91e31f31bf6beb0e8b7a6312c3 Mon Sep 17 00:00:00 2001
From 793e01eae13938fd9aea1d1e8325707b74a19780 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 17/18] contrib/gcrypt: use git version on iOS
Subject: [PATCH 14/21] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......
From 86c9372f3014405ea0e095b10bca8e2fc6603d90 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:38:25 +0200
Subject: [PATCH 14/18] contrib/png: fix compilation for arm64 which is unknown
to the libpng developers
---
contrib/src/png/rules.mak | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 701e3a8..d76206e 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -7,6 +7,13 @@ ifeq ($(call need_pkg,"libpng"),)
PKGS_FOUND += png
endif
+PNGCONF =
+ifdef HAVE_IOS
+ifeq ($(ARCH),arm64)
+PNGCONF = --enable-arm-neon=no
+endif
+endif
+
$(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
$(call download,$(PNG_URL))
@@ -26,6 +33,6 @@ DEPS_png = zlib $(DEPS_zlib)
.png: png
$(RECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(PNGCONF)
cd $< && $(MAKE) install
touch $@
--
1.8.3.4 (Apple Git-47)
From a9249b92ecc4eeb1abe16c9f17e7023c3bea8299 Mon Sep 17 00:00:00 2001
From 0b18b8cc380363064af90e0861853b9de2f21a8a 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 18/18] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 15/21] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......
From 2dff3bf03a26fc5534ba07a1d1945e987b535d15 Mon Sep 17 00:00:00 2001
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 22/24] contrib: don't try to guess ARCH if it was given as an
Subject: [PATCH 16/21] contrib: don't try to guess ARCH if it was given as an
argument
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 22/24] contrib: don't try to guess ARCH if it was given as an
1 file changed, 2 insertions(+)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 9562165..ae76215 100644
index 23a47e9..352e557 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......
From 44d5fa79102a04d70ed340310c25c37b0aa75b03 Mon Sep 17 00:00:00 2001
From 6e5b1bb00ca1d09d5fc1b8b0690a505e3bfe9fc7 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 24/24] contrib/opus disable asm on arm
Subject: [PATCH 17/21] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......
From fafa89aad243d2e2e8f215ae07f9f2d20f5ba169 Mon Sep 17 00:00:00 2001
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 29/29] contrib: fix iOS simulator architecture features
Subject: [PATCH 18/21] contrib: fix iOS simulator architecture features
---
contrib/bootstrap | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
contrib/bootstrap | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index bddb1a8..53a8f6c 100755
index 5e5f935..6d5753b 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -225,10 +225,13 @@ case "${OS}" in
@@ -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"
- if [ "$ARCH" != "arm64" ]; then
- add_make_enabled "HAVE_ARMV7A"
- fi
+ 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
- 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*)
......
From 190946ee1cb7a949ac2e3c2d57b6bd49e2d4678c Mon Sep 17 00:00:00 2001
From 5d3ae3a09d585beb778361f7a5b653d218dec320 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:19:19 +0100
Subject: [PATCH 23/24] contrib/libavcodec: update hash and tweak configure
chain a bit
Date: Thu, 23 Jan 2014 13:30:06 +0100
Subject: [PATCH 19/21] contrib/avcodec: deploy libav and a post-arm64 hash
---
contrib/src/ffmpeg/rules.mak | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
contrib/src/ffmpeg/rules.mak | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 1b41466..0c2d1fe 100644
index 84acdd2..c1cca3a 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -8,7 +8,7 @@ ifdef USE_FFMPEG
HASH=74a9c92840d3494393938874c1cdd5bdb95cc918
@@ -1,14 +1,14 @@
# FFmpeg
#Uncomment the one you want
-#USE_LIBAV ?= 1
-USE_FFMPEG ?= 1
+USE_LIBAV ?= 1
+#USE_FFMPEG ?= 1
ifdef USE_FFMPEG
HASH=ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
else
-HASH=9a4c10e3af011dd84d3135090d3ca4212cbad127
-HASH=8b2e5e42bb9d6a59ede5af2e6df4aaf7750d1195
+HASH=fe96769bed828cf54c0d9dc5d55b74948a68946d
FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
endif
@@ -64,7 +64,9 @@ endif
# ARM stuff
ifeq ($(ARCH),arm)
+ifndef HAVE_DARWIN_OS
FFMPEGCONF += --arch=arm
+endif
ifdef HAVE_NEON
FFMPEGCONF += --enable-neon
endif
@@ -98,7 +100,6 @@ endif
ifdef HAVE_IOS
ifeq ($(ARCH),arm)
FFMPEGCONF += --enable-pic --as="$(AS)"
-FFMPEGCONF += --extra-cflags='-no-integrated-as'
endif
endif
ifdef HAVE_MACOSX
--
1.8.3.4 (Apple Git-47)
From 462d2be9d8af203977ff5ebd17fcb754a5cc5810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 31 Dec 2013 14:45:31 +0100
Subject: [PATCH] contrib/avcodec: use the other side
---
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 d908ca3..1b41466 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,8 +1,8 @@
# FFmpeg
#Uncomment the one you want
-#USE_LIBAV ?= 1
-USE_FFMPEG ?= 1
+USE_LIBAV ?= 1
+#USE_FFMPEG ?= 1
ifdef USE_FFMPEG
HASH=74a9c92840d3494393938874c1cdd5bdb95cc918
--
1.8.3.4 (Apple Git-47)
From 0bd87b03acb8bdec0f049ea881db144cfa471b42 Mon Sep 17 00:00:00 2001
From f869132e62564ab7e212ffa0bc8961c50cf87083 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 12/18] contrib: add arch option for platforms where the arch
triplet would be ambigous
Date: Thu, 23 Jan 2014 14:06:17 +0100
Subject: [PATCH 20/21] contrib: add arch option
---
contrib/bootstrap | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
contrib/bootstrap | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 5e5f935..bddb1a8 100755
index 6d5753b..beb8602 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -30,6 +30,7 @@ usage()
......@@ -46,18 +45,15 @@ index 5e5f935..bddb1a8 100755
#
# Checks
@@ -219,7 +225,10 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
@@ -220,7 +226,7 @@ case "${OS}" in
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" "HAVE_NEON"
+ if [ "$ARCH" != "arm64" ]; then
+ add_make_enabled "HAVE_ARMV7A"
+ fi
fi
;;
*bsd*)
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"
--
1.8.3.4 (Apple Git-47)
From 438bcbf0cfeffd99667fb477a42973e25ec9a8f9 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:13:03 +0100
Subject: [PATCH 20/24] tools: update gas-pp
---
extras/tools/packages.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 085f0ef..a4ce1db 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -32,7 +32,7 @@ XZ_URL=http://tukaani.org/xz/xz-$(XZ_VERSION).tar.bz2
OPENSSL_VERSION=1.0.0e
OPENSSL_URL=http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
-GAS_VERSION=35de474
+GAS_VERSION=940274b
GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION);sf=tgz
RAGEL_VERSION=6.8
--
1.8.3.4 (Apple Git-47)
From cb8df005549bd384afabeda65603647778b910fe Mon Sep 17 00:00:00 2001
From 8b6d6b1a1d6b5de6f7e278457b18a3cc743f58e8 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 27/29] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 21/21] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......
From 8381c283f37b45ee09b08b08456d901b57b5f2bb 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:13:42 +0100
Subject: [PATCH 21/24] package/ios: update for future architectures
---
extras/package/ios/build.sh | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index a51ef1d..487052c 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -110,9 +110,6 @@ PREFIX="${VLCROOT}/install-ios-${PLATFORM}/${ARCH}"
export PATH="${VLCROOT}/extras/tools/build/bin:${VLCROOT}/contrib/${TARGET}/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
-# contains gas-processor.pl
-export PATH=$PATH:${VLCROOT}/extras/package/ios/resources
-
info "Building tools"
spushd "${VLCROOT}/extras/tools"
./bootstrap
@@ -135,7 +132,10 @@ export PLATFORM=$PLATFORM
export SDK_VERSION=$SDK_VERSION
if [ "$PLATFORM" = "OS" ]; then
-export CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -mcpu=cortex-a8 -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
+export CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
+if [ "$ARCH" != "arm64" ]; then
+export CFLAGS="${CFLAGS} -mcpu=cortex-a8"
+fi
else
export CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} -miphoneos-version-min=${SDK_MIN} ${OPTIM}"
fi
@@ -156,7 +156,10 @@ fi
export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
if [ "$PLATFORM" = "OS" ]; then
- EXTRA_CFLAGS="-arch ${ARCH} -mcpu=cortex-a8"
+ EXTRA_CFLAGS="-arch ${ARCH}"
+if [ "$ARCH" != "arm64" ]; then
+ EXTRA_CFLAGS+=" -mcpu=cortex-a8"
+fi
EXTRA_LDFLAGS="-arch ${ARCH}"
else
EXTRA_CFLAGS="-arch ${ARCH}"
@@ -178,6 +181,9 @@ if [ "$PLATFORM" = "OS" ]; then
export AS="gas-preprocessor.pl ${CC}"
export ASCPP="gas-preprocessor.pl ${CC}"
export CCAS="gas-preprocessor.pl ${CC}"
+if [ "$ARCH" = "arm64" ]; then
+ export GASPP_FIX_XCODE5=1
+fi
else
export AS="xcrun as"
export ASCPP="xcrun as"
--
1.8.3.4 (Apple Git-47)
From 2673d3b7d1c79d76e780853e7e1e00e7d76ad9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 02:32:01 +0100
Subject: [PATCH 25/25] contrib: reverse logic
---
contrib/src/main.mak | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index ae76215..12976a9 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -130,12 +130,15 @@ CCAS=$(CC) -c
ifdef HAVE_IOS
CC=xcrun clang
CXX=xcrun clang++
-ifeq ($(ARCH), arm)
-AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
-CCAS=gas-preprocessor.pl $(CC) -c
-else
+ifeq ($(ARCH),i386)
+CCAS=$(CC) -c
+AS=xcrun as
+else ifeq ($(ARCH),x86_64)
CCAS=$(CC) -c
AS=xcrun as
+else
+AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
+CCAS=gas-preprocessor.pl $(CC) -c
endif
AR=xcrun ar
LD=xcrun ld
--
1.8.3.4 (Apple Git-47)
From e9bf490eb79beb2661efb38eb08b47bf5adefea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 03:05:48 +0100
Subject: [PATCH 26/29] extras/ios: simulator doesn't necessarily mean i386
anymore
---
extras/package/ios/build.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 6e42216..9f57b14 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -76,8 +76,7 @@ fi
info "Building libvlc for iOS"
if [ "$PLATFORM" = "Simulator" ]; then
- TARGET="i686-apple-darwin11"
- ARCH="i386"