Merge branch 'vlc-nacl' into 'master'

Add NaCL toolchains



See merge request !13

vlc-nacl/0001-Disable-arm-testing-for-zlib-on-x86-systems.patch

+From 859fc95e5e8248a986d4f0327f36bb2c46dcc86c Mon Sep 17 00:00:00 2001
+From: Bastien Penavayre <bastien@videolabs.io>
+Date: Thu, 2 Jun 2016 17:18:15 +0200
+Subject: [PATCH] Disable arm testing for zlib on x86 systems
+
+---
+ ports/zlib/build.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/ports/zlib/build.sh b/ports/zlib/build.sh
+index a2e6f77..2cc44b2 100644
+--- a/ports/zlib/build.sh
++++ b/ports/zlib/build.sh
+@@ -58,9 +58,5 @@ TestStep() {
+     # Run the minigzip tests again but with x86-32 and arm translations
+     WriteLauncherScript minigzip minigzip.x86-32.nexe
+     RunMinigzip
+-    if [[ ${SEL_LDR_SUPPORTS_ARM} == 1 ]]; then
+-      WriteLauncherScript minigzip minigzip.arm.nexe
+-      RunMinigzip
+-    fi
+   fi
+ }
+-- 
+2.7.4
+

vlc-nacl/Dockerfile

+FROM videolan-base-sid:latest
+
+MAINTAINER Bastien Penavayre <bastienPenava@gmail.com>
+
+ENV DEP_ROOT="/deps/"
+
+RUN mkdir $DEP_ROOT && cd $DEP_ROOT && \
+    dpkg --add-architecture i386 && \
+    apt-get update && apt-get -y install \
+    wget automake autoconf make gettext pkg-config python2.7 python-dev \
+    curl sed cmake texinfo autoconf automake libtool libglib2.0-dev \
+    libxml2 git cmake unzip libc6:i386 libstdc++6:i386 && \
+    apt-get clean -y && rm -fr /var/lib/apt/lists/*
+
+ADD 0001-Disable-arm-testing-for-zlib-on-x86-systems.patch /deps/
+
+ENV PEPPER_VERSION="pepper_49"
+ENV NACL_SDK_ROOT="$DEP_ROOT/nacl_sdk/$PEPPER_VERSION/"
+ENV WEBPORTS_ROOT="$DEP_ROOT/webports/src/"
+
+RUN  git config --global user.name "VideoLAN Buildbot" && \
+     git config --global user.email buildbot@videolan.org  && \
+     cd $DEP_ROOT && \
+     wget -q https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip &&\
+     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && \
+     unzip nacl_sdk.zip && cd nacl_sdk && \
+     ./naclsdk install $PEPPER_VERSION && \
+     cd $DEP_ROOT && mkdir webports && cd webports && \
+     ../depot_tools/gclient config --unmanaged --name=src https://chromium.googlesource.com/webports.git && \
+     ../depot_tools/gclient sync && \
+     cd src && git checkout -b $PEPPER_VERSION origin/$PEPPER_VERSION && \
+     git apply $DEP_ROOT/0001-Disable-arm-testing-for-zlib-on-x86-systems.patch && \
+     ../../depot_tools/gclient sync --with_branch_heads && \
+     ./bin/webports -t pnacl -a pnacl install libtheora libvorbis zlib ffmpeg libogg flac libpng x264 lame freetype fontconfig libxml2 libarchive mpg123 libmodplug faad2 libebml libmatroska

vlc-nacl/Makefile

+.PHONY: build
+
+build:
+	docker build -t nacl-toolchains:latest .