appimage: switch to mlt7

packaging/appimage/3rdparty/ext_mlt/CMakeLists.txt

@@ -2,12 +2,8 @@ ExternalProject_Add(
   ext_mlt
   DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
   GIT_REPOSITORY https://github.com/mltframework/mlt.git
-  GIT_TAG v6
+  GIT_TAG master
 
-  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY} --enable-gpl --enable-gpl3 --enable-opencv --enable-opengl
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE} -DMOD_OPENCV=ON -DMOD_MOVIT=ON
   BUILD_IN_SOURCE 1
-  BUILD_ALWAYS TRUE
-  BUILD_COMMAND $(MAKE) clean
-  COMMAND $(MAKE)
-  INSTALL_COMMAND $(MAKE) install
 )

packaging/appimage/build-image.sh

@@ -66,8 +66,8 @@ cp -r $DEPS_INSTALL_PREFIX/translations $APPDIR/usr/
 # TO remove once we switch to the newer Qt5.12 Appimage dependency
 # cp -r $DEPS_INSTALL_PREFIX/openssl/lib/*  $APPDIR/usr/lib
 
-cp -r $DEPS_INSTALL_PREFIX/share/mlt  $APPDIR/usr/share
-cp -r $DEPS_INSTALL_PREFIX/lib/mlt  $APPDIR/usr/lib
+cp -r $DEPS_INSTALL_PREFIX/share/mlt-7  $APPDIR/usr/share
+cp -r $DEPS_INSTALL_PREFIX/lib/mlt-7  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libharfbuzz*  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libfribidi*  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libpango*  $APPDIR/usr/lib
@@ -128,7 +128,7 @@ done
 #  patchelf --set-rpath '$ORIGIN/../../lib' $lib;
 #done
 
-for lib in $APPDIR/usr/lib/mlt/*.so*; do
+for lib in $APPDIR/usr/lib/mlt-7/*.so*; do
   patchelf --set-rpath '$ORIGIN/..' $lib;
 done
 
@@ -189,7 +189,7 @@ linuxdeployqt $APPDIR/usr/share/applications/org.kde.kdenlive.desktop \
   -qmldir=$DEPS_INSTALL_PREFIX/qml \
   -verbose=2 \
   -bundle-non-qt-libs \
-  -extra-plugins=$APPDIR/usr/lib/mlt,$APPDIR/usr/plugins,$APPDIR/usr/qml,$APPDIR/usr/share/locale \
+  -extra-plugins=$APPDIR/usr/lib/mlt-7,$APPDIR/usr/plugins,$APPDIR/usr/qml,$APPDIR/usr/share/locale \
   -exclude-libs=libnss3.so,libnssutil3.so,libGL.so.1
 
 #  -appimage \
@@ -229,14 +229,14 @@ export XDG_CONFIG_HOME=\$HOME/.config/
 export PATH=\$DIR/usr/bin:\$DIR/usr/lib:\$DIR/usr/lib/libexec/kf5::\$PATH
 export KDE_FORK_SLAVES=1
 
-export MLT_REPOSITORY=\$DIR/usr/lib/mlt/
-export MLT_DATA=\$DIR/usr/share/mlt/
+export MLT_REPOSITORY=\$DIR/usr/lib/mlt-7/
+export MLT_DATA=\$DIR/usr/share/mlt-7/
 export MLT_ROOT_DIR=\$DIR/usr/
 export LADSPA_PATH=\$DIR/usr/lib/ladspa
 export LIBVA_DRIVERS_PATH=\$DIR/usr/lib/va
 export FREI0R_PATH=\$DIR/usr/lib/frei0r-1
-export MLT_PROFILES_PATH=\$DIR/usr/share/mlt/profiles/
-export MLT_PRESETS_PATH=\$DIR/usr/share/mlt/presets/
+export MLT_PROFILES_PATH=\$DIR/usr/share/mlt-7/profiles/
+export MLT_PRESETS_PATH=\$DIR/usr/share/mlt-7/presets/
 export SDL_AUDIODRIVER=pulseaudio
 export GST_PLUGIN_SCANNER=\$DIR/usr/lib/x86_64-linux-gnu/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner
 export GST_PLUGIN_PATH=\$DIR/usr/lib/x86_64-linux-gnu/gstreamer1.0/