Thomas Guillem 8 роки тому
батько
коміт
1216faa5e9
17 змінених файлів з 24 додано та 24 видалено
  1. 1 1
      Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 1 1
      Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  3. 1 1
      Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch
  4. 1 1
      Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
  5. 1 1
      Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch
  6. 1 1
      Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch
  7. 2 2
      Resources/MobileVLCKit/patches/0007-contrib-avcodec-enforce-use-of-FFmpeg.patch
  8. 6 6
      Resources/MobileVLCKit/patches/0008-Enable-System-DL.patch
  9. 1 1
      Resources/MobileVLCKit/patches/0009-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
  10. 2 2
      Resources/MobileVLCKit/patches/0010-http-add-vlc_http_cookies_clear.patch
  11. 1 1
      Resources/MobileVLCKit/patches/0011-libvlc_media-add-cookie_jar-API.patch
  12. 1 1
      Resources/MobileVLCKit/patches/0012-Revert-Contribs-update-libpng-to-1.6.29.patch
  13. 1 1
      Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch
  14. 1 1
      Resources/MobileVLCKit/patches/0014-contrib-gcrypt-work-around-a-libtool-limitation.patch
  15. 1 1
      Resources/MobileVLCKit/patches/0015-contrib-gcrypt-fix-tvOS-compilation.patch
  16. 1 1
      Resources/MobileVLCKit/patches/0016-contrib-gcrypt-update-patches.patch
  17. 1 1
      Resources/MobileVLCKit/patches/0017-core-Fix-TLS-usage.patch

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

@@ -1,4 +1,4 @@
-From 4051ca0b3fe378b4c46a5ab5c6b2e0f62d125736 Mon Sep 17 00:00:00 2001
+From a061a62ae0465717d796aa1532370c8dcd0c23e2 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/17] arm_neon: added function macro to handle the underscore

+ 1 - 1
Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,4 +1,4 @@
-From 7b6753c9892d260911443eb9baf2803714f8a35f Mon Sep 17 00:00:00 2001
+From 076ac14102d238ca11e855772f07c6ff921db6fc 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 02/17] deinterlace/merge: use a macro to fix compilation for

+ 1 - 1
Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch

@@ -1,4 +1,4 @@
-From 102091125ec24713f67d44884cea348a6fbbe4b5 Mon Sep 17 00:00:00 2001
+From 3b965e0b2f369c0c28df1b598c090320b3ac11e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
 Subject: [PATCH 03/17] arm_neon: work-around libtool issue

+ 1 - 1
Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch

@@ -1,4 +1,4 @@
-From d52777aa44af19ea98e0d9e986d358cba22291b9 Mon Sep 17 00:00:00 2001
+From c58bdd653853056d3e290c2362d56dcc4e718308 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Subject: [PATCH 04/17] arm_neon: fix iOS linking

+ 1 - 1
Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch

@@ -1,4 +1,4 @@
-From 1f2841f7d8111c487023f1870b8bdd3cf754a96a Mon Sep 17 00:00:00 2001
+From a0019d3e79fb4fe453156aa376e440f629a953d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Subject: [PATCH 05/17] disable neon volume plugin

+ 1 - 1
Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch

@@ -1,4 +1,4 @@
-From 2050c7be9fae67690b3c89ca5790e88177e9132f Mon Sep 17 00:00:00 2001
+From 0414fa99437e71a13114446848d087e60cd92a38 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 4 May 2016 16:00:40 +0200
 Subject: [PATCH 06/17] libvlc: create VT-zero-copy variable

+ 2 - 2
Resources/MobileVLCKit/patches/0007-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -1,4 +1,4 @@
-From f892058cf71a3cfaaeedb781b7c50495b4b0191d Mon Sep 17 00:00:00 2001
+From f840c7cbd8d479b4d203cc14f3a8618c9970cab2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=83=C2=BChne?= <fkuehne@videolan.org>
 Date: Tue, 12 Jul 2016 13:50:54 +0200
 Subject: [PATCH 07/17] contrib/avcodec: enforce use of FFmpeg
@@ -8,7 +8,7 @@ Subject: [PATCH 07/17] contrib/avcodec: enforce use of FFmpeg
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 5725e8f11e..5ee8a6896a 100644
+index eabf605179..c37d463706 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -2,10 +2,10 @@

+ 6 - 6
Resources/MobileVLCKit/patches/0008-Enable-System-DL.patch

@@ -1,4 +1,4 @@
-From 4b383a454629899d4c7574f0989b07b784e905e6 Mon Sep 17 00:00:00 2001
+From 2be3b715533e501857003e8276e336cf60fe39a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 22 Jul 2016 11:11:44 +0200
 Subject: [PATCH 08/17] Enable System DL
@@ -36,7 +36,7 @@ index 0000000000..2d60cf7140
 +         in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
 +         in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 5ee8a6896a..453e4566b8 100644
