Skip to content
Snippets Groups Projects
  1. Apr 07, 2022
  2. Mar 23, 2022
    • Amin Bandali's avatar
      packaging: fix libclient dependency issues of deb packages · 030db788
      Amin Bandali authored
      Since for our deb packages all the binary packages share the same
      source package, and are built in the same environment, depending on
      the distro and dpkg tools versions, dpkg-shlibdeps might incorrectly
      add the wrong libclient package for either clients.  For example,
      have the jami-gnome package depend on both jami-libclient-gnome and
      jami-libclient; which is wrong, since jami-libclient-gnome and
      jami-libclient conflict with each other and cannot be installed
      simultaneously.  So, we instruct dpkg-shlibdeps to exclude the two
      libclient packages from ${shlibs:Depends}, which is fine because
      we already manually add the correct one to each client's Depends.
      
      Also, use the system libarchive-dev package for Ubuntu 18.04 as well;
      since like with Debian 10, building libarchive from daemon's contribs
      fails there too.
      
      GitLab: #1415
      Change-Id: I1c065a7fd3fc58324c7893d5d23039f2a5109931
      Unverified
      030db788
  3. Mar 17, 2022
    • Amin Bandali's avatar
      packaging: use system libarchive on Debian 10 · 519e16a3
      Amin Bandali authored
      The bundled one from the daemon contribs does not build on Debian 10
      for some reason.
      
      Change-Id: Id6fbc1e09bdf2912663f78502b255e975aebec1a
      Unverified
      519e16a3
    • Amin Bandali's avatar
      packaging: build bundled ffmpeg for libclient and client-qt · 2f1ebdd4
      Amin Bandali authored
      Recent libclient and client-qt use avframe from ffmpeg's libavutil.
      
      Change-Id: Ia860e374eb2b8d6c22a79ee0f5a22673a292bf19
      2f1ebdd4
    • Amin Bandali's avatar
      build: add separate lrc-gnome submodule for client-gnome · fd10998d
      Amin Bandali authored
      After the recent merge of the video renderer changes into lrc and
      client-qt, the build for client-gnome is currently broken because it
      has not yet been updated to follow the new API, a non-trivial task.
      Thus, we add a separate lrc-gnome submodule for use by client-gnome,
      as a temporary measure until the future vendoring of lrc into the two
      clients.
      
      With this change, the users of the Qt client ('jami' package) would
      continue using 'jami-libclient' as a dependency, whereas for users of
      the GNOME client ('jami-gnome') they would install and use the new
      'jami-libclient-gnome' package.
      
      Change-Id: I6aacb6c495c9a2953c328f2e9bfe6acd2b8cc645
      Unverified
      fd10998d
  4. Mar 15, 2022
  5. Jan 31, 2022
  6. Jan 28, 2022
  7. Jan 14, 2022
    • Amin Bandali's avatar
      Bump Qt up to 6.2.2, add missing nodejs build-dep for libqt-jami · 880936d2
      Amin Bandali authored
      * Makefile (QT_PATCH): Bump up to 2.
      (QT_TARBALL_CHECKSUM): Update to Qt 6.2.2 release tarball's sha256sum.
      * docker/Dockerfile_ubuntu_18.04: Move the nodejs installation earlier
      in the Dockerfile, as it needs to already be installed by the time we
      want to install libqt-jami's build dependencies.
      * packaging/rules/debian-qt/control (libqt-jami) <Build-Depends>: Add
      missing nodejs (>= 10.19) dependency.
      
      jami-packaging#111
      Change-Id: Ie15a1f4c7cfb274dc6a1784ce41f5b7383002abe
      880936d2
  8. Jan 13, 2022
  9. Jan 11, 2022
  10. Dec 28, 2021
  11. Dec 02, 2021
  12. Nov 11, 2021
  13. Nov 04, 2021
  14. Oct 22, 2021
    • Maxim Cournoyer's avatar
      packaging: Add the deb-pack-x86_64 and deb-pack-i686 targets. · 977919b9
      Maxim Cournoyer authored
      The deb-pack targets build a Guix pack of the jami-qt client in the
      .deb format, ready to be installed on any dpkg-based GNU/Linux
      distribution.
      
      * Makefile (RELEASE_VERSION, RELEASE_TARBALL_FILENAME): Export
      variables.
      (has-guix-p): New target, to be used as a predicate.
      (portable-release-tarball): Rewrite in terms of the above.
      (SUPPORTED_GNU_ARCHS, DEB_PACKS, DEB_PACK_TARGETS): New variables.
      (guix-pack-command, define-deb-pack-rule): Likewise.
      (deb-pack-x86_64, deb-pack-i686): New targets.
      (PACKAGE-TARGETS): Register them.
      * guix/guix-pack-manifest.scm: New file.
      * guix/guix-pack-deb.postinst: Likewise.
      * guix/manifest.scm: Specify qtbase to be at version 5, as Guix now
      has version 6 too.
      * packaging/rules/debian/jami-all.postinst: Harmonize.
      * scripts/deploy-packages.sh (package): Simplify and register the
      'guix-deb-pack' distribution.
      * Jenkinsfile (Sign & deploy packages): Simplify to deploy all the
      packages subdirectories.  This makes it easier to handle multi-arch
      packages for the same distribution, and removes the need to encode the
      distribution information in the target name.
      
      Change-Id: Id6f69e7a5872a39b4b8f50fa09c8ec3475e9c896
      Unverified
      977919b9
  15. Oct 12, 2021
  16. Sep 29, 2021
  17. Sep 24, 2021
    • Maxim Cournoyer's avatar
      Build jami-libclient (LRC) with libwrap enabled. · 6096e314
      Maxim Cournoyer authored and Sébastien Blin's avatar Sébastien Blin committed
      * packaging/rules/debian/rules (override_dh_auto_configure): Move
      recipes to ...
      (override_dh_auto_configure_build): ... here.  This is necessary as
      the LRC now must find the share library of the daemon, hence it must
      be built before the LRC configuration occurs.
      <-DENABLE_LIBWRAP=true>: New option when configuring the LRC.
      * packaging/rules/rpm/jami-libclient.spec (%build): Likewise.
      * scripts/install.sh (lrc_cmake_flags): Likewise.
      (OSTYPE): Remove variable.
      (sharedLib): Remove variable.  The Jami daemon shared library is
      needed when dynamically linking against it when libwrap is enabled.
      * packaging/rules/rpm/jami-daemon.spec (%build): Drop the --disable-shared
      option.
      (%files): Register the libring.so dynamic library.
      * packaging/rules/debian/rules (override_dh_auto_configure): Drop the
      --disable-shared option.
      
      GitLab: jami-packaging#101
      Change-Id: Id1acaaf15a0f3d561c73bf34dde48f4eaf058eed
      6096e314
    • Maxim Cournoyer's avatar
      Revert "debian: rules: Work around a regression in Autoconf 2.70." · 0bd1425d
      Maxim Cournoyer authored and Sébastien Blin's avatar Sébastien Blin committed
      This reverts commit 62f547b5.  The fix
      now more properly lives in the contrib build system.
      
      Change-Id: I7bb7d1f302c91be46627fc26eddece1d768fb308
      0bd1425d
  18. Sep 23, 2021
  19. Sep 16, 2021
  20. Sep 15, 2021
  21. Sep 02, 2021
  22. Sep 01, 2021
  23. Aug 25, 2021
  24. Aug 20, 2021
  25. Aug 19, 2021
  26. Jul 14, 2021
  27. Jun 29, 2021
    • Maxim Cournoyer's avatar
      packaging: Adjust following the relocation of the ringtones. · 15dd42ec
      Maxim Cournoyer authored
      This is a follow up to the f0fb8148ba7f453d73e31e1cece2dcffae68e878
      commit (Use the PROGSHAREDIR macro to refer to the custom datadir) in
      the daemon, that moved the ringtones from a hard-coded location of
      /usr/share/ring/ringtones to $datadir/jami/ringtones.
      
      * packaging/rules/rpm/jami-daemon.spec (%files): Adjust accordingly.
      * scripts/install.sh (client_cmake_flags) <DRINGTONE_DIR>: Likewise.
      
      Change-Id: Ia9d3403f5600a4ab4eefe28ee20611afc3f5e8b0
      Unverified
      15dd42ec
    • Maxim Cournoyer's avatar
      packaging: Adjust for the 'dring' command renaming. · 5c3c23d5
      Maxim Cournoyer authored
      * build.py (run_run) <dring>: Adjust file name.
      * packaging/rules/rpm/jami-daemon.spec (%install): Likewise.
      
      Change-Id: Iedc4e0803bda19d139b29a4ccc669dcc8cc3fb9f
      Unverified
      5c3c23d5
  28. Jun 28, 2021
    • Maxim Cournoyer's avatar
      packaging: Normalize debian/rules indentation. · 7be07615
      Maxim Cournoyer authored
      This change normalizes the hanging indent to 2 spaces.
      
      Change-Id: I98bd6919eae547b946af2c59a14cbee96ee50a9d
      Unverified
      7be07615
    • Maxim Cournoyer's avatar
      packaging: Limit the number of parallel jobs when building Qt. · 78c6b88a
      Maxim Cournoyer authored
      Workaround <https://bugreports.qt.io/browse/QTBUG-94800>.
      
      This is to avoid out of memory conditions during the build, which
      requires up to about 2 GiB of memory per parallel process.  There was
      also a problem with how the MAKEFLAGS was passed, which led
      qtwebengine to be built using all the CPU cores even when specifying a
      lesser NO_CPUS value.
      
      * packaging/rules/debian-qt/rules (min, max): New functions.
      (NO_CPUS): Express in terms of max.
      (AVAILABLE_MEMORY, MEMORY_REQUIRED_PER_CORE, COMPUTED_JOB_COUNT)
      (JOB_COUNT, MAX_PARALLEL_BUILDS): New variables.
      (override_dh_auto_build): Override to manually control job count.
      Specify NINJAFLAGS for the Chromium build.
      * packaging/rules/rpm/jami-libqt.spec (min, max, cpu_count)
      (available_memory, computed_job_count, job_count): New macros.
      (%build): Re-indent and use the above 'job_count' variable as
      the number of parallel jobs.
      (%install): Likewise.
      
      Change-Id: I9134c1e63e92104a1da8435670e2919ce692040c
      Unverified
      78c6b88a
    • Maxim Cournoyer's avatar
      packaging: Do not install a ring.cx symbolic link. · f236d5f6
      Maxim Cournoyer authored
      Change-Id: Ib5ad6c091560f7fc4ee9734ca283e78c90d9d769
      Unverified
      f236d5f6
  29. Jun 25, 2021
    • Maxim Cournoyer's avatar
      packaging: Streamline jami-all.postinst script. · 8d3e1a4e
      Maxim Cournoyer authored
      * packaging/rules/rpm/jami-all.postinst (is_distribution_supported):
      Make version agnostic.
      (has_rpm, is_opensuse): New procedures.
      (CAN_ADD_REPO_SOURCE, JAMI_REPO, ENDTAG): Delete variable.
      (jami_repo_name, jami_repo_base_url): New variables.
      
      Change-Id: I01ee72da39a1a8377ec70ae9dc3ef218d0837633
      Unverified
      8d3e1a4e
Loading