3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Commit graph

27 commits

Author SHA1 Message Date
Maxim Cournoyer
4ec964ec38
gnu: jami-gnome: Include phases from the glib-or-gtk-build-system.
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>
2021-05-28 09:48:15 -04:00
Maxim Cournoyer
59134f1e02
gnu: jami-qt: Remove the custom wrap phase.
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.
2021-04-10 00:55:18 -04:00
Maxim Cournoyer
591c930337
gnu: jami: Add debug outputs.
* gnu/packages/jami.scm (libring, libringclient, jami-gnome, jami-qt): Add a
"debug" output.
2021-04-02 14:17:44 -04:00
Maxim Cournoyer
532c0e745a
gnu: libringclient: Disable the libwrap feature.
As it causes video calls to segfault.

* gnu/packages/jami.scm (libringclient): Set -DENABLE_LIBWRAP to false for the
time being.
2021-04-02 11:47:17 -04:00
Maxim Cournoyer
e6b447cf75
gnu: Add jami-qt.
* gnu/packages/jami.scm (jami-qt): New variable.
2021-04-02 07:41:16 -04:00
Maxim Cournoyer
60e64e28f3
gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome.
* 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.
2021-04-02 07:41:16 -04:00
Maxim Cournoyer
40a5f7904a
gnu: libringclient: Update to 20210326.1.cfba013.
* 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.
2021-04-02 07:41:16 -04:00
Maxim Cournoyer
2cfd4770af
gnu: libring: Update to 20210326.1.cfba013.
* gnu/packages/jami.scm (libring): Update to 20210326.1.cfba013.  Remove
trailing #t.
[inputs]: Remove boost, flac, gmp, gsm, libogg, libva, opus, pcre,
libsamplerate, libsndfile, libvorbis, libx264, libvdpau, zlib, python,
python-wrapper, restinio, and libx11.  Add libgit2 and webrtc-audio-processing.
[native-inputs]: Remove cppunit.  Add gcc-8.
[make-flags]: Add the V=1 flag.
[synopsis]: More explicitly describe what this component is.
[description]: Describe the specifics before the generalities.
2021-04-02 07:41:16 -04:00
Maxim Cournoyer
3f742c77ef
ffmpeg-jami: Apply patches from Jami 20210326.1.cfba013.
* 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.
2021-04-02 07:41:16 -04:00
Maxim Cournoyer
3d913c1ed8
gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375.
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.
2021-04-02 07:41:16 -04:00
Mark H Weaver
1a265842e6
gnu: Use PACKAGE/INHERIT in more places.
* gnu/packages/algebra.scm (fftwf, fftw-openmpi),
gnu/packages/audio.scm (ztoolkit-rsvg),
gnu/packages/bioinformatics.scm (python2-dendropy),
gnu/packages/boost.scm (boost-with-python2),
gnu/packages/check.scm (python2-mock, python2-pytest-mock),
gnu/packages/cups.scm (hplip-minimal),
gnu/packages/freedesktop.scm (libinput-minimal),
gnu/packages/gettext.scm (gnu-gettext),
gnu/packages/glib.scm (python2-pygobject),
gnu/packages/gnome.scm (gdl-minimal, libsoup-minimal, python2-pyatspi),
gnu/packages/groff.scm (groff-minimal),
gnu/packages/jami.scm (ffmpeg-jami),
gnu/packages/libcanberra.scm (libcanberra/gtk+-2),
gnu/packages/lirc.scm (python2-lirc),
gnu/packages/llvm.scm (clang-runtime-3.5),
gnu/packages/mpi.scm (java-openmpi, openmpi-thread-multiple),
gnu/packages/node.scm (libnode),
gnu/packages/onc-rpc.scm (libtirpc/hurd),
gnu/packages/python-compression.scm (bitshuffle-for-snappy),
gnu/packages/python-crypto.scm (python2-pycrypto, python2-cryptography)
(python2-cryptography, python2-m2crypto),
gnu/packages/python-web.scm (python2-html2text, python2-tornado)
(python2-terminado, python2-ndg-httpsclient, python2-websocket-client)
(python2-rauth, python2-url, python2-s3transfer),
gnu/packages/python-xyz.scm (python2-psutil, python2-serpent)
(python2-humanfriendly, python2-empy, python2-parse-type, python2-polib)
(python2-jsonschema, python2-pystache, python2-cython, python2-numpydoc)
(python2-ipyparallel, python2-traitlets, python2-dbus)
(python2-beautifulsoup4, python2-pep517, python2-flake8, python2-llfuse)
(python2-tlsh, python-file, python2-notebook, python-jupyter-console-minimal)
(python2-contextlib2, python2-promise, python2-anyjson, python2-amqp)
(python2-kombu, python2-billiard, python2-celery, python2-whoosh)
(python2-jellyfish, python-rope, ptpython-2, python2-binaryornot)
(python2-setproctitle, python2-argcomplete, python2-xopen, python2-isort)
(python2-radon, python2-rfc6555, python2-activepapers, python2-send2trash)
(python2-cloudpickle, python2-reparser),
gnu/packages/python.scm (python2-called-python),
gnu/packages/qt.scm (python2-sip, python-pyqt-without-qtwebkit, python2-pyqt)
(python-qscintilla, python-pyqt+qscintilla),
gnu/packages/scanner.scm (sane-backends),
gnu/packages/sdl.scm (guile3.0-sdl2),
gnu/packages/selinux.scm (checkpolicy, libselinux, libsemanage, secilc)
(python-sepolgen, policycoreutils),
gnu/packages/serialization.scm (lua5.1-libmpack, lua5.2-libmpack),
gnu/packages/simulation.scm (fenics),
gnu/packages/statistics.scm (python2-statsmodels),
gnu/packages/texinfo.scm (info-reader),
gnu/packages/wxwidgets.scm (wxwidgets-gtk2, wxwidgets-gtk2-3.1),
gnu/packages/xml.scm (xmlsec-nss),
gnu/packages/xorg.scm (uim-gtk, uim-qt),
guix/build-system/python.scm (package-with-explicit-python)
(strip-python2-variant): Use PACKAGE/INHERIT.
2021-03-17 03:58:10 -04:00
Maxim Cournoyer
0531ea982b
gnu: jami: Always remove contrib tarballs from the sources of Jami.
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.
2020-08-06 00:01:50 -04:00
Maxim Cournoyer
a5b44d999f
gnu: pjproject-jami: Reuse more of the base pjproject.
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.
2020-08-03 23:30:12 -04:00
Maxim Cournoyer
839bb42f0c
gnu: pjproject: Fix problem in pkg-config file.
* 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.
2020-08-03 23:30:11 -04:00
Jan Wielkiewicz
c54b9afb87
gnu: pjproject-jami: Build without debugging assertions.
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>
2020-07-12 20:33:56 +01:00
Jan Wielkiewicz
1c15d30521
gnu: jami: Update to 20200710.1.6bd18d2.
* gnu/packages/jami.scm (%jami-version): Update to 20200710.1.6bd18d2.
(jami-source)[origin]: Adjust the hash.
(pjproject-jami)[arguments]: Add new patches.
(libring)[inputs]: Add libarchive.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2020-07-12 20:33:56 +01:00
Jan Wielkiewicz
8551bc64e4
gnu: jami-client-gnome: Remove deprecated package.
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>
2020-07-12 20:33:55 +01:00
Jan Wielkiewicz
da358e8c88
gnu: Add ffmpeg-jami.
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>
2020-05-15 09:08:46 +02:00
Marius Bakke
12bcfcedb0
gnu: jami: Remove obsolete wrapper.
* gnu/packages/jami.scm (jami)[inputs]: Change from
SQLITE-WITH-COLUMN-METADATA to SQLITE.
[arguments]: Remove 'wrap' phase.
2020-05-13 00:57:15 +02:00
Jan Wielkiewicz
8c98eb2808
gnu: jami: Add epoll support.
* gnu/packages/jami.scm (jami)[arguments]: Add epoll support on Linux systems.

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
2020-05-02 12:04:58 +02:00
Jan Wielkiewicz
f06eefa31d
gnu: jami: Use gettext-minimal.
* gnu/packages/jami.scm (jami)[native-inputs]: Use "gettext-minimal" instead
of "gnu-gettext".

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
2020-05-02 12:04:58 +02:00
Jan Wielkiewicz
2ff4e549bb
gnu: pjproject-jami: Update to 2.10.
* gnu/packages/telephony.scm (pjproject): Update to 2.10,
[source]: reorder "file-name" and "sha256" fields.
* gnu/packages/jami.scm (%jami-version): Update to 20200401.1.6f090d,
(pjproject-jami)[arguments]: apply patches related to 2.10.

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
2020-05-02 12:04:58 +02:00
Jan Wielkiewicz
7f8f39d344
gnu: jami: Make gettext a native input.
* gnu/packages/jami.scm (jami)[inputs]: Move "gettext" to ...
[native-inputs]: ... here.

Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
2020-05-02 12:04:58 +02:00
Jan Wielkiewicz
63e6f1cdee
gnu: libring: Add libnatpmp dependency.
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>
2020-05-02 12:04:57 +02:00
Jan Wielkiewicz
f60699af61
gnu: jami: Create a jami-apply-dependency-patches procedure.
* 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>
2020-05-02 12:04:57 +02:00
Jan Wielkiewicz
aaa199ca52
gnu: jami: Fix download.
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>
2020-05-02 12:04:57 +02:00
Jan Wielkiewicz
15c6e4260b
gnu: telephony: Move Jami and its dependencies to jami.scm.
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>
2020-05-02 12:04:57 +02:00