Browse Source

Require iOS 6.1 and update libvlc

Felix Paul Kühne 10 years ago
parent
commit
ae8c1142d1
2 changed files with 28 additions and 3 deletions
  1. 25 0
      MobileVLCKit/patches/0010-Sparkle-fix-iOS-compilation.patch
  2. 3 3
      buildMobileVLCKit.sh

+ 25 - 0
MobileVLCKit/patches/0010-Sparkle-fix-iOS-compilation.patch

@@ -0,0 +1,25 @@
+From 83ab5bb6966e1484b2b3e80cf8708388b4b5929e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Fri, 12 Jun 2015 14:09:05 +0200
+Subject: [PATCH] Sparkle: fix iOS compilation
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d1437b..49f4793 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3811,7 +3811,7 @@ dnl  MacOS X sparkle update support
+ dnl
+ AC_ARG_ENABLE(sparkle,
+   [  --enable-sparkle        Sparkle update support for OS X (default enabled on Mac OS X)])
+-if test "x${enable_sparkle}" != "xno" -a "${SYS}" = "darwin"
++if test "x${enable_sparkle}" != "xno" -a "${HAVE_OSX}" = "1"
+ then
+   if test ! -d ${CONTRIB_DIR}/Sparkle.framework
+   then
+-- 
+2.4.3
+

+ 3 - 3
buildMobileVLCKit.sh

@@ -8,14 +8,14 @@ BUILD_DEVICE=yes
 BUILD_SIMULATOR=no
 BUILD_FRAMEWORK=no
 SDK=`xcrun --sdk iphoneos --show-sdk-version`
-SDK_MIN=6.1
+SDK_MIN=7.0
 VERBOSE=no
 CONFIGURATION="Release"
 NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=f5d5cb75768b
+TESTEDHASH=fe65f5106
 
 usage()
 {
@@ -138,7 +138,7 @@ spushd MobileVLCKit/ImportedSources
 if [ "$NONETWORK" != "yes" ]; then
 if ! [ -e vlc ]; then
 git clone git://git.videolan.org/vlc.git vlc
-info "Applying patches to vlc-2.2.git"
+info "Applying patches to vlc.git"
 cd vlc
 git checkout -B localBranch ${TESTEDHASH}
 git branch --set-upstream-to=origin/master localBranch