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

update libvlc to 2.2-pre2

parent c96a16eb
From af17d754e0843347f72485d983e5391f2472df08 Mon Sep 17 00:00:00 2001
From 54b3e2c48e7e821e0451085dfa5d662837854970 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
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From a2f92fc173b629dd72867a8ce11964f757f0c576 Mon Sep 17 00:00:00 2001
From d7bba4ac85ee80a12c8527a7901ce76ccf30a087 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
......@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
pop {r4,pc}
+endfunc
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 511c44a963670f7262d9e2db9071c4444541ab8f Mon Sep 17 00:00:00 2001
From 98134a88267a83deafe528061768d406f297d378 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
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 5847653081296aebf90da0b3ae7e22903ef24576 Mon Sep 17 00:00:00 2001
From eac1c9f3cc0408dcb2d5158a3a39b8d930dd1585 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
......@@ -48,5 +48,5 @@ index 336e001..40dfb1e 100644
cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 23366a4675bad6bec658b63a46840e9d8b7c3438 Mon Sep 17 00:00:00 2001
From 918081f32b47a44b9f9981c2978271e1a735fa33 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
......@@ -62,5 +62,5 @@ index aa38f1b..38961bc 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 */
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 7b600ee10f1c0406b382e4208a44e5c93b9ee58f Mon Sep 17 00:00:00 2001
From 404d52d126f671efe915da2ee1dbe049513e5340 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
......@@ -119,5 +119,5 @@ index 122c4b6..2b30a2e 100644
cd $< && $(MAKE) install
touch $@
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From e08bb5b999f6743d3ee98b07369065061bf02f9a Mon Sep 17 00:00:00 2001
From 8e80a72b504961fed95c9c3d8b45b6db7ab3c275 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
......@@ -26,5 +26,5 @@ index 7d7cce9..e356bbc 100644
.speex: speex
mkdir -p $</m4 && $(RECONF)
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From ae00808b5b063e8a7780063aa96170fb409f152b Mon Sep 17 00:00:00 2001
From a1d21517316f25ef554f63a2a1f83edcf443bed9 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
......@@ -47,5 +47,5 @@ index bf72caf..ee6c2b5 100644
endif
ifdef HAVE_ANDROID
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From ac023003c175db578175371524f4cfdafafcc641 Mon Sep 17 00:00:00 2001
From ee9c4fd089bd991bc3f6bae577bd4e81556dae1f 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/20] lib/media_player: inherit deinterlace and vbi variables
......@@ -9,10 +9,10 @@ Subject: [PATCH 09/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 7201a78..968a0e8 100644
index 1a72207..867df26 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -531,10 +531,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);
......@@ -26,5 +26,5 @@ index 7201a78..968a0e8 100644
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)
1.8.5.2 (Apple Git-48)
From 4bb1928363ca94a65fed6eb38fcadad3446508f4 Mon Sep 17 00:00:00 2001
From 915dae7cf822268cb640b46ad5105cfdcc0faacc 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/20] contrib/avcodec: deploy libav
......@@ -8,7 +8,7 @@ Subject: [PATCH 10/20] contrib/avcodec: deploy libav
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 9ddcd83..ae99178 100644
index 65d9cb8..107e104 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
......@@ -21,5 +21,5 @@ index 9ddcd83..ae99178 100644
ifdef USE_FFMPEG
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 6bc2c93e9af43c9979846d5418b2356fe3a76b1c Mon Sep 17 00:00:00 2001
From f28214b753e85f78cbe36fd0a86bcb0e1531f0f2 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/20] contrib/opus disable asm on arm
......@@ -22,5 +22,5 @@ index d783648..f09a112 100644
.opus: opus
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 0c2c0674d5fe6431303fdd9ad335a7bbffdd359b Mon Sep 17 00:00:00 2001
From 77fa69e4e6adaa7d9b2324b5a809076f58aabb53 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/20] contrib/gcrypt: disable asm on iOS
......@@ -22,5 +22,5 @@ index ced0f43..e0824ba 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 8f3a8df957416d6e4d1d12411a64fb32167f9d03 Mon Sep 17 00:00:00 2001
From 5ee058e18a7b1f9832b0cd492d2c000d6f184313 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/20] fix libtool
......@@ -33,5 +33,5 @@ index 3bb8cdb..542abaa 100644
SOURCES_transform = transform.c
SOURCES_invert = invert.c
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 8f14a6a4421bd5081f13796e8ec431ca9b64b156 Mon Sep 17 00:00:00 2001
From 72710713f930854a4c29dfdfe6fd6cd061d213f5 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/20] freetype: added a fake font lookup mechanism for iOS to
......@@ -11,10 +11,10 @@ Subject: [PATCH 14/20] 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 55b85a5..8d78933 100644
index f7fcd80..79bdfd4 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1963,6 +1963,8 @@ static int Create( vlc_object_t *p_this )
@@ -1950,6 +1950,8 @@ static int Create( vlc_object_t *p_this )
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
p_sys->pf_select = MacLegacy_Select;
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 00210e9b2b7dad1bba5ab0ba4da216167ccab2e4 Mon Sep 17 00:00:00 2001
From 6288d65e40a08132df82ab7acce08a4d1393e241 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/20] contrib/speexdsp: disable neon for AArch64
......@@ -24,5 +24,5 @@ index 7a2bc80..396af52 100644
.speexdsp: speexdsp
mkdir -p $</m4 && $(RECONF)
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From d1be7338b1390ae1be96b635d8ae97ac6a2159b1 Mon Sep 17 00:00:00 2001
From c4939003e042225979482d654d0b18734ce88d15 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/20] contrib: add arch option for platforms where the arch
......@@ -79,5 +79,5 @@ index dd2bd25..2b085ea 100644
ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
HAVE_WIN64 := 1
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From cca213ce0b98be2d785d4239c237c063af8e7bdd Mon Sep 17 00:00:00 2001
From 630c8b9f2c32cfca56f2e43cd934dc8fbe3eeda4 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/20] extras: deploy arch option for iOS
......@@ -21,5 +21,5 @@ index b5aa364..b3d4afe 100755
--disable-sdl \
--disable-SDL_image \
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 12588578479f7961de39f6d623964e4751a0b2ca Mon Sep 17 00:00:00 2001
From 329766ed7844a5dab6eb8e9f8a9433eb7c51d032 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/20] contrib/harfbuzz: work-around build system stupidity
......@@ -45,5 +45,5 @@ index a34ee2b..30e9a2b 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From 676fd11a579c6ed05728f82f478f82fe0f0f9434 Mon Sep 17 00:00:00 2001
From e8ce7d24a9ddb056642f6b8147b785a590925b17 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 19/20] contrib/gcrypt: use git version on iOS
......@@ -137,5 +137,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
From eccc9db9235cb5a57443686e3787d07da4a18364 Mon Sep 17 00:00:00 2001
From 9bdbee535c16aa4a524be44467cb6131bf082f66 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 20/20] libvlc: add preliminary code path to modify quartztext
......@@ -67,10 +67,10 @@ index c0c66dd..7810ed7 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index 968a0e8..5c88620 100644
index 867df26..8401b45 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -560,6 +560,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -464,6 +464,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
......@@ -139,7 +139,7 @@ index c8b3711..cda3c35 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 ceb97a6..4cce93f 100644
index 8de1081..112e952 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -65,6 +65,10 @@
......@@ -234,7 +234,7 @@ index ceb97a6..4cce93f 100644
free(p_sys);
}
@@ -957,12 +980,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 ceb97a6..4cce93f 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;
}
......@@ -275,5 +275,5 @@ index ceb97a6..4cce93f 100644
+ return VLC_SUCCESS;
+}
--
1.9.3 (Apple Git-50)
1.8.5.2 (Apple Git-48)
......@@ -14,7 +14,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=83c8054c1
TESTEDHASH=03efc84b3
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