Commit 37a36c82 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Switch to libvlc 3.0 branch

parent aa11b928
From b263d52c5a75a582b829ac3384e2901ad46c06d7 Mon Sep 17 00:00:00 2001
From 6b2d1704cd28655382a8574b3b457f175b491c04 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/14] arm_neon: added function macro to handle the underscore
......
From 26f5a2b1ad9aafde480806a88d03d5d10bf7f6e1 Mon Sep 17 00:00:00 2001
From ae2eceaf92da938e31602e3c6a87875370ca0edc 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/14] deinterlace/merge: use a macro to fix compilation for
......
From e0aaacfb19be2cbd14d89af273ca54107ed33635 Mon Sep 17 00:00:00 2001
From a624715518d8bc2b9873c56eeec430b69b1d868b 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/14] arm_neon: work-around libtool issue
......
From 354579cf5140d01f5f944e0de92cb91c4813bdad Mon Sep 17 00:00:00 2001
From 55591459e4599f7c1abaa8cf89c167dd6aaf9b89 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/14] arm_neon: fix iOS linking
......
From c3f4477dae5a5aff8d54d6c30cf14067c5aae1e0 Mon Sep 17 00:00:00 2001
From 2add547659387a1996038405ef037358b5fd9fcd 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/14] disable neon volume plugin
......
From 878cd2e9ab9041f692a21bc38f8b2566dce27cd1 Mon Sep 17 00:00:00 2001
From c19bc84988c3b2dda0705215cb8e57739e2110d7 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 06/14] 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 41d16a4fb2..3e5f910e99 100644
index 4afb87af7c..9ac5c4862c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -24,6 +24,9 @@ FFMPEGCONF = \
......@@ -49,10 +49,10 @@ index 41d16a4fb2..3e5f910e99 100644
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -227,6 +230,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
endif
@@ -222,6 +225,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)
+ $(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
$(MOVE)
......
From b08ebe442bbf6c27e53ef176b537cb1d32d78239 Mon Sep 17 00:00:00 2001
From 38e65496b516b9035ab8806eb2326aa0d92250e5 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 07/14] deinterlace-merge-arm64: fix linking on appleOS
......
From d7dc0f73174cd1be9080d561c2ee1b0e3c21815a Mon Sep 17 00:00:00 2001
From 3715a96bcebcfe93ee565db903fb8d80f0b7d148 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 08/14] 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 7c99021ae4..250f14da5a 100644
index 3e0d23fdf0..221c76aed8 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -128,6 +128,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
......
From 7ff53222824c4e61f8db548dd28b50f2b86a9921 Mon Sep 17 00:00:00 2001
From 57b02508120bc150c7d13d43542abe82800fbee6 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 09/14] libvlc_media: add cookie_jar API
......@@ -138,7 +138,7 @@ index 5a67e9ff60..0f0341e260 100644
/* Media Descriptor */
diff --git a/lib/media_player.c b/lib/media_player.c
index daef2faedd..4a6cf0cb0e 100644
index 3d159f7123..ae72bb2b95 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -149,7 +149,7 @@ index daef2faedd..4a6cf0cb0e 100644
/* Video */
var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
@@ -964,6 +965,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
@@ -968,6 +969,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
for( size_t i = 0; i < ARRAY_SIZE( p_mi->selected_es ); ++i )
p_mi->selected_es[i] = ES_INIT;
......
From 99e5fd5479e463e9fed6e616fcaff8d9e3f1e434 Mon Sep 17 00:00:00 2001
From 685dfe858bcadda5b050f5daa7e68e7b06d4e7b6 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 10/14] contrib/gcrypt: work-around a libtool limitation
......
From 0ea9497b2392046e13fbe9d91992b1c5e246ea77 Mon Sep 17 00:00:00 2001
From 11106312cf107240bde09784a4153d020f4a4f4c 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 11/14] contrib/gcrypt: fix tvOS compilation
......
From 4b2f48db45888f8f388805da5cb2964728405fcd Mon Sep 17 00:00:00 2001
From cb12522d3da445719c5a0e4754c4718696222e0c 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 12/14] contrib/gcrypt: update patches
......
From a26045e6d1d33c23d3227173b34f34ae2527218d Mon Sep 17 00:00:00 2001
From 0e94157e18853600c26af0a16ebfb70c52f89ee6 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 13/14] Replace thread local with pthread TSD
......
From e11038af88732b7774dc3f39393e2018406ea632 Mon Sep 17 00:00:00 2001
From dcdcc90c3a80bb7397baaa7393facfbce36a7d3d Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 14/14] contrib: use live555 version that is compatible with
......@@ -18,7 +18,7 @@ index f459fb9d16..02b2a69734 100644
+10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5 live.2016.10.21.tar.gz
\ No newline at end of file
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index c389f2c33d..7a629bdee4 100644
index 11bf9c0052..e51fac6950 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -37,7 +37,7 @@ index c389f2c33d..7a629bdee4 100644
$(TARBALLS)/$(LIVE555_FILE):
$(call download_pkg,$(LIVEDOTCOM_URL),live555)
@@ -76,7 +74,6 @@ endif
@@ -78,7 +76,6 @@ endif
SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
.live555: live555
......
......@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
FARCH="all"
TESTEDHASH=acadd3b9
TESTEDHASH=12fa1382
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......@@ -221,7 +221,7 @@ echo `pwd`
if [ "$NONETWORK" != "yes" ]; then
if ! [ -e vlc ]; then
git clone git://git.videolan.org/vlc.git vlc
git clone git://git.videolan.org/vlc/vlc-3.0.git vlc
info "Applying patches to vlc.git"
cd vlc
git checkout -B localBranch ${TESTEDHASH}
......
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