Browse Source

MVK: update libvlc

Felix Paul Kühne 10 years ago
parent
commit
3cc8f3a76e

+ 2 - 2
MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,4 +1,4 @@
-From 2d0c70a824694b540326d9d655db2d37d7a4dc40 Mon Sep 17 00:00:00 2001
+From 9715479c904379a1c968cdde6ceb93e50c13f134 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 1/9] arm_neon: added function macro to handle the underscore
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch

@@ -1,4 +1,4 @@
-From da41f6ce2a498eb04031fb5ee6dd80ac3fbe7f96 Mon Sep 17 00:00:00 2001
+From 298b8b2c8652d9b448a9f98ebf32ff313c579999 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 2/9] arm_neon: use a macro to fix compilation for iOS
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,4 +1,4 @@
-From 16937da7fcf6605daf03ebbd1fc71a90bd3d7d77 Mon Sep 17 00:00:00 2001
+From d1695f7626f33421054fb4dae1aeca05baa225b0 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 3/9] deinterlace/merge: use a macro to fix compilation for iOS
@@ -81,5 +81,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.3.0
+2.3.2
 

+ 3 - 3
MobileVLCKit/patches/0004-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,4 +1,4 @@
-From 14dbd85fdd383aa6dd091841ee67b15de33053e9 Mon Sep 17 00:00:00 2001
+From 4927e1c1755d5e37fb36bc3d377f3f55a668e5b9 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 4/9] libass: fix text rendering on iOS by providing a font
@@ -9,7 +9,7 @@ Subject: [PATCH 4/9] 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 f6f14a6..48e8375 100644
+index 067ef6b..256ab21 100644
 --- a/modules/codec/libass.c
 +++ b/modules/codec/libass.c
 @@ -29,6 +29,13 @@
@@ -62,5 +62,5 @@ index f6f14a6..48e8375 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.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0005-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,4 +1,4 @@
-From 1218bcd1112e9297e0c31821b0ffe7768f2ca1d8 Mon Sep 17 00:00:00 2001
+From afeda4a80a110924d48502af4c9f2ce4c93c27d9 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 5/9] freetype: added a fake font lookup mechanism for iOS to
@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
  #endif
  
 -- 
-2.3.0
+2.3.2
 

+ 5 - 5
MobileVLCKit/patches/0006-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,4 +1,4 @@
-From f3353bd062f3505c2dd529f53df3b9af291fd397 Mon Sep 17 00:00:00 2001
+From fc9aca281a2d103b78b6004297b49636a0069ac7 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 6/9] libvlc: add preliminary code path to modify quartztext
@@ -45,10 +45,10 @@ index 3f9441c..81b5ce3 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 4fd2378..25aaa16 100644
+index 1e241e7..ab1e3e8 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -223,6 +223,8 @@ libvlc_video_get_spu_count
+@@ -224,6 +224,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 4fd2378..25aaa16 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -247,6 +249,8 @@ libvlc_video_set_spu
+@@ -248,6 +250,8 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -277,5 +277,5 @@ index 3b8e6ca..d81b531 100644
 +    return VLC_SUCCESS;
 +}
 -- 
-2.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0007-contrib-gcrypt-simplify-compilation-by-disabling-doc.patch

@@ -1,4 +1,4 @@
-From d137174a240d8b0db2511983387f42302a02ee53 Mon Sep 17 00:00:00 2001
+From 2abccdbedc8b0bf802af7747fb240530509ec1b7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
 Subject: [PATCH 7/9] contrib/gcrypt: simplify compilation by disabling /doc
@@ -106,5 +106,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0008-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,4 +1,4 @@
-From 01b7d5e08e14839d435a1c048ab8b81873be62ab Mon Sep 17 00:00:00 2001
+From c9d7c5a322e520b9214c66d85005a484e400ebed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 9 Dec 2014 22:14:55 +0100
 Subject: [PATCH 8/9] lib/media player: inherit deinterlace variable to achieve
@@ -22,5 +22,5 @@ index 19b447d..73d7277 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.3.0
+2.3.2
 

+ 2 - 2
MobileVLCKit/patches/0009-arm_neon-work-around-libtool-issue.patch

@@ -1,4 +1,4 @@
-From 33f30abf1aa78660b02526e012b849cb91f7f9b6 Mon Sep 17 00:00:00 2001
+From 05bf84ae1c8befddec7b0097425dc363844bc5dc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 18 Feb 2015 21:35:16 +0100
 Subject: [PATCH 9/9] arm_neon: work-around libtool issue
@@ -18,5 +18,5 @@ index 4e73a4f..43ef527 100644
  
  libsimple_channel_mixer_neon_plugin_la_SOURCES = \
 -- 
-2.3.0
+2.3.2
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=bf991772dac
+TESTEDHASH=cd273368d7f6
 
 usage()
 {