Commit a1f34a6d authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update patches

parent 7260b7d0
From 423b2743f8ab16b65f216bb48dfaa3c7038938c3 Mon Sep 17 00:00:00 2001
From 4e9b88ca430112cc5b7803b926b53a7c0de2212e 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
Subject: [PATCH 01/18] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From c49ca9b6041784f36d18216aea76e2e5deb6dc9c Mon Sep 17 00:00:00 2001
From 9c78976ce69af54cb4c8c2fe729a6cde711ca637 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
Subject: [PATCH 02/18] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From 001dfeae87c9c6bd6db401a789419a3b8abd8ff0 Mon Sep 17 00:00:00 2001
From 9a5009bc2f0298b348d9d76fec608226a191e021 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
Subject: [PATCH 03/18] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From cbce9125fe4292936c9b896c869532039357362d Mon Sep 17 00:00:00 2001
From 609d580b57eb98d6e78089da40829a4268fcb6d7 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
Subject: [PATCH 04/18] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
......
From 83d8085c9e0974dc5804504c4e88a173859fdc68 Mon Sep 17 00:00:00 2001
From 8432ac45ae89156b24ddc5eb7f408e0327475cde 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
Subject: [PATCH 05/18] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 50d4c647b218bf7c4ce8cf790b4f578b936f405c Mon Sep 17 00:00:00 2001
From 317804ff239acee2310b0d4b74a3faa31e207eb9 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
Subject: [PATCH 06/18] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......@@ -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 d1adc34..4f12595 100644
index 468dd14..24b0b5f 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
......
From d1c71ffe72f27b0ea1855aa020bc8d804361e7b0 Mon Sep 17 00:00:00 2001
From f60c084fa4590e1339e28be48acf603fd2c93020 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
Subject: [PATCH 07/18] contrib/speex: fix compilation for non-ARMv7 iOS
targets
the neon code included in speex doesn't do ARMv8 yet
......
From b2d71dfee53ef2529ed8dfa836cd796ff1b666c8 Mon Sep 17 00:00:00 2001
From 116f54f1e6a14a3ff683ede43d30912da609b27d 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
Subject: [PATCH 08/18] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
......
From 345f0afcde20e811b9afc29218c0da7f9bb1b8b2 Mon Sep 17 00:00:00 2001
From 9bf8926abdc3d92fec03822ea83bbe53d55d99af 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 09/20] contrib/gcrypt: use git version on iOS
Subject: [PATCH 09/18] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......
From ed73d937f8d7cabeb58805a74419fa1763bd6099 Mon Sep 17 00:00:00 2001
From ea9d3b886060712a0c0f30792d13bb19a11470ec 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 10/20] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 10/18] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......@@ -9,10 +9,10 @@ Subject: [PATCH 10/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 c23dd42..df23b7c 100644
index 868aefe..942e66a 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -411,10 +411,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -435,10 +435,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_SetFloat (mp, "scale", 1.);
var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
var_Create (mp, "crop", VLC_VAR_STRING);
......
From 399426ce576cb1d73fa88d4b7d941e9e2b361c7b Mon Sep 17 00:00:00 2001
From 4bc8ffe1d61a44372b90371de8e05249b216f47d 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 11/20] contrib/avcodec: deploy libav
Subject: [PATCH 11/18] contrib/avcodec: deploy libav
---
contrib/src/ffmpeg/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3516b7a..3ba202c 100644
index 5f73239..1b3fdad 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
......
From 7de3a3a848ec17d7b00afb5a20264e1a94fbdf24 Mon Sep 17 00:00:00 2001
From 371926f1e783f42994d6beb27b070844da099518 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 12/20] contrib/opus disable asm on arm
Subject: [PATCH 12/18] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......
From b44de08d69a3a172968a1ec80d2cb31c371c92ff Mon Sep 17 00:00:00 2001
From 8644fde58f1f99fcc0f60f58590ca9e745c7d37e 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 13/20] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 13/18] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......
From 318f19aeed806e5a353671018b48dd212df2c0f2 Mon Sep 17 00:00:00 2001
From a2a2a8ab16e65fe390f791b80109047267620522 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 15/20] fix libtool
Subject: [PATCH 14/18] fix libtool
---
modules/arm_neon/Makefile.am | 4 ++++
......
From 6046587ef9aa62deab17405ceb99213bc15dbb00 Mon Sep 17 00:00:00 2001
From 889159a162b0349789c387f3e3f01bf7f1784680 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 16/20] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 15/18] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -24,7 +24,7 @@ index 573d49b..214cb76 100644
#elif defined( _WIN32 )
p_sys->pf_select = Win32_Select;
diff --git a/modules/text_renderer/platform_fonts.c b/modules/text_renderer/platform_fonts.c
index 28d4437..b7dd200 100644
index 3e0c3f1..2abc5de 100644
--- a/modules/text_renderer/platform_fonts.c
+++ b/modules/text_renderer/platform_fonts.c
@@ -42,6 +42,9 @@
......@@ -37,7 +37,7 @@ index 28d4437..b7dd200 100644
#endif
#include <sys/param.h> /* for MAXPATHLEN */
#undef HAVE_FONTCONFIG
@@ -410,6 +413,43 @@ char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
@@ -405,6 +408,43 @@ char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
return psz_path;
}
......
From af117fb9e998d59bb9335416110412949deb5a1a Mon Sep 17 00:00:00 2001
From c465462809d024bdfd6fca0ccf46c9ddc734d344 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 17/20] contrib/speexdsp: disable neon for AArch64
Subject: [PATCH 16/18] contrib/speexdsp: disable neon for AArch64
---
contrib/src/speexdsp/rules.mak | 5 +++++
......
From 2e15ad4df8c7e8f9f26ed0a0e2cd0c2625a56d3c Mon Sep 17 00:00:00 2001
From 200cff45e8f93956f860effc02a25ef44bbd8aa6 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 18/20] contrib: add arch option for platforms where the arch
Subject: [PATCH 17/18] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......@@ -10,7 +10,7 @@ Subject: [PATCH 18/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 246e3d6..e393195 100755
index 24e5779..748323d 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
......@@ -39,7 +39,7 @@ index 246e3d6..e393195 100755
*)
echo "Unrecognized options $1"
usage
@@ -212,6 +217,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
@@ -222,6 +227,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
test -z "$GPL" || add_make_enabled "GPL"
......@@ -47,7 +47,7 @@ index 246e3d6..e393195 100755
#
# Checks
@@ -225,7 +231,15 @@ case "${OS}" in
@@ -235,7 +241,15 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
check_ios_sdk
......@@ -65,7 +65,7 @@ index 246e3d6..e393195 100755
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 8b2a9a5..1b36be7 100644
index b6b70c1..ce5816e 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......
From 510752c462a13db7105af169cd792d92c3df43bc Mon Sep 17 00:00:00 2001
From cf42fdb428ab875e81f289b5a805491688f98502 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 14/20] extras: deploy arch option for iOS
Subject: [PATCH 18/18] 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..f98a6b0 100755
index 81b2a17..cc1aee6 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
-../bootstrap --host=x86_64-apple-darwin11 --build=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
+../bootstrap --host=x86_64-apple-darwin11 --build=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
-../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
+../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
--disable-disc --disable-sout \
--disable-sdl \
--disable-SDL_image \
......
From fc45d0b90fb85160d2d1af8302b70fcfe135a59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 5 Feb 2014 15:12:37 +0100
Subject: [PATCH 01/24] contrib/avcodec: unconditionally enable pic on iOS
(close #10532, close #10531)
---
contrib/src/ffmpeg/rules.mak | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3516b7a..8324226 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -101,8 +101,9 @@ FFMPEGCONF += --cpu=core2
endif
endif
ifdef HAVE_IOS
-ifeq ($(ARCH),arm)
-FFMPEGCONF += --enable-pic --as="$(AS)"
+FFMPEGCONF += --enable-pic
+ifdef HAVE_NEON
+FFMPEGCONF += --as="$(AS)"
endif
endif
ifdef HAVE_MACOSX
--
1.8.3.4 (Apple Git-47)
From 72013a5b4f565e8fbfe83369a4bfa76d0026fc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 5 Feb 2014 15:37:07 +0100
Subject: [PATCH 02/24] iOS: don't deploy xcrun as for Intel builds as this
isn't needed
---
contrib/src/main.mak | 1 -
extras/package/ios/build.sh | 1 -
2 files changed, 2 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 8b2a9a5..bb7c87b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -133,7 +133,6 @@ AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
CCAS=gas-preprocessor.pl $(CC) -c
else
CCAS=$(CC) -c
-AS=xcrun as
endif
AR=xcrun ar
LD=xcrun ld
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index ae65a4b..32536ea 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -184,7 +184,6 @@ if [ "$PLATFORM" = "OS" ]; then
export GASPP_FIX_XCODE5=1
fi
else
- export AS="xcrun as"
export ASCPP="xcrun as"
fi
--
1.8.3.4 (Apple Git-47)
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