update automated appimage build scripts

packaging/appimage/3rdparty/CMakeLists.txt

@@ -85,15 +85,10 @@ add_subdirectory( ext_phonon )
 add_subdirectory( ext_gpgme )
 add_subdirectory( ext_gcrypt )
 add_subdirectory( ext_frameworks )
-add_subdirectory( ext_grantlee )
-add_subdirectory( ext_applications )
-add_subdirectory( ext_ktoblzcheck )
-add_subdirectory( ext_gwenhywfar )
 add_subdirectory( ext_xmlsec1 )
 add_subdirectory( ext_sqlcipher )
 add_subdirectory( ext_opensp )
 add_subdirectory( ext_ofx )
-add_subdirectory( ext_ical )
 add_subdirectory( ext_libsndfile )
 add_subdirectory( ext_libsamplerate )
 add_subdirectory( ext_alsa )

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

@@ -233,6 +233,33 @@ ExternalProject_Add(
   DEPENDS ext_kwindowsystem ext_kconfig ext_kcodecs ext_kcoreaddons ext_phonon
 )
 
+ExternalProject_Add(
+  ext_attica
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/attica-5.51.0.zip
+  URL_MD5 2915e774c50d0f09f4365897922fb0b0
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kwindowsystem ext_kconfig ext_kcodecs ext_kcoreaddons ext_phonon
+)
+
+ExternalProject_Add(
+  ext_knewstuff
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/knewstuff-5.51.0.zip
+  URL_MD5 d5fcff457dc70b2de16488b2f1ba8e7b
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kwindowsystem ext_kconfig ext_kcodecs ext_kcoreaddons ext_phonon ext_attica
+)
+
+ExternalProject_Add(
+  ext_knotifyconfig
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/knotifyconfig-5.51.0.zip
+  URL_MD5 a1a8c6331858aab8ded199ec0b9795f4
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kwindowsystem ext_kconfig ext_kcodecs ext_kcoreaddons ext_phonon ext_knewstuff
+)
+
 ExternalProject_Add(
   ext_kpackage
   DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
@@ -358,4 +385,32 @@ ExternalProject_Add(
   URL_MD5 bb889cbd5a3b39f226d57da4c694ff57
   CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
   DEPENDS ext_kitemviews
-)
\ No newline at end of file
+)
+
+ExternalProject_Add(
+  ext_kpurpose
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/purpose-5.51.0.zip
+  URL_MD5 0d3323f67ed6b360e2cd77167278489b
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kxmlgui
+)
+
+ExternalProject_Add(
+  ext_kfilemetadata
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/kfilemetadata-5.51.0.zip
+  URL_MD5 9946d31383ea759ffedcd6528bfdec92
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kguiaddons
+)
+
+ExternalProject_Add(
+  ext_kdoctools
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  URL http://download.kde.org/stable/frameworks/5.51/kdoctools-5.51.0.zip
+  URL_MD5 696f5f8f4eb7e3e3b2cedca18ea6331f
+  CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
+  DEPENDS ext_kcoreaddons
+)
+

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

@@ -10,9 +10,9 @@ ExternalProject_Add(
 
   PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qsql_mysql.diff
 
-  CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXT_INSTALL_DIR} -opensource -confirm-license -verbose -nomake examples -nomake tests -nomake tools ICU_LIBDIR="${EXT_INSTALL_DIR}/lib" ICU_INCDIR="${EXT_INSTALL_DIR}/include" OPENSSL_LIBDIR="${EXT_INSTALL_DIR}/openssl/lib" OPENSSL_INCDIR="${EXT_INSTALL_DIR}/openssl/include" -openssl-linked -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtwayland -skip qtandroidextras -skip qtserialport -skip qtdatavis3d -skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml -skip qtremoteobjects -skip qtxmlpatterns -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtpurchasing -skip qtscxml -skip qtserialbus -skip qtspeech -skip qtvirtualkeyboard -skip qtdoc -skip qtmacextras -skip qtwinextras -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtmultimedia -skip qtnetworkauth -skip qtimageformats -system-webengine-icu
+  CONFIGURE_COMMAND <SOURCE_DIR>/configure -prefix ${EXT_INSTALL_DIR} -opensource -confirm-license -verbose -nomake examples -nomake tests -nomake tools ICU_LIBDIR="${EXT_INSTALL_DIR}/lib" ICU_INCDIR="${EXT_INSTALL_DIR}/include" OPENSSL_LIBDIR="${EXT_INSTALL_DIR}/openssl/lib" OPENSSL_INCDIR="${EXT_INSTALL_DIR}/openssl/include" -openssl-linked -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtenginio -skip qtlocation -skip qtwayland -skip qtandroidextras -skip qtserialport -skip qtdatavis3d -skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml -skip qtremoteobjects -skip qtxmlpatterns -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtpurchasing -skip qtscxml -skip qtserialbus -skip qtspeech -skip qtvirtualkeyboard -skip qtdoc -skip qtmacextras -skip qtwinextras -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtmultimedia -skip qtnetworkauth -system-webengine-icu
 
   BUILD_COMMAND $(MAKE)
-  INSTALL_COMMAND $(MAKE) install
+  BUILD_COMMAND $(MAKE) install
   DEPENDS ext_xslt ext_mysql ext_sqlite ext_postgresql ext_pcre2
 )

packaging/appimage/build-dependencies.sh

@@ -8,7 +8,7 @@ set -x
 
 # Make sure the base dependencies are installed
 apt-get -y install build-essential perl python git '^libxcb.*-dev' libx11-xcb-dev \
