diff --git a/client-gnome b/client-gnome index e5e70ca76c11324eb35df3cc1945361224e3b953..14b2f97f95646e79eb1f25038ba4573f1439cb0a 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit e5e70ca76c11324eb35df3cc1945361224e3b953 +Subproject commit 14b2f97f95646e79eb1f25038ba4573f1439cb0a diff --git a/daemon b/daemon index 7286e6cb04906d46c00f7829d74f057d828f102f..51136fdc7c21e79e1e4674a3dc178b5d7561df2d 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 7286e6cb04906d46c00f7829d74f057d828f102f +Subproject commit 51136fdc7c21e79e1e4674a3dc178b5d7561df2d diff --git a/lrc b/lrc index 564784bb62cc4128a2174d4744d38365d5a52bf4..98a6f6dcbaa00724edd72b299a0e013217005abd 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 564784bb62cc4128a2174d4744d38365d5a52bf4 +Subproject commit 98a6f6dcbaa00724edd72b299a0e013217005abd diff --git a/make-ring.py b/make-ring.py index 932ed7eb4b56d5173b7988e3b0ef66894f311fde..8b395fb5cec595e9adfd1ef651845d4e7b864e33 100755 --- a/make-ring.py +++ b/make-ring.py @@ -31,6 +31,7 @@ win_toolset_default = '142' APT_BASED_DISTROS = [ 'debian', 'ubuntu', + 'trisquel', 'linuxmint', 'raspbian', ] @@ -306,7 +307,7 @@ def run_dependencies(args): sys.exit(1) else: - print("Not yet implemented for current distribution (%s)" % + print("Not yet implemented for current distribution (%s). Please continue with the --install instruction. Note: You may need to install some dependencies manually." % args.distribution) sys.exit(1) @@ -506,10 +507,9 @@ def validate_args(parsed_args): + ZYPPER_BASED_DISTROS + FLATPAK_BASED_RUNTIMES if parsed_args.distribution not in supported_distros: - print('Distribution \'{0}\' not supported.\nChoose one of: {1}'.format( + print('WARNING: Distribution \'{0}\' not supported.\nChoose one of: {1}'.format( parsed_args.distribution, ', '.join(supported_distros) ), file=sys.stderr) - sys.exit(1) # The Qt client support will be added incrementally. if parsed_args.qt is not None: diff --git a/packaging/rules/snap/snapcraft.yaml b/packaging/rules/snap/snapcraft.yaml index 8b68fd85172b0ce29f2a002b47bc940298660d4e..0c9f5b0f287c0d6397b8748ba384534d86a7d67e 100644 --- a/packaging/rules/snap/snapcraft.yaml +++ b/packaging/rules/snap/snapcraft.yaml @@ -99,6 +99,8 @@ layout: bind: $SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0 /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib: bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib + /usr/share/alsa: + bind: $SNAP/usr/share/alsa /usr/local/share/jami-gnome: bind: $SNAP/usr/share/jami-gnome @@ -120,6 +122,7 @@ apps: - dbus-ring - dbus-jamignome plugs: + - alsa - audio-playback - audio-record - browser-support @@ -137,17 +140,26 @@ apps: - wayland - x11 +package-repositories: + - type: apt + ppa: beineri/opt-qt-5.15.2-bionic + # qt515base consists of: + # Qt5Concurrent, Qt5Core, Qt5DBus, Qt5EglFSDeviceIntegration, + # Qt5EglFsKmsSupport, Qt5Gui, Qt5Network, Qt5OpenGL, + # Qt5PrintSupport, Qt5Sql, Qt5Test, Qt5Widgets, Qt5XcbQpa, + # Qt5Xml + parts: desktop-launch: source: https://github.com/ubuntu/snapcraft-desktop-helpers.git plugin: nil build-packages: - - gcc-8 - - qtbase5-dev - dpkg-dev + - gcc-8 + - qt515base stage-packages: - - libqt5gui5 - - libqt5svg5 # for loading icon themes which are svg + - qt515base + - qt515svg # for loading icon themes which are svg - try: [appmenu-qt5] # not available on core18 override-pull: | snapcraftctl pull @@ -193,6 +205,7 @@ parts: stage-packages: - libasound2 - libasound2-plugins + - yad jami: after: [alsa-mixin] @@ -200,6 +213,12 @@ parts: source-type: local plugin: nil parse-info: [usr/share/metainfo/jami-gnome.appdata.xml] + build-environment: + - QT_BASE_DIR: "/opt/qt515" + - QTDIR: "$QT_BASE_DIR" + - PATH: "$QT_BASE_DIR/bin:$PATH" + - LD_LIBRARY_PATH: "$QT_BASE_DIR/lib:$LD_LIBRARY_PATH" + - PKG_CONFIG_PATH: "$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH" override-pull: | snapcraftctl pull sed -i -E 's|(tmpName) << (PACKAGE_NAME << "_shm_")|\1 << "snap.jami." << \2|' daemon/src/media/video/sinkclient.cpp @@ -292,8 +311,7 @@ parts: - libwebkit2gtk-4.0-dev - libyaml-cpp-dev - nasm # seems to be needed for building libvpx on an 18.04 base - - qtbase5-dev - - qttools5-dev + - qt515base - uuid-dev - yasm stage-packages: @@ -316,11 +334,6 @@ parts: - libopus0 - libpcre3 - libqrencode3 - - libqt5core5a - - libqt5dbus5 - - libqt5gui5 - - libqt5sql5 - - libqt5sql5-sqlite - libsamplerate0 - libslang2 - libsndfile1 @@ -336,4 +349,5 @@ parts: - libva2 - libvdpau-va-gl1 - libvdpau1 + - qt515base - va-driver-all diff --git a/scripts/build-package-snap.sh b/scripts/build-package-snap.sh index e637595deccb56da56a8eb40c1669b53ed222163..8855f840bf3c3333357a8b72657d4fc966266a38 100755 --- a/scripts/build-package-snap.sh +++ b/scripts/build-package-snap.sh @@ -29,7 +29,7 @@ cd /opt/ring-project/packaging/rules/snap/ # set the version and tarball filename sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" snapcraft.yaml -snapcraft +snapcraft --enable-experimental-package-repositories # requires snapcraft >= 4.4 # move the built snap to output mv *.snap /opt/output/