Commit 444eaef8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

update libvlc and rebase patches

parent 04ae79bb
From dd960cdb919a164de13ed02b7bbbbee12eff7a0e Mon Sep 17 00:00:00 2001
From daa128fa3fec38637658f78c255dd254b166c0e6 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/19] arm_neon: added function macro to handle the underscore
......
From 0938789826068deecc1406d47dd825d87b9981d3 Mon Sep 17 00:00:00 2001
From 1243a42b94dcd4f290cec3c81018d6ac14890d4f 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/19] arm_neon: use a macro to fix compilation for iOS
......
From 9c968febe108c08eac9cd521f51c863c0d7f5e46 Mon Sep 17 00:00:00 2001
From 536ebe840e403e8de4787a6753f7b762740f4d63 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/19] deinterlace/merge: use a macro to fix compilation for
......
From fd69a76cabc6a15acf0312e3b5dd8d19927a8185 Mon Sep 17 00:00:00 2001
From 7beb928d1b0aa992109e623fd62e01c59a90d1be 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/19] contrib/ebml+mkv: compile with hidden symbols on iOS
......
From 852fbfaa3906fb44d0a7f4b15afb9bcaea95ed4f Mon Sep 17 00:00:00 2001
From da23c0b70de9b29c981857697cff678fa3b969c8 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/19] libass: fix text rendering on iOS by providing a font
......@@ -9,7 +9,7 @@ Subject: [PATCH 05/19] libass: fix text rendering on iOS by providing a font
1 file changed, 35 insertions(+)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 5590df1..fff51db 100644
index dc247f4..dffe14e 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -29,6 +29,13 @@
......
From ae36ba388b2dfad83ab856e19f09c0d567d22d3c Mon Sep 17 00:00:00 2001
From 3a928b72484280f7ec32721c935448728085f370 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/19] contrib/png: fix ARM assembly for iOS
......
From a02ded8163ba002fd316a4bf4d53991dfe4f37bf Mon Sep 17 00:00:00 2001
From 86432e82afb4a908e6de2a73f8a1ad27a596b680 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 07/19] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
contrib/src/flac/libFLAC-clang-5.0.patch | 13 +++++++++++++
contrib/src/flac/rules.mak | 1 +
2 files changed, 20 insertions(+)
2 files changed, 14 insertions(+)
create mode 100644 contrib/src/flac/libFLAC-clang-5.0.patch
diff --git a/contrib/src/flac/libFLAC-clang-5.0.patch b/contrib/src/flac/libFLAC-clang-5.0.patch
new file mode 100644
index 0000000..9fcad0b
index 0000000..164b8ab
--- /dev/null
+++ b/contrib/src/flac/libFLAC-clang-5.0.patch
@@ -0,0 +1,19 @@
+diff -ru flac/configure.ac flac-fixed/configure.ac
+--- flac/configure.ac 2013-05-27 10:08:57.000000000 +0200
++++ flac-fixed/configure.ac 2013-10-07 16:56:51.000000000 +0200
+@@ -381,15 +381,9 @@
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror "
@@ -0,0 +1,13 @@
+--- flac/configure.ac 2014-11-27 03:45:33.000000000 +0100
++++ flac/configure.ac 2014-12-22 19:01:04.000000000 +0100
+@@ -381,10 +381,6 @@
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ fi
+
+- if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then
+ CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- fi
+-
+- if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
+- XIPH_ADD_CFLAGS([-fgnu89-inline])
+- fi
+ fi
+
+
+-
+ if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
+ XIPH_ADD_CFLAGS([-msse2])
+ fi
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index bf72caf..ee6c2b5 100644
index 53393a4..1bcfd27 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -17,6 +17,7 @@ flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
......
From 1ac90dccccb8ca1265b24f2ee26b4b4a9943f3b8 Mon Sep 17 00:00:00 2001
From a5dea9eacdedfa12322b930647d52f68d262e80e 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 08/19] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
lib/media_player.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
lib/media_player.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index b75006a..5691345 100644
index 0ff0a4c..5691345 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -436,10 +436,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -436,7 +436,7 @@ 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);
......@@ -20,11 +20,7 @@ index b75006a..5691345 100644
+ var_Create (mp, "deinterlace", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (mp, "deinterlace-mode", VLC_VAR_STRING);
- var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
+ var_Create (mp, "vbi-page", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (mp, "marq-marquee", VLC_VAR_STRING);
var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (mp, "vbi-page", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
--
1.9.3 (Apple Git-50)
From 954239e53d2615a2713fee71fa4923ca671b5eea Mon Sep 17 00:00:00 2001
From 68859622aeec2e3c04f1daf146be2d3c342a0338 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 09/19] contrib/avcodec: deploy libav
......
From d26112e91e3ba08f07a7c59214fa04667392ba00 Mon Sep 17 00:00:00 2001
From c32f254a2e7d548e53d2afbda64dcbdd72c77223 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 10/19] contrib/opus disable asm on arm
......
From 2873ae8263670b9f335d9f8bb8d7ccece7dc3310 Mon Sep 17 00:00:00 2001
From ddaa5d2d2432cbb37af7511ac9ecc361e76b415e 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 11/19] contrib/gcrypt: disable asm on iOS
......
From 5ff6995bbd1f4727fc5895a8b336e48e714ee497 Mon Sep 17 00:00:00 2001
From 44f9c4ed00edb4cf2001af8cb1cb99db889e0079 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 12/19] fix libtool
......
From 1e6c688206b1f70fb99d6fee28ef97f1d186cbb3 Mon Sep 17 00:00:00 2001
From 59b7f22625536f2fa9772a40cd0d3697b27396ef 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 13/19] freetype: added a fake font lookup mechanism for iOS to
......
From 407b787ae87531dc69baf3399cc566000e2bf415 Mon Sep 17 00:00:00 2001
From 6e30980349205c7d241e3842722f8fe42a94d657 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 14/19] contrib/speexdsp: disable neon for AArch64
......
From 6a1817276018208220de6eb87aacd413d02ebcd2 Mon Sep 17 00:00:00 2001
From 3065caff36de2afc4c26833597b1e12ebbe3468a 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 15/19] contrib: add arch option for platforms where the arch
......@@ -65,7 +65,7 @@ index b77a9d9..86d4b9e 100755
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index dd2bd25..2b085ea 100644
index 79e8e57..dc06051 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......
From d665f7424cab347a425e7680618e5d3847df8f08 Mon Sep 17 00:00:00 2001
From 337d88c04a118319df2d8f96c2ec1ca1ad8e44e5 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 16/19] contrib/harfbuzz: work-around build system stupidity
......@@ -33,7 +33,7 @@ index 0000000..59d1e06
+
+ AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index a34ee2b..30e9a2b 100644
index c6a84a6..e9ea233 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -16,6 +16,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
......
From f2ddd8e147a08fc63b01609d6028ebd8d7327fe6 Mon Sep 17 00:00:00 2001
From e0f790a5af18b040af9ae8754ecc409549980c35 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/19] contrib/gcrypt: use git version on iOS
......
From 389859bd70e47c210a6a23aabfebecf7299c56e6 Mon Sep 17 00:00:00 2001
From 0a62d14b39e7b0b64879027066b70a7813d84105 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 18/19] libvlc: add preliminary code path to modify quartztext
......
From 259913e58d83b99bae60546010648f515b4e5d07 Mon Sep 17 00:00:00 2001
From 582f2960bb97e390ac6de707a8eb9939ceca135e 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 19/19] contrib/speex: fix compilation for non-ARMv7 iOS
......@@ -9,10 +9,10 @@ Subject: [PATCH 19/19] contrib/speex: fix compilation for non-ARMv7 iOS
1 file changed, 5 insertions(+)
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index fd90cde..a3d9ea3 100644
index 376dcbd..50709e5 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -37,6 +37,11 @@ endif
@@ -27,6 +27,11 @@ endif
ifeq ($(ARCH),aarch64)
SPEEX_CONF += --disable-neon
endif
......
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=ee7783e6a
TESTEDHASH=9d6da84e3
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