-	libglu1-mesa-dev libxrender-dev libxi-dev flex bison gperf libicu-dev libxslt-dev ruby
+	libglu1-mesa-dev libxrender-dev libxi-dev flex bison gperf libicu-dev ruby
 apt-get -y install cmake3 wget tar bzip2 xz-utils libtool libfile-which-perl automake gcc-4.8 patch \
 	g++-4.8 zlib1g-dev libglib2.0-dev libc6-dev libeigen3-dev libssl-dev \
 	libcppunit-dev libstdc++-4.8-dev libfreetype6-dev libfontconfig1-dev liblcms2-dev \
@@ -16,6 +16,8 @@ apt-get -y install cmake3 wget tar bzip2 xz-utils libtool libfile-which-perl aut
 	libpulse-dev libsox-dev liblist-moreutils-perl libxml-parser-perl \
 	libjack-dev autopoint language-pack-en-base
 
+apt-get -y install libpixman-1-dev docbook-xml docbook-xsl libattr1-dev
+
 # Read in our parameters
 #export BUILD_PREFIX=$1
 #export KDENLIVE_SOURCES=$2
@@ -67,13 +69,16 @@ cd $BUILD_PREFIX/deps-build/
 cmake $KDENLIVE_SOURCES/packaging/appimage/3rdparty -DCMAKE_INSTALL_PREFIX=$DEPS_INSTALL_PREFIX -DEXT_INSTALL_DIR=$DEPS_INSTALL_PREFIX -DEXT_DOWNLOAD_DIR=$DOWNLOADS_DIR
 
 # Now start building everything we need, in the appropriate order
+
 cmake --build . --target ext_iconv
 cmake --build . --target ext_lzma
 cmake --build . --target ext_xml
 cmake --build . --target ext_gettext
 cmake --build . --target ext_xslt
 cmake --build . --target ext_png
-# cmake --build . --target ext_jpeg #this causes build failures in Qt 5.10
+
+  # cmake --build . --target ext_jpeg #this causes build failures in Qt 5.10
+
 cmake --build . --target ext_qt
 cmake --build . --target ext_boost
 cmake --build . --target ext_gpgme
@@ -85,4 +90,20 @@ cmake --build . --target ext_yasm
 cmake --build . --target ext_alsa
 cmake --build . --target ext_sdl2
 
+cmake --build . --target ext_fftw3
+
+# ladspa expects fft3w.pc pkgconfig files
+cp /build/deps/usr/lib/pkgconfig/fftwf.pc /build/deps/usr/lib/pkgconfig/fftw3f.pc
+
+cmake --build . --target ext_ladspa
 
+cmake --build . --target ext_x264
+cmake --build . --target ext_x265
+cmake --build . --target ext_libvpx
+cmake --build . --target ext_ffmpeg
+cmake --build . --target ext_cairo
+cmake --build . --target ext_harfbuzz
+cmake --build . --target ext_pango
+cmake --build . --target ext_gdkpixbuf
+cmake --build . --target ext_gtk+
+cmake --build . --target ext_mlt

packaging/appimage/build-kdenlive.sh

+#!/bin/bash
+
+# Halt on errors and be verbose about what we are doing
+set -e
+set -x
+
+# Read in our parameters
+#export BUILD_PREFIX=$1
+#export KDENLIVE_SOURCES=$2
+export BUILD_PREFIX=/build
+export KDENLIVE_SOURCES=/kdenlive
+
+# qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment.
+# That's not always the case, so make sure it is
+export LC_ALL=en_US.UTF-8
+export LANG=en_us.UTF-8
+
+# We want to use $prefix/deps/usr/ for all our dependencies
+export DEPS_INSTALL_PREFIX=$BUILD_PREFIX/deps/usr/
+export DOWNLOADS_DIR=$BUILD_PREFIX/downloads/
+
+# Setup variables needed to help everything find what we build
+export LD_LIBRARY_PATH=$DEPS_INSTALL_PREFIX/lib:$DEPS_INSTALL_PREFIX/openssl/lib:$LD_LIBRARY_PATH
+export PATH=$DEPS_INSTALL_PREFIX/bin:$DEPS_INSTALL_PREFIX/openssl/bin:$PATH
+export PKG_CONFIG_PATH=$DEPS_INSTALL_PREFIX/share/pkgconfig:$DEPS_INSTALL_PREFIX/lib/pkgconfig:$DEPS_INSTALL_PREFIX/openssl/lib/pkgconfig:/usr/lib/pkgconfig:$PKG_CONFIG_PATH
+export CMAKE_PREFIX_PATH=$DEPS_INSTALL_PREFIX:${DEPS_INSTALL_PREFIX}/openssl:$CMAKE_PREFIX_PATH
+
+# Make sure our build directory exists
+if [ ! -d $BUILD_PREFIX/kdenlive-build/ ] ; then
+    mkdir -p $BUILD_PREFIX/kdenlive-build/
+fi
+
+# Now switch to it
+cd $BUILD_PREFIX/kdenlive-build/
+
+# Determine how many CPUs we have
+CPU_COUNT=`grep processor /proc/cpuinfo | wc -l`
+
+# Configure Kdenlive
+cmake $KDENLIVE_SOURCES \
+    -DCMAKE_INSTALL_PREFIX:PATH=$BUILD_PREFIX/kdenlive.appdir/usr \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DBUILD_TESTING=FALSE \
+    -DBUILD_TESTS=FALSE
+
+# Build and Install Kdenlive (ready for the next phase)
+make -j$CPU_COUNT install