Update AppImage scripts

packaging/appimage/01-dependencies.sh

@@ -147,7 +147,7 @@ cd  /app/usr
 rm -Rf lib64
 ln -s lib lib64
 
-QTVERSION=5.9.2
+QTVERSION=5.9.4
 QVERSION_SHORT=5.9
 QTDIR=/usr/local/Qt-${QTVERSION}/
 
@@ -173,7 +173,7 @@ cd $BUILDING_DIR
 
 rm -rf $BUILDING_DIR/* || true
 
-cmake3 /appimage-scripts/3rdparty \
+cmake3 /kdenlive/packaging/appimage/3rdparty \
        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
        -DINSTALL_ROOT=/usr \
        -DEXTERNALS_DOWNLOAD_DIR=$DOWNLOAD_DIR
@@ -183,10 +183,13 @@ cmake3 --build . --config RelWithDebInfo --target ext_jasper     -- -j$CPU_CORES
 cmake3 --build . --config RelWithDebInfo --target ext_png        -- -j$CPU_CORES
 cmake3 --build . --config RelWithDebInfo --target ext_tiff       -- -j$CPU_CORES
 #cmake3 --build . --config RelWithDebInfo --target ext_opencv     -- -j$CPU_CORES
-#cmake3 --build . --config RelWithDebInfo --target ext_qt         -- -j$CPU_CORES
+cmake3 --build . --config RelWithDebInfo --target ext_qt         -- -j$CPU_CORES
 cmake3 --build . --config RelWithDebInfo --target ext_exiv2      -- -j$CPU_CORES
 
 
+#necessary ?
+#pulseaudio-libs 
+
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
@@ -271,6 +274,21 @@ EXTERNAL_CMAKE="${external_options[2]}"
 EXTERNAL_CONFIGURE="${external_options[3]}"
 build_external $EXTERNAL
 
+#nasm
+cd /external
+if ( test -d /external/nasm-2.13.02 )
+then
+        echo "nasm already downloaded"
+else
+        wget http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.xz
+        tar -xf nasm-2.13.02.tar.xz
+fi
+cd nasm-2.13.02
+./configure --prefix=$WLD
+make -j5
+make install
+
+
 #libsndfile
 cd /external
 if ( test -d /external/libsndfile-1.0.28 )
@@ -317,7 +335,7 @@ make install
 #sdl
 cd /external
 if ( test -d /external/SDL2-2.0.7 )
-then
+then 
 	echo "SDL already downloaded"
 else
 	wget http://libsdl.org/release/SDL2-2.0.7.tar.gz
@@ -357,10 +375,11 @@ function build_framework
 	elif [ "$FRAMEWORK" = "knotifications" ]; then
             git checkout .
             git checkout master
-            git checkout v5.40.0
+	    git fetch --tags
+            git checkout v5.43.0
         else
             git fetch --tags
-            git checkout v5.40.0
+            git checkout v5.43.0
         fi
         #git checkout master
         #git reset --hard
@@ -376,10 +395,10 @@ function build_framework
 	elif [ "$FRAMEWORK" = "knotifications" ]; then
 	    git reset --hard
             git fetch --tags
-	    git checkout v5.40.0
+	    git checkout v5.43.0
         else
             git fetch --tags
-            git checkout v5.40.0
+            git checkout v5.43.0
         fi
         cd ..
     fi

packaging/appimage/02-avlibs.sh

@@ -11,7 +11,10 @@ grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 . /opt/rh/devtoolset-3/enable
 
-QTVERSION=5.9.1
+#necessary ?
+#pulseaudio-libs 
+
+QTVERSION=5.9.4
 QVERSION_SHORT=5.9
 QTDIR=/usr/local/Qt-${QTVERSION}/
 
@@ -112,7 +115,7 @@ else
 	tar -xf libsndfile-1.0.28.tar.gz
 fi
 cd libsndfile-1.0.28
-./configure --prefix=$WLD
+./configure --prefix=$WLD 
 make -j5
 make install
 
@@ -126,7 +129,7 @@ else
 	tar -xf libsamplerate-0.1.9.tar.gz
 fi
 cd libsamplerate-0.1.9
-./configure --prefix=$WLD
+./configure --prefix=$WLD 
 make -j5
 make install
 
@@ -141,7 +144,7 @@ else
 	tar -xf alsa-lib-1.1.5.tar.bz2
 fi
 cd alsa-lib-1.1.5
-./configure --prefix=$WLD
+./configure --prefix=$WLD 
 make -j5
 make install
 
@@ -163,7 +166,7 @@ else
 	git clone https://anonscm.debian.org/git/pkg-multimedia/x264.git
 fi
 cd x264
-./configure --enable-static --enable-shared --prefix=$WLD
+./configure --enable-static --enable-shared --prefix=$WLD 
 make -j5
 make install
 
@@ -171,7 +174,7 @@ make install
 #libx265
 cd /external
 if ( test -d /external/x265 )
-then
+then 
 	echo "libx265 already downloaded"
         cd x265
 if [ $# -eq 0 ]; then
@@ -199,12 +202,12 @@ if [ $# -eq 0 ]; then
         git pull --rebase
         cd ..
 fi
-        # make distclean
+        #make clean
 else
 	git clone https://anonscm.debian.org/git/pkg-multimedia/libvpx.git
 fi
 cd libvpx
-./configure --enable-static --enable-shared --prefix=$WLD
+./configure --enable-static --as=yasm --enable-shared --prefix=$WLD 
 make -j5
 make install
 
@@ -236,7 +239,7 @@ make install
 
 
 if ( test -d /external/cairo-1.14.10 )
-then
+then 
     echo "cairo already downloaded"
     cd /external/cairo-1.14.10
 else
@@ -345,7 +348,7 @@ else
 fi
 
 #opencv
-IN=opencv,https://github.com/opencv/opencv.git,true,""
+IN=opencv,https://github.com/opencv/opencv.git,true,"" 
 IFS=',' read -a external_options <<< $IN
 EXTERNAL="${external_options[0]}"
 EXTERNAL_ADDRESS="${external_options[1]}"
@@ -375,7 +378,7 @@ make install
 
 
 #vidstab
-IN=vid.stab,https://github.com/georgmartius/vid.stab.git,true,""
+IN=vid.stab,https://github.com/georgmartius/vid.stab.git,true,"" 
 IFS=',' read -a external_options <<< $IN
 EXTERNAL="${external_options[0]}"
 EXTERNAL_ADDRESS="${external_options[1]}"

packaging/appimage/03-kdenlive.sh

@@ -16,7 +16,10 @@ rm -f functions.sh
 
 . /opt/rh/devtoolset-3/enable
 
-QTVERSION=5.9.2
+#necessary ?
+#pulseaudio-libs 
+
+QTVERSION=5.9.4
 QVERSION_SHORT=5.9
 QTDIR=/usr/local/Qt-${QTVERSION}/
 
@@ -64,7 +67,7 @@ fi
 cd /external/ruby-2.1.2
 ./configure
 make
-make install
+make install 
 gem update --system
 
 # Get project
@@ -164,7 +167,7 @@ build_external $EXTERNAL $EXTERNAL_CMAKE_OPTIONS
 #TODO: dependencies for MLT modules (xml, sdl, etc).
 
 #movit - - Requires some adjustments to build with older automake
-# cd /external
+#cd /external
 #if ( test -d /external/movit )
 #then
 #        echo "movit already cloned"
@@ -213,7 +216,7 @@ index e501888..55f0307 100755
 @@ -19,7 +19,8 @@ then
 		exit 0
 	fi
-
+ 
 -	echo > config.mak
 +	echo "CFLAGS += $(pkg-config --cflags vidstab)" > config.mak
 +	echo "LDFLAGS += $(pkg-config --libs vidstab)" >> config.mak

packaging/appimage/04-create-app.sh

@@ -329,6 +329,8 @@ rm -Rf $APP.AppDir/usr/share/man/ || true
 rm -Rf $APP.AppDir/usr/bin/ffserver || true
 rm -Rf $APP.AppDir/usr/bin/gtk-demo || true
 rm -Rf $APP.AppDir/usr/bin/yasm || true
+rm -Rf $APP.AppDir/usr/bin/nasm || true
+rm -Rf $APP.AppDir/usr/bin/ndisasm || true
 rm -Rf $APP.AppDir/usr/bin/ytasm || true
 rm -Rf $APP.AppDir/usr/bin/x264 || true
 rm -Rf $APP.AppDir/usr/bin/x265 || true