Fix AppImage install path

parent 44e80593
......@@ -4,7 +4,8 @@ ExternalProject_Add(
GIT_REPOSITORY http://anongit.kde.org/kdenlive.git
GIT_TAG refactoring_timeline
CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
-DCMAKE_INSTALL_PREFIX=${KDENLIVE_INSTALL_DIR}
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DBUILD_TESTING=FALSE
-DBUILD_TESTS=FALSE
......
......@@ -77,11 +77,6 @@ cp -r $DEPS_INSTALL_PREFIX/lib/x86_64-linux-gnu/libexec/kf5/* $APPDIR/usr/libex
cp $(ldconfig -p | grep libGL.so.1 | cut -d ">" -f 2 | xargs) $APPDIR/usr/lib/
#cp $(ldconfig -p | grep libGLU.so.1 | cut -d ">" -f 2 | xargs) $APPDIR/usr/lib/
rm $APPDIR/usr/lib/libGL.so.1
# libxcb should be removed but does not seem present on binary-factory
#rm $APPDIR/usr/lib/libxcb*
# Step 2: Relocate x64 binaries from the architecture specific directory as required for Appimages
if [ -d $APPDIR/usr/lib/x86_64-linux-gnu/plugins ] ; then
......@@ -123,6 +118,11 @@ linuxdeployqt $APPDIR/usr/share/applications/org.kde.kdenlive.desktop \
# -appimage \
rm $APPDIR/usr/lib/libGL.so.1
# libxcb should be removed
rm $APPDIR/usr/lib/libxcb*
rm $APPDIR/AppRun
cat > $APPDIR/AppRun << EOF
......
......@@ -20,6 +20,7 @@ export APPIMAGEPLUGINS=$APPDIR/usr/plugins/
mkdir -p $APPDIR
mkdir -p $APPDIR/usr/share/kdenlive
mkdir -p $APPDIR/usr/lib
mkdir -p $APPDIR/usr/bin
# We want to use $prefix/deps/usr/ for all our dependencies
export DEPS_INSTALL_PREFIX=$BUILD_PREFIX/deps/usr/
......@@ -55,7 +56,7 @@ cd $BUILD_PREFIX/deps-build/
mkdir -p $BUILD_PREFIX/kdenlive.appdir/usr
# Configure the dependencies for building
cmake $KDENLIVE_SOURCES/packaging/appimage/3rdparty -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX/kdenlive.appdir/usr/ -DEXT_INSTALL_DIR=$DEPS_INSTALL_PREFIX -DEXT_DOWNLOAD_DIR=$DOWNLOADS_DIR
cmake $KDENLIVE_SOURCES/packaging/appimage/3rdparty -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX/kdenlive.appdir/usr/ -DEXT_INSTALL_DIR=$DEPS_INSTALL_PREFIX -DEXT_DOWNLOAD_DIR=$DOWNLOADS_DIR -DKDENLIVE_INSTALL_DIR=$BUILD_PREFIX/kdenlive.appdir/usr/
cmake --build . --target ext_kdenlive
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment