From 850615e1d333e818566263a64261d703bd5f3b5b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 24 Aug 2016 12:24:43 +0100
Subject: [PATCH] ffmpeg in its own script

---
 src/freedombone-app-tox      | 21 --------------
 src/freedombone-utils-ffmpeg | 53 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 21 deletions(-)
 create mode 100755 src/freedombone-utils-ffmpeg

diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 96863682..d9085844 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -48,26 +48,6 @@ TOXIC_FILE=/usr/local/bin/toxic
 
 QTOX_REPO="https://github.com/bashrc/qTox"
 QTOX_COMMIT='27a628a3789fca4f31516c3982e580052dd3c773'
-FFMPEG_VERSION=3.1.2
-
-function mesh_install_ffmpeg
-{
-    chroot "${rootdir}" apt-get -y remove ffmpeg libav-tools
-    chroot "${rootdir}" apt-get -y install build-essential
-    chroot "${rootdir}" apt-get -y install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libopenjpeg-dev libx264-dev mjpegtools libmjpegtools-dev
-    mkdir -p ${rootdir}$INSTALL_DIR/ffmpeg-release
-    cd ${rootdir}$INSTALL_DIR
-    wget http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
-    tar xvjf ffmpeg-${FFMPEG_VERSION}.tar.bz2
-    chroot ${rootdir} /bin/bash -x <<EOF
-cd ${INSTALL_DIR}/ffmpeg-${FFMPEG_VERSION}
-./configure --enable-gpl --enable-postproc --enable-swscale --enable-avfilter --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libx264 --enable-libspeex --enable-shared --enable-pthreads --enable-libopenjpeg --enable-ffplay --enable-encoder=mjpeg --enable-decoder=mjpeg --enable-muxer=mjpeg
-make
-make install
-EOF
-    chroot "${rootdir}" apt-get install libav-tools
-    chroot "${rootdir}" ldconfig
-}
 
 function mesh_tox_qtox {
     if [ ! ${rootdir}$INSTALL_DIR ]; then
@@ -80,7 +60,6 @@ function mesh_tox_qtox {
 
     chroot "${rootdir}" apt-get -y install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
     chroot "${rootdir}" apt-get -y install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
-    #chroot "${rootdir}" apt-get -y install --force-yes tox-ffmpeg-dev
 
     mesh_install_ffmpeg
 
diff --git a/src/freedombone-utils-ffmpeg b/src/freedombone-utils-ffmpeg
new file mode 100755
index 00000000..fda7f212
--- /dev/null
+++ b/src/freedombone-utils-ffmpeg
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# ffmpeg functions
+#
+# License
+# =======
+#
+# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+FFMPEG_VERSION=3.1.2
+
+function mesh_install_ffmpeg
+{
+    chroot "${rootdir}" apt-get -y remove ffmpeg libav-tools
+    chroot "${rootdir}" apt-get -y install build-essential
+    chroot "${rootdir}" apt-get -y install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libopenjpeg-dev libx264-dev mjpegtools libmjpegtools-dev
+    mkdir -p ${rootdir}$INSTALL_DIR/ffmpeg-release
+    cd ${rootdir}$INSTALL_DIR
+    wget http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    tar xvjf ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    chroot ${rootdir} /bin/bash -x <<EOF
+cd ${INSTALL_DIR}/ffmpeg-${FFMPEG_VERSION}
+./configure --enable-gpl --enable-postproc --enable-swscale --enable-avfilter --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libx264 --enable-libspeex --enable-shared --enable-pthreads --enable-libopenjpeg --enable-ffplay --enable-encoder=mjpeg --enable-decoder=mjpeg --enable-muxer=mjpeg
+make
+make install
+EOF
+    chroot "${rootdir}" apt-get install libav-tools
+    chroot "${rootdir}" ldconfig
+}
+
+
+# NOTE: deliberately there is no "exit 0"