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

libvlc: bump hash and update patches

parent adc1a0b3
From 0bd4648b799ec260d869a21efd2479bb52b3b070 Mon Sep 17 00:00:00 2001
From 895ef08988bee7b0c725f4b2c139692d819345ce 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/20] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 579359b0caf2038311ae473d61af4c9fe38d5db0 Mon Sep 17 00:00:00 2001
From d02409a62ad48f853f57fd710385ce0815c72648 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/20] arm_neon: use a macro to fix compilation for iOS
---
modules/arm_neon/amplify.S | 9 +++---
......
From a2c3775e11e6c5b4ce5fe2c3d362988f01006072 Mon Sep 17 00:00:00 2001
From 7f1f1eb66e9db3b5c0fc9d4da43114687ced6d1c 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/20] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From fabb2a0b94fea17af77db88ae89ce9352bf77ea9 Mon Sep 17 00:00:00 2001
From da8846eadf83e9f867eb9087072271374a50c47e 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
Subject: [PATCH 04/20] contrib/ebml+mkv: compile with hidden symbols on iOS
---
contrib/src/ebml/rules.mak | 7 +++++--
......
From ac60c779d14dc25e09d5603a39be9106293a2246 Mon Sep 17 00:00:00 2001
From 3443fdc552460190226b23d7e05be63c990764a2 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 05/20] libass: fix text rendering on iOS by providing a font
lookup mechanism for the font shipped with Aspen
---
......
From 6da6091c3ed606a90ccfe99e2423e74492f45c0e Mon Sep 17 00:00:00 2001
From cd01b3d671af8f9243b7b73748ce27682faca7a7 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 06/20] contrib/png: fix ARM assembly for iOS
---
contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
......
From 0fb1dfd76b31caa8d2b74692ac15c944636815c6 Mon Sep 17 00:00:00 2001
From 5c8d3ecadd139afb01c27302804c5e9ad332574a 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/19] contrib/speex: fix compilation for non-ARMv7 iOS
Subject: [PATCH 07/20] contrib/speex: fix compilation for non-ARMv7 iOS
targets
the neon code included in speex doesn't do ARMv8 yet
......
From 209801da12c6fcd1f2a7d44779576290473aec21 Mon Sep 17 00:00:00 2001
From 19bab313abb6ddf78870159a7f059c2486d23d9a 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/19] contrib/flac: fix compilation with clang 5.0
Subject: [PATCH 08/20] contrib/flac: fix compilation with clang 5.0
---
contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
......
From af6842a474a848529d872fab98e66869263293d6 Mon Sep 17 00:00:00 2001
From cff961452bd498e5596d47519959a4c56ea2b961 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 09/19] lib/media_player: inherit deinterlace and vbi variables
Subject: [PATCH 09/20] lib/media_player: inherit deinterlace and vbi variables
to fix correct variables values on first use
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 09/19] 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 8eee79c..7027bf4 100644
index 5e8f6b2..cfb64b2 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -435,10 +435,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......
From ae6958130609926dd267d3315dea15504e7eba56 Mon Sep 17 00:00:00 2001
From b59e610cb019bd30e1dfc9cf6336fa5442cd8525 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 10/19] contrib/avcodec: deploy libav
Subject: [PATCH 10/20] 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 5f73239..1b3fdad 100644
index 4ce4682..bde43c3 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
......
From 4a32373acb892bfddaa603291218fb428b67b143 Mon Sep 17 00:00:00 2001
From 0e191e19286e87a993d35b021e3f659842efbec2 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 11/19] contrib/opus disable asm on arm
Subject: [PATCH 11/20] contrib/opus disable asm on arm
---
contrib/src/opus/rules.mak | 3 +++
......
From e81fbbd1ef1c932153be175de7f8a946b1ab7c7d Mon Sep 17 00:00:00 2001
From 704a51c1338959b317f148bfa210fabc6cc476ea 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 12/19] contrib/gcrypt: disable asm on iOS
Subject: [PATCH 12/20] contrib/gcrypt: disable asm on iOS
---
contrib/src/gcrypt/rules.mak | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 75a9639..0a4d7d5 100644
index ced0f43..e0824ba 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -31,6 +31,9 @@ GCRYPT_EXTRA_CFLAGS =
@@ -32,6 +32,9 @@ GCRYPT_EXTRA_CFLAGS =
endif
ifdef HAVE_MACOSX
GCRYPT_CONF += --disable-aesni-support
......
From 02f8208d4ea55bf21804d0ee15ae8ef2b38824a8 Mon Sep 17 00:00:00 2001
From 74a2ff4747e19cf1b96fc3c25a7bcb3b5fcd3edf 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 13/19] fix libtool
Subject: [PATCH 13/20] fix libtool
---
modules/arm_neon/Makefile.am | 4 ++++
......@@ -21,7 +21,7 @@ index 4e73a4f..8631f76 100644
libsimple_channel_mixer_neon_plugin_la_SOURCES = \
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 9e329c8..72c7279 100644
index 3bb8cdb..542abaa 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -1,3 +1,7 @@
......
From e7bd84b67abaeb81f98a039c03b200627a57eab0 Mon Sep 17 00:00:00 2001
From 7777539a8c592b117b15af0c362880a5c4a08d62 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 14/19] freetype: added a fake font lookup mechanism for iOS to
Subject: [PATCH 14/20] freetype: added a fake font lookup mechanism for iOS to
use the packaged demo fonts
---
......
From b7fcf17da304c886e8dec0580dd4c23781814bd2 Mon Sep 17 00:00:00 2001
From ab89706197400d3df45c3384380d9ffa989146fb 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 15/19] contrib/speexdsp: disable neon for AArch64
Subject: [PATCH 15/20] contrib/speexdsp: disable neon for AArch64
---
contrib/src/speexdsp/rules.mak | 5 +++++
......
From e5b65fa0b688413a5f067f8f27143381e886000a Mon Sep 17 00:00:00 2001
From a90f83c5e102d401163f29fa1b36e8ee652e54ce 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 16/19] contrib: add arch option for platforms where the arch
Subject: [PATCH 16/20] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......@@ -65,7 +65,7 @@ index 2c755df..b46f536 100755
;;
*bsd*)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 45ba470..372c8d4 100644
index ae01fea..de82f38 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
......
From 725076cb2b8ca12eb7ab4c4791a1aa3c07e24289 Mon Sep 17 00:00:00 2001
From ee7049a59e627ee62184c17d782db24767039a23 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 17/19] extras: deploy arch option for iOS
Subject: [PATCH 17/20] extras: deploy arch option for iOS
---
extras/package/ios/build.sh | 2 +-
......
From e8349d9a027375def84b7b37a493a6abf03e40da Mon Sep 17 00:00:00 2001
From db3c7e76872d172ce8e49aefb551f0c30b45f2b3 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 18/19] contrib/harfbuzz: work-around build system stupidity
Subject: [PATCH 18/20] contrib/harfbuzz: work-around build system stupidity
breaking clang compilation
---
......
From 1b606fcf143286a099796cda60254d1ea9ea42af Mon Sep 17 00:00:00 2001
From 26fd934ffbe0a8052b0087e298ba27620ced73cd 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] contrib/gcrypt: use git version on iOS
Subject: [PATCH 19/20] contrib/gcrypt: use git version on iOS
---
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
......@@ -61,12 +61,12 @@ index 0000000..e63224e
+1.8.3.4 (Apple Git-47)
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 828a594..f6a9554 100644
index e0824ba..da17a41 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,6 +1,7 @@
# GCRYPT
GCRYPT_VERSION := 1.6.0
GCRYPT_VERSION := 1.6.1
GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
......
From 7a64d54c92c295463ba2a1ceedf422c8feed2d76 Mon Sep 17 00:00:00 2001
From 0166690c33c086b44d278547de643264b02c189d 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] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 20/20] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -13,7 +13,7 @@ Subject: [PATCH] libvlc: add preliminary code path to modify quartztext
5 files changed, 130 insertions(+), 9 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index fb91f59..47996f0 100644
index 4b2f449..59beb48 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1382,6 +1382,27 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
......@@ -45,10 +45,10 @@ index fb91f59..47996f0 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index fdfd164..9ea91db 100644
index c0c66dd..7810ed7 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -216,6 +216,8 @@ libvlc_video_get_spu_count
@@ -217,6 +217,8 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -57,7 +57,7 @@ index fdfd164..9ea91db 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -240,6 +242,8 @@ libvlc_video_set_spu
@@ -241,6 +243,8 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......@@ -67,7 +67,7 @@ index fdfd164..9ea91db 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 7027bf4..bd8d37c 100644
index cfb64b2..d105c6e 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -464,6 +464,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -84,10 +84,10 @@ index 7027bf4..bd8d37c 100644
var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create (mp, "mute", VLC_VAR_BOOL);
diff --git a/lib/video.c b/lib/video.c
index 43471b9..4eb8de5 100644
index c8b3711..cda3c35 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -933,3 +933,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -903,3 +903,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
{
return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
}
......@@ -139,7 +139,7 @@ index 43471b9..4eb8de5 100644
+ return get_string( p_mi, "quartztext", textrenderer_option_bynumber(option) );
+}
diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
index 73ed014..463e09e 100644
index f0b5b67..aecb7b9 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -65,6 +65,10 @@
......@@ -234,7 +234,7 @@ index 73ed014..463e09e 100644
free(p_sys);
}
@@ -959,12 +982,12 @@ static int GetFontSize(filter_t *p_filter)
@@ -949,12 +972,12 @@ static int GetFontSize(filter_t *p_filter)
{
int i_size = 0;
......@@ -250,7 +250,7 @@ index 73ed014..463e09e 100644
msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
}
@@ -1048,3 +1071,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
@@ -1041,3 +1064,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
return VLC_SUCCESS;
}
......
......@@ -14,7 +14,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=c2699feec
TESTEDHASH=1aaaece95
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