MVK: fix simulator compilation

MobileVLCKit/patches/0025-contrib-reverse-logic.patch

@@ -1,17 +1,17 @@
-From 2b064b5808344fa33c7983c20b43d77e47eafc50 Mon Sep 17 00:00:00 2001
+From 2673d3b7d1c79d76e780853e7e1e00e7d76ad9f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 02:32:01 +0100
 Subject: [PATCH 25/25] contrib: reverse logic
 
 ---
- contrib/src/main.mak | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ contrib/src/main.mak | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index ae76215..5c24cf0 100644
+index ae76215..12976a9 100644
 --- a/contrib/src/main.mak
 +++ b/contrib/src/main.mak
-@@ -130,12 +130,12 @@ CCAS=$(CC) -c
+@@ -130,12 +130,15 @@ CCAS=$(CC) -c
  ifdef HAVE_IOS
  CC=xcrun clang
  CXX=xcrun clang++
@@ -19,7 +19,10 @@ index ae76215..5c24cf0 100644
 -AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
 -CCAS=gas-preprocessor.pl $(CC) -c
 -else
-+ifeq ($(ARCH), i386)
++ifeq ($(ARCH),i386)
++CCAS=$(CC) -c
++AS=xcrun as
++else ifeq ($(ARCH),x86_64)
  CCAS=$(CC) -c
  AS=xcrun as
 +else

MobileVLCKit/patches/0026-extras-ios-simulator-doesn-t-necessarily-mean-i386-a.patch

@@ -0,0 +1,36 @@
+From 49042e5effdf3e046636a2e7a204c0109535df88 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Wed, 22 Jan 2014 03:05:48 +0100
+Subject: [PATCH 26/26] extras/ios: simulator doesn't necessarily mean i386
+ anymore
+
+---
+ extras/package/ios/build.sh | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
+index 6e42216..84e05f8 100755
+--- a/extras/package/ios/build.sh
++++ b/extras/package/ios/build.sh
+@@ -76,8 +76,7 @@ fi
+ info "Building libvlc for iOS"
+ 
+ if [ "$PLATFORM" = "Simulator" ]; then
+-    TARGET="i686-apple-darwin11"
+-    ARCH="i386"
++    TARGET="${ARCH}-apple-darwin11"
+     OPTIM="-O3 -g"
+ else
+     TARGET="arm-apple-darwin11"
+@@ -189,7 +188,7 @@ else
+   export ASCPP="xcrun as"
+ fi
+ 
+-../bootstrap --host=${TARGET} --build="i686-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
++../bootstrap --host=${TARGET} --build="${ARCH}-apple-darwin10" --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
+     --disable-disc --disable-sout \
+     --disable-sdl \
+     --disable-SDL_image \
+-- 
+1.8.3.4 (Apple Git-47)
+

buildMobileVLCKit.sh

@@ -162,7 +162,7 @@ if [ "$VERBOSE" = "yes" ]; then
 fi
 if [ "$PLATFORM" = "iphonesimulator" ]; then
     args="${args} -s"
-    ./build.sh ${args} -k "${SDK}"
+    ./build.sh -a i386 ${args} -k "${SDK}" && ./build.sh -a x86_64 ${args} -k "${SDK}"
 else
     ./build.sh -a armv7 ${args} -k "${SDK}" && ./build.sh -a armv7s ${args} -k "${SDK}"
 fi