+index c37d463706..29b2f6c878 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -24,6 +24,9 @@ FFMPEGCONF = \
@@ -49,10 +49,10 @@ index 5ee8a6896a..453e4566b8 100644
  	--disable-debug \
  	--disable-avdevice \
  	--disable-devices \
-@@ -224,6 +227,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
- 	rm -Rf $@ $@-$(FFMPEG_BASENAME)
- 	mkdir -p $@-$(FFMPEG_BASENAME)
- 	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+@@ -227,6 +230,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
+ ifdef USE_FFMPEG
+ 	$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
+ endif
 +	$(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
  	$(MOVE)
  

+ 1 - 1
Resources/MobileVLCKit/patches/0009-deinterlace-merge-arm64-fix-linking-on-appleOS.patch

@@ -1,4 +1,4 @@
-From 0ecc0e07a1b429029bac73e33ff2940b34f6cc48 Mon Sep 17 00:00:00 2001
+From cfcf84e696ea96474186335dd3e6a8e8fd2bfdaa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:04:05 +0200
 Subject: [PATCH 09/17] deinterlace-merge-arm64: fix linking on appleOS

+ 2 - 2
Resources/MobileVLCKit/patches/0010-http-add-vlc_http_cookies_clear.patch

@@ -1,4 +1,4 @@
-From f7921491ab235c8fad524cc83f47ed098123b935 Mon Sep 17 00:00:00 2001
+From f3adbf5e030f329301fe8d1242b2782b9904d449 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
 Subject: [PATCH 10/17] http: add vlc_http_cookies_clear
@@ -23,7 +23,7 @@ index ed7e1613da..da1fe4ef1a 100644
  
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index aa957ff26d..289a786d51 100644
+index bc21ee682c..f82b9599b8 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -127,6 +127,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader

+ 1 - 1
Resources/MobileVLCKit/patches/0011-libvlc_media-add-cookie_jar-API.patch

@@ -1,4 +1,4 @@
-From 19fc64bc72aab272286eac88163b9c512fb7a212 Mon Sep 17 00:00:00 2001
+From 9b675f6b64a900b914eca8d497ff1d35378ad96f Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
 Subject: [PATCH 11/17] libvlc_media: add cookie_jar API

+ 1 - 1
Resources/MobileVLCKit/patches/0012-Revert-Contribs-update-libpng-to-1.6.29.patch

@@ -1,4 +1,4 @@
-From 5b2e134ecf5df7dcae1316fdc8ebb0d4534daf31 Mon Sep 17 00:00:00 2001
+From a27ff1b88e446d12ba718479aa60cf0863c3675a Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 18 Apr 2017 17:24:03 +0200
 Subject: [PATCH 12/17] Revert "Contribs: update libpng to 1.6.29"

+ 1 - 1
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch

@@ -1,4 +1,4 @@
-From a17dc67ea2f8bc9e85192b1298b9c6dd28820d4c Mon Sep 17 00:00:00 2001
+From b7e264ca4871ab48b6c53ea7e73bda27cda5aa46 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 11 Apr 2017 15:15:26 +0200
 Subject: [PATCH 13/17] build: rename exported symbols by module

+ 1 - 1
Resources/MobileVLCKit/patches/0014-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,4 +1,4 @@
-From 6bc6c19e1b7cd349e3f4d82f0153af8a78530ac4 Mon Sep 17 00:00:00 2001
+From 695757ddf69b3d985e40f45b405efc84fb797562 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 14/17] contrib/gcrypt: work-around a libtool limitation

+ 1 - 1
Resources/MobileVLCKit/patches/0015-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,4 +1,4 @@
-From 3e2bf61afea94cf8b017eb5e0c28688d603c64b0 Mon Sep 17 00:00:00 2001
+From 007e4b71510d385b85470f5e3368bea3e389a4b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
 Subject: [PATCH 15/17] contrib/gcrypt: fix tvOS compilation

+ 1 - 1
Resources/MobileVLCKit/patches/0016-contrib-gcrypt-update-patches.patch

@@ -1,4 +1,4 @@
-From 411e6abbf6d2cbd5f814257d0d2213a6e8c68c7f Mon Sep 17 00:00:00 2001
+From 326564e66ebd2809b5ffde9d9b1576931468a265 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:03:37 +0200
 Subject: [PATCH 16/17] contrib/gcrypt: update patches

+ 1 - 1
Resources/MobileVLCKit/patches/0017-core-Fix-TLS-usage.patch

@@ -1,4 +1,4 @@
-From e7ca2669f77afced27ec82f932973a2a4d712a74 Mon Sep 17 00:00:00 2001
+From a8a9f64d358be38fb5f5a0a85cbd4652a84a9321 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 2 Jun 2017 15:56:34 +0200
 Subject: [PATCH 17/17] core: Fix TLS usage