Commit 41bb9f84 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc

parent b937bd6a
From daa128fa3fec38637658f78c255dd254b166c0e6 Mon Sep 17 00:00:00 2001
From 86e78a661d9d0fdef727d47e620abd3f608a9870 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
Subject: [PATCH 01/16] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 1243a42b94dcd4f290cec3c81018d6ac14890d4f Mon Sep 17 00:00:00 2001
From 8c588caac55570323977aeeb81cbda1c17cf4ecd 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
Subject: [PATCH 02/16] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From 536ebe840e403e8de4787a6753f7b762740f4d63 Mon Sep 17 00:00:00 2001
From 1b16716985dce6e5121cb08d428636a838ab6a1f 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
Subject: [PATCH 03/16] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
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
---
contrib/src/ebml/rules.mak | 7 +++++--
contrib/src/matroska/rules.mak | 6 +++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 1d01818..a36727c 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -16,8 +16,11 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
$(MOVE)
# libebml requires exceptions
-EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
- CPPFLAGS=""
+ifdef HAVE_IOS
+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" CPPFLAGS=""
+else
+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
+endif
.ebml: libebml
ifdef HAVE_WIN32
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 336e001..40dfb1e 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -17,11 +17,15 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
$(APPLY) $(SRC)/matroska/matroska-pic.patch
$(MOVE)
+ifdef HAVE_IOS
+MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+endif
+
.matroska: libmatroska
ifdef HAVE_WIN32
cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
else
- cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
+ cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(MATROSKA_EXTRA_FLAGS) staticlib
endif
cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
--
1.9.3 (Apple Git-50)
From da23c0b70de9b29c981857697cff678fa3b969c8 Mon Sep 17 00:00:00 2001
From 6d6eb8476cb2f303d30d92b563a4596ed76c4c70 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
Subject: [PATCH 04/16] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 3a928b72484280f7ec32721c935448728085f370 Mon Sep 17 00:00:00 2001
From 6f564f1a8d4543fa1f0480f7283e76afc43236f8 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
Subject: [PATCH 05/16] 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 a63c4e6..fa65363 100644
index c5a3fba..7649c4b 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
......
From 86432e82afb4a908e6de2a73f8a1ad27a596b680 Mon Sep 17 00:00:00 2001
From bb45c9bd11337e6474f997f2bbf48c42cb31049c 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
Subject: [PATCH 06/16] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 13 +++++++++++++
......
From a5dea9eacdedfa12322b930647d52f68d262e80e Mon Sep 17 00:00:00 2001
From 7b41449dea2824b81811120032b2811ca0d80f79 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
Subject: [PATCH 07/16] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
lib/media_player.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
lib/media_player.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/media_player.c b/lib/media_player.c
index 0ff0a4c..5691345 100644
index b4a5f10..5691345 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -436,7 +436,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -436,11 +436,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);
......@@ -20,7 +20,12 @@ index 0ff0a4c..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 | VLC_VAR_DOINHERIT);
- var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
- var_SetInteger (mp, "vbi-page", 100);
+ 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);
--
1.9.3 (Apple Git-50)
From c32f254a2e7d548e53d2afbda64dcbdd72c77223 Mon Sep 17 00:00:00 2001
From b2fd81527841744b4683f9e485c7ac6d13d90d24 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
Subject: [PATCH 08/16] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......
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
---
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 0ad6ac6..56fd34f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
# FFmpeg
#Uncomment the one you want
-#USE_LIBAV ?= 1
+USE_LIBAV ?= 1
#USE_FFMPEG ?= 1
ifdef USE_FFMPEG
--
1.9.3 (Apple Git-50)
From ddaa5d2d2432cbb37af7511ac9ecc361e76b415e Mon Sep 17 00:00:00 2001
From 07792ddf63a887b6d64dcdb4a355c4381ddf680e 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
Subject: [PATCH 09/16] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......
From 44f9c4ed00edb4cf2001af8cb1cb99db889e0079 Mon Sep 17 00:00:00 2001
From a01ff6dcc9b91895485abf1e89076e3119a6fd07 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
Subject: [PATCH 10/16] fix libtool
---
modules/arm_neon/Makefile.am | 4 ++++
......
From 59b7f22625536f2fa9772a40cd0d3697b27396ef Mon Sep 17 00:00:00 2001
From 8b7833872b75c6580622d5cd99b296c625447100 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
Subject: [PATCH 11/16] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -11,10 +11,10 @@ Subject: [PATCH 13/19] freetype: added a fake font lookup mechanism for iOS to
3 files changed, 45 insertions(+)
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index f7fcd80..79bdfd4 100644
index b9da7bf..f7dbe21 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1950,6 +1950,8 @@ static int Create( vlc_object_t *p_this )
@@ -1956,6 +1956,8 @@ static int Create( vlc_object_t *p_this )
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
p_sys->pf_select = MacLegacy_Select;
......
From 6e30980349205c7d241e3842722f8fe42a94d657 Mon Sep 17 00:00:00 2001
From b538e15f742c3a47bdeea6db4cdc1ce4a4721396 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
Subject: [PATCH 12/16] contrib/speexdsp: disable neon for AArch64
---
contrib/src/speexdsp/rules.mak | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 3cc2b15..049565d 100644
index e82c6ba..658a72e 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -36,6 +36,11 @@ ifeq ($(ARCH),arm)
@@ -31,6 +31,11 @@ ifeq ($(ARCH),arm)
SPEEXDSP_CONF += --enable-arm5e-asm
endif
endif
......@@ -22,7 +22,7 @@ index 3cc2b15..049565d 100644
+endif
.speexdsp: speexdsp
mkdir -p $</m4 && $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
--
1.9.3 (Apple Git-50)
From 3065caff36de2afc4c26833597b1e12ebbe3468a Mon Sep 17 00:00:00 2001
From 5fd240062795c886e79b2559e83d854c4272eb18 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
Subject: [PATCH 13/16] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......
From e0f790a5af18b040af9ae8754ecc409549980c35 Mon Sep 17 00:00:00 2001
From 2e21566b99d70124138b9024607214ce543e2e58 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
Subject: [PATCH 14/16] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......
From 0a62d14b39e7b0b64879027066b70a7813d84105 Mon Sep 17 00:00:00 2001
From 02e3616c9470ee8453f65dc28bf88c3ad6ccc33f 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
Subject: [PATCH 15/16] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......
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
breaking clang compilation
---
contrib/src/harfbuzz/harfbuzz-clang.patch | 16 ++++++++++++++++
contrib/src/harfbuzz/rules.mak | 1 +
2 files changed, 17 insertions(+)
create mode 100644 contrib/src/harfbuzz/harfbuzz-clang.patch
diff --git a/contrib/src/harfbuzz/harfbuzz-clang.patch b/contrib/src/harfbuzz/harfbuzz-clang.patch
new file mode 100644
index 0000000..59d1e06
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-clang.patch
@@ -0,0 +1,16 @@
+--- harfbuzz/configure.ac 2013-07-16 22:04:08.000000000 +0200
++++ harfbuzz/configure.ac 2014-03-12 14:46:36.000000000 +0100
+@@ -80,13 +80,6 @@
+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+ ;;
+ esac
+-
+- case "$host" in
+- arm-*-*)
+- # Request byte alignment on arm
+- CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+- ;;
+- esac
+ fi
+
+ AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
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
$(UNPACK)
$(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
+ $(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
1.9.3 (Apple Git-50)
From 582f2960bb97e390ac6de707a8eb9939ceca135e Mon Sep 17 00:00:00 2001
From cb73954924b6fc2ca5376e4f295eaaac42aa7ef7 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
Subject: [PATCH 16/16] contrib/speex: fix compilation for non-ARMv7 iOS
targets
---
......@@ -9,7 +9,7 @@ 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 376dcbd..50709e5 100644
index a5f003c..916b0ea 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -27,6 +27,11 @@ endif
......@@ -23,7 +23,7 @@ index 376dcbd..50709e5 100644
+endif
.speex: speex
mkdir -p $</m4 && $(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
--
1.9.3 (Apple Git-50)
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=9d6da84e3
TESTEDHASH=f333a1c7fc9
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