From 2131c790bb3e7620531c0402409a022f6ed12f58 Mon Sep 17 00:00:00 2001 From: martinrotter Date: Wed, 8 Sep 2021 02:18:28 -0400 Subject: [PATCH 1/3] Update build-linux-mac.sh --- .../scripts/github-actions/build-linux-mac.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index 16cbc773d..71d798ef3 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -63,17 +63,26 @@ if [ $is_linux = true ]; then wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage chmod a+x linuxdeployqt-continuous-x86_64.AppImage + # Copy Gstreamer libs. + install -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" + + for plugin in alsa app audioconvert audioparsers audioresample autodetect coreelements id3demux jack mpg123 mulaw playback typefindfunctions wavparse apetag; do + install -Dm755 "/usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgst${plugin}.so" "AppDir/usr/lib/gstreamer-1.0/libgst${plugin}.so" + gst_executables="${gst_executables} -executable=AppDir/usr/lib/gstreamer-1.0/libgst${plugin}.so" + done + # Create AppImage. unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH - ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations - ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations + ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations $gst_executables + ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations $gst_executables if [[ "$webengine" == "true" ]]; then # Copy some NSS3 files to prevent WebEngine crashes. cp /usr/lib/x86_64-linux-gnu/nss/* ./AppDir/usr/lib/ -v fi - ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -appimage -no-translations + ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -appimage -no-translations $gst_executables # Rename AppImaage. set -- R*.AppImage @@ -104,4 +113,4 @@ else fi mv "$imagename" "$imagenewname" -ls \ No newline at end of file +ls From d5cb3b486928af090099e26de7d3ac56375213e3 Mon Sep 17 00:00:00 2001 From: martinrotter Date: Wed, 8 Sep 2021 02:51:59 -0400 Subject: [PATCH 2/3] Update build-linux-mac.sh --- resources/scripts/github-actions/build-linux-mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index 71d798ef3..2c3b7b8c9 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -22,7 +22,7 @@ if [ $is_linux = true ]; then #sudo apt-get -y install gcc-7 g++-7 sudo apt-get -y install qt515tools qt515base qt515webengine qt515svg qt515multimedia - sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev + sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-qt5 #sudo update-alternatives --remove-all gcc #sudo update-alternatives --remove-all g++ From 0d7ca12b45e94f06c033f762560c26be79c03d34 Mon Sep 17 00:00:00 2001 From: martinrotter Date: Wed, 8 Sep 2021 02:55:44 -0400 Subject: [PATCH 3/3] Update build-linux-mac.sh --- resources/scripts/github-actions/build-linux-mac.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index 2c3b7b8c9..aaa3ea9d2 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -67,9 +67,10 @@ if [ $is_linux = true ]; then install -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" - for plugin in alsa app audioconvert audioparsers audioresample autodetect coreelements id3demux jack mpg123 mulaw playback typefindfunctions wavparse apetag; do - install -Dm755 "/usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgst${plugin}.so" "AppDir/usr/lib/gstreamer-1.0/libgst${plugin}.so" - gst_executables="${gst_executables} -executable=AppDir/usr/lib/gstreamer-1.0/libgst${plugin}.so" + for plugin in $(ls /usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgst*.so); do + basen=$(basename "$plugin") + install -Dm755 "$plugin" "AppDir/usr/lib/gstreamer-1.0/$basen" + gst_executables="${gst_executables} -executable=AppDir/usr/lib/gstreamer-1.0/$basen" done # Create AppImage.