OTX: Fix travis builds

Author: manongjohn

ci-scripts/linux/travis-install.sh

@@ -1,7 +1,8 @@
-sudo add-apt-repository --yes ppa:beineri/opt-qt597-trusty
+sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
 sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
+sudo add-apt-repository --yes ppa:litenstein/opencv3-xenial
 sudo apt-get update
-sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu3-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev
+sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt59serialport
 
 # someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
 wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb

ci-scripts/osx/travis-buildpkg.sh

@@ -5,15 +5,37 @@ export TOONZDIR=toonz/build/toonz
 echo ">>> Copying stuff to $TOONZDIR/OpenToonz.app/portablestuff"
 cp -R stuff $TOONZDIR/OpenToonz.app/portablestuff
 
-echo ">>> Creating OpenToonz-OTX-osx.dmg"
+echo ">>> Configuring OpenToonz.app for deployment"
 
-$QTDIR/bin/macdeployqt $TOONZDIR/OpenToonz.app -dmg -verbose=0 -always-overwrite \
+$QTDIR/bin/macdeployqt $TOONZDIR/OpenToonz.app -verbose=0 -always-overwrite \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/lzocompress \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/lzodecompress \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/tcleanup \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/tcomposer \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/tconverter \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/tfarmcontroller \
    -executable=$TOONZDIR/OpenToonz.app/Contents/MacOS/tfarmserver 
+
+echo ">>> Correcting library paths"
+for X in `find $TOONZDIR/OpenToonz.app/Contents -type f -name *.dylib -exec otool -l {} \; | grep -e "^toonz" -e"name \/usr\/local" | sed -e"s/://" -e"s/ (.*$//" -e"s/^ *name //"`
+do
+   Z=`echo $X | cut -c 1-1`
+   if [ "$Z" != "/" ]
+   then
+      LIBFILE=$X
+   else
+      Y=`basename $X`
+      W=`basename $LIBFILE`
+      if [ -f $TOONZDIR/OpenToonz.app/Contents/Frameworks/$Y -a "$Y" != "$W" ]
+      then
+         echo "Fixing $X in $LIBFILE"
+         install_name_tool -change $X @executable_path/../Frameworks/$Y $LIBFILE
+      fi
+   fi
+done
 
+echo ">>> Creating OpenToonz-OTX-osx.dmg"
+
+$QTDIR/bin/macdeployqt $TOONZDIR/OpenToonz.app -dmg -verbose=0
+
 mv $TOONZDIR/OpenToonz.dmg $TOONZDIR/../OpenToonz-OTX-osx.dmg