Minor update for AppImage dependencies

parent 635d27a7
Pipeline #4700 passed with stage
in 15 minutes and 5 seconds
......@@ -98,13 +98,13 @@ cmake --build . --target ext_x264
cmake --build . --target ext_x265
# libvpx does not compile with this gcc6 version
#export CC=/usr/bin/gcc
#export CXX=/usr/bin/g++
export CC=/usr/bin/gcc
export CXX=/usr/bin/g++
cmake --build . --target ext_libvpx
#export CC=/usr/bin/gcc-6
#export CXX=/usr/bin/g++-6
export CC=/usr/bin/gcc-6
export CXX=/usr/bin/g++-6
cmake --build . --target ext_ffmpeg
cmake --build . --target ext_sox
......@@ -134,3 +134,4 @@ cmake --build . --target ext_breezeicons
cmake --build . --target ext_kcrash
cmake --build . --target ext_breeze
cmake --build . --target ext_ruby
#cmake --build . --target ext_mlt
......@@ -85,15 +85,11 @@ cp $(ldconfig -p | grep libGL.so.1 | cut -d ">" -f 2 | xargs) $APPDIR/usr/lib/
# 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
mv $APPDIR/usr/lib/x86_64-linux-gnu/plugins/* $APPDIR/usr/lib/plugins
mv $APPDIR/usr/lib/x86_64-linux-gnu/plugins/* $APPDIR/usr/plugins
rm -rf $APPDIR/usr/lib/x86_64-linux-gnu/
fi
# Step 3: Update the rpath in the various plugins we have to make sure they'll be loadable in an Appimage context
#for lib in $PLUGINS/*.so*; do
# patchelf --set-rpath '$ORIGIN/../lib' $lib;
#done
for lib in $APPIMAGEPLUGINS/*.so*; do
patchelf --set-rpath '$ORIGIN/../lib' $lib;
done
......@@ -118,19 +114,7 @@ for lib in $APPDIR/usr/lib/mlt/*.so*; do
patchelf --set-rpath '$ORIGIN/..' $lib;
done
# Step 4: Move plugins to loadable location in AppImage
# Make sure our plugin directory already exists
if [ ! -d $APPIMAGEPLUGINS ] ; then
mkdir -p $APPIMAGEPLUGINS
fi
# mv $PLUGINS/* $APPIMAGEPLUGINS
# copy icon
cp $APPDIR/usr/share/icons/breeze/apps/48/kdenlive.svg $APPDIR
# GSTREAMER
### GSTREAMER
# Requires gstreamer1.0-plugins-good
#GST_PLUGIN_SRC_DIR=/usr/lib/x86_64-linux-gnu/
#mkdir -p $APPDIR/usr/lib/x86_64-linux-gnu
......@@ -138,19 +122,28 @@ cp $APPDIR/usr/share/icons/breeze/apps/48/kdenlive.svg $APPDIR
#mkdir -p $GST_LIB_DEST_DIR
#GST_PLUGIN_DEST_DIR=$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer1.0/gstreamer-1.0
#mkdir -p $GST_PLUGIN_DEST_DIR
#cp $GST_PLUGIN_SRC_DIR/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner #$GST_PLUGIN_DEST_DIR
##cp $GST_PLUGIN_SRC_DIR/gstreamer-1.0/* $GST_LIB_DEST_DIR
#for p in $GST_PLUGIN_SRC_DIR/libgst*.so*; do
# cp $p $GST_LIB_DEST_DIR
#done
#cp $GST_PLUGIN_SRC_DIR/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner $GST_PLUGIN_DEST_DIR
#cp $GST_PLUGIN_SRC_DIR/gstreamer-1.0/* $GST_LIB_DEST_DIR
#rm $GST_LIB_DEST_DIR/libgstegl*
#rm $GST_LIB_DEST_DIR/libgstegl* || true
#for p in $GST_LIB_DEST_DIR/libgst*.so*; do
# patchelf --set-rpath '$ORIGIN/../..' $p;
#done
### end of GSTREAMER STUFF
# Step 4: Move plugins to loadable location in AppImage
# Make sure our plugin directory already exists
if [ ! -d $APPIMAGEPLUGINS ] ; then
mkdir -p $APPIMAGEPLUGINS
fi
# mv $PLUGINS/* $APPIMAGEPLUGINS
# copy icon
cp $APPDIR/usr/share/icons/breeze/apps/48/kdenlive.svg $APPDIR
# Step 5: Build the image!!!
#linuxdeployqt $APPDIR/usr/bin/ffmpeg
......@@ -203,7 +196,6 @@ export XDG_CURRENT_DESKTOP=
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/
kdenlive --config kdenlive-appimagerc \$@
EOF
chmod +x $APPDIR/AppRun
......
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