added missing libs for travis trusty install
This commit is contained in:
+2
-2
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
|
||||||
brew install ffmpeg qt5 grep
|
brew install ffmpeg qt5 grep opencolorio openimageio
|
||||||
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
|
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
|
||||||
|
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
|
|
||||||
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake
|
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
|
||||||
source /opt/qt*/bin/qt*-env.sh
|
source /opt/qt*/bin/qt*-env.sh
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
+25
-25
@@ -2,43 +2,43 @@
|
|||||||
|
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
|
||||||
# Generate Makefile
|
# Generate Makefile
|
||||||
cmake .
|
cmake .
|
||||||
|
|
||||||
# Make
|
# Make
|
||||||
make -j$(sysctl -n hw.ncpu)
|
make -j$(sysctl -n hw.ncpu)
|
||||||
|
|
||||||
# Move Qt deps into bundle
|
# Move Qt deps into bundle
|
||||||
macdeployqt Olive.app
|
macdeployqt Olive.app
|
||||||
|
|
||||||
# Fix other deps that macdeployqt missed
|
# Fix other deps that macdeployqt missed
|
||||||
wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
|
wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
|
||||||
python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
|
python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
|
||||||
|
|
||||||
# Distribute in zip
|
# Distribute in zip
|
||||||
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
|
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
|
||||||
|
|
||||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
|
|
||||||
# Generate Makefile
|
# Generate Makefile
|
||||||
cmake .
|
cmake .
|
||||||
|
|
||||||
# Make
|
# Make
|
||||||
make -j$(nproc)
|
make -j$(nproc)
|
||||||
|
|
||||||
# Use `make install` on `appdir` to place files in the correct place
|
# Use `make install` on `appdir` to place files in the correct place
|
||||||
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
|
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
|
||||||
|
|
||||||
# Download linuxdeployqt
|
# Download linuxdeployqt
|
||||||
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
|
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
|
||||||
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
|
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
|
||||||
|
|
||||||
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
|
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
|
||||||
|
|
||||||
# linuxdeployqt uses this for naming the file
|
# linuxdeployqt uses this for naming the file
|
||||||
export VERSION=$(git rev-parse --short HEAD)
|
export VERSION=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
# Use linuxdeployqt to set up dependencies
|
# Use linuxdeployqt to set up dependencies
|
||||||
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -extra-plugins=imageformats/libqsvg.so -appimage
|
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -extra-plugins=imageformats/libqsvg.so -appimage
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user