Commit 926b8557 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: remove patches merged upstream and fix compilation

parent 27425075
From 1e4daafcf88c5784b046621dd03630af865bcecb Mon Sep 17 00:00:00 2001
From 4568922db55dd338bce644de6a8efc1db75e74c2 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/17] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......
From 82cca4d4e6ec00ee3095e491af42bb23fb9ee40d Mon Sep 17 00:00:00 2001
From 7a8bcf0ac2291b9d600888e9376b241f3693a1b5 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/19] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/17] deinterlace/merge: use a macro to fix compilation for
iOS
---
......
From 740d331f33d77be696674b79ed036ea287a244a8 Mon Sep 17 00:00:00 2001
From e230d6337b90fd543558a00ca1d76ad33c4fa77d 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/19] arm_neon: work-around libtool issue
Subject: [PATCH 03/17] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 37b5438993733e3c6007ac5a0144267b64d97b96 Mon Sep 17 00:00:00 2001
From 34f0d96cbcf1f7fef590ef896c10affbbbbbe98a 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/19] arm_neon: fix iOS linking
Subject: [PATCH 04/17] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 4dd37452c0a8d9894e78b31999251bb9f80c3642 Mon Sep 17 00:00:00 2001
From be3fe9abc4c9b034ae828de67b980aa55faf59cd 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/19] disable neon volume plugin
Subject: [PATCH 05/17] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From da015892c1793885fd4e030988cfa3e9d921984e Mon Sep 17 00:00:00 2001
From 842f401de356a75309fca1bc38602c2373611eca 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/19] libvlc: create VT-zero-copy variable
Subject: [PATCH 06/17] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......
From f3d83d8373a8b6440d3a78231ef1aeb11cd48802 Mon Sep 17 00:00:00 2001
From 3f27566c166c7d027b02e9ab67e2ffecde662816 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 07/19] Enable System DL
Subject: [PATCH 07/17] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......
From 05c1deb1bd3550e76d381e5eaa6184eb82e6b579 Mon Sep 17 00:00:00 2001
From 6cf8ed64c72808277097ae16242d4ca20350dfbf 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 08/19] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 08/17] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......
From b973b13bedb1362bc12fc500a5057cbdcbc414e4 Mon Sep 17 00:00:00 2001
From dc67d85f2d680decc96216b8781a3fffbcf47a22 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 09/19] http: add vlc_http_cookies_clear
Subject: [PATCH 09/17] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......
From 76dcf904cf9b82457fe48d85650b7660fd6ddf72 Mon Sep 17 00:00:00 2001
From f2ab81dff221c6a3ced8d7fdd749bc1efefd1b98 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 10/19] libvlc_media: add cookie_jar API
Subject: [PATCH 10/17] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......
From c8a434012c3cccbb551c1755f204ac6260d4df00 Mon Sep 17 00:00:00 2001
From c87d39e592a02fde8e8d2f941353225522cf1551 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 18 Apr 2017 17:24:03 +0200
Subject: [PATCH 11/19] Revert "Contribs: update libpng to 1.6.29"
Subject: [PATCH 11/17] Revert "Contribs: update libpng to 1.6.29"
This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
---
......
From 2ef35a22e30df3ea9399f0c57db2e2cb950853de Mon Sep 17 00:00:00 2001
From f690bcee3b48cc2229c85c51fea8d5d4269a2a38 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 12/19] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 12/17] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......
From 32e4af99ed1e9d44e447c247363bcc63740a1d26 Mon Sep 17 00:00:00 2001
From 4b17054cba1f801f0e0e7afb538cd8b886db0355 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 13/19] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 13/17] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......
From ddddf2d9ce20c43a0dbc2ac7801ff13637e07651 Mon Sep 17 00:00:00 2001
From f1834f210421272c4522d72089350310ac8f1209 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 14/19] contrib/gcrypt: update patches
Subject: [PATCH 14/17] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
......
From 51db444d84bc5b5167a557d929e37e81206bbdd8 Mon Sep 17 00:00:00 2001
From b253fc4ff2fdfd6335551da33adb85ea6bb00717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:05:51 +0200
Subject: [PATCH 15/19] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 15/17] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 2 +-
......
From 2bf1a280c10db4aa4199e404285622946b603eae Mon Sep 17 00:00:00 2001
From fd3b47066fcf706bd611721248db6b042c44ea31 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 16/19] build: rename exported symbols by module
Subject: [PATCH 16/17] build: rename exported symbols by module
This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
---
......
From 9e4426bba569c34b6f0de0e0fd815fe537df2c0b Mon Sep 17 00:00:00 2001
From a0abeb095f644192b94822dd5b1e9da523e84ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 17/19] Remove thread local
Subject: [PATCH 17/17] Remove thread local
---
src/misc/interrupt.c | 2 +-
......
From 8b4fae0e2f969ced0f2104a37b730b1495c69557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:52:51 +0200
Subject: [PATCH 18/19] video_chroma/cvpx: disable cvpx to cvpx conversion on
iOS and tvOS
---
modules/video_chroma/cvpx.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/modules/video_chroma/cvpx.c b/modules/video_chroma/cvpx.c
index abb5303f9b..752a547dbe 100644
--- a/modules/video_chroma/cvpx.c
+++ b/modules/video_chroma/cvpx.c
@@ -28,6 +28,8 @@
# include "config.h"
#endif
+#include <TargetConditionals.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_filter.h>
@@ -38,14 +40,26 @@
static int Open(vlc_object_t *);
static void Close(vlc_object_t *);
+#if !TARGET_OS_IPHONE
static int Open_CVPX_to_CVPX(vlc_object_t *);
static void Close_CVPX_to_CVPX(vlc_object_t *);
+#endif
vlc_module_begin ()
set_description("Conversions from/to CoreVideo buffers")
set_capability("video converter", 10)
set_callbacks(Open, Close)
+#if TARGET_OS_IPHONE
+vlc_module_end ()
+
+struct filter_sys_t
+{
+ filter_t *p_sw_filter;
+ CVPixelBufferPoolRef pool;
+};
+
+#else
add_submodule()
set_description("Conversions between CoreVideo buffers")
set_callbacks(Open_CVPX_to_CVPX, Close_CVPX_to_CVPX)
@@ -64,6 +78,7 @@ struct filter_sys_t
VTPixelTransferSessionRef vttransfer;
};
};
+#endif
/********************************
* CVPX to/from I420 conversion *
@@ -237,6 +252,8 @@ error:
* CVPX to CVPX conversion *
***************************/
+#if !TARGET_OS_IPHONE
+
static picture_t *
Filter(filter_t *filter, picture_t *src)
{
@@ -314,3 +331,5 @@ Close_CVPX_to_CVPX(vlc_object_t *obj)
CFRelease(filter->p_sys->vttransfer);
free(filter->p_sys);
}
+
+#endif
--
2.13.2
From e9b79fb80f099821a0ab635ec19db966405b9a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:56:05 +0200
Subject: [PATCH 19/19] video_chroma/cvpx: set correct deployment targets
---
modules/video_chroma/Makefile.am | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index 14195e8f04..e0298d50bf 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -132,8 +132,16 @@ chroma_LTLIBRARIES += \
libd3d11_surface_plugin.la
endif
-libcvpx_plugin_la_SOURCES = video_chroma/cvpx.c \
- codec/vt_utils.c codec/vt_utils.h
+libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx.c
+if HAVE_OSX
+libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -mmacosx-version-min=10.8
+endif
+if HAVE_IOS
+libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -miphoneos-version-min=8.0
+endif
+if HAVE_TVOS
+libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -mtvos-version-min=10.2
+endif
libcvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
EXTRA_LTLIBRARIES += libcvpx_plugin.la
chroma_LTLIBRARIES += $(LTLIBcvpx)
--
2.13.2
......@@ -21,7 +21,7 @@ OSVERSIONMINCFLAG=miphoneos-version-min
OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
TESTEDHASH=58921590
TESTEDHASH=b9ca7841
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
let MAKE_JOBS=$CORE_COUNT+1
......
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