From patchwork Tue Apr 21 16:10:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21393 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7075C27BBE4; Tue, 21 Apr 2020 17:12:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4E91E27BBE1 for ; Tue, 21 Apr 2020 17:12:50 +0100 (BST) Received: from localhost ([::1]:60882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVx-0004QB-S4 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52364) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVP-0003bI-Ty for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVH-000451-UO for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVH-00044P-CJ for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVH-00061a-69 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. References: <20200417015857.0650ff6a@interia.pl> In-Reply-To: <20200417015857.0650ff6a@interia.pl> Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748549823004 (code B ref 40677); Tue, 21 Apr 2020 16:12:07 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:38 +0000 Received: from localhost ([127.0.0.1]:50600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUf-0005yj-EU for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:38 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUT-0005vZ-Bh for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:10 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:15 +0200 Message-Id: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485470; bh=AcPZrJO4Ta94Kp1AzafG/MbagAft3W9bmuVRju9miPY=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus; b=MKCNuWCG0rAnsYcl47+brim7wjmXgecp16Za+JF7nON7EOCXbnLXxRpM9E4O9X6Ps qzIfvzJH09hp9Vn4mHSv16jaMnJPAQn+wNP9ad4K+ZXFv13Ym47WcrSpn11p194C34 5LHPTPm1uk14/F6Vbyi6mK2H/hT0WqUA01ed25Jk= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/local.mk | 2 + gnu/packages/jami.scm | 351 +++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 ------------------------------ 3 files changed, 353 insertions(+), 291 deletions(-) create mode 100644 gnu/packages/jami.scm diff --git a/gnu/local.mk b/gnu/local.mk index 952fc55df4..10bf91366d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -30,6 +30,7 @@ # Copyright © 2020 Vincent Legoll # Copyright © 2020 R Veera Kumar # Copyright © 2020 Nicolò Balzarotti # # This file is part of GNU Guix. # @@ -275,6 +276,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ipfs.scm \ %D%/packages/irc.scm \ %D%/packages/iso-codes.scm \ + %D%/packages/jami.scm \ %D%/packages/java.scm \ %D%/packages/java-compression.scm \ %D%/packages/java-graphics.scm \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm new file mode 100644 index 0000000000..5c167808f0 --- /dev/null +++ b/gnu/packages/jami.scm @@ -0,0 +1,351 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019, 2020 Jan Wielkiewicz +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages jami) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages aidc) + #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages libcanberra) + #:use-module (gnu packages linux) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages telephony) + #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) + #:use-module (gnu packages video) + #:use-module (gnu packages webkit) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xorg) + #:use-module (gnu packages) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define %jami-version "20191101.3.67671e7") + +(define* (jami-source #:key without-daemon) + (origin + (method url-fetch) + (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" + %jami-version + ".tar.gz")) + (modules '((guix build utils))) + (snippet + (if without-daemon + '(begin + (delete-file-recursively "daemon/contrib")) + #f)) + (sha256 + (base32 + "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + +(define-public pjproject-jami + (package + (inherit pjproject) + (name "pjproject-jami") + (native-inputs + `(("savoir-faire-linux-patches" ,(jami-source)) + ,@(package-native-inputs pjproject))) + (arguments + `(#:tests? #f + ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. + #:configure-flags + (list "--disable-oss" + "--disable-sound" + "--disable-video" + "--enable-ext-sound" + "--disable-speex-aec" + "--disable-g711-codec" + "--disable-l16-codec" + "--disable-gsm-codec" + "--disable-g722-codec" + "--disable-g7221-codec" + "--disable-speex-codec" + "--disable-ilbc-codec" + "--disable-opencore-amr" + "--disable-silk" + "--disable-sdl" + "--disable-ffmpeg" + "--disable-v4l2" + "--disable-openh264" + "--disable-resample" + "--disable-libwebrtc" + "--with-gnutls" + "--with-external-srtp" + ;; We need -fPIC or else we get the following error when linking + ;; against pjproject-jami: + ;; relocation R_X86_64_32S against `.rodata' can not be used when + ;; making a shared object; + "CFLAGS=-fPIC" + "CXXFLAGS=-fPIC") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (savoir-faire-linux-patches + '("fix_turn_alloc_failure" + "rfc2466" + "ipv6" + "multiple_listeners" + "pj_ice_sess" + "fix_turn_fallback" + "fix_ioqueue_ipv6_sendto" + "add_dtls_transport" + "rfc6544" + "ice_config" + "sip_config" + "fix_first_packet_turn_tcp" + "fix_ebusy_turn" + "ignore_ipv6_on_transport_check" + "fix_turn_connection_failure" + ;; "uwp_vs" ; for windows + "disable_local_resolution"))) + (mkdir-p savoir-faire-linux-patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") + "-C" savoir-faire-linux-patches-directory + "--strip-components=5" + "ring-project/daemon/contrib/src/pjproject") + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-directory "/" + file ".patch"))) + savoir-faire-linux-patches)) + #t)) + ;; TODO: We could use substitute-keyword-arguments instead of + ;; repeating the phases from pjproject, but somehow it does + ;; not work. + (add-before 'build 'build-dep + (lambda _ (invoke "make" "dep"))) + (add-before 'patch-source-shebangs 'autoconf + (lambda _ + (invoke "autoconf" "-v" "-f" "-i" "-o" + "aconfigure" "aconfigure.ac"))) + (add-before 'autoconf 'disable-some-tests + ;; Three of the six test programs fail due to missing network + ;; access. + (lambda _ + (substitute* "Makefile" + (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") + "selftest: pjlib-test pjlib-util-test pjmedia-test")) + #t))))))) + +(define-public libring + (package + (name "libring") + (version %jami-version) + (source (jami-source #:without-daemon #t)) + (build-system gnu-build-system) + (inputs + ;; Missing (optional?) dep: libnatpmp. + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("dbus-c++" ,dbus-c++) + ("eudev" ,eudev) + ("ffmpeg" ,ffmpeg) + ("flac" ,flac) + ("gmp" ,gmp) + ("gsm" ,gsm) + ("jack" ,jack-1) + ("jsoncpp" ,jsoncpp) + ("libogg" ,libogg) + ("libva" ,libva) + ("opendht" ,opendht) + ("opus" ,opus) + ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("speex" ,speex) + ("speexdsp" ,speexdsp) + ("libupnp" ,libupnp) + ("libvorbis" ,libvorbis) + ("libx264" ,libx264) + ("libvdpau" ,libvdpau) + ("yaml-cpp" ,yaml-cpp) + ("zlib" ,zlib) + ("openssl" ,openssl) + ("libsecp256k1" ,libsecp256k1) + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("restinio" ,restinio) + ("libx11" ,libx11) + ("asio" ,asio) + ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. + ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. + ("pjproject" ,pjproject-jami))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("which" ,which) + ("cppunit" ,cppunit) + ("perl" ,perl))) ; Needed for documentation. + (arguments + `(#:tests? #f ; The tests fail to compile due to missing headers. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "daemon") + #t)) + (add-before 'build 'add-lib-dir + (lambda _ + (mkdir-p "src/lib") + #t))))) + (synopsis "Distributed multimedia communications platform") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides a library and daemon implementing the Jami core +functionality.") + (home-page "https://jami.net/") + (license license:gpl3+))) + +(define-public libringclient + (package + (inherit libring) + (name "libringclient") + (build-system cmake-build-system) + (propagated-inputs + `(("libring" ,libring) ; For 'dring'. + ("qtbase" ,qtbase) ; Qt is included in several installed headers. + ("qttools" ,qttools))) + (arguments + `(#:tests? #f ; There is no testsuite. + #:configure-flags + (list (string-append "-DRING_BUILD_DIR=" + (assoc-ref %build-inputs "libring") "/include")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "lrc") + #t)) + (add-before 'configure 'fix-dbus-interfaces-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) + (string-append (assoc-ref inputs "libring") + dbus-interfaces-path-suffix)))))))) + (synopsis "Distributed multimedia communications platform") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides a library common to all Jami clients.") + (home-page "https://jami.net") + (license license:gpl3+))) + +(define-public jami + (package + (inherit libring) + (name "jami") + (build-system cmake-build-system) + (inputs + `(("libringclient" ,libringclient) + ("gtk+" ,gtk+) + ("qrencode" ,qrencode) + ("libnotify" ,libnotify) + ("clutter" ,clutter) + ("clutter-gtk" ,clutter-gtk) + ("gettext" ,gnu-gettext) + ("libcanberra" ,libcanberra) + ("webkitgtk" ,webkitgtk) + ;; TODO: We must wrap ring-client-gnome to force using the + ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it + ;; fails with: + ;; + ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: + ;; undefined symbol: sqlite3_column_table_name16 + ;; + ;; qtbase is built against sqlite-with-column-metadata but somehow + ;; jami-client-gnome ends up with both `sqlite' and + ;; `sqlite-with-column-metadata' as inputs and it seems that + ;; libqsqlite.so gets confused. + ("sqlite" ,sqlite-with-column-metadata))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") + ("doxygen" ,doxygen))) + (propagated-inputs + `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. + ("adwaita-icon-theme" ,adwaita-icon-theme) + ("evolution-data-server" ,evolution-data-server))) + (arguments + `(#:tests? #f ; There is no testsuite. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "client-gnome") + #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (path (string-append (assoc-ref inputs "sqlite") "/lib"))) + (wrap-program (string-append out "/bin/jami-gnome") + `("LD_LIBRARY_PATH" ":" prefix (,path)))) + #t))))) + (synopsis "Distributed, privacy-respecting communication program") + (description "Jami (formerly GNU Ring) is a secure and distributed voice, +video and chat communication platform that requires no centralized server and +leaves the power of privacy in the hands of the user. It supports the SIP and +IAX protocols, as well as decentralized calling using P2P-DHT. + +This package provides the Jami client for the GNOME desktop.") + (home-page "https://jami.net") + (license license:gpl3+))) + +(define-public jami-client-gnome + (deprecated-package "jami-client-gnome" jami)) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 85c2f2ab5e..62bd8fd548 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -730,297 +730,6 @@ calls and messages") Initiation Protocol (SIP) and a multimedia framework.") (license license:gpl2+))) -(define %jami-version "20191101.3.67671e7") - -(define* (jami-source #:key without-daemon) - (origin - (method url-fetch) - (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" - %jami-version - ".tar.gz")) - (modules '((guix build utils))) - (snippet - (if without-daemon - '(begin - (delete-file-recursively "daemon/contrib")) - #f)) - (sha256 - (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) - -(define-public pjproject-jami - (package - (inherit pjproject) - (name "pjproject-jami") - (native-inputs - `(("savoir-faire-linux-patches" ,(jami-source)) - ,@(package-native-inputs pjproject))) - (arguments - `(#:tests? #f - ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. - #:configure-flags - (list "--disable-oss" - "--disable-sound" - "--disable-video" - "--enable-ext-sound" - "--disable-speex-aec" - "--disable-g711-codec" - "--disable-l16-codec" - "--disable-gsm-codec" - "--disable-g722-codec" - "--disable-g7221-codec" - "--disable-speex-codec" - "--disable-ilbc-codec" - "--disable-opencore-amr" - "--disable-silk" - "--disable-sdl" - "--disable-ffmpeg" - "--disable-v4l2" - "--disable-openh264" - "--disable-resample" - "--disable-libwebrtc" - "--with-gnutls" - "--with-external-srtp" - ;; We need -fPIC or else we get the following error when linking - ;; against pjproject-jami: - ;; relocation R_X86_64_32S against `.rodata' can not be used when - ;; making a shared object; - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") - ;; Comes from - ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". - ;; WARNING: These amount for huge changes in pjproject. - (savoir-faire-linux-patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - ;; "uwp_vs" ; for windows - "disable_local_resolution"))) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") - "-C" savoir-faire-linux-patches-directory - "--strip-components=5" - "ring-project/daemon/contrib/src/pjproject") - (for-each - (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-directory "/" - file ".patch"))) - savoir-faire-linux-patches)) - #t)) - ;; TODO: We could use substitute-keyword-arguments instead of - ;; repeating the phases from pjproject, but somehow it does - ;; not work. - (add-before 'build 'build-dep - (lambda _ (invoke "make" "dep"))) - (add-before 'patch-source-shebangs 'autoconf - (lambda _ - (invoke "autoconf" "-v" "-f" "-i" "-o" - "aconfigure" "aconfigure.ac"))) - (add-before 'autoconf 'disable-some-tests - ;; Three of the six test programs fail due to missing network - ;; access. - (lambda _ - (substitute* "Makefile" - (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") - "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))))) - -(define-public libring - (package - (name "libring") - (version %jami-version) - (source (jami-source #:without-daemon #t)) - (build-system gnu-build-system) - (inputs - ;; Missing (optional?) dep: libnatpmp. - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("dbus-c++" ,dbus-c++) - ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) - ("flac" ,flac) - ("gmp" ,gmp) - ("gsm" ,gsm) - ("jack" ,jack-1) - ("jsoncpp" ,jsoncpp) - ("libogg" ,libogg) - ("libva" ,libva) - ("opendht" ,opendht) - ("opus" ,opus) - ("pcre" ,pcre) - ("pulseaudio" ,pulseaudio) - ("libsamplerate" ,libsamplerate) - ("libsndfile" ,libsndfile) - ("speex" ,speex) - ("speexdsp" ,speexdsp) - ("libupnp" ,libupnp) - ("libvorbis" ,libvorbis) - ("libx264" ,libx264) - ("libvdpau" ,libvdpau) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("openssl" ,openssl) - ("libsecp256k1" ,libsecp256k1) - ("python" ,python) - ("python-wrapper" ,python-wrapper) - ("restinio" ,restinio) - ("libx11" ,libx11) - ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. - ("pjproject" ,pjproject-jami))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("which" ,which) - ("cppunit" ,cppunit) - ("perl" ,perl))) ; Needed for documentation. - (arguments - `(#:tests? #f ; The tests fail to compile due to missing headers. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "daemon") - #t)) - (add-before 'build 'add-lib-dir - (lambda _ - (mkdir-p "src/lib") - #t))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library and daemon implementing the Jami core -functionality.") - (home-page "https://jami.net/") - (license license:gpl3+))) - -(define-public libringclient - (package - (inherit libring) - (name "libringclient") - (build-system cmake-build-system) - (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) - (arguments - `(#:tests? #f ; There is no testsuite. - #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "lrc") - #t)) - (add-before 'configure 'fix-dbus-interfaces-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) - (string-append (assoc-ref inputs "libring") - dbus-interfaces-path-suffix)))))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library common to all Jami clients.") - (home-page "https://jami.net") - (license license:gpl3+))) - -(define-public jami - (package - (inherit libring) - (name "jami") - (build-system cmake-build-system) - (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) - ("clutter-gtk" ,clutter-gtk) - ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ;; TODO: We must wrap ring-client-gnome to force using the - ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it - ;; fails with: - ;; - ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: - ;; undefined symbol: sqlite3_column_table_name16 - ;; - ;; qtbase is built against sqlite-with-column-metadata but somehow - ;; jami-client-gnome ends up with both `sqlite' and - ;; `sqlite-with-column-metadata' as inputs and it seems that - ;; libqsqlite.so gets confused. - ("sqlite" ,sqlite-with-column-metadata))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) - (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) - (arguments - `(#:tests? #f ; There is no testsuite. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "client-gnome") - #t)) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "sqlite") "/lib"))) - (wrap-program (string-append out "/bin/jami-gnome") - `("LD_LIBRARY_PATH" ":" prefix (,path)))) - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") - (home-page "https://jami.net") - (license license:gpl3+))) - -(define-public jami-client-gnome - (deprecated-package "jami-client-gnome" jami)) - (define-public libtgvoip (package (name "libtgvoip") From patchwork Tue Apr 21 16:10:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21383 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 598A327BBE4; Tue, 21 Apr 2020 17:12:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2322F27BBE1 for ; Tue, 21 Apr 2020 17:12:16 +0100 (BST) Received: from localhost ([::1]:60851 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVO-0003GD-Ft for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVD-0003CY-Mk for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVD-00041C-21 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVC-000417-Mn for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVC-00060N-IR for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 02/18] gnu: jami: Fix downloading. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548222877 (code B ref 40677); Tue, 21 Apr 2020 16:12:02 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:22 +0000 Received: from localhost ([127.0.0.1]:50574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUX-0005wV-9l for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:32930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUT-0005va-Bh for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:19 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:10 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:16 +0200 Message-Id: <20200421161032.1847-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485471; bh=6KVz15PSu71sEzqTskpg2hcFu1jT564KM6FjaubEt10=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=hhKulx91uRR6MIh2ON/Ym87ATVp1rRZg6CwBXqg+0QE6sNldSYpVMhDKNeshcBKNw QTWj8M0B5E2zqDVNxjaMslMhiqjw55G666IY64+xhOgHj5AV5LiBIe9hWJojIqMaSy F3wq5smmSVmxtx/IOWfkn2OQJY4LfIox4rGmHRTA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 5c167808f0..44a57c9bfb 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -64,7 +64,7 @@ (define* (jami-source #:key without-daemon) (origin (method url-fetch) - (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" + (uri (string-append "https://dl.jami.net/release/tarballs/jami_" %jami-version ".tar.gz")) (modules '((guix build utils))) From patchwork Tue Apr 21 16:10:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21385 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8CA7527BBE4; Tue, 21 Apr 2020 17:12:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A9BB627BBEA for ; Tue, 21 Apr 2020 17:12:29 +0100 (BST) Received: from localhost ([::1]:60860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVd-0003eO-5F for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52306) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVK-0003Nq-D8 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00046f-NF for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00046P-8B for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVJ-000624-1N for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 03/18] gnu: jami.scm: Add and use a generalized procedure for applying patches made by Savoir-faire linux to Jami dependencies. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551523050 (code B ref 40677); Tue, 21 Apr 2020 16:12:08 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:55 +0000 Received: from localhost ([127.0.0.1]:50608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvV5-0005zc-0m for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:55 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUT-0005vc-Bc for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:11 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:17 +0200 Message-Id: <20200421161032.1847-3-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485471; bh=OVPaEgcfbtN7xcjG7i7zO/ZYDsrZD7o312zEZQ2eavQ=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=T8NZp5idceRsdJ3oZjpGXCtfXPKOLbuG4a6iXD1mg55lBQDHaMoOC+R8xRZqUx3aS ifu0plHhzzTRi36deIPSyzMdVuwy4vuEV7lS2j+SgdCzb0Is/GMG38im8kBvYh0qTn eeV2muLk5wdUSB3kyw++3kTFOXaziELx6UubGV9M= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 82 +++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 44a57c9bfb..3a50cef18a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -77,12 +77,31 @@ (base32 "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) +;; Savoir-Faire Linux modifies many libraries to add features +;; to Jami. This procedure makes applying patches to a given +;; package easy. +(define-public jami-apply-dependency-patches + '(lambda* (#:key inputs dep-name patches) + (let ((patches-directory "SFL-patches")) + (mkdir-p patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "SFL-patches") + "-C" patches-directory + "--strip-components=5" + (string-append "ring-project/daemon/contrib/src/" + dep-name)) + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append patches-directory "/" + file ".patch"))) + patches)))) + (define-public pjproject-jami (package (inherit pjproject) (name "pjproject-jami") (native-inputs - `(("savoir-faire-linux-patches" ,(jami-source)) + `(("SFL-patches" ,(jami-source)) ,@(package-native-inputs pjproject))) (arguments `(#:tests? #f @@ -116,6 +135,8 @@ ;; making a shared object; "CFLAGS=-fPIC" "CXXFLAGS=-fPIC") + #:modules ((guix build utils) + ,@(@@ (guix build-system gnu) %default-modules)) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -124,40 +145,31 @@ #t)) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) - (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches") - ;; Comes from - ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". - ;; WARNING: These amount for huge changes in pjproject. - (savoir-faire-linux-patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - ;; "uwp_vs" ; for windows - "disable_local_resolution"))) - (mkdir-p savoir-faire-linux-patches-directory) - (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches") - "-C" savoir-faire-linux-patches-directory - "--strip-components=5" - "ring-project/daemon/contrib/src/pjproject") - (for-each - (lambda (file) - (invoke "patch" "--force" "-p1" "-i" - (string-append savoir-faire-linux-patches-directory "/" - file ".patch"))) - savoir-faire-linux-patches)) - #t)) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "pjproject" + #:patches + '("fix_turn_alloc_failure" + "rfc2466" + "ipv6" + "multiple_listeners" + "pj_ice_sess" + "fix_turn_fallback" + "fix_ioqueue_ipv6_sendto" + "add_dtls_transport" + "rfc6544" + "ice_config" + "sip_config" + "fix_first_packet_turn_tcp" + "fix_ebusy_turn" + "ignore_ipv6_on_transport_check" + "fix_turn_connection_failure" + "disable_local_resolution")) + #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does ;; not work. From patchwork Tue Apr 21 16:10:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21386 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9F0527BBE4; Tue, 21 Apr 2020 17:12:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 455DC27BBE1 for ; Tue, 21 Apr 2020 17:12:30 +0100 (BST) Received: from localhost ([::1]:60862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVd-0003hT-Kn for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52222) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVE-0003Dn-JH for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVE-000423-2I for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVD-00041q-Mq for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVD-00060d-FF for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548722937 (code B ref 40677); Tue, 21 Apr 2020 16:12:03 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:27 +0000 Received: from localhost ([127.0.0.1]:50584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUc-0005xn-Tw for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:27 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:54468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUT-0005vd-JM for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:20 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:11 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:18 +0200 Message-Id: <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485472; bh=SqXL2auVzYrjzv4d1dpZDy37vIA3u60ltbk0X54h2Ww=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=YL4jQ1byjTSmEcpfI11+uQconHz2jkiAQyejULw4F7vZwLPaG3bv7DBidIvi8KNVv HMI7Qyw9YF6qkKLGNhV/pmrSGH125i4qOHUFC5Ja/PVZq4/P0PrROT/PIURms6LOaB AzzsyaMg+345FSbz/XHdIwv3copjsrSzQ3rvU+eg= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/networking.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f754683bb9..02ba5e9601 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -374,6 +374,34 @@ between different versions of ØMQ.") files contain direct mappings of the abstractions provided by the ØMQ C API.") (license license:expat))) +(define-public libnatpmp + (package + (name "libnatpmp") + (version "20150609") + (source (origin + (method url-fetch) + (uri (string-append + "http://miniupnp.free.fr/files/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check)) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (home-page "http://miniupnp.free.fr/libnatpmp.html") + (synopsis "C library implementing NAT-PMP") + (description + "libnatpmp is a portable and asynchronous implementaiton of +the Network Address Translation - Port Mapping Protocol (NAT-PMP) +written in the C programming language.") + (license license:bsd-3))) + (define-public librdkafka (package (name "librdkafka") From patchwork Tue Apr 21 16:10:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21382 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EB7727BBE4; Tue, 21 Apr 2020 17:12:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E904627BBE1 for ; Tue, 21 Apr 2020 17:12:13 +0100 (BST) Received: from localhost ([::1]:60852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVN-0003GN-Ab for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52208) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVD-0003Cr-TB for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVD-00041e-GU for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVD-00041L-4k for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVC-00060V-Vg for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 05/18] gnu: libring: Add libnatpmp as an optional dependency. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548722930 (code B ref 40677); Tue, 21 Apr 2020 16:12:02 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:27 +0000 Received: from localhost ([127.0.0.1]:50582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUc-0005xl-Jo for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:26 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUT-0005ve-Ue for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:20 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:12 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:19 +0200 Message-Id: <20200421161032.1847-5-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485472; bh=jhCysiL0em9xbYbNNQM+HYu75xC1aeY25q5vJerNTXA=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=eNF2EWOq07uPkieNqd3rZd2PSoM4t0Lkg8uCKnqBZOsA50Ygf7aIDZvKKkUeOjLKH Rbpz9G7YkRwe2tKMJLqPS9JauF2rzEXLMw7feAwdjg5D8cZJ7m/i/FV64nc32QwZeD CoTfkNNunRa8a/FlneXgpjsHah90V0VHSEdd/GqM= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3a50cef18a..041f0a1292 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -195,7 +195,6 @@ (source (jami-source #:without-daemon #t)) (build-system gnu-build-system) (inputs - ;; Missing (optional?) dep: libnatpmp. `(("alsa-lib" ,alsa-lib) ("boost" ,boost) ("dbus-c++" ,dbus-c++) @@ -206,6 +205,7 @@ ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) + ("libnatpmp" ,libnatpmp) ("libogg" ,libogg) ("libva" ,libva) ("opendht" ,opendht) From patchwork Tue Apr 21 16:10:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21389 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9BC7A27BBE1; Tue, 21 Apr 2020 17:12:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 128A227BBE4 for ; Tue, 21 Apr 2020 17:12:37 +0100 (BST) Received: from localhost ([::1]:60870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVk-00046L-Ja for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52228) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVF-0003F8-3v for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVE-00042I-Gh for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVE-000429-4V for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVD-00060k-Vb for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 06/18] gnu: libupnp: Bump to 1.8.6; change the download method to git-fetch; add missing dependencies. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548722945 (code B ref 40677); Tue, 21 Apr 2020 16:12:03 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:27 +0000 Received: from localhost ([127.0.0.1]:50586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUd-0005xu-5w for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:27 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:33897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUU-0005vg-F0 for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:20 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:12 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:20 +0200 Message-Id: <20200421161032.1847-6-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485472; bh=aaS/eLvnC7qh4dzgszgxnJVmuJoixE7h/jxh6rLDV6k=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=mcsQ3TvVOZnN/EMbJKvG8KVAMTaSW0mmLuYbMV7Z24zvx3h7AWriir2sRjaUA87yB 01beunweEOLKEbIC1ld/EwRgcuwwOzYtppOtyUlJKe/FpfJJH1vmigj7+hMSZkZZme vphsy+taOIj2NusdfwqtkCyk7YcrVB1Zno3DzbWs= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/upnp.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f3c887a68..768df4a03e 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2019 Jens Mølgaard +;;; Copyright © 2020 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages image) #:use-module (gnu packages mp3) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages xiph) #:use-module (gnu packages sqlite) #:use-module (gnu packages python) @@ -92,15 +94,21 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.6.25") + (version "1.8.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/pupnp/pupnp/libUPnP%20" - version "/" name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pupnp/pupnp.git") + (commit (string-append "release-" version)))) (sha256 (base32 - "0hzsd7rvfa87b4hxg9yj4xhdfxx9sp09r9sqdl3mqhvmcyw018y5")))) + "1jlb6qh47513h2simy0zxia5q61w1c31mnwmjqpr2nf832lmnpk4")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (build-system gnu-build-system) (arguments ;; The tests require a network device capable of multicasting which is From patchwork Tue Apr 21 16:10:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21397 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA34D27BBE4; Tue, 21 Apr 2020 17:13:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3A52027BBE1 for ; Tue, 21 Apr 2020 17:13:01 +0100 (BST) Received: from localhost ([::1]:60892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvW8-0004p7-PD for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:13:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVI-0003Jk-Cd for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVG-00043Q-E5 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVG-00043I-0U for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVF-00061E-Rl for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 07/18] gnu: Add ffmpeg-jami. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548822974 (code B ref 40677); Tue, 21 Apr 2020 16:12:05 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:28 +0000 Received: from localhost ([127.0.0.1]:50594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUe-0005yN-6j for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:28 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:56478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUU-0005vh-TU for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:21 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:12 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:21 +0200 Message-Id: <20200421161032.1847-7-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485473; bh=u1Wlajd2yvnJmn++w6U8BZb0u741RNQEcD6i3tqgRfw=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=IqSYsxS0oukE6dWedxGJwyAslPMlMtm2ZJFkHG0UPmtXx4UBQELHTn253aHKLX9WR 9JKYsv+ZOMzhGv5+LMQRO2ZLz9qL0mmc1nVv/fyqeGXDWwNulyFO77PoW5QmH87gT5 rXIEC0h/HcdP5uXJ1T/iH5msHWcPwh+FesLXSSqI= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 239 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 041f0a1292..e7f15c7197 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -188,6 +188,245 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +(define-public ffmpeg-jami + (let ((commit "59da9dcd7ef6277e4e04998ced71b05a6083c635") + (revision "0")) + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (version (git-version "4.2.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.ffmpeg.org/ffmpeg.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))) + (native-inputs + `(("SFL-patches" ,(jami-source)) + ("libiconv" ,libiconv) + ,@(package-native-inputs ffmpeg))) + (arguments + (append + '(#:tests? #f) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags '()) + (append '("--disable-everything" + "--enable-zlib" + "--enable-gpl" + "--enable-swscale" + "--enable-bsfs" + "--disable-filters" + "--disable-programs" + "--disable-postproc" + "--disable-protocols" + "--enable-protocol=crypto" + "--enable-protocol=file" + "--enable-protocol=rtp" + "--enable-protocol=srtp" + "--enable-protocol=tcp" + "--enable-protocol=udp" + "--enable-protocol=unix" + "--enable-protocol=pipe" + ;; enable muxers/demuxers + "--disable-demuxers" + "--disable-muxers" + "--enable-muxer=rtp" + "--enable-muxer=g722" + "--enable-muxer=h263" + "--enable-muxer=h264" + "--enable-muxer=hevc" + "--enable-muxer=webm" + "--enable-muxer=ogg" + "--enable-muxer=pcm_s16be" + "--enable-muxer=pcm_s16le" + "--enable-demuxer=rtp" + "--enable-demuxer=mjpeg" + "--enable-demuxer=mjpeg_2000" + "--enable-demuxer=mpegvideo" + "--enable-demuxer=gif" + "--enable-demuxer=image_jpeg_pipe" + "--enable-demuxer=image_png_pipe" + "--enable-demuxer=image_webp_pipe" + "--enable-demuxer=matroska" + "--enable-demuxer=m4v" + "--enable-demuxer=mp3" + "--enable-demuxer=ogg" + "--enable-demuxer=flac" + "--enable-demuxer=wav" + "--enable-demuxer=ac3" + "--enable-demuxer=g722" + "--enable-demuxer=pcm_mulaw" + "--enable-demuxer=pcm_alaw" + "--enable-demuxer=pcm_s16be" + "--enable-demuxer=pcm_s16le" + "--enable-demuxer=h263" + "--enable-demuxer=h264" + "--enable-demuxer=hevc" + ;; enable parsers + "--enable-parser=h263" + "--enable-parser=h264" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + ;; encoders/decoders + "--enable-encoder=adpcm_g722" + "--enable-decoder=adpcm_g722" + "--enable-encoder=rawvideo" + "--enable-decoder=rawvideo" + "--enable-encoder=libx264" + "--enable-decoder=h264" + "--enable-encoder=pcm_alaw" + "--enable-decoder=pcm_alaw" + "--enable-encoder=pcm_mulaw" + "--enable-decoder=pcm_mulaw" + "--enable-encoder=mpeg4" + "--enable-decoder=mpeg4" + "--enable-encoder=libvpx_vp8" + "--enable-decoder=vp8" + "--enable-decoder=vp9" + "--enable-encoder=h263" + "--enable-encoder=h263p" + "--enable-decoder=h263" + "--enable-encoder=mjpeg" + "--enable-decoder=mjpeg" + "--enable-decoder=mjpegb" + "--enable-libspeex" + "--enable-libopus" + "--enable-libvpx" + "--enable-libx264" + "--enable-encoder=libspeex" + "--enable-decoder=libspeex" + "--enable-encoder=libopus" + "--enable-decoder=libopus" + ;; decoders for ringtones and audio streaming + "--enable-decoder=flac" + "--enable-decoder=vorbis" + "--enable-decoder=aac" + "--enable-decoder=ac3" + "--enable-decoder=eac3" + "--enable-decoder=mp3" + "--enable-decoder=pcm_u24be" + "--enable-decoder=pcm_u24le" + "--enable-decoder=pcm_u32be" + "--enable-decoder=pcm_u32le" + "--enable-decoder=pcm_u8" + "--enable-decoder=pcm_f16le" + "--enable-decoder=pcm_f24le" + "--enable-decoder=pcm_f32be" + "--enable-decoder=pcm_f32le" + "--enable-decoder=pcm_f64be" + "--enable-decoder=pcm_f64le" + "--enable-decoder=pcm_s16be" + "--enable-decoder=pcm_s16be_planar" + "--enable-decoder=pcm_s16le" + "--enable-decoder=pcm_s16le_planar" + "--enable-decoder=pcm_s24be" + "--enable-decoder=pcm_s24le" + "--enable-decoder=pcm_s24le_planar" + "--enable-decoder=pcm_s32be" + "--enable-decoder=pcm_s32le" + "--enable-decoder=pcm_s32le_planar" + "--enable-decoder=pcm_s64be" + "--enable-decoder=pcm_s64le" + "--enable-decoder=pcm_s8" + "--enable-decoder=pcm_s8_planar" + "--enable-decoder=pcm_u16be" + "--enable-decoder=pcm_u16le" + ;; encoders/decoders for images + "--enable-encoder=gif" + "--enable-decoder=gif" + "--enable-encoder=jpegls" + "--enable-decoder=jpegls" + "--enable-encoder=ljpeg" + "--enable-decoder=jpeg2000" + "--enable-encoder=png" + "--enable-decoder=png" + "--enable-encoder=bmp" + "--enable-decoder=bmp" + "--enable-encoder=tiff" + "--enable-decoder=tiff" + ;; filters + "--enable-filter=scale" + "--enable-filter=overlay" + "--enable-filter=amix" + "--enable-filter=amerge" + "--enable-filter=aresample" + "--enable-filter=format" + "--enable-filter=aformat" + "--enable-filter=fps" + "--enable-filter=transpose" + "--enable-filter=pad") + ;; platform specific options + (if (string-contains (%current-system) "linux") + '("--enable-pic" + "--extra-cxxflags=-fPIC --extra-cflags=-fPIC" + "--target-os=linux" + "--enable-indev=v4l2" + "--enable-indev=xcbgrab" + "--enable-vdpau" + "--enable-hwaccel=h264_vdpau" + "--enable-hwaccel=mpeg4_vdpau" + "--enable-vaapi" + "--enable-hwaccel=h264_vaapi" + "--enable-hwaccel=mpeg4_vaapi" + "--enable-hwaccel=h263_vaapi" + "--enable-hwaccel=vp8_vaapi" + "--enable-hwaccel=mjpeg_vaapi" + "--enable-encoder=h264_vaapi" + "--enable-encoder=vp8_vaapi" + "--enable-encoder=mjpeg_vaapi" + )) + (cond ((string?= (%current-system) "i386") + '("--arch=x86" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=h264_nvdec" + "--enable-hwaccel=hevc_nvdec" + "--enable-hwaccel=vp8_nvdec" + "--enable-hwaccel=mjpeg_nvdec" + "--enable-encoder=h264_nvenc" + "--enable-encoder=hevc_nvenc")) + ((string?= (%current-system) "x86_64") + '("--arch=x86_64" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=h264_nvdec" + "--enable-hwaccel=hevc_nvdec" + "--enable-hwaccel=vp8_nvdec" + "--enable-hwaccel=mjpeg_nvdec" + "--enable-encoder=h264_nvenc" + "--enable-encoder=hevc_nvenc")) + ((string?= (%current-system) "aarch64-linux") '("--arch=aarch64")) + ((string?= (%current-system) "arm64-linux") '("--arch=aarch64")) + ((string?= (%current-system) "arm") '("--arch=arm")) + (else '())))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + ;; These patches come from: + ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time")) + #t))))))))))) + (define-public libring (package (name "libring") From patchwork Tue Apr 21 16:10:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21384 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9B1527BBE4; Tue, 21 Apr 2020 17:12:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6C42127BBE1 for ; Tue, 21 Apr 2020 17:12:16 +0100 (BST) Received: from localhost ([::1]:60854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVP-0003Jm-U2 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52244) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVG-0003HH-Vo for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVF-00042d-21 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVE-00042P-J4 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVE-00060s-DS for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 08/18] gnu: libring: Use ffmpeg-jami instead of ffmpeg. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548722952 (code B ref 40677); Tue, 21 Apr 2020 16:12:04 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:27 +0000 Received: from localhost ([127.0.0.1]:50588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUd-0005y2-FB for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:27 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUV-0005vk-6S for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:21 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:13 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:22 +0200 Message-Id: <20200421161032.1847-8-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485473; bh=k40Wb3sN2261nWYi9itwJ8aADx7aVBXvBn1+eCKEmsE=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=aTB7YCefEEBdQiS5QGEaoIpvRBMtAc0BaLGZ1us9IardT30pYdiTpAFH7GugxjeNv +Gh5zyi0NdRyQdkF922+IhObhD7ibOjQq356D+M/lqH/yT9duTmqcfgOIgqK788xHX ++vZlrydkGxdMrkRcd6M91v7AKCs4ROUH0zi2vsE= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e7f15c7197..c67236ac0d 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -438,7 +438,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) From patchwork Tue Apr 21 16:10:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21395 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B0A3D27BBE4; Tue, 21 Apr 2020 17:12:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 89FFF27BBE1 for ; Tue, 21 Apr 2020 17:12:54 +0100 (BST) Received: from localhost ([::1]:60886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvW2-0004d3-4J for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52248) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVH-0003Hi-94 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVF-00042w-DG for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVF-00042k-1C for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVE-00060z-Sx for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 09/18] gnu: restinio: Bump to 0.6.1.1. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548822959 (code B ref 40677); Tue, 21 Apr 2020 16:12:04 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:28 +0000 Received: from localhost ([127.0.0.1]:50590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUd-0005y9-Lz for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:27 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:54475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUV-0005vl-Jg for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:21 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:13 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:23 +0200 Message-Id: <20200421161032.1847-9-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485474; bh=JeAvIYQ9X2ilgD5t78JQervhLjAkoT/2yEAJPC+07PI=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=GBJ6ZW9uzO1p0Vza4L3xP3lPz8aBa/YQr2VEucEIFELDd7ZYUFcpim3678O915W28 BJxi/DYy7rUsIDg/3F9ZpixHpqMvbvo1QcM38p6zw5wtNl4AB7sSlQsLvB4ZALauZY HSqG1UvZvD2VXG8MxMzEmVljxuwde6/Do27BYlIg= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 02ba5e9601..b767c9035a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2608,7 +2608,7 @@ communication over HTTP.") (define-public restinio (package (name "restinio") - (version "0.6.0.1") + (version "0.6.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2617,7 +2617,7 @@ communication over HTTP.") (file-name (git-file-name name version)) (sha256 (base32 - "1c25kpx652nng8m1sqf5an2c3c4g3k6zj85mkkaxzk88iwfzq1s8")))) + "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5")))) (build-system cmake-build-system) (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. `(("zlib" ,zlib) From patchwork Tue Apr 21 16:10:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21392 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9F72427BBE1; Tue, 21 Apr 2020 17:12:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5CE9227BBE4 for ; Tue, 21 Apr 2020 17:12:44 +0100 (BST) Received: from localhost ([::1]:60880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVr-0004N3-Sb for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52238) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVG-0003GW-Dl for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVF-00043C-Uc for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVF-000434-H1 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVF-000617-CY for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 10/18] gnu: pjproject-jami: Add a new SFL patch. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548822966 (code B ref 40677); Tue, 21 Apr 2020 16:12:05 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:28 +0000 Received: from localhost ([127.0.0.1]:50592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUd-0005yG-Un for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:28 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUW-0005vm-1i for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:21 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:14 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:24 +0200 Message-Id: <20200421161032.1847-10-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485474; bh=qfMuNxABJ/RMiKKZzfmIMqIWVFR7Ddq/XiNH5qKPps8=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=fiwlnJ8/+gt6GumhLfoyA7Wh+peFGaV5dDd30DBM4733UL8qBxr2euX64ptkFACPE PrOKLXgQEjOwk5IuocRmgV9oDGgXGjBWhbVqPte7TyFNN3tgqtIk5rJbLFJKnGx8l4 bv4UgMwevzLXnzUfN5UWqbP3Xldvno25S8KdbdPM= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index c67236ac0d..e612605775 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -168,7 +168,8 @@ "fix_ebusy_turn" "ignore_ipv6_on_transport_check" "fix_turn_connection_failure" - "disable_local_resolution")) + "disable_local_resolution" + "fix_assert_on_connection_attempt")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does From patchwork Tue Apr 21 16:10:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21388 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 74C2827BBE1; Tue, 21 Apr 2020 17:12:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F290327BBE4 for ; Tue, 21 Apr 2020 17:12:33 +0100 (BST) Received: from localhost ([::1]:60868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVh-0003v6-Gi for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVH-0003IC-Fn for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVG-00043t-T7 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVG-00043m-GI for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVG-00061M-BN for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 11/18] gnu: pjproject: Fix formatting. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548922981 (code B ref 40677); Tue, 21 Apr 2020 16:12:06 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:29 +0000 Received: from localhost ([127.0.0.1]:50596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUe-0005yV-N6 for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:29 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:33903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUW-0005vo-GA for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:14 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:25 +0200 Message-Id: <20200421161032.1847-11-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485475; bh=f+LhTkH8nhlrEwXvScbOFnM4A+i8zFbYkyVEcthQjF4=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=XdDroL6dy+dX95pwMz/NH+vZQ87O0fpql54nRBwOGnMMvr3Fxk8lXh98pKSJ1YW3a yc8ZwYkx++ee1rrwATN7/GHjri2cmFO3RW7/W8cU8FCjZRoOjcsUeiO1nmC9hGtAKk 7q9/z6gWTgi3+qtM+iSVbK+S6pQMHfIBM+JRo03s= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/telephony.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 62bd8fd548..59cd06f6f5 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -704,10 +704,10 @@ calls and messages") ("pkg-config" ,pkg-config) ("libtool" ,libtool))) (arguments - `(;; FIXME make: No rule to make target + `( ;; FIXME make: No rule to make target ;; 'pjlib-test-unknown-[something]-gnu'. #:tests? #f - ;; #:test-target "selftest" + ;; #:test-target "selftest" #:phases (modify-phases %standard-phases (add-before 'build 'build-dep From patchwork Tue Apr 21 16:10:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21399 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7EA2127BBE4; Tue, 21 Apr 2020 17:13:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5309327BBE1 for ; Tue, 21 Apr 2020 17:13:12 +0100 (BST) Received: from localhost ([::1]:60904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvWJ-00055E-T7 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52264) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVH-0003JB-U0 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVH-00044G-Eu for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVG-000442-Tu for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVG-00061T-OE for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 12/18] gnu: jami: Make gettext a native input. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748548922988 (code B ref 40677); Tue, 21 Apr 2020 16:12:06 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:29 +0000 Received: from localhost ([127.0.0.1]:50598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUf-0005yc-57 for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:29 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:54479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUW-0005vp-VC for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:15 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:26 +0200 Message-Id: <20200421161032.1847-12-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485475; bh=fzkSGxn7YQukcs4Le1VQWEfugGghIGXS+xXenyEtB4g=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=ctq9ivCZxXdcyIAQonXVoKag6VAmYb7mNtnBkLauoDB9Yl6ihXETp6Kh1W5tQE/kh j2J4bp3uUj+rv8iR7CZpUw2eGc7gIiIf7u7XCdVSIFkOz8ZGzkKSM9k3QqX+j88CrY j8+zslLQeVvAwvmOdXob/5bsH4nR4wITeewVVLYE= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e612605775..534958df5d 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -551,7 +551,6 @@ This package provides a library common to all Jami clients.") ("libnotify" ,libnotify) ("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) - ("gettext" ,gnu-gettext) ("libcanberra" ,libcanberra) ("webkitgtk" ,webkitgtk) ;; TODO: We must wrap ring-client-gnome to force using the @@ -568,6 +567,7 @@ This package provides a library common to all Jami clients.") ("sqlite" ,sqlite-with-column-metadata))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gnu-gettext) ("glib:bin" ,glib "bin") ("doxygen" ,doxygen))) (propagated-inputs From patchwork Tue Apr 21 16:10:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21391 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E77EB27BBEA; Tue, 21 Apr 2020 17:12:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E243627BBE4 for ; Tue, 21 Apr 2020 17:12:40 +0100 (BST) Received: from localhost ([::1]:60878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVo-0004GX-Fn for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52298) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVK-0003NK-39 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00045z-5b for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045s-O0 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVI-00061x-Iy for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 13/18] gnu: pjproject, pjproject-jami: Remove broken pjproject package. Make pjproject-jami package stand-alone by moving package code from pjproject into it. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551523043 (code B ref 40677); Tue, 21 Apr 2020 16:12:08 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:55 +0000 Received: from localhost ([127.0.0.1]:50606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUs-0005zH-Mw for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:54 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:56485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUX-0005vq-CX for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:15 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:27 +0200 Message-Id: <20200421161032.1847-13-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485476; bh=gYWQnbxyI4deI9ph06KkWsRz20YqajlUH03hEDGfRGc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=k8XWAp+xw/YFCtYhIQbuUv0JwXAoqYKQjErCgy8kkYKY3vpD6RGeoVgq99+V/+jZB 1ih4yqPYjphJLrik0MS+oF5QeHYswu2EkqcXs4Pjq+JbdVrPjOkSeZ+M5V/uD7UwuJ xplNdcvy+vTVWO4OBT7XvVAxJnq4/T2CtIfNY+eA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 65 ++++++++++++++++++++++++++-- gnu/packages/telephony.scm | 86 -------------------------------------- 2 files changed, 61 insertions(+), 90 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 534958df5d..95f34afa03 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -98,11 +98,64 @@ (define-public pjproject-jami (package - (inherit pjproject) (name "pjproject-jami") + (version "2.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject.git") + (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) + (modules '((guix build utils))) + (snippet + '(begin + (let ((third-party-directories + ;; Things we don't need: + ;; BaseClasses - contains libraries from Windows SDK + ;; we don't need it, at least not now. + (list "BaseClasses" "g7221" "ilbc" "milenage" + "speex" "threademulation" "yuv" "bdsound" + "gsm" "mp3" "resample" "srtp" "webrtc" + ;; Keep only resample, build and README.txt. + "build/baseclasses" "build/g7221" "build/gsm" + "build/ilbc" "build/milenage" "build/resample" + "build/samplerate" "build/speex" "build/srtp" + "build/webrtc" "build/yuv"))) + ;; Keep only Makefiles related to resample. + (for-each (lambda (directory) + (delete-file-recursively + (string-append "third_party/" directory))) + third-party-directories) + #t) + (let ((third-party-dirs + (list "gsm" "ilbc" "speex" "g7221" "srtp" + "portaudio" "resample"))) + (for-each + (lambda (dirs) + (substitute* "third_party/build/os-linux.mak" + (((string-append "DIRS += " dirs)) ""))) + third-party-dirs)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + (build-system gnu-build-system) + (inputs + `(("portaudio" ,portaudio))) + (propagated-inputs + ;; These packages are referenced in the Libs field of the pkg-config + ;; file that will be installed by pjproject. + `(("speex" ,speex) + ("libsrtp" ,libsrtp) + ("gnutls" ,gnutls) + ("resample", resample) + ("util-linux" ,util-linux))) (native-inputs - `(("SFL-patches" ,(jami-source)) - ,@(package-native-inputs pjproject))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("SFL-patches" ,(jami-source)))) (arguments `(#:tests? #f ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. @@ -187,7 +240,11 @@ (substitute* "Makefile" (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))))) + #t))))) + (home-page "https://www.pjsip.org") + (synopsis "SIP (protocol) stack used by Jami") + (description "Pjsip is a C library implementing the SIP protocol. This version is highly modified for use in GNU Jami.") + (license license:gpl2+))) (define-public ffmpeg-jami (let ((commit "59da9dcd7ef6277e4e04998ced71b05a6083c635") diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 59cd06f6f5..b3d2b8bc70 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -644,92 +644,6 @@ phone to IP phone communication or in a network using a SIP proxy to route your calls and messages") (license license:gpl2+))) -(define-public pjproject - (package - (name "pjproject") - (version "2.9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pjsip/pjproject.git") - (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) - (modules '((guix build utils))) - (snippet - '(begin - (let ((third-party-directories - ;; Things we don't need: - ;; BaseClasses - contains libraries from Windows SDK - ;; we don't need it, at least not now. - (list "BaseClasses" "g7221" "ilbc" "milenage" - "speex" "threademulation" "yuv" "bdsound" - "gsm" "mp3" "resample" "srtp" "webrtc" - ;; Keep only resample, build and README.txt. - "build/baseclasses" "build/g7221" "build/gsm" - "build/ilbc" "build/milenage" "build/resample" - "build/samplerate" "build/speex" "build/srtp" - "build/webrtc" "build/yuv"))) - ;; Keep only Makefiles related to resample. - (for-each (lambda (directory) - (delete-file-recursively - (string-append "third_party/" directory))) - third-party-directories) - #t) - (let ((third-party-dirs - (list "gsm" "ilbc" "speex" "g7221" "srtp" - "portaudio" "resample"))) - (for-each - (lambda (dirs) - (substitute* "third_party/build/os-linux.mak" - (((string-append "DIRS += " dirs)) ""))) - third-party-dirs)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) - (build-system gnu-build-system) - (inputs - `(("portaudio" ,portaudio))) - (propagated-inputs - ;; These packages are referenced in the Libs field of the pkg-config - ;; file that will be installed by pjproject. - `(("speex" ,speex) - ("libsrtp" ,libsrtp) - ("gnutls" ,gnutls) - ("resample", resample) - ("util-linux" ,util-linux))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool))) - (arguments - `( ;; FIXME make: No rule to make target - ;; 'pjlib-test-unknown-[something]-gnu'. - #:tests? #f - ;; #:test-target "selftest" - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-dep - (lambda _ (invoke "make" "dep"))) - (add-before 'patch-source-shebangs 'autoconf - (lambda _ - (invoke "autoconf" "-v" "-f" "-i" "-o" - "aconfigure" "aconfigure.ac"))) - (add-before 'autoconf 'disable-some-tests - ;; Three of the six test programs fail due to missing network - ;; access. - (lambda _ - (substitute* "Makefile" - (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test") - "selftest: pjlib-test pjlib-util-test pjmedia-test")) - #t))))) - (home-page "https://www.pjsip.org") - (synopsis "Session Initiation Protocol (SIP) stack") - (description "PJProject provides an implementation of the Session -Initiation Protocol (SIP) and a multimedia framework.") - (license license:gpl2+))) - (define-public libtgvoip (package (name "libtgvoip") From patchwork Tue Apr 21 16:10:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21387 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 102CE27BBE4; Tue, 21 Apr 2020 17:12:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CCBB627BBE1 for ; Tue, 21 Apr 2020 17:12:30 +0100 (BST) Received: from localhost ([::1]:60864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVe-0003jZ-85 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52336) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVL-0003Rs-UP for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045C-7I for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVH-00044w-Pb for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVH-00061i-KN for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 14/18] gnu: pjproject-jami: Bump to 2.10, apply new SFL patches. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748549823012 (code B ref 40677); Tue, 21 Apr 2020 16:12:07 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:38 +0000 Received: from localhost ([127.0.0.1]:50602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUo-0005yz-DZ for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:38 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:33906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUX-0005vs-Pq for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:22 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:15 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:28 +0200 Message-Id: <20200421161032.1847-14-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485476; bh=gYy6AQ9CyFB9VYZi7lig0mYvN+DzHUUDWoscMTsLs8w=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=o63KAV7mVXdfdnYUCcbZO9KjX/YdgEKNhQc2k7RGb2t1Oe83XBbRpkI231zIHULTI qpvWurBM/GLbVmqJkUwEbbDErUPNM4i4N79TyGB9M9Dcq4iQOLa4mMOAubbqyDKWFo v3/ahQWrQELJvE01JYyzA21GWGAL9nqiDYITWpm0= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 95f34afa03..291eb8522c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -99,13 +99,13 @@ (define-public pjproject-jami (package (name "pjproject-jami") - (version "2.9") + (version "2.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/pjsip/pjproject.git") - (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) + (commit "3e7b75cb2e482baee58c1991bd2fa4fb06774e0d"))) (modules '((guix build utils))) (snippet '(begin @@ -138,7 +138,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) @@ -160,7 +160,7 @@ `(#:tests? #f ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. #:configure-flags - (list "--disable-oss" + (list ;;"--disable-oss" ; do we need this? "--disable-sound" "--disable-video" "--enable-ext-sound" @@ -206,23 +206,15 @@ #:inputs inputs #:dep-name "pjproject" #:patches - '("fix_turn_alloc_failure" - "rfc2466" - "ipv6" - "multiple_listeners" - "pj_ice_sess" - "fix_turn_fallback" - "fix_ioqueue_ipv6_sendto" - "add_dtls_transport" - "rfc6544" - "ice_config" - "sip_config" - "fix_first_packet_turn_tcp" - "fix_ebusy_turn" - "ignore_ipv6_on_transport_check" - "fix_turn_connection_failure" - "disable_local_resolution" - "fix_assert_on_connection_attempt")) + '("0001-rfc6544" + "0002-rfc2466" + "0003-add-tcp-keep-alive" + "0004-multiple_listeners" + "0005-fix_ebusy_turn" + "0006-ignore_ipv6_on_transport_check" + "0007-pj_ice_sess" + "0008-fix_ioqueue_ipv6_sendto" + "0009-add-config-site")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does From patchwork Tue Apr 21 16:10:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21398 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5E42627BBE4; Tue, 21 Apr 2020 17:13:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 213CF27BBE1 for ; Tue, 21 Apr 2020 17:13:06 +0100 (BST) Received: from localhost ([::1]:60900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvWD-0004zB-NL for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:13:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52290) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVJ-0003Mv-Q3 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045h-Kq for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVI-00045M-7w for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVI-00061p-3G for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 15/18] gnu: opendht: Bump to 2.0.0. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748550223022 (code B ref 40677); Tue, 21 Apr 2020 16:12:08 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:42 +0000 Received: from localhost ([127.0.0.1]:50604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUo-0005z7-Ob for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:42 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:60176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUY-0005vt-6y for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:16 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:29 +0200 Message-Id: <20200421161032.1847-15-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485476; bh=bJD+M0cgu5QcvE4CGvh7/9uHTRj0W5n+jExg98ezQp8=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=C7Pe2qmb4X4XuHgUsc/CU4n/hCtakaWM6RSpab2GraTekc39R4BMwv9cLs0+nWHDd SpNE1nym0mXwwntCTKd3pqB7U+9wek6ChQEE3YcK6FtRPGApDiJ63M2SgEC/GcooQP Hcal7Thb8YXfLmyXLhqcN/j9K15MCy0NUUlDXM3I= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b767c9035a..cf865edef4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Tonton ;;; Copyright © 2019, 2020 Alex Griffin -;;; Copyright © 2019 Jan Wielkiewicz +;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato ;;; Copyright © 2020 Vincent Legoll @@ -2650,7 +2650,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0beta2") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -2659,7 +2659,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5")))) + "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs From patchwork Tue Apr 21 16:10:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21394 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B88ED27BBE4; Tue, 21 Apr 2020 17:12:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9381A27BBE1 for ; Tue, 21 Apr 2020 17:12:52 +0100 (BST) Received: from localhost ([::1]:60884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvW0-0004WM-44 for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52314) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVK-0003Ok-QT for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVK-000473-6F for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVJ-00046n-Me for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVJ-00062B-Hb for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 16/18] gnu: jami: Bump to 20200401.1.6f090de. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551523058 (code B ref 40677); Tue, 21 Apr 2020 16:12:09 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:55 +0000 Received: from localhost ([127.0.0.1]:50610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvV5-0005zo-GS for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:55 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:58051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUY-0005vx-Jf for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:16 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:30 +0200 Message-Id: <20200421161032.1847-16-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485477; bh=x1qfZKI+2CvK4gckLo4blhQyabOw3WupFVJzQDd4dw4=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=c6/XID1lgHOZPLcdGEgngu+Ai+RK3ygDynqfKLYuS3/Q3cIj7NiEhjzA3F/pkfMYE p/1T/2IseMP+F0UxJ9Pm7AR943ImP9VyTnBOA0XSZjb6QB3hxeaaG9LwNQRh/OAe3Z MtlH5I95+YxCQ/GwB17MnYaLeu2XvxKwfbmkEdT8= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 291eb8522c..50bcd63a35 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,7 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20191101.3.67671e7") +(define %jami-version "20200401.1.6f090de") (define* (jami-source #:key without-daemon) (origin @@ -75,7 +75,7 @@ #f)) (sha256 (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) ;; Savoir-Faire Linux modifies many libraries to add features ;; to Jami. This procedure makes applying patches to a given From patchwork Tue Apr 21 16:10:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21390 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ACFE527BBE4; Tue, 21 Apr 2020 17:12:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8132B27BBE1 for ; Tue, 21 Apr 2020 17:12:38 +0100 (BST) Received: from localhost ([::1]:60874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVm-0004Ap-0d for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52328) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVL-0003R5-K1 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047V-Ih for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047F-5q for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVJ-00062J-Vx for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 17/18] gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551623065 (code B ref 40677); Tue, 21 Apr 2020 16:12:09 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:56 +0000 Received: from localhost ([127.0.0.1]:50612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvV5-0005zr-Nj for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:55 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:32949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUZ-0005vy-3Q for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:17 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:31 +0200 Message-Id: <20200421161032.1847-17-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485477; bh=tMS2HD2Du6uGjntf/zx70asww5rSxqGg6hpVdGfkyCs=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=qG+AeegwE5njR+EaWlm+nyw4n0/nYfJTBisstQBtvDoOo4EbxwmocLAGXSo+bWIP/ QIIAzCyPaDGxruu/YLoWHSb5L2NRkxX1dB7LKF1Yp+cpF2084pBulRFcPnMnX1geXO VmL6+GpDYWvtAH+/R6MkIDwS+/vrL7EJQIHxahww= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 50bcd63a35..b441e5e426 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -616,7 +616,7 @@ This package provides a library common to all Jami clients.") ("sqlite" ,sqlite-with-column-metadata))) (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gnu-gettext) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("doxygen" ,doxygen))) (propagated-inputs From patchwork Tue Apr 21 16:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CFC027BBE4; Tue, 21 Apr 2020 17:12:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 082D127BBE1 for ; Tue, 21 Apr 2020 17:12:59 +0100 (BST) Received: from localhost ([::1]:60890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvW6-0004lF-JM for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52342) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVM-0003SR-5d for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047v-W9 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047e-JL for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVK-00062Q-EI for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551623071 (code B ref 40677); Tue, 21 Apr 2020 16:12:10 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:56 +0000 Received: from localhost ([127.0.0.1]:50614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvV5-0005zy-Tw for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:56 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUZ-0005vz-Fu for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:24 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:17 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:32 +0200 Message-Id: <20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485478; bh=0l3KDGfWlGneWe3W5TgPS9ApoZHkAJxVz1huxoRZ980=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=qeoFwOQYC13EkddtzzZ7kFHhQo0BHtE5w6r2zo0Gnd07bVzIsRLqJ7CCkt8bmtHRi jSq3Le/jTWW9jaO9o1mOGzgSrpd/ZVSI32gAiNtlETfsztsh9RUfrDk4+seovHdekH 1XgqNLrgMbXqwuCBPE6hV7Ox32IzvAacikzfL3pI= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 60 ++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b441e5e426..a61b1b6043 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages hurd) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) @@ -161,33 +162,38 @@ ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. #:configure-flags (list ;;"--disable-oss" ; do we need this? - "--disable-sound" - "--disable-video" - "--enable-ext-sound" - "--disable-speex-aec" - "--disable-g711-codec" - "--disable-l16-codec" - "--disable-gsm-codec" - "--disable-g722-codec" - "--disable-g7221-codec" - "--disable-speex-codec" - "--disable-ilbc-codec" - "--disable-opencore-amr" - "--disable-silk" - "--disable-sdl" - "--disable-ffmpeg" - "--disable-v4l2" - "--disable-openh264" - "--disable-resample" - "--disable-libwebrtc" - "--with-gnutls" - "--with-external-srtp" - ;; We need -fPIC or else we get the following error when linking - ;; against pjproject-jami: - ;; relocation R_X86_64_32S against `.rodata' can not be used when - ;; making a shared object; - "CFLAGS=-fPIC" - "CXXFLAGS=-fPIC") + "--disable-sound" + "--disable-video" + ;; The following flag is linux specific + ,@(if (hurd-triplet? (or (%current-system) + (%current-target-system))) + '("--enable-epoll") + '()) + "--enable-ext-sound" + "--disable-speex-aec" + "--disable-g711-codec" + "--disable-l16-codec" + "--disable-gsm-codec" + "--disable-g722-codec" + "--disable-g7221-codec" + "--disable-speex-codec" + "--disable-ilbc-codec" + "--disable-opencore-amr" + "--disable-silk" + "--disable-sdl" + "--disable-ffmpeg" + "--disable-v4l2" + "--disable-openh264" + "--disable-resample" + "--disable-libwebrtc" + "--with-gnutls" + "--with-external-srtp" + ;; We need -fPIC or else we get the following error when linking + ;; against pjproject-jami: + ;; relocation R_X86_64_32S against `.rodata' can not be used when + ;; making a shared object; + "CFLAGS=-fPIC" + "CXXFLAGS=-fPIC") #:modules ((guix build utils) ,@(@@ (guix build-system gnu) %default-modules)) #:phases