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

MVK: update libvlc

parent f08257a1
From 54b3e2c48e7e821e0451085dfa5d662837854970 Mon Sep 17 00:00:00 2001
From 6ee37b416c7a01c48d8f72c30e646c51a985f157 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From d7bba4ac85ee80a12c8527a7901ce76ccf30a087 Mon Sep 17 00:00:00 2001
From 270e918982a41c5f9448709c0cb3d9442ae31d04 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 98134a88267a83deafe528061768d406f297d378 Mon Sep 17 00:00:00 2001
From f693f9b8fcbb0d26f0b4c2ca0ce32e8b0ca8d95d 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From eac1c9f3cc0408dcb2d5158a3a39b8d930dd1585 Mon Sep 17 00:00:00 2001
From cddc2ba0abafc5364f3970acc42a7a38eba5059e 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 918081f32b47a44b9f9981c2978271e1a735fa33 Mon Sep 17 00:00:00 2001
From 128207f7b3390d14663fb9e02727ac336f8f54ff 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 404d52d126f671efe915da2ee1dbe049513e5340 Mon Sep 17 00:00:00 2001
From 81ed342e9c98072eb596e624a0717ef1a1f2e248 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 8e80a72b504961fed95c9c3d8b45b6db7ab3c275 Mon Sep 17 00:00:00 2001
From 337dd3659bb709b818b9111de83f15f0dcac62b3 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From a1d21517316f25ef554f63a2a1f83edcf443bed9 Mon Sep 17 00:00:00 2001
From 193eb63cd14e09f5801375075bfdf4b9d0a87954 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From ee9c4fd089bd991bc3f6bae577bd4e81556dae1f Mon Sep 17 00:00:00 2001
From 098fee6373745962b8fa55215613648e0b9ee69f 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
......@@ -26,5 +26,5 @@ index 1a72207..867df26 100644
var_Create (mp, "marq-marquee", VLC_VAR_STRING);
var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 915dae7cf822268cb640b46ad5105cfdcc0faacc Mon Sep 17 00:00:00 2001
From db3069eed9e1a5ba61e231dbe0c99d12c280f3be 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
......@@ -21,5 +21,5 @@ index 65d9cb8..107e104 100644
ifdef USE_FFMPEG
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From f28214b753e85f78cbe36fd0a86bcb0e1531f0f2 Mon Sep 17 00:00:00 2001
From 9333f06f32861c992bfe3680d17b04a3bb28ba46 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 77fa69e4e6adaa7d9b2324b5a809076f58aabb53 Mon Sep 17 00:00:00 2001
From 4ed922433141fd14b989151b793c3d824ab58dcd 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
......@@ -8,10 +8,10 @@ Subject: [PATCH 12/20] contrib/gcrypt: disable asm on iOS
1 file changed, 3 insertions(+)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index ced0f43..e0824ba 100644
index 0cc1222..7e67319 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -32,6 +32,9 @@ GCRYPT_EXTRA_CFLAGS =
@@ -31,6 +31,9 @@ GCRYPT_EXTRA_CFLAGS =
endif
ifdef HAVE_MACOSX
GCRYPT_CONF += --disable-aesni-support
......@@ -22,5 +22,5 @@ index ced0f43..e0824ba 100644
ifdef HAVE_BSD
GCRYPT_CONF += --disable-asm --disable-aesni-support
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 5ee058e18a7b1f9832b0cd492d2c000d6f184313 Mon Sep 17 00:00:00 2001
From d70317a96c6335d5e4e77758c336e91bced9be5c 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 72710713f930854a4c29dfdfe6fd6cd061d213f5 Mon Sep 17 00:00:00 2001
From 803994c91e4be81987334acea89535550ccf0af3 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
......@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
#endif
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 6288d65e40a08132df82ab7acce08a4d1393e241 Mon Sep 17 00:00:00 2001
From e740c0309e6682026a19ec9d1260b4e40f0995ac 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From c4939003e042225979482d654d0b18734ce88d15 Mon Sep 17 00:00:00 2001
From b4f5f62a309c7dafe7cece1d769aa1f99f931b63 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 630c8b9f2c32cfca56f2e43cd934dc8fbe3eeda4 Mon Sep 17 00:00:00 2001
From 755c5b223fbe2df5c23a7c1fa1988394b1c59873 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
......@@ -8,10 +8,10 @@ Subject: [PATCH 17/20] extras: deploy arch option for iOS
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index b5aa364..b3d4afe 100755
index e484594..3247859 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -186,7 +186,7 @@ else
@@ -210,7 +210,7 @@ else
export ASCPP="xcrun as"
fi
......@@ -21,5 +21,5 @@ index b5aa364..b3d4afe 100755
--disable-sdl \
--disable-SDL_image \
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 329766ed7844a5dab6eb8e9f8a9433eb7c51d032 Mon Sep 17 00:00:00 2001
From 1502957483c58fc9d72d3d67dd88b9607a4e20fe 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.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From e8ce7d24a9ddb056642f6b8147b785a590925b17 Mon Sep 17 00:00:00 2001
From d3477f08a3fff6784b008449384be9d650d32d7b 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
......@@ -61,18 +61,18 @@ index 0000000..e63224e
+1.8.3.4 (Apple Git-47)
+
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index e0824ba..da17a41 100644
index 7e67319..f2aae48 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -1,6 +1,7 @@
# GCRYPT
GCRYPT_VERSION := 1.6.1
GCRYPT_VERSION := 1.6.2
GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
PKGS += gcrypt
@@ -9,12 +10,24 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
@@ -9,11 +10,23 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
.sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
......@@ -82,7 +82,6 @@ index e0824ba..da17a41 100644
+ifndef HAVE_IOS
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
$(MOVE)
......@@ -97,7 +96,7 @@ index e0824ba..da17a41 100644
DEPS_gcrypt = gpg-error
@@ -48,6 +61,6 @@ endif
@@ -47,6 +60,6 @@ endif
.gcrypt: libgcrypt
$(RECONF)
......@@ -137,5 +136,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
From 9bdbee535c16aa4a524be44467cb6131bf082f66 Mon Sep 17 00:00:00 2001
From c0b4e5efa0f9d57bdfe81f4cf5b94877b22098e4 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
......@@ -275,5 +275,5 @@ index 8de1081..112e952 100644
+ return VLC_SUCCESS;
+}
--
1.8.5.2 (Apple Git-48)
1.9.3 (Apple Git-50)
......@@ -14,7 +14,7 @@ CONFIGURATION="Release"
NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDHASH=03efc84b3
TESTEDHASH=465acb4a4
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