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

MVK: update libvlc for 2.6b2

parent b1126bb3
From 4fed5cc0be0c14da4fb4603879f1d82c0d7dbd0d Mon Sep 17 00:00:00 2001
From be9e6669cf654d39138d335729257d8d904a280d 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/16] 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
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.4.0
2.4.1
From 236cf2a64fd03187cc7141aad4fe89594d3bdcba Mon Sep 17 00:00:00 2001
From 21472daccbb1a2ee9a4991647f25211fc3e01d45 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/16] 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 +++---
......@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc}
+endfunc
--
2.4.0
2.4.1
From e1fcb0bfc6dcd89517d5bae00f4169c88689e8d2 Mon Sep 17 00:00:00 2001
From 2f5908d0482800a38d18be5d5c693485f3c1a034 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/16] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 03/18] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.4.0
2.4.1
From 06f0dec1764d7390d8783180766375dd174f1ce3 Mon Sep 17 00:00:00 2001
From 4a0b1a4a9bd4b15005c489b4bf95e1f9b6aa2ae0 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 04/16] libass: fix text rendering on iOS by providing a font
Subject: [PATCH 04/18] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......@@ -62,5 +62,5 @@ index 8e32d64..21cdadc 100644
const char *psz_font = NULL; /* We don't ship a default font with VLC */
const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
--
2.4.0
2.4.1
From bda43da18eb2a023273403639a1ad2b1d376b777 Mon Sep 17 00:00:00 2001
From 7b9fc8eb2dd4da9415e7aa85396904147de4d69c 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 05/16] contrib/png: fix ARM assembly for iOS
Subject: [PATCH 05/18] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......@@ -119,5 +119,5 @@ index c5a3fba..7649c4b 100644
cd $< && $(MAKE) install
touch $@
--
2.4.0
2.4.1
From 4744b0e06ef415794f8c3970cb2b3dda9cba1b71 Mon Sep 17 00:00:00 2001
From d98c07d871e445331ae7a39b6915443376d7c886 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 06/16] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 06/18] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......@@ -27,5 +27,5 @@ index b4a5f10..5691345 100644
var_Create (mp, "marq-marquee", VLC_VAR_STRING);
var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
--
2.4.0
2.4.1
From ab4cf2daeec653d631a24e9a913423131db004ce Mon Sep 17 00:00:00 2001
From 98321018b4f3e1265110168e8a7c93cf75a110b3 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 07/16] contrib/opus disable asm on arm
Subject: [PATCH 07/18] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......@@ -22,5 +22,5 @@ index 56f0933..273521f 100644
.opus: opus
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
--
2.4.0
2.4.1
From f330b7551f8b2158a510dfeb02cfde1d55bc4d4f Mon Sep 17 00:00:00 2001
From 3d65f75fa53e81ed3b3f4d306be80e3044c22006 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 08/16] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 08/18] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
......@@ -22,5 +22,5 @@ index 0cc1222..7e67319 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
2.4.0
2.4.1
From bbeafa5b9343542e5b04dae87be78bf2069fff67 Mon Sep 17 00:00:00 2001
From c745b8195b38e2f0efe26ddcc73c7fbd582cab52 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 09/16] fix libtool
Subject: [PATCH 09/18] fix libtool
---
modules/arm_neon/Makefile.am | 4 ++++
......@@ -33,5 +33,5 @@ index 3bb8cdb..542abaa 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
2.4.0
2.4.1
From 01c310184d5e65089f0039b962b30af98f165b90 Mon Sep 17 00:00:00 2001
From 91b354e43f2617e8ebc24edb630cad8f4493e03f 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 10/16] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 10/18] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
2.4.0
2.4.1
From 5f0a6b228bc77f64ce3fbdcf0b9e7f8c77454869 Mon Sep 17 00:00:00 2001
From f0f19c97409e450650f1994df14f3f6f1b27ae76 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 11/16] contrib/speexdsp: disable neon for AArch64
Subject: [PATCH 11/18] contrib/speexdsp: disable neon for AArch64
---
contrib/src/speexdsp/rules.mak | 5 +++++
......@@ -24,5 +24,5 @@ index e82c6ba..658a72e 100644
.speexdsp: speexdsp
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEXDSP_CONF)
--
2.4.0
2.4.1
From eb6464835c38ed6f712e69ea5e15779a93a08031 Mon Sep 17 00:00:00 2001
From d150f54c584fb6fbdfdf53e439c5c13a79ebfc1a 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/16] contrib: add arch option for platforms where the arch
Subject: [PATCH 12/18] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......@@ -79,5 +79,5 @@ index c9f409a..1ae11e9 100644
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
2.4.0
2.4.1
From 509e21254e7f00e95b0fb59f6e410e492393d175 Mon Sep 17 00:00:00 2001
From d84d076da95734a440b1b6b69b0ed052fd20bd1f 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 13/16] contrib/gcrypt: use git version on iOS
Subject: [PATCH 13/18] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......@@ -135,5 +135,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.4.0
2.4.1
From 37f4952b3e94ad3917a6a7370a2428db1cb7aeee Mon Sep 17 00:00:00 2001
From bfecab4073911da1df2e7443836efc6964f473dd 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 14/16] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 14/18] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -275,5 +275,5 @@ index 8de1081..112e952 100644
+ return VLC_SUCCESS;
+}
--
2.4.0
2.4.1
From 78870f08f7b51031338825989e704416aaa5cb23 Mon Sep 17 00:00:00 2001
From 9d028a16a45aefcae69763a371d862b57309d10a 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 15/16] contrib/speex: fix compilation for non-ARMv7 iOS
Subject: [PATCH 15/18] contrib/speex: fix compilation for non-ARMv7 iOS
targets
---
......@@ -25,5 +25,5 @@ index a5f003c..916b0ea 100644
.speex: speex
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(SPEEX_CONF)
--
2.4.0
2.4.1
From 4393ef7d6a4af80c4d0cd92e784b293171196cec Mon Sep 17 00:00:00 2001
From f5ddd5fcd853350b9a3cf2f253a7a48fc72a7f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 12 May 2015 22:00:33 +0200
Subject: [PATCH 16/16] contrib/vpx: fix iOS 32bit Intel simulator compilation
Subject: [PATCH 16/18] contrib/vpx: fix iOS 32bit Intel simulator compilation
---
contrib/src/vpx/libvpx-ios.patch | 16 +++++++++++++---
......@@ -39,5 +39,5 @@ index 504860c..abc46d2 100644
gcc*)
add_cflags -m${bits}
--
2.4.0
2.4.1
From da65cdb24158dbc58460dfbdf17d814f41607882 Mon Sep 17 00:00:00 2001
From d6bb0087607e9e7ecbdf0b1922e155c8514753db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 13 May 2015 13:00:49 +0200
Subject: [PATCH 1/2] Revert "Contribs: update libvpx to 1.4.0"
Subject: [PATCH 17/18] Revert "Contribs: update libvpx to 1.4.0"
This reverts commit caa52414b9f47919c9c0a64ff077765b4ceb86a4.
---
......@@ -333,5 +333,5 @@ index ac3eace..b55199d 100644
$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
$(call download,$(VPX_URL))
--
2.4.0
2.4.1
From 1d229a1e707340820eee1a587337d560da1216b4 Mon Sep 17 00:00:00 2001
From 60a9b9b4ce397ec0240a1f3c71a26f73362aa84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 13 May 2015 13:06:05 +0200
Subject: [PATCH 2/2] ebml: disable exceptions
Subject: [PATCH 18/18] ebml: disable exceptions
---
contrib/src/ebml/rules.mak | 2 +-
......@@ -21,5 +21,5 @@ index 4a5ac16..c779726 100644
.ebml: libebml
--
2.4.0
2.4.1
......@@ -15,7 +15,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
SCARY=yes
TESTEDHASH=7f525a92163d262
TESTEDHASH=8e8ac4a07f3c
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