FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle gstreamer in a better way

Browse Source
This commit is contained in:
Martin Rotter 2022-09-07 13:30:30 +02:00
parent 08ba783551
commit 514830f697
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/scripts/github-actions/build-linux-mac.sh
View File

@ -73,6 +73,17 @@ if [ $is_linux = true ]; then
chmod a+x linuxdeploy*.AppImage linuxdeploy*.sh chmod a+x linuxdeploy*.AppImage linuxdeploy*.sh
# Copy Gstreamer libs.
install -v -Dm755 "/usr/lib/x86_64-linux-gnu/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" "AppDir/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
gst_executables="--executable=./AppDir/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
gst_libs=""
for plugin in /usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgst*.so; do
basen=$(basename "$plugin")
install -v -Dm755 "$plugin" "./AppDir/usr/lib/gstreamer-1.0/$basen"
gst_libs="${gst_libs} --library=./AppDir/usr/lib/gstreamer-1.0/$basen"
done
if [[ "$webengine" == "ON" ]]; then if [[ "$webengine" == "ON" ]]; then
# Copy some NSS3 files to prevent WebEngine crashes. # Copy some NSS3 files to prevent WebEngine crashes.
cp /usr/lib/x86_64-linux-gnu/nss/* ./AppDir/usr/lib/ -v cp /usr/lib/x86_64-linux-gnu/nss/* ./AppDir/usr/lib/ -v
@ -85,11 +96,8 @@ if [ $is_linux = true ]; then
# Adjust library search paths. # Adjust library search paths.
export LD_LIBRARY_PATH="$QTPATH/$QTVERSION/$QTOS/lib:$(pwd)/AppDir/usr/lib" export LD_LIBRARY_PATH="$QTPATH/$QTVERSION/$QTOS/lib:$(pwd)/AppDir/usr/lib"
# GStreamer stuff.
export GSTREAMER_INCLUDE_BAD_PLUGINS="1"
# Create AppImage. # Create AppImage.
./linuxdeploy-x86_64.AppImage --output "appimage" --plugin "qt" --plugin "gstreamer" --appdir "AppDir" ./linuxdeploy-x86_64.AppImage --output "appimage" --plugin "qt" --plugin "gstreamer" --appdir "AppDir" $gst_executables $gst_libs
# Rename AppImaage. # Rename AppImaage.
set -- R*.AppImage set -- R*.AppImage

2
src/librssguard/miscellaneous/application.cpp
View File

@ -129,7 +129,6 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin
connect(m_nodejs, &NodeJs::packageError, this, &Application::onNodeJsPackageUpdateError); connect(m_nodejs, &NodeJs::packageError, this, &Application::onNodeJsPackageUpdateError);
connect(m_nodejs, &NodeJs::packageInstalledUpdated, this, &Application::onNodeJsPackageInstalled); connect(m_nodejs, &NodeJs::packageInstalledUpdated, this, &Application::onNodeJsPackageInstalled);
/*
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QString app_dir = QString::fromLocal8Bit(qgetenv("APPDIR")); QString app_dir = QString::fromLocal8Bit(qgetenv("APPDIR"));
@ -146,7 +145,6 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin
} }
} }
#endif #endif
*/
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
m_webFactory->urlIinterceptor()->load(); m_webFactory->urlIinterceptor()->load();