This change was automated via the following command:
$ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g'
$ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g'
$ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g'
$ git checkout etc # to clear some spurious changes
This is done so the qtbase package can be upgraded to version 6 in the
following commit.
* gnu/packages/jami.scm (jami): Update to 20210606.1.e2f9490.
(pjproject-jami)[0019-ignore-down-interfaces]: Apply new custom patch.
(jami-qt)[source]: Use %jami-sources, which now includes the Qt client.
[phases]{change-directory}: New phase.
Before this change, there was a Jami origin containing the sources with the
patches, and another one containing the sources but with the patches removed.
Unify the source to always contain the patches, which adds just 1 MiB to the
corresponding tarball and simplifies things.
* gnu/packages/jami.scm (%jami-sources): Make it a simple variable. Move the
docstring to a comment. Only remove the tarballs, always keeping the patches
with the sources. Adjust the comments.
(%sfl-patches): Remove variable.
(jami-apply-dependency-patches): Rename to...
(jami-apply-custom-patches): ... this. Adjust the input label used to
'jami-sources'.
(pjproject-jami): Replace %sfl-patches by %jami-sources. Adjust following the
renaming of the jami-apply-custom-patches procedure.
(ffmpeg-jami): Likewise. Do not make a temporary binding, simply call the
unquoted jami-apply-custom-patches procedure.
This makes Jami less dependent on the environment it is run within; for
example when using Jami on a foreign distributions.
* gnu/packages/jami.scm (jami-gnome)[imported-modules]: New argument.
[modules]: New argument.
[phases]{glib-or-gtk-compile-schemas, glib-or-gtk-wrap}: New phases.
Reported-by: Simon Tournier <zimon.toutoune@gmail.com>
Commit 06eb21856f made it necessary, since it is now handled by the Qt build
system itself.
* gnu/packages/jami.scm (jami-qt)[phases]{wrap}: Remove phase.
* gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ...
(jami-gnome): ... this, in prevision to the soon released Jami Qt client.
(jami): Define as obsoleted by jami-gnome.
[inputs]: Sort lexico-graphically. Add libappindicator and network-manager.
[native-inputs]: Add a comment and fix a typo. Remove doxygen.
[propagated-inputs]: Remove evolution-data-server.
[synopsis]: More explicitly describe what this package is.
[description]: Describe the specifics before the generalities.
* gnu/packages/jami.scm (libringclient): Update to 20210326.1.cfba013. Remove
trailing #t. Do not inherit from libring.
[version, source]: Specify fields.
[propagated-inputs]: Remove qttools. Move libring to ...
[inputs]: ... here. Add network-manager.
[configure-flags] Define the RING_XML_INTERFACES_DIR and LIBWRAP variables.
[phases]{fix-dbus-interfaces-path}: Delete.
[synopsis]: More explicitly describe what this component is.
[description]: Describe the specifics before the generalities.
* gnu/packages/jami.scm (ffmpeg-jami): Remove trailing #t.
[phases] <apply-patches>: Add libopusdec-enable-FEC and
libopusenc-enable-FEC to the list of patches to apply.
The custom pjproject package used by Jami is updated with the latest patches
found in the 20210326.1.cfba013 release of Jami.
* gnu/packages/jami.scm (%jami-version): Update to 20210326.1.cfba013.
(jami-source) [snippet]: Update comment. Add client-electron and client-ios
to the list of deleted directories. Remove client-windows from the list, as
it no longer exists.
(jami-apply-dependency-patches): Update comment. Ignore whitespace
when applying patches, otherwise the pjproject patches would not apply.
(pjproject-jami): Add comment.
[source]: Define the source; the parent pjproject package was
updated was updated to 2.11, but the patches only apply against 2.10.
[phases] <apply-patches>: Update the list of patches used with those found in
the release tarball.
The origin used as the "sfl-patches" input contained bundled library tarballs,
and weighed 217 MiB. After this change, it weighs 3.3 MiB.
* gnu/packages/jami.scm (jami-source): Rename #:without-daemon to
\#:keep-contrib-patches. Delete the daemon/contrib/tarballs sub-directory even
when keeping the patches. Delete extraneous code.
(%sfl-patches, %jami-sources): New variables.
(pjproject-jami, ffmpeg-jami, libring): Adjust to use the above variables.
Now that the base pjproject is built as a shared library, the cost of adding
dependencies shared with Jami is minimal. The pjproject-jami now differs only
by its added patches.
* gnu/packages/jami.scm (pjproject-jami)[arguments]: Use the
substitute-keyword-arguments macro to reuse the base pjproject package
arguments, adding only the 'apply-patches phase.
* gnu/packages/patches/pjproject-correct-the-cflags-field.patch: Add patch.
* gnu/packages/patches/pjproject-fix-pkg-config-ldflags.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register the new patches.
* gnu/packages/telephony.scm (pjproject): Use them.
* gnu/packages/jami.scm (pjproject-jami): Remove a patch from
pjproject-jami that is already applied against pjproject.
This fixes a bug where Jami crashes while disconnecting from an audio call.
* gnu/packages/jami.scm (pjproject-jami)[arguments]: Use -DNDEBUG flag.
Signed-off-by: Christopher Baines <mail@cbaines.net>
As this package has been deprecated for over a year.
* gnu/packages/jami.scm (jami-client-gnome): Remove variable.
Signed-off-by: Christopher Baines <mail@cbaines.net>
This package is needed because Jami uses a modified version
of ffmpeg, which provides GPU hardware acceleration, automatical
adapting of bitrate and extra codecs. Because of the configure flags
list being long, it is better to keep them separated in variables,
instead of littering the package definition.
* gnu/packages/jami.scm (ffmpeg-jami, %ffmpeg-default-configure-flags,
%ffmpeg-linux-configure-flags, %ffmpeg-linux-x86-configure-flags):
New variables.
(ffmpeg-compose-configure-flags): New procedure.
(libring)[inputs]: Use ffmpeg-jami instead of ffmpeg.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This library isn't mandatory, but it works better with new
routers than libupnp.
* gnu/packages/jami.scm (libring)[inputs]: Add libnatpmp.
Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
* gnu/packages/jami.scm (pjproject-jami)
[native-inputs]: Rename "savoir-faire-linux-patches" to "sfl-patches".
[arguments]: Move Jami patching procedure to ...
(jami-apply-dependency-patches): ... this new procedure.
Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
The package name changed from Ring to Jami. Package tarballs start now with
"jami_" prefix. The "ring-release" folder is also deprecated, let's use the
"release" folder instead.
* gnu/packages/jami.scm (jami-source)[origin]:
Change the uri from "https://dl.jami.net/ring-release/tarballs/ring_"
to "https://dl.jami.net/release/tarballs/jami_".
Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
Jami is a massive package and its developers modify many libraries. Keeping
them in a single file makes maintenance easier.
* gnu/packages/telephony.scm (%jami-version, jami-source,
pjproject-jami, libring, libringclient,
jami, jami-client-gnome): Move to ...
* gnu/packages/jami.scm: ... this new file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
Diego Nicola Barbato
Maxim Cournoyer
Mark H Weaver
Jan Wielkiewicz
Marius Bakke