Commit addeaec8 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Update Appimage dependencies

parent 9e0b8dc6
Pipeline #51432 canceled with stage
......@@ -71,6 +71,7 @@ add_subdirectory( ext_assuan2 )
add_subdirectory( ext_nettle )
add_subdirectory( ext_tasn1 )
add_subdirectory( ext_unistring )
add_subdirectory( ext_cmake )
add_subdirectory( ext_gnutls )
add_subdirectory( ext_pcre2 )
add_subdirectory( ext_freetype )
......@@ -112,10 +113,12 @@ add_subdirectory( ext_gdkpixbuf )
add_subdirectory( ext_gtk+ )
add_subdirectory( ext_gavl )
add_subdirectory( ext_frei0r )
add_subdirectory( ext_bigshot )
add_subdirectory( ext_opencv )
add_subdirectory( ext_opus )
add_subdirectory( ext_vidstab )
add_subdirectory( ext_rubberband )
add_subdirectory( ext_mlt )
add_subdirectory( ext_ruby )
add_subdirectory( ext_webp )
add_subdirectory( ext_kdenlive )
ExternalProject_Add(
ext_bigshot
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
GIT_REPOSITORY https://bitbucket.org/leo_sutic/bigsh0t.git
CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
INSTALL_COMMAND ""
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_eq_mask.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_eq_mask.so
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_eq_to_rect.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_eq_to_rect.so
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_rect_to_eq.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_rect_to_eq.so
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_stabilize_360.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_stabilize_360.so
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_hemi_to_eq.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_hemi_to_eq.so
COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_transform_360.so >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_transform_360.so
#INSTALL_COMMAND cp ${BUILD_DIR}/{bigsh0t_eq_mask.so,bigsh0t_rect_to_eq.so,bigsh0t_eq_to_rect.so,bigsh0
#t_stabilize_360.so,bigsh0t_hemi_to_eq.so,bigsh0t_transform_360.so} ${EXT_INSTALL_DIR}/lib/frei0r-1/
)
ExternalProject_Add(
ext_cmake
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
GIT_REPOSITORY https://gitlab.kitware.com/cmake/cmake.git
GIT_TAG v3.18.2
CONFIGURE_COMMAND cd <SOURCE_DIR> && ./bootstrap --prefix=${EXT_INSTALL_DIR}
BUILD_COMMAND ${MAKE}
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
......@@ -195,11 +195,11 @@ function(InstallKF5Component
endfunction()
if(MINGW)
set(KF5_VERSION 5.74) # we have Qt 5.14.2 available.
set(KF5_VERSION 5.76) # we have Qt 5.14.2 available.
elseif(APPLE)
set(KF5_VERSION 5.74) # we have Qt 5.14.1 available.
set(KF5_VERSION 5.76) # we have Qt 5.14.1 available.
else()
set(KF5_VERSION 5.74) # we have Qt 5.14.2 available.
set(KF5_VERSION 5.76) # we have Qt 5.14.2 available.
endif()
if(APPLE)
......@@ -222,7 +222,7 @@ InstallKF5Component(kpackage ${KF5_VERSION} ""
InstallKF5Component(kcodecs ${KF5_VERSION} "" "")
InstallKF5Component(kauth ${KF5_VERSION} "${MacosKauthBackend}" "")
InstallKF5Component(knewstuff ${KF5_VERSION} "" "")
InstallKF5Component(kguiaddons ${KF5_VERSION} "" "")
InstallKF5Component(kguiaddons ${KF5_VERSION} "-DWITH_WAYLAND=OFF" "")
InstallKF5Component(kwidgetsaddons ${KF5_VERSION} "" "")
InstallKF5Component(kdeclarative ${KF5_VERSION} "" "")
InstallKF5Component(kitemviews ${KF5_VERSION} "" "")
......@@ -243,6 +243,8 @@ InstallKF5Component(ktextwidgets ${KF5_VERSION} ""
InstallKF5Component(attica ${KF5_VERSION} "" "")
InstallKF5Component(kio ${KF5_VERSION} "" "")
InstallKF5Component(frameworkintegration ${KF5_VERSION} "" "")
InstallKF5Component(kirigami2 ${KF5_VERSION} "" "")
InstallKF5Component(kactivities ${KF5_VERSION} "" "")
InstallKF5Component(qqc2-desktop-style ${KF5_VERSION} "" "")
InstallKF5Component(plasma-framework ${KF5_VERSION} "" "")
......@@ -259,6 +261,7 @@ ExternalProject_Add(
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL http://download.kde.org/stable/plasma/5.19.5/breeze-5.19.5.tar.xz
URL_MD5 f664f181d10c4cbbe4b385068c75539a
PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/breeze_constexpr.diff
CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
DEPENDS ext_kdecoration
)
......
--- a/kstyle/breezehelper.h 2020-09-01 10:21:05.000000000 +0000
+++ b/kstyle/breezehelper.h 2021-02-18 14:00:51.609956729 +0000
@@ -270,11 +270,11 @@
virtual qreal devicePixelRatio( const QPixmap& ) const;
//* frame radius
- constexpr qreal frameRadius( const int penWidth = PenWidth::NoPen, const qreal bias = 0 ) const
+ const qreal frameRadius( const int penWidth = PenWidth::NoPen, const qreal bias = 0 ) const
{ return qMax( Metrics::Frame_FrameRadius - (0.5 * penWidth) + bias, 0.0 ); }
//* frame radius with new pen width
- constexpr qreal frameRadiusForNewPenWidth( const qreal oldRadius, const int penWidth ) const
+ const qreal frameRadiusForNewPenWidth( const qreal oldRadius, const int penWidth ) const
{ return qMax( oldRadius - (0.5 * penWidth), 0.0 ); }
//* return a QRectF with the appropriate size for a rectangle with a pen stroke
ExternalProject_Add(
ext_icu
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
URL_MD5 9e40f6055294284df958200e308bce50
CONFIGURE_COMMAND <SOURCE_DIR>/source/configure --prefix=${EXT_INSTALL_DIR} --disable-tests
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
URL https://github.com/unicode-org/icu/archive/release-64-2.tar.gz
URL_MD5 b52fcb73e71545c6528beadc755e45e7
CONFIGURE_COMMAND cd <SOURCE_DIR>/icu4c/source &&
./configure --prefix ${EXT_INSTALL_DIR}/local
--enable-tests=no
--enable-samples=no
--with-data-packaging=library
--disable-renaming
BUILD_COMMAND cd <SOURCE_DIR>/icu4c/source && $(MAKE)
INSTALL_COMMAND cd <SOURCE_DIR>/icu4c/source && $(MAKE) install
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
SET(PREFIX_ext_openssl "${EXT_INSTALL_DIR}" )
ExternalProject_Add(
ext_openssl
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL https://www.openssl.org/source/openssl-1.1.1.tar.gz
URL_MD5 7079eb017429e0ffb9efb42bf80ccb21
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://www.openssl.org/source/openssl-1.1.1j.tar.gz
URL_HASH SHA256=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
CONFIGURE_COMMAND <SOURCE_DIR>/config --prefix=${PREFIX_ext_openssl} --openssldir=openssl
BUILD_COMMAND make depend COMMAND make
INSTALL_COMMAND make install
INSTALL_DIR ${PREFIX_ext_openssl}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_openssl} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
CONFIGURE_COMMAND <SOURCE_DIR>/config --prefix=${EXT_INSTALL_DIR}/openssl --openssldir=${EXT_INSTALL_DIR}/openssl/ssl
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install_sw
UPDATE_COMMAND ""
)
......@@ -5,12 +5,13 @@
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL https://download.qt.io/official_releases/qt/5.14/5.14.1/single/qt-everywhere-src-5.14.1.tar.xz
URL_MD5 781c3179410aff7ef84607214e1e91b4
CMAKE_ARGS -DOPENSSL_LIBS='-L${EXTPREFIX_qt}/lib -lssl -lcrypto'
URL http://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz
URL_MD5 b3d2b6d00e6ca8a8ede6d1c9bdc74daf
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qt-appimage-support.patch
CMAKE_ARGS -DOPENSSL_LIBS='-L${EXT_INSTALL_DIR}/lib -lssl -lcrypto'
BUILD_IN_SOURCE 1
#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 -openssl-linked -verbose -nomake examples -nomake tests -nomake tools -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtlocation -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtandroidextras -skip qtserialport -skip qtdatavis3d -skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml -skip qtremoteobjects -skip qtxmlpatterns -skip qtcharts -skip qtpurchasing -skip qtserialbus -skip qtdoc -skip qtmacextras -skip qtwinextras -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -linker gold
CONFIGURE_COMMAND <SOURCE_DIR>/configure ICU_LIBS="-I${EXT_INSTALL_DIR}/local/ -L${EXT_INSTALL_DIR}/local/lib -licui18n -licuuc -licudata" -prefix ${EXT_INSTALL_DIR} -opensource -confirm-license -openssl-linked -verbose -nomake examples -nomake tests -nomake tools -no-icu -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtlocation -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtandroidextras -skip qtserialport -skip qtdatavis3d -skip qtvirtualkeyboard -skip qtspeech -skip qtsensors -skip qtgamepad -skip qtscxml -skip qtremoteobjects -skip qtxmlpatterns -skip qtcharts -skip qtpurchasing -skip qtserialbus -skip qtdoc -skip qtmacextras -skip qtwinextras -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -linker gold
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
......
......@@ -2,6 +2,7 @@ ExternalProject_Add(
ext_rubberband
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
GIT_REPOSITORY git://github.com/breakfastquay/rubberband.git
GIT_TAG default
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} --disable-programs --disable-vamp --disable-ladspa
BUILD_COMMAND $(MAKE)
......
ExternalProject_Add(
ext_ruby
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.5.tar.gz
URL_MD5 4e6b030af3897b811059e1289fc75b31
URL https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz
URL_MD5 2d4a28dcfa38352a627a597f6057c465
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY}
BUILD_COMMAND $(MAKE)
......
ExternalProject_Add(
ext_webp
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz
URL_MD5 7e047f2cbaf584dff7a8a7e0f8572f18
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST}
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
)
......@@ -7,7 +7,7 @@ ExternalProject_Add(
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/xml.diff
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} --without-python --with-icu --without-catalog --with-lzma=${EXT_INSTALL_DIR}/lib CPPFLAGS=${AT_CPP_FLAGS} LDFLAGS=${AT_LD_FLAGS}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} --without-python --with-icu --with-lzma=${EXT_INSTALL_DIR}/lib CPPFLAGS=${AT_CPP_FLAGS} LDFLAGS=${AT_LD_FLAGS}
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
DEPENDS ext_lzma ext_readline
......
......@@ -83,16 +83,21 @@ echo "CPU Cores to use : $CPU_CORES"
# Now start building everything we need, in the appropriate order
cmake --build . --target ext_lzma -j$CPU_CORES
cmake --build . --target ext_icu -j$CPU_CORES
cmake --build . --target ext_xml -j$CPU_CORES
cmake --build . --target ext_gettext -j$CPU_CORES
cmake --build . --target ext_xslt -j$CPU_CORES
cmake --build . --target ext_png -j$CPU_CORES
cmake --build . --target ext_webp -j$CPU_CORES
export CC=/usr/bin/gcc-6
export CXX=/usr/bin/g++-6
cmake --build . --target ext_openssl
cmake --build . --target ext_cmake
cmake --build . --target ext_qt
cmake --build . --target ext_boost -j$CPU_CORES
cmake --build . --target ext_gpgme -j$CPU_CORES
cmake --build . --target ext_libsndfile -j$CPU_CORES
......@@ -126,16 +131,16 @@ cmake --build . --target ext_opus -j$CPU_CORES
cmake --build . --target ext_nv-codec-headers -j$CPU_CORES
cmake --build . --target ext_amf -j$CPU_CORES
cmake --build . --target ext_mfx -j$CPU_CORES
cmake --build . --target ext_libass -j$CPU_CORES
cmake --build . --target ext_ffmpeg -j$CPU_CORES
cmake --build . --target ext_sox -j$CPU_CORES
cmake --build . --target ext_jack -j$CPU_CORES
cmake --build . --target ext_ladspa -j$CPU_CORES
cmake --build . --target ext_cairo -j$CPU_CORES
cmake --build . --target ext_harfbuzz -j$CPU_CORES
cmake --build . --target ext_pango -j$CPU_CORES
cmake --build . --target ext_gdkpixbuf -j$CPU_CORES
cmake --build . --target ext_gtk+ -j$CPU_CORES
cmake --build . --target ext_libass -j$CPU_CORES
cmake --build . --target ext_ffmpeg -j$CPU_CORES
cmake --build . --target ext_sox -j$CPU_CORES
cmake --build . --target ext_jack -j$CPU_CORES
cmake --build . --target ext_ladspa -j$CPU_CORES
cmake --build . --target ext_gavl -j$CPU_CORES
cmake --build . --target ext_frei0r -j$CPU_CORES
cmake --build . --target ext_vidstab -j$CPU_CORES
......@@ -145,8 +150,7 @@ export CC=/usr/bin/gcc-6
export CXX=/usr/bin/g++-6
##cmake --build . --target ext_movit
cmake --build . --target ext_ruby
cmake --build . --target ext_frameworks
cmake --build . --config RelWithDebInfo --target ext_extra-cmake-modules -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kconfig -- -j$CPU_CORES
......@@ -157,6 +161,8 @@ cmake --build . --config RelWithDebInfo --target ext_solid -- -j$C
cmake --build . --config RelWithDebInfo --target ext_threadweaver -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_karchive -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kdbusaddons -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kirigami2 -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_qqc2-desktop-style -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_ki18n -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kcrash -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kcodecs -- -j$CPU_CORES
......@@ -181,10 +187,14 @@ cmake --build . --config RelWithDebInfo --target ext_kpackage --
cmake --build . --config RelWithDebInfo --target ext_knewstuff -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_knotifications -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kdeclarative -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kdoctools -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kservice -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kimageformats -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_frameworkintegration -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kactivities -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_plasma-framework -- -j$CPU_CORES
cmake --build . --target ext_breeze
#cmake --build . --target ext_kwayland
#cmake --build . --target ext_ruby
cmake --build . --target ext_rubberband
cmake --build . --target ext_bigshot
......@@ -44,10 +44,11 @@ cd $BUILD_PREFIX
# Step 1: Copy over all the resources provided by dependencies that we need
cp -r $DEPS_INSTALL_PREFIX/share/kf5 $APPDIR/usr/share
#cp -r $DEPS_INSTALL_PREFIX/share/kstyle $APPDIR/usr/share
#cp -r $DEPS_INSTALL_PREFIX/share/plasma $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/kstyle $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/plasma $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/alsa $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/kservices5 $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/kservicetypes5 $APPDIR/usr/share
#cp -r $DEPS_INSTALL_PREFIX/share/qt5 $APPDIR/usr/share
cp -r $DEPS_INSTALL_PREFIX/share/mime $APPDIR/usr/share
......@@ -67,25 +68,32 @@ cp -r $DEPS_INSTALL_PREFIX/translations $APPDIR/usr/
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/lib/libharfbuzz* $APPDIR/usr/lib
cp -r $DEPS_INSTALL_PREFIX/lib/libmlt* $APPDIR/usr/lib
cp -r $DEPS_INSTALL_PREFIX/lib/frei0r-1 $APPDIR/usr/lib
cp -r $DEPS_INSTALL_PREFIX/bin/melt $APPDIR/usr/bin
cp -r $DEPS_INSTALL_PREFIX/bin/ffmpeg $APPDIR/usr/bin
cp -r $DEPS_INSTALL_PREFIX/bin/ffplay $APPDIR/usr/bin
cp -r $DEPS_INSTALL_PREFIX/bin/ffprobe $APPDIR/usr/bin
cp -r $DEPS_INSTALL_PREFIX/bin/kbuildsycoca5 $APPDIR/usr/bin
cp -r $DEPS_INSTALL_PREFIX/plugins/kf5 $APPIMAGEPLUGINS
#cp -r $DEPS_INSTALL_PREFIX/plugins/styles $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/styles $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/audio $APPIMAGEPLUGINS
#cp -r $DEPS_INSTALL_PREFIX/plugins/org.kde.kdecoration2 $APPIMAGEPLUGINS
#cp -r $DEPS_INSTALL_PREFIX/plugins/kstyle_breeze_config.so $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/org.kde.kdecoration2 $APPIMAGEPLUGINS
cp -r $DEPS_INSTALL_PREFIX/plugins/kstyle_breeze_config.so $APPIMAGEPLUGINS
cp /build/deps-build/ext_bigshot/ext_bigshot-prefix/src/ext_bigshot-build/*.so $APPDIR/usr/lib/frei0r-1
mkdir -p $APPDIR/usr/libexec
cp -r $DEPS_INSTALL_PREFIX/lib/x86_64-linux-gnu/libexec/kf5/* $APPDIR/usr/libexec/
#Put translation files where Qt looks for them
cp -r $DEPS_INSTALL_PREFIX/share/locale $APPDIR/usr/share/
#libva accel
cp -r /usr/lib/x86_64-linux-gnu/libva* $APPDIR/usr/lib || true
cp -r /usr/lib/x86_64-linux-gnu/dri/*_drv_video.so $APPDIR/usr/lib/va || true
cp -r /usr/lib/x86_64-linux-gnu/dri/*_drv_video.so $APPDIR/usr/lib/va || true
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/
......@@ -123,13 +131,13 @@ for lib in $APPDIR/usr/lib/mlt/*.so*; do
done
#for lib in $APPDIR/usr/lib/libva*.so*; do
# patchelf --set-rpath '$ORIGIN' $lib;
#done
for lib in $APPDIR/usr/lib/libva*.so*; do
patchelf --set-rpath '$ORIGIN' $lib;
done
#for lib in $APPDIR/usr/lib/va/*.so*; do
# patchelf --set-rpath '$ORIGIN/..' $lib;
#done
for lib in $APPDIR/usr/lib/va/*.so*; do
patchelf --set-rpath '$ORIGIN/..' $lib;
done
### GSTREAMER
......@@ -171,16 +179,15 @@ cp $APPDIR/usr/share/icons/breeze/apps/48/kdenlive.svg $APPDIR
#linuxdeployqt -executable $APPDIR/usr/lib/va/*.so
# -executable=$APPDIR/usr/lib/libva.so \
# -executable=$APPDIR/usr/lib/libva-drm.so \
# -executable=$APPDIR/usr/lib/libva-x11.so \
linuxdeployqt $APPDIR/usr/share/applications/org.kde.kdenlive.desktop \
-executable=$APPDIR/usr/bin/kdenlive \
-executable=$APPDIR/usr/lib/libva.so \
-executable=$APPDIR/usr/lib/libva-drm.so \
-executable=$APPDIR/usr/lib/libva-x11.so \
-qmldir=$DEPS_INSTALL_PREFIX/qml \
-verbose=2 \
-bundle-non-qt-libs \
-extra-plugins=$APPDIR/usr/lib/mlt,$APPDIR/usr/plugins,$APPDIR/usr/qml \
-extra-plugins=$APPDIR/usr/lib/mlt,$APPDIR/usr/plugins,$APPDIR/usr/qml,$APPDIR/usr/share/locale \
-exclude-libs=libnss3.so,libnssutil3.so,libGL.so.1
# -appimage \
......@@ -195,6 +202,9 @@ rm $APPDIR/usr/lib/libxcb-dri{2,3}.so* || true
rm $APPDIR/usr/lib/libgcrypt.so.20 || true
# libdrm-* cause startup crash
rm $APPDIR/usr/lib/libdrm_* || true
rm $APPDIR/AppRun
cat > $APPDIR/AppRun << EOF
......@@ -203,12 +213,18 @@ cat > $APPDIR/AppRun << EOF
DIR="\`dirname \"\$0\"\`"
DIR="\`( cd \"\$DIR\" && pwd )\`"
export APPDIR=\$DIR
export LC_ALL=\$LANG
export APPIMAGE_ORIGINAL_LD_LIBRARY_PATH=\$LD_LIBRARY_PATH
export APPIMAGE_ORIGINAL_QT_PLUGIN_PATH=\$QT_PLUGIN_PATH
export APPIMAGE_ORIGINAL_XDG_DATA_DIRS=\$XDG_DATA_DIRS
export APPIMAGE_ORIGINAL_PATH=\$PATH
export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=\$DIR/usr/plugins/
export XDG_DATA_DIRS=\$DIR/usr/share/:\$XDG_DATA_DIRS
export XDG_CONFIG_HOME=\$HOME/.config/
export PATH=\$DIR/usr/bin:\$PATH
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/
......@@ -220,10 +236,19 @@ 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 SDL_AUDIODRIVER=pulseaudio
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/
export APPIMAGE_ORIGINAL_KDE_FULL_SESSION=\$KDE_FULL_SESSION
export APPIMAGE_ORIGINAL_DESKTOP_SESSION=\$DESKTOP_SESSION
export APPIMAGE_ORIGINAL_XDG_CURRENT_DESKTOP=\$XDG_CURRENT_DESKTOP
export APPIMAGE_ORIGINAL_XDG_SESSION_DESKTOP=\$XDG_SESSION_DESKTOP
export APPIMAGE_STARTUP_LD_LIBRARY_PATH=\$LD_LIBRARY_PATH
export APPIMAGE_STARTUP_QT_PLUGIN_PATH=\$QT_PLUGIN_PATH
export APPIMAGE_STARTUP_XDG_DATA_DIRS=\$XDG_DATA_DIRS
export APPIMAGE_STARTUP_PATH=\$PATH
kdenlive --config kdenlive-appimagerc \$@
EOF
chmod +x $APPDIR/AppRun
......
......@@ -58,8 +58,9 @@ if [ ! -d $BUILD_PREFIX/kdenlive-build/ ] ; then
fi
#download translations
cd $KDENLIVE_SOURCES/packaging/appimage/
ruby fetch_l10n_po.rb --enable-kdenlive
#cd $KDENLIVE_SOURCES/packaging/appimage/
#ruby fetch_l10n_po.rb --enable-kdenlive
#export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
# Now switch to it
cd $BUILD_PREFIX/kdenlive-build/
......@@ -70,8 +71,9 @@ 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
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=FALSE \
-DKDE_L10N_SYNC_TRANSLATIONS=ON
# Build and Install Kdenlive (ready for the next phase)
make -j$CPU_COUNT install
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