Switch to download and package precompiled 3rd party apps (linux)

.github/workflows/linux_build.yml

@@ -48,6 +48,9 @@ jobs:
           export CC="ccache ${{ matrix.cc }}"
           export CXX="ccache ${{ matrix.cxx }}"
           ci-scripts/linux/tahoma-build.sh
+      - name: Get 3rd Party Apps
+        run: |
+          ci-scripts/linux/tahoma-get3rdpartyapps.sh
       - name: Create Package
         run: |
           ci-scripts/linux/tahoma-buildpkg.sh

ci-scripts/linux/tahoma-buildffmpeg.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 cd thirdparty
 
 echo ">>> Cloning openH264"
@@ -15,10 +16,9 @@ sudo make install
 cd ..
 
 echo ">>> Cloning ffmpeg"
-git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
-cp -R ffmpeg ffmpeg_shared
+git clone https://github.com/tahoma2d/ffmpeg ffmpeg
 
-cd ffmpeg_shared
+cd ffmpeg
 echo "*" >| .gitignore
 
 echo ">>> Configuring to build ffmpeg (shared)"
@@ -65,56 +65,3 @@ echo ">>> Installing ffmpeg (shared)"
 sudo make install
 
 sudo ldconfig
-
-echo ">>> Configuring to build ffmpeg (static)"
-cd ../ffmpeg
-echo "*" >| .gitignore
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-
-./configure  --prefix=/usr/local \
-      --cc="$CC" \
-      --cxx="$CXX" \
-      --pkg-config-flags="--static" \
-      --extra-cflags="-I/usr/local/include -static" \
-      --extra-ldflags="-L/usr/local/lib -static" \
-      --extra-ldexeflags="-static" \
-      --enable-static \
-      --enable-cross-compile \
-      --enable-pic \
-      --disable-shared \
-      --enable-libopenh264 \
-      --enable-pthreads \
-      --enable-version3 \
-      --enable-avresample \
-      --enable-libmp3lame \
-      --enable-libopus \
-      --enable-libsnappy \
-      --enable-libtheora \
-      --enable-libvorbis \
-      --enable-libvpx \
-      --enable-libwebp \
-      --enable-lzma \
-      --enable-libfreetype \
-      --enable-libopencore-amrnb \
-      --enable-libopencore-amrwb \
-      --enable-libspeex \
-      --disable-ffplay \
-      --disable-htmlpages \
-      --disable-manpages \
-      --disable-podpages \
-      --disable-txtpages \
-      --disable-libjack \
-      --disable-indev=jack
-
-echo ">>> Building ffmpeg (static)"
-make
-
-echo ">>> Installing to tahoma2d/thirdparty/ffmpeg/bin"
-if [ ! -d bin ]
-then
-   mkdir bin
-fi
-
-cp ffmpeg ffprobe bin/
-

ci-scripts/linux/tahoma-buildopencv.sh

@@ -1,7 +1,8 @@
+#!/bin/bash
 cd thirdparty
 
 echo ">>> Cloning opencv"
-git clone https://github.com/opencv/opencv.git
+git clone https://github.com/tahoma2d/opencv
 
 cd opencv
 echo "*" >| .gitignore

ci-scripts/linux/tahoma-buildpkg.sh

@@ -35,24 +35,26 @@ mv appdir/usr/share/tahoma2d/stuff Tahoma2D/tahomastuff
 chmod -R 777 Tahoma2D/tahomastuff
 rmdir appdir/usr/share/tahoma2d
 
-if [ -d ../../thirdparty/ffmpeg/bin ]
+if [ -d ../../thirdparty/apps/ffmpeg/bin ]
 then
    echo ">>> Copying FFmpeg to Tahoma2D/ffmpeg"
    if [ -d Tahoma2D/ffmpeg ]
    then
       rm -rf Tahoma2D/ffmpeg
    fi
-   cp -R ../../thirdparty/ffmpeg/bin Tahoma2D/ffmpeg
+   mkdir -p Tahoma2D/ffmpeg
+   cp -R ../../thirdparty/apps/ffmpeg/bin/ffmpeg ../../thirdparty/apps/ffmpeg/bin/ffprobe Tahoma2D/ffmpeg
 fi
 
-if [ -d ../../thirdparty/rhubarb ]
+if [ -d ../../thirdparty/apps/rhubarb ]
 then
    echo ">>> Copying Rhubarb Lip Sync to Tahoma2D/rhubarb"
    if [ -d Tahoma2D/rhubarb ]
    then
       rm -rf Tahoma2D/rhubarb
    fi
-   cp -R ../../thirdparty/rhubarb Tahoma2D/rhubarb
+   mkdir -p Tahoma2D/rhubarb
+   cp -R ../../thirdparty/apps/rhubarb/rhubarb ../../thirdparty/apps/rhubarb/res Tahoma2D/rhubarb
 fi
 
 echo ">>> Creating Tahoma2D/Tahoma2D.AppImage"

ci-scripts/linux/tahoma-get3rdpartyapps.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+cd thirdparty
+
+if [ ! -d apps ]
+then
+   mkdir apps
+fi
+cd apps
+echo "*" >| .gitignore
+
+echo ">>> Getting FFmpeg"
+if [ -d ffmpeg ]
+then
+   rm -rf ffmpeg
+fi
+wget https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-linux-static-lgpl.zip
+unzip ffmpeg-4.3.1-linux-static-lgpl.zip 
+mv ffmpeg-4.3.1-linux-static-lgpl ffmpeg
+
+
+echo ">>> Getting Rhubarb Lip Sync"
+if [ -d rhubarb ]
+then
+   rm -rf rhubarb ]
+fi
+wget https://github.com/tahoma2d/rhubarb-lip-sync/releases/download/v1.10.2/rhubarb-lip-sync-tahoma2d-linux.zip
+unzip rhubarb-lip-sync-tahoma2d-linux.zip -d rhubarb
+

ci-scripts/linux/tahoma-install.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
 sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
 sudo apt-get update