From unknown Wed Jun 18 22:58:58 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#40677 <40677@debbugs.gnu.org> To: bug#40677 <40677@debbugs.gnu.org> Subject: Status: Jami Reply-To: bug#40677 <40677@debbugs.gnu.org> Date: Thu, 19 Jun 2025 05:58:58 +0000 retitle 40677 Jami reassign 40677 guix-patches submitter 40677 Jan Wielkiewicz severity 40677 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:01:19 2020 Received: (at submit) by debbugs.gnu.org; 17 Apr 2020 00:01:19 +0000 Received: from localhost ([127.0.0.1]:39578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPERa-0004s0-Nw for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:01:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:36669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPERY-0004rt-QO for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:01:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54550) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPERW-0001iI-A8 for guix-patches@gnu.org; Thu, 16 Apr 2020 20:01:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_05,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,SPOOFED_FREEMAIL,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPERV-0006Ge-11 for guix-patches@gnu.org; Thu, 16 Apr 2020 20:01:13 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:58151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jPERU-0006Fc-Ee for guix-patches@gnu.org; Thu, 16 Apr 2020 20:01:12 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost (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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA for ; Fri, 17 Apr 2020 02:01:07 +0200 (CEST) Date: Fri, 17 Apr 2020 02:00:29 +0200 From: Jan Wielkiewicz To: guix-patches@gnu.org Subject: Jami Message-ID: <20200417015857.0650ff6a@interia.pl> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587081668; bh=8GLgdthxwo8534bRYg8ID6/iS6vujFXnnPKvF34WkQM=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Subject: Message-ID:X-Mailer:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus; b=F5b5ODFDcr0Ha+vaJgDnPX7Dv4Yhh5k7VI6DsylidcRYM73beZ3fIk+FWHVgeEmhg vIg46ERYtHOXgAiCQT17dvvzv4i3J4X3QOvHR2fj7pOxQlabSR48I3B/0iw+EBnPbo RE8NtovImdLbU2Kt/FDBL+PtVRBrz2La/4QiT4x8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 217.74.65.157 X-Spam-Score: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, these commits are mainly updates, some improvements, I don't remember it's late here :D Jan Wielkiewicz Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: interia.pl] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [209.51.188.17 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=tona_kosmicznego_smiecia%40interia.pl; ip=209.51.188.17; r=debbugs.gnu.org] 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hello, these commits are mainly updates, some improvements, I don't remember it's late here :D Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:55 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:56 +0000 Received: from localhost ([127.0.0.1]:39596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy1-0005fH-QM for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:55 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:41363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPExy-0005ew-ST for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:48 -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; Fri, 17 Apr 2020 02:34:39 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 01/30] gnu: jami: Move Jami and its dependencies to jami.scm. Date: Fri, 17 Apr 2020 02:34:04 +0200 Message-Id: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083680; bh=fWKk7RWQxDw8CowjT+EQReFbmuApgBCAKvGzidhDEU8=; 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=oojbteARFh+GUeksedIg2D1AMGY/BnYi+AlH3U+VUBoUp3aOPpMGBk73EY8h2DeTa QU/b5ZEt5DUg3qS2vm+OgnCrXB5VuGHvex/dL8q0qxRu8YYNAksr5mJ1fXrPdhDmUN qUL3LKV3u6az3vJK5tGNicR1AkqcOQVaHh9DG2nU= X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- gnu/packages/jami.scm | 350 +++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 2 files changed, 350 insertions(+), 291 deletions(-) create mode 1 [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.74.65.157 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --- gnu/packages/jami.scm | 350 +++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 ------------------------------ 2 files changed, 350 insertions(+), 291 deletions(-) create mode 100644 gnu/packages/jami.scm diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm new file mode 100644 index 0000000000..cca420971c --- /dev/null +++ b/gnu/packages/jami.scm @@ -0,0 +1,350 @@ +;;; 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)) + +(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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:56 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:56 +0000 Received: from localhost ([127.0.0.1]:39603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy7-0005fp-NQ for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:56 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:34417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy2-0005f2-Qs for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:51 -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; Fri, 17 Apr 2020 02:34:44 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 02/30] gnu: jami: Bump to 20200203.1.5ee7e10. Date: Fri, 17 Apr 2020 02:34:05 +0200 Message-Id: <20200417003433.5608-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083685; bh=Yo4KkvODxfirmSGH7mhOt1jenUPtPTPQa/4fykuzUuo=; 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=gUVnX3rA/cJ3NW3WFLhh3Uw33e4pPdtCsiHSvcSDhPgm4UEdiCgRynvV+9tw/NxnI 07hnvCtjT2PmMRrYPeRMVO45+Rql5pbnQJCgTLY5uO1bhooVcPhPauECbgjuI/JwNh /qj8dbPJOVlY32y4n0nZ3GhRDl0YhkoQX+fAhwmg= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 cca420971c..0e6218c4a0 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -58,7 +58,7 @@ #:use-module (guix git-download) #:use-module (guix packages)) -(define %jami-version "20191101.3.67671e7") +(define %jami-version "20200203.1.5ee7e10") (define* (jami-source #:key without-daemon) (origin @@ -74,7 +74,7 @@ #f)) (sha256 (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + "0kx0y9jxyhgj6id6n3xxpm54i6b8dqyx9vxwkx505jvhlbxd2x7x")))) (define-public pjproject-jami (package -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:57 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:57 +0000 Received: from localhost ([127.0.0.1]:39605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy8-0005g5-4x for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:58679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy4-0005f4-2k for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:52 -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; Fri, 17 Apr 2020 02:34:46 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 03/30] gnu: jami: Fix downloading by changing the prefix to "jami_"; Use the "release" dir instead of the deprecated "ring-release". Date: Fri, 17 Apr 2020 02:34:06 +0200 Message-Id: <20200417003433.5608-3-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083686; bh=1aB+Y2p7bc7oF47ghU2cvYvQzsSjvQuO4mGOpgevkMI=; 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=A4kybO67gCED7lYxRU76Df+ZMTy3symfRdeTOagwbdfI3EEfqulBXL3iyovTkL2Uo 2v3qK4qZOxbonQKzQahml8p2Bt2mUuepAfJ92eMzkVhsUVGJohOefwfivVK4fTR6zP 4bzaeo41E4t7coVHPOlJkfpzNipB8nl7CMO+tqv4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 0e6218c4a0..8601ad718d 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -63,7 +63,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))) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:57 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:57 +0000 Received: from localhost ([127.0.0.1]:39609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy9-0005gH-78 for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:41368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy5-0005f6-09 for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:53 -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; Fri, 17 Apr 2020 02:34:47 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 04/30] gnu: jami: Add a generalized procedure for applying patches made by Savoir-faire linux to Jami dependencies. Date: Fri, 17 Apr 2020 02:34:07 +0200 Message-Id: <20200417003433.5608-4-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083687; bh=Pj9UNdp//8MPWVbFhlA5s2Ol9jzfLFI7d3nidU9PgPk=; 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=QT1F9jMQpjfJqvsF4VdnY00xOoWkJHPPuZx9IavfpwKdFAWm+IyGeoJD7Cg6mKjsd 5lIMHwD7u5Qgojbpc7ZSEAyr2qXQ4TodZu0pQIkBBVE/7lxc2iFBCPf7s/MW/AtGmX ELH6zuidXbcqxeemONkS82gm9s2M4+GBvzQk/AWk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8601ad718d..27f6ff26f5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -76,6 +76,22 @@ (base32 "0kx0y9jxyhgj6id6n3xxpm54i6b8dqyx9vxwkx505jvhlbxd2x7x")))) +(define-public jami-apply-dependency-patches + '(lambda* (#:key inputs dep-name patches) + (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")) + (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" + (string-append "ring-project/daemon/contrib/src/" + dep-name)) + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-directory "/" + file ".patch"))) + patches)))) + (define-public pjproject-jami (package (inherit pjproject) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:57 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:57 +0000 Received: from localhost ([127.0.0.1]:39611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy9-0005gU-Gk for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy6-0005f8-6i for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:54 -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; Fri, 17 Apr 2020 02:34:48 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 05/30] gnu: pjproject-jami: Use the jami-apply-dependency-patches procedure. Date: Fri, 17 Apr 2020 02:34:08 +0200 Message-Id: <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083688; bh=zn6CHjbcmsRX29f2blDjOwvG/79HL9b1BzNc2nZ99dQ=; 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=rVOaqx8DdGzG995nnZGDF9mAL9OUe7hvGwB4mRz01GZ562jYadCFYQhFHT5ubLRe8 S1yt1VdOGlw36W+Ajw7MaA4ZihEXWNv0uv12wR/U/uoTwEXKE8TEQao5p86jh0xXOd wp1BW2YorDR17duW+aXEa5yEMrful3Avojw8Zi+Q= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 60 +++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 27f6ff26f5..b165335e26 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -131,6 +131,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 @@ -139,40 +141,30 @@ #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. -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:58 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:58 +0000 Received: from localhost ([127.0.0.1]:39613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy9-0005gb-Qq for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:58 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:57134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy7-0005fG-1j for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:55 -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; Fri, 17 Apr 2020 02:34:49 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 06/30] gnu: Add libnatpmp. Date: Fri, 17 Apr 2020 02:34:09 +0200 Message-Id: <20200417003433.5608-6-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083689; bh=v7UQTs1XgIGOXxKU+YBXL3o9B9KgZP6BT+FkQofUsGQ=; 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=m/mw68dngaHDeNOTEQiZY2QPNmhL3OrCiZYJ9WJHgmPOp2rKiNL5TfvD4P+rPLUf2 x7KVYSuRG0hkqaYVfgnqj4J/d/VPJIgd5Hc8EZDpe6SsUCGtBG2gWv4v9DGJyIX4rJ VUYEKOL6IZbQgOcvF6ki8YHflLna469hbbNkLT7U= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/networking.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f754683bb9..adcb341a29 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -374,6 +374,32 @@ 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 NAT Port Mapping Protocol (NAT-PMP) written in C.") + (license license:bsd-3))) + (define-public librdkafka (package (name "librdkafka") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:34:58 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:34:58 +0000 Received: from localhost ([127.0.0.1]:39616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyA-0005gj-4z for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:58 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:54839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy8-0005fJ-5Q for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:56 -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; Fri, 17 Apr 2020 02:34:50 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 07/30] gnu: libring: Add libnatpmp as an optional dependency; remove unnecessary comment. Date: Fri, 17 Apr 2020 02:34:10 +0200 Message-Id: <20200417003433.5608-7-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083690; bh=NBWknU0RZKoFpg0s+A3coXTv1FYhPKyoGBuQ8NZ1xLg=; 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=KoKHj6oNH5TWiJK7E175+DGNZQsZu3JQTQlWs9e6qvo+pQJwAwAUaAwkcI1dynFGp 0K6MXoiqmoiLgPNmB8IOmKtACmfLxdWHnwLL2YC3MVGbmS+VDWjDpfDdNSYzTW/Tel THAwPxCaF/6XukRA9rOkE2sDwXxDej69PRYDBoDw= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 b165335e26..21872122e1 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -190,7 +190,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++) @@ -201,6 +200,7 @@ ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) + ("libnatpmp" ,libnatpmp) ("libogg" ,libogg) ("libva" ,libva) ("opendht" ,opendht) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:02 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:03 +0000 Received: from localhost ([127.0.0.1]:39623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyE-0005hf-FK for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:02 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:34420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy8-0005fP-Vm for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:57 -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; Fri, 17 Apr 2020 02:34:51 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 08/30] gnu: libupnp: Bump to 1.8.6; change the download method to git-fetch; add missing dependencies. Date: Fri, 17 Apr 2020 02:34:11 +0200 Message-Id: <20200417003433.5608-8-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083691; bh=107oqQDnMcFNoqGvnQGvrdz5jTjP0lWJSo+5atltiP4=; 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=Ewdx8yXu4gScE3KmmZiIqwY6TKWYxUX//U67rLLwFgb3JWcwAJ5EWxwuzm0s93Ve9 QmDRhhk9LA37htYgAVpqHtEZ8Zn1E7EcATxCFZUd9PWrKWFB43Xfsf2EaMVEw7wjG9 ouGqQGYt3aGwE9HNrv42yc6IuMpSR40/SBx4WB7Q= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/upnp.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f3c887a68..be75b9068f 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -28,6 +28,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 +93,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/mrjimenez/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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:03 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:03 +0000 Received: from localhost ([127.0.0.1]:39625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyE-0005hn-RY for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:03 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:41370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEy9-0005fW-UO for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:34:58 -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; Fri, 17 Apr 2020 02:34:52 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 09/30] gnu: opendht: Bump to 2.0.0rc1. Date: Fri, 17 Apr 2020 02:34:12 +0200 Message-Id: <20200417003433.5608-9-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083692; bh=ZRF8g8se9CVM3aCKf3a2Q6A2qLOiIBVjtq2us2WEIvE=; 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=ULqgonOUQMCcQnKPVtSb9EqC3dATDNiXJO515fNme4oJVBk+sByxBuGdFg5tZ8PGg 23WmpDHUTHDKFhgYbTkG0N1YdGHMsRugnB/F3OzMzYmRvUFCkdBbPPPesIogJ8vSLY i/3jkiBARlNToPiF8ev38vFQAxjgkOWLj6iD1/IA= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 adcb341a29..cc7fc1ea87 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2648,7 +2648,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0beta2") + (version "2.0.0rc1") (source (origin (method git-fetch) (uri (git-reference @@ -2657,7 +2657,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5")))) + "1adpdvpc7dwc973803nng3mkqn6x9k93xfsy59f1n5dnv5xmbg9w")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:03 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:03 +0000 Received: from localhost ([127.0.0.1]:39628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyF-0005i2-3h for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:03 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:57138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyC-0005fk-2G for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:00 -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; Fri, 17 Apr 2020 02:34:54 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 11/30] gnu: libring: Use ffmpeg-jami instead of ffmpeg. Date: Fri, 17 Apr 2020 02:34:14 +0200 Message-Id: <20200417003433.5608-11-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083694; bh=x/jWkHS1vAFPlGHM34ht0PU9xF7E5XUgKp2hv27DrT4=; 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=f8ygJ8PLLKJ4w1neWjKJ37X2h6evx9eBbv3+13W0uhpXNk1A+9n64606BCtixdbaV 726MUKHYMkfaQ/BosIEAMhJrN0ATgl8ZlisOBS/VTJBPDasQX803UQy2yvSUIoleKm 2YmzvL7CJTG/PJsb1H4XuEe6yIyfMHpTa+WvtWH4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 de60c8bb15..362832f74a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -432,7 +432,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:04 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:04 +0000 Received: from localhost ([127.0.0.1]:39631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyF-0005iA-Dd for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:04 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:39165) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyA-0005fd-Uv for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:00 -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; Fri, 17 Apr 2020 02:34:53 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 10/30] gnu: Add ffmpeg-jami. Date: Fri, 17 Apr 2020 02:34:13 +0200 Message-Id: <20200417003433.5608-10-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083693; bh=CCSR7sE8vV96cMlDe76qRPk7kcwavxEQAR/TCwERRYs=; 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=i6UdbSqgRi2HUdaccLUO9SW8sIrwD3m64/1I4Dn38vHV7dhD0OCASl/owNkbA2gpZ +JV5whw56uYeYlqYDONw+GOu9ML+sjbv2IzlTE1k2zgYtabJg24upcQFff6FZKpeaf o4Rl+Ks5UPR4d+6rmjmb7AEkR11x1h8pBT/vPk6U= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 238 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 21872122e1..de60c8bb15 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -183,6 +183,244 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +(define-public ffmpeg-jami + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (version "4.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.ffmpeg.org/ffmpeg.git") + (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) + (file-name (git-file-name "ffmpeg" version)) + (sha256 + (base32 + "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))) + (native-inputs + `(("savoir-faire-linux-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)) + ;; 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 "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time")) + #t)))))))))) + (define-public libring (package (name "libring") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:04 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:04 +0000 Received: from localhost ([127.0.0.1]:39634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyG-0005iU-5O for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:04 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:44544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyD-0005fz-2f for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:01 -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; Fri, 17 Apr 2020 02:34:55 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 12/30] gnu: restinio: Bump to 0.6.1.1. Date: Fri, 17 Apr 2020 02:34:15 +0200 Message-Id: <20200417003433.5608-12-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083695; bh=Ug3VOQDeL/JW1Zzjj9U9kxS+PEKJR/AwsTqIoQ/dN+s=; 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=FVr2FrXnKXQJ5xo6vkDLlks5tzkXySknMsx+hLp65pdtW25+XqiNJTfxmoLuD/wOy R4Z8qALNjQT2KT25SPRAJjiA9HgiT5yRYblDCfRN4UlpPWb6hYWXmDlMj4UNxtAy7g A8EkLNnWkeA+Lh0gHnhYD89wrjh1zBc7mBQCdIFY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 cc7fc1ea87..8c3a2137eb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2606,7 +2606,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 @@ -2615,7 +2615,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) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:05 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:05 +0000 Received: from localhost ([127.0.0.1]:39638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyG-0005ij-JM for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:05 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:54842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyE-0005gF-3E for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:02 -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; Fri, 17 Apr 2020 02:34:56 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 13/30] gnu: pjproject: Add and apply a patch fixing the crash. Date: Fri, 17 Apr 2020 02:34:16 +0200 Message-Id: <20200417003433.5608-13-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083696; bh=sZn73LGiNXc4oguze8EbERaPhBbOoM0JFXGBufLh27M=; 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=Kfxjprl0BjwhjhxW+qVQyirDszIMvZIwdcfbqkuQlFCgI4VeI3RpRYMmQ//+dpuEk fx7UMS/kGMYElkFubfVqeHyvhwBu+4jE09yrlV+YJxXwsdpmcvkBfLDPEPw7MYBERp 73tjdE55lu2USFn4CZuZsqdPpcbRQ5hedcT/dNzU= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/patches/pjproject-fix.patch | 21 +++++++++++++++++++++ gnu/packages/telephony.scm | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 gnu/packages/patches/pjproject-fix.patch diff --git a/gnu/packages/patches/pjproject-fix.patch b/gnu/packages/patche= s/pjproject-fix.patch new file mode 100644 index 0000000000..8d7e22f965 --- /dev/null +++ b/gnu/packages/patches/pjproject-fix.patch @@ -0,0 +1,21 @@ +--- a/pjsip/src/pjsip-ua/sip_inv.c (revision 6086)=0D ++++ b/pjsip/src/pjsip-ua/sip_inv.c (revision 6087)=0D +@@ -314,10 +314,16 @@=0D + inv->cb_called |=3D (1 << state);=0D + =0D +- /* Call on_state_changed() callback. */=0D ++ /* Call on_state_changed() callback.=0D ++ * While in the callback, can the state shift to DISCONNECTED? Perhap= s=0D ++ * yes, so better avoid premature destroy of the invite session by=0D ++ * temporarily increase its ref counter.=0D ++ */=0D ++ pjsip_inv_add_ref(inv);=0D + if (mod_inv.cb.on_state_changed && inv->notify && !dont_notify)=0D + (*mod_inv.cb.on_state_changed)(inv, e);=0D ++ pjsip_inv_dec_ref(inv);=0D + =0D + /* Only decrement when previous state is not already DISCONNECTED */= =0D +- if (inv->state =3D=3D PJSIP_INV_STATE_DISCONNECTED &&=0D ++ if (state =3D=3D PJSIP_INV_STATE_DISCONNECTED &&=0D + prev_state !=3D PJSIP_INV_STATE_DISCONNECTED) =0D + {=0D diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 62bd8fd548..7ee9bdd9ab 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -655,6 +655,8 @@ calls and messages") (url "https://github.com/pjsip/pjproject.git") (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) (modules '((guix build utils))) + (patches + (search-patches "pjproject-fix.patch")) (snippet '(begin (let ((third-party-directories --=20 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:05 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:05 +0000 Received: from localhost ([127.0.0.1]:39640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyH-0005ix-6I for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:05 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:34422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyF-0005gg-47 for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:03 -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; Fri, 17 Apr 2020 02:34:57 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 14/30] gnu: jami.scm: Add a missing module. Date: Fri, 17 Apr 2020 02:34:17 +0200 Message-Id: <20200417003433.5608-14-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083697; bh=Rodt4MUTihRLZFFIRwiNUWtHZOcpI+815rodE3gLIFE=; 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=fwiDx0WzxcL+12O8kHUi5g48NvETXNvmRHpCM5fQsRN16U0gEPNJNt2DC3SSxal7v oNPXPAbhukq4lGwcJGOq9434uyAWQ57+hWjGd0JiK25T+XlAXbrKCIjIk/Gc/NjVnP 8+aDSGiKdSxnu4t00XFH0j7gfuG1lQNp+wmKvLi4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 362832f74a..65d8c5bb0b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -56,7 +56,8 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define %jami-version "20200203.1.5ee7e10") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:16 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:16 +0000 Received: from localhost ([127.0.0.1]:39660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyS-0005lV-IT for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:16 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:43231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyG-0005h1-7j for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:04 -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; Fri, 17 Apr 2020 02:34:58 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 15/30] gnu: jami: Bump to 20200206.2.996bf03. Date: Fri, 17 Apr 2020 02:34:18 +0200 Message-Id: <20200417003433.5608-15-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083698; bh=GM4SCykzs6sTKsI0Pv9kgiglR/ZcZxMVJ40VvXvOpTA=; 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=jF69KGZExJvxMbIBURxLUK7Fvr0nXnG9kSnrgNeP9+Hs4ZIQxlxtezuWQNvtj9P/g UTRN82fbf2ZTc6s5D50O4qd6BOgisE33mNWI1ccwOdv9/9jc4a10zXCPxKgXkn9wWp KgdYHlu0cqKu+Zz2cfTNc1pgS6wV1NdGq5SlGL4A= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 65d8c5bb0b..9ec4b45a32 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 "20200203.1.5ee7e10") +(define %jami-version "20200206.2.996bf03") (define* (jami-source #:key without-daemon) (origin @@ -75,7 +75,7 @@ #f)) (sha256 (base32 - "0kx0y9jxyhgj6id6n3xxpm54i6b8dqyx9vxwkx505jvhlbxd2x7x")))) + "0f8j9xv5whw3jvxnmvz9w1xq2vc5a9a0f1lpif1gdkk6bl1157lz")))) (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:18 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:18 +0000 Received: from localhost ([127.0.0.1]:39662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyT-0005lX-PP for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:18 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:45025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyH-0005h5-JH for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:05 -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; Fri, 17 Apr 2020 02:34:59 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 16/30] gnu: pjproject-jami: Add a new SFL patch. Date: Fri, 17 Apr 2020 02:34:19 +0200 Message-Id: <20200417003433.5608-16-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083700; bh=gghihWBoy9b15Bzi/wvx84oTN+vXWo0u+wJbRuHR/cg=; 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=a1VHFLXsxzx9lwncPxcA8iQ8AZNND6DUFnuXSn6znQBrDHC5pbiZ4Mu3W0WKCXP2O 9zKcOnbVfiRfokXSxcOBN1rf3gz6JF3vGxdqqgcoljXo9RpXhpjxaEIp3mG5Jz4j59 jMhjCll7Uij8dCDYEdLnXUlYtbqRM59VYF0lHM1g= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 9ec4b45a32..e28f97c4d9 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -164,7 +164,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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:18 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:18 +0000 Received: from localhost ([127.0.0.1]:39664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyU-0005lg-2X for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:18 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:55785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyI-0005hK-M9 for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:07 -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; Fri, 17 Apr 2020 02:35:00 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 17/30] gnu: pjproject: Fix formatting. Date: Fri, 17 Apr 2020 02:34:20 +0200 Message-Id: <20200417003433.5608-17-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083701; bh=RHeddDG4ib6DHtYubjWspgmdvmBvY1tWwfGCShiOzhA=; 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=bZOcWLz87xiFN8pwKCL7hR2CuxdhZpDuCasMfedArVnNtTFCi+VULt0t3Gs//zh5H Q2Fbuu+loZbyugjUOOhHlQZBK1pJKFfTaO9zoL747IYQCjHGQ4YismzkKjLwOHOqRG e7HK8TmhYI4hipQvUNdIq9pe3LKH0cjQ9s3Zz+C0= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 7ee9bdd9ab..64a5827795 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -706,10 +706,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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:18 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:18 +0000 Received: from localhost ([127.0.0.1]:39666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyU-0005ln-Bp for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:18 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:57140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyK-0005hv-7Q for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:08 -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; Fri, 17 Apr 2020 02:35:02 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 18/30] gnu: jami: Make gettext a native input. Date: Fri, 17 Apr 2020 02:34:21 +0200 Message-Id: <20200417003433.5608-18-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083702; bh=cprKVj2XgpDWl2+4x1PL+1GfIrhG2r/kXn7hIju7pqY=; 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=L/L4S/VnnkmmFkGLEmvW5Ig81Y39D/5MlUe1Na+Qu0wpcTxWPm72bwKBw+0+9H01B AkUppf4BWBl17xe9bFohIXR9hEk1+xYjLxHZSDbxUm2YWy7yNAozKgNCW0fHkWjl5O tgiNZ91mZMA4ZxL8nOZCnkmhZYPTJu6paq+Mj/nU= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 e28f97c4d9..2a5d282fdd 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -546,7 +546,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 @@ -563,6 +562,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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:19 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:19 +0000 Received: from localhost ([127.0.0.1]:39668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyU-0005lu-KM for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:19 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:58689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyL-0005ic-Iq for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:10 -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; Fri, 17 Apr 2020 02:35:03 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 19/30] gnu: jami.scm: Untabify by emacs. Date: Fri, 17 Apr 2020 02:34:22 +0200 Message-Id: <20200417003433.5608-19-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083704; bh=rdKQZb+3k1sucLxGAGp7t6+69BA1LsjjRTPtx9Pjtp8=; 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=uzzVlSIxb3LiZGLJ4vfxYPvSFoxrN4dReenBcUVgUtw10MW6h/Pb9jsKZwpb5wNX/ djtBKY3efxBQ0daM3zGkBEOeyux7QKVCyjCkYh7cWYiekQOGVZiY44ekriH0xb7nJQ xs+cZZNADCbQ0fKXoI7uRSMy/ymnJ6s+s269YCig= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2a5d282fdd..96969eb349 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -133,7 +133,7 @@ "CFLAGS=-fPIC" "CXXFLAGS=-fPIC") #:modules ((guix build utils) - ,@(@@ (guix build-system gnu) %default-modules)) + ,@(@@ (guix build-system gnu) %default-modules)) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -165,7 +165,7 @@ "ignore_ipv6_on_transport_check" "fix_turn_connection_failure" "disable_local_resolution" - "fix_assert_on_connection_attempt")) + "fix_assert_on_connection_attempt")) #t))) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does @@ -225,7 +225,7 @@ "--enable-protocol=udp" "--enable-protocol=unix" "--enable-protocol=pipe" - ;; enable muxers/demuxers + ;; enable muxers/demuxers "--disable-demuxers" "--disable-muxers" "--enable-muxer=rtp" @@ -260,14 +260,14 @@ "--enable-demuxer=h263" "--enable-demuxer=h264" "--enable-demuxer=hevc" - ;; enable parsers + ;; enable parsers "--enable-parser=h263" "--enable-parser=h264" "--enable-parser=mpeg4video" "--enable-parser=vp8" "--enable-parser=vp9" "--enable-parser=opus" - ;; encoders/decoders + ;; encoders/decoders "--enable-encoder=adpcm_g722" "--enable-decoder=adpcm_g722" "--enable-encoder=rawvideo" @@ -297,7 +297,7 @@ "--enable-decoder=libspeex" "--enable-encoder=libopus" "--enable-decoder=libopus" - ;; decoders for ringtones and audio streaming + ;; decoders for ringtones and audio streaming "--enable-decoder=flac" "--enable-decoder=vorbis" "--enable-decoder=aac" @@ -331,7 +331,7 @@ "--enable-decoder=pcm_s8_planar" "--enable-decoder=pcm_u16be" "--enable-decoder=pcm_u16le" - ;; encoders/decoders for images + ;; encoders/decoders for images "--enable-encoder=gif" "--enable-decoder=gif" "--enable-encoder=jpegls" @@ -344,7 +344,7 @@ "--enable-decoder=bmp" "--enable-encoder=tiff" "--enable-decoder=tiff" - ;; filters + ;; filters "--enable-filter=scale" "--enable-filter=overlay" "--enable-filter=amix" @@ -355,7 +355,7 @@ "--enable-filter=fps" "--enable-filter=transpose" "--enable-filter=pad") - ;; platform specific options + ;; platform specific options (if (string-contains (%current-system) "linux") '("--enable-pic" "--extra-cxxflags=-fPIC --extra-cflags=-fPIC" @@ -375,34 +375,34 @@ "--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 '())))) + (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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:19 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:19 +0000 Received: from localhost ([127.0.0.1]:39672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyV-0005m8-6o for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:19 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:45027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyM-0005jB-QS for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:11 -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; Fri, 17 Apr 2020 02:35:04 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 20/30] gnu: jami: Bump to 20200214.1.7488e86. Date: Fri, 17 Apr 2020 02:34:23 +0200 Message-Id: <20200417003433.5608-20-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083705; bh=qcrSDQBjWuZtVZ/kgt3CwJ78EKhjXBFes3/2JiF7uuY=; 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=b1jJR3JDcF5Sdxvmr4p0T8GTdBXTIjIFMP8wZfe3LoEqDtCXHDRzv7D8uz43+e9kq TxHqPpRgGUsfCj/KnVUZtS8HNoOx8TbZtf4ta92vR6Yq/tm6LDnbd5LDJW/VjvT47h g1wfgudURM6JhjOP6GJ6HdENOCnBvt7Mf9bFtXOM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 96969eb349..f67ef45072 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 "20200206.2.996bf03") +(define %jami-version "20200214.1.7488e86") (define* (jami-source #:key without-daemon) (origin @@ -75,7 +75,7 @@ #f)) (sha256 (base32 - "0f8j9xv5whw3jvxnmvz9w1xq2vc5a9a0f1lpif1gdkk6bl1157lz")))) + "174akfri3l1wjchkybz3ida975k7fxwd9vhpfxqyliy1i894z721")))) (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:19 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:20 +0000 Received: from localhost ([127.0.0.1]:39674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyV-0005mK-Mw for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:19 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:41379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyO-0005jd-2V for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:12 -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; Fri, 17 Apr 2020 02:35:06 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 21/30] gnu: opendht: Bump to 2.0.0rc2. Date: Fri, 17 Apr 2020 02:34:24 +0200 Message-Id: <20200417003433.5608-21-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083706; bh=MdPJYKbYcxYCKAqzL3UjHief9osqhdi4EMCHEoYF8XI=; 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=SeACGKH30+//29Ka5hV6h4eI5KzWEjfKc9QaQ3MfpG2oMS/7X1IcjYK6TmaOaZHiI WKYwZ1/12pfTnPAdAtZilL1mliXIIWpUZHOuCumFyTi7gCVrczkjT5f+H4bOKaqXSa 2Ev6lbU6Ke5ATH3OdfeyXNTi5oJbGMPpqtL3bkZc= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 8c3a2137eb..7707032aba 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2648,7 +2648,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0rc1") + (version "2.0.0rc2") (source (origin (method git-fetch) (uri (git-reference @@ -2657,7 +2657,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "1adpdvpc7dwc973803nng3mkqn6x9k93xfsy59f1n5dnv5xmbg9w")))) + "1l3j55qqm894jc9r2sd55snqpcdp9k0kmy7iprpf707jg67c22ij")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:25 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:25 +0000 Received: from localhost ([127.0.0.1]:39676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyV-0005mT-V2 for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:25 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:44549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyP-0005k9-SG for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:14 -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; Fri, 17 Apr 2020 02:35:07 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 22/30] gnu: networking.scm: Add missing copyright year. Date: Fri, 17 Apr 2020 02:34:25 +0200 Message-Id: <20200417003433.5608-22-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083708; bh=0JZqC+dWHAtC2fPMsX3YbTu8EThDAa7fBgzevLyBgkY=; 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=mhvfntNXhZ/sFbk/8bzCCkvQp0nsACojqUwwAYkk8YaGI95YTbhBmPcjoyRVHRIDD leDADkBrcvuvFxmX+5TAeBUf3/YcjpUkonM6N2Y2C5EKolhJADgBUmaEMUNVcWVNLM joW0lu9rglpw6X84PZFRtwOPDa2XQ2IyYhLD7WKM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7707032aba..8f020a6179 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:25 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:25 +0000 Received: from localhost ([127.0.0.1]:39682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyb-0005mu-5t for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:25 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:54848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyR-0005kT-Di for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:16 -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; Fri, 17 Apr 2020 02:35:09 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 23/30] gnu: pjproject, pjproject-jami: Remove broken pjproject package. Make pjproject-jami package stand-alone by moving package code from pjproject into it. Date: Fri, 17 Apr 2020 02:34:26 +0200 Message-Id: <20200417003433.5608-23-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083709; bh=a3YmKJlOfqnrz5ckCU5YSTU0uIxlAnDAwoqXbym6fRk=; 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=DpnqWjlrhICx37XPoSigOXNtXtfzIFwai37XV6rHAnePX3nAc8MML5Zd49AK73vBZ YyLSjbZjkM8Rutfz6nmJmqkyunF5nm2ipFe7+nHwe81M/8pwunUz0uBgqUAwvoSrnf z1rjhhrTU/3nB2hwC8/9alBzMYTHO/4aNphFJGEs= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 67 +++++++++++++++++++++++++++-- gnu/packages/telephony.scm | 88 -------------------------------------- 2 files changed, 63 insertions(+), 92 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index f67ef45072..61236ff9a0 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -95,11 +95,66 @@ (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))) + (patches + (search-patches "pjproject-fix.patch")) + (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 - `(("savoir-faire-linux-patches" ,(jami-source)) - ,@(package-native-inputs pjproject))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("savoir-faire-linux-patches" ,(jami-source)))) (arguments `(#:tests? #f ;; See ring-project/daemon/contrib/src/pjproject/rules.mak. @@ -183,7 +238,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 (package diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 64a5827795..b3d2b8bc70 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -644,94 +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))) - (patches - (search-patches "pjproject-fix.patch")) - (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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:30 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:30 +0000 Received: from localhost ([127.0.0.1]:39685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyf-0005nP-TI for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:30 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:34428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyU-0005l6-GJ for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:18 -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; Fri, 17 Apr 2020 02:35:11 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 24/30] gnu: jami: Bump to 20200326.1.f8d3d10. Date: Fri, 17 Apr 2020 02:34:27 +0200 Message-Id: <20200417003433.5608-24-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083711; bh=K9fI6Pg72Vk2pCNvKeBG87t3IUuqrsDZKEX3qU0OK9o=; 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=k6e6zavUgdwywYNh7QUBrY9Vtg/Dy4KSO1bgegxZdNLQ7vwvXBLuV9cc4QFjfi7Yy r+19W/6vbuQYBmUQ46S5/yXYKuPY9SBXk8aApod12a3rcZo3vyya8+ckP3lpbOvPlr HE6BWwHOKhn4MKgNSUkpNZCPhhCwxRd5ahHUALAA= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 61236ff9a0..7d4f13250b 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 "20200214.1.7488e86") +(define %jami-version "20200326.1.f8d3d10") (define* (jami-source #:key without-daemon) (origin @@ -75,7 +75,7 @@ #f)) (sha256 (base32 - "174akfri3l1wjchkybz3ida975k7fxwd9vhpfxqyliy1i894z721")))) + "05mi8axxfslbmqc0658zxnjyhgihh5mn97g8hdasd4ip96gyyv1p")))) (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:30 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:30 +0000 Received: from localhost ([127.0.0.1]:39687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyg-0005nR-6f for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:30 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:39176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyU-0005lE-Hb for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35: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; Fri, 17 Apr 2020 02:35:12 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 25/30] gnu: pjproject-jami: Bump to 2.10; apply some cool patches. Date: Fri, 17 Apr 2020 02:34:28 +0200 Message-Id: <20200417003433.5608-25-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083713; bh=PGRgbt87QqPnnMK8A7AJw8XmVVunfL/QrRhPugHIu8Y=; 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=CBZEKYG3NwgrhmguWFFc4argMJFDUO7We+IkTRg3hBR+lIGWM7x9QkAKPxa8djHhj k0tIz9Dlp17ZODvpPR2fyYjAcktGiidFX/On2FT/CRSduO6B7YxHrL+tiYNJy9IafY oV0fgT1QXeb8e9kbeu97FN5HiyJ+1FC7TznNSB8U= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 7d4f13250b..d52bfa866e 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -96,16 +96,14 @@ (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))) - (patches - (search-patches "pjproject-fix.patch")) (snippet '(begin (let ((third-party-directories @@ -137,7 +135,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) @@ -159,7 +157,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" @@ -204,23 +202,15 @@ (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" - "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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:30 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:30 +0000 Received: from localhost ([127.0.0.1]:39689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyg-0005nY-GW for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:30 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:55796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyW-0005lM-5e for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35: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; Fri, 17 Apr 2020 02:35:14 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 26/30] gnu: jami.scm: Indent code properly. Date: Fri, 17 Apr 2020 02:34:29 +0200 Message-Id: <20200417003433.5608-26-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083714; bh=HH3VTMgvwZK7W6T3dx1P6FXv6Eq1FrTRkydeBgjjxHY=; 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=KdRS2pgWfPNEP4P7GrIRowO5V369pk4gsIyEmJCAentCs9kC9f8nQB6T/O3hJ7FBn kKBjTjKOWBH7Ybb8mEptRToGMzx+Z5U00dQWPA9b4CTr2Rwy5Cwi3YBiqIznO0q//a DkGD0n5VM2SwxreY0sjWNfwbZesEDHErc7VoOU78= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index d52bfa866e..899c6fb747 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -158,33 +158,33 @@ ;; 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" + "--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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:31 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:31 +0000 Received: from localhost ([127.0.0.1]:39691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyg-0005nf-QG for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:31 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:54850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyX-0005lU-MR for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35: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; Fri, 17 Apr 2020 02:35:15 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 27/30] gnu: opendht: Bump to 2.0.0. Date: Fri, 17 Apr 2020 02:34:30 +0200 Message-Id: <20200417003433.5608-27-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083716; bh=nIFlew6eEn/VcXKwiWq9t+7RB/IfXcOF7kt1UsC9J94=; 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=OD1LiQXAO6E3LnqcEoKCQRwO6rPKsVfscCq8jwNLq8EbTH0N6+8b5gF3H/0b5WPro vb0Fm3qF6+Ds2KsHhA7bD1UMcLm/Q7F1epyB+1z6vzoHnjdVozhEGJuY/UK11TG9c2 qD6YC3iN/mMkUXB/+ybrjYKeRPAD1BcPaYSp/j8M= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 8f020a6179..c8d009080b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2648,7 +2648,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0rc2") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -2657,7 +2657,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "1l3j55qqm894jc9r2sd55snqpcdp9k0kmy7iprpf707jg67c22ij")))) + "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:31 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:31 +0000 Received: from localhost ([127.0.0.1]:39693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyh-0005nn-36 for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:31 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:34431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyZ-0005le-90 for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35: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; Fri, 17 Apr 2020 02:35:17 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 28/30] gnu: jami: Bump to 20200401.1.6f090de. Date: Fri, 17 Apr 2020 02:34:31 +0200 Message-Id: <20200417003433.5608-28-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083717; bh=vgTFa2jyFtASQp/9XoyV12VinBwEaFMjRN2z2WVdBgA=; 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=QmjmwqEmJllnaUOR87nyYXbh9RLrEYtdF79neYtpbo+Rnahe/ZbB+53HFtZFYLkpG zygymkfEt1RdxCf07YD6ZwC0xyVYFIWluqZxtWJx5Wr5V4rvyj/drjaJWxDn3rtMUO Dea1XgXv8lmEeLlg90wlHmPQYacmHvbZZ57Zgi04= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 899c6fb747..608baea660 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 "20200326.1.f8d3d10") +(define %jami-version "20200401.1.6f090de") (define* (jami-source #:key without-daemon) (origin @@ -75,7 +75,7 @@ #f)) (sha256 (base32 - "05mi8axxfslbmqc0658zxnjyhgihh5mn97g8hdasd4ip96gyyv1p")))) + "0lryx9n1jn0jsw7s10pbwivqv0d5m3jdzhdhdyg5n02v72mjvkmh")))) (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:31 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:31 +0000 Received: from localhost ([127.0.0.1]:39695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyh-0005nu-Ek for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:31 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:45034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEya-0005mL-Uh for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:25 -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; Fri, 17 Apr 2020 02:35:19 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 29/30] gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. Date: Fri, 17 Apr 2020 02:34:32 +0200 Message-Id: <20200417003433.5608-29-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083719; bh=ygYgOZ8aDZuJgn5ZX+8cf26RYj0q+3WsNbkGARbNKXM=; 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=vG+Mfi+FHm+5VmU/syeealFY2EdqJqaojvz4uqXpOfIgwqlI7dKeojRX+a156JBB9 g2W+vsT5/MdfAeQdInElbwa38vMReBJ/A/ttCpp+gQQJPRb2qsfBoJyjGWorw7hjQc fRTCIqDGcXlQeM35jA6pzZNpB0D5gKradFHXso08= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 608baea660..00ee79fce4 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -611,7 +611,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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 16 20:35:32 2020 Received: (at 40677) by debbugs.gnu.org; 17 Apr 2020 00:35:32 +0000 Received: from localhost ([127.0.0.1]:39697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyh-0005o1-Ng for submit@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:32 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:55800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPEyc-0005mf-Bs for 40677@debbugs.gnu.org; Thu, 16 Apr 2020 20:35:26 -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; Fri, 17 Apr 2020 02:35:20 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH 30/30] gnu: pjproject-jami: Add the missing "--enable-epoll" flag. Date: Fri, 17 Apr 2020 02:34:33 +0200 Message-Id: <20200417003433.5608-30-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587083720; bh=fU3gQh6afOq8xHCXVWGNPQcORb4J9PMp5dzp783HctI=; 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=BC7865qkp69J5s9ya6T6/D1A4s2nVqwr+8r2d41G2Oye7PoYr0dWxjLkG955eIQmp iiEMmaO0HZSA3Vv4DfbsJZ93YcPq+4S42kiZQzHCZBWCMrcoQohYIp4+va3r/Ej9iH v3hr0egNCSCX7x9Qq5irZp7EAa8yO0ms3I5PYvUY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- gnu/packages/jami.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 00ee79fce4..58280b3b7c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -160,6 +160,7 @@ (list ;;"--disable-oss" ; do we need this? "--disable-sound" "--disable-video" + "--enable-epoll" ; if have linux "--enable-ext-sound" "--disable-speex-aec" "--disable-g711-codec" -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:13:52 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:13:52 +0000 Received: from localhost ([127.0.0.1]:42091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmM3-00033j-Tn for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:13:52 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmM2-00033V-Mm for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:13:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id g13so3998665wrb.8 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=RUDlTDI0kOeW32rjfybkR1HJZNz3IuXUvf9l5VOK1ug=; b=mJ8LzKbYwSa8iozqW0Oxr60hytpIPHEFzLIFcjvIrCJNnKYLlJ3oT5G3e/mN42M2CD IWBjwYFRGex4fRSb+ytDTfOdI1HL9+LVD9A4075wIjUKkgi9ltsDvsbkmvIqePgIDuF7 Od4EqN905Yrm0DtvTU7Ke/l7DGEYzHuRYpGQd3W7jZFCN9C/wOTO7cxTZaesmjL0u1e5 qAGXBo3QpR8ehowbLki5ch5/xaNWXcRS7+lxcN81AoHmGjkTERRmYjAAQap4CgaXAhCm d5cOxltzisk+mm2OOwVPo6+DguodKx6HVPyYAABAz0hXbnMmi53S6KQfGUmvYWOPzL7m LuwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=RUDlTDI0kOeW32rjfybkR1HJZNz3IuXUvf9l5VOK1ug=; b=X/5oFPhtVb0r8LoP2IqdpL0pjFAu+BfZNP9wrpXI3Eo7C3Gz8hvOLY2imxH+pxpZzk FFHaDDT7RW/UFJXN9pf+Wvro8vGSefDJzPct/oacga0ER03bv2Q/Nd08zP71wpFIDcQQ vg7HrsjGkzXberWUsm45N/xT097ApRQKkd9DIK9xu3Y9MlqKBzXuTJ3Tcb7qb6rf5Vxf EDl9NC5U/GXai4D886jgaqs4zWu23+Ii0ETGnBbZY+7wYjykHTQWc1++OhSWfl3tSFM0 In+qnTLzLvr19rVyilPGqZiisi6HCUMuIQcSY+1HRZRvujipPhRxL6lNTBF+OOSB1yln AkZQ== X-Gm-Message-State: AGi0PubKudsIiARsAKmuoUKYJ3gIaP5gcb98EWUKlo5I3SrBTuth2uyK IERw60ZBEDl9JW8jUWuSDKgR185i2yc= X-Google-Smtp-Source: APiQypK0Cwk+7wPzNv9tiVXlNcdUwtkbZ4xJ4VtCCb/OQQUcCJZyOSQokoYS/Wzrfqx5GtPnlmZ7mQ== X-Received: by 2002:adf:9d8b:: with SMTP id p11mr4959708wre.322.1587212024627; Sat, 18 Apr 2020 05:13:44 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id f18sm12776533wrq.29.2020.04.18.05.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:13:43 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 01/30] gnu: jami: Move Jami and its dependencies to jami.scm. References: <20200417015857.0650ff6a@interia.pl> <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:13:42 +0200 In-Reply-To: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:04 +0200") Message-ID: <87mu79j8jt.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Hello Jan, Nice work! Please find my comments below. > gnu/packages/jami.scm | 350 +++++++++++++++++++++++++++++++++++++ > gnu/packages/telephony.scm | 291 ------------------------------ > 2 files changed, 350 insertions(+), 291 deletions(-) > create mode 100644 gnu/packages/jami.scm You also need to update 'gnu/local.mk' when adding new files. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:16:32 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:16:32 +0000 Received: from localhost ([127.0.0.1]:42095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmOe-00038e-BU for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:16:32 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmOc-00038Q-Qd for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:16:31 -0400 Received: by mail-wr1-f67.google.com with SMTP id x18so6071306wrq.2 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=YEuB1pIMWwECXzE/CuHO4Pp/GRo/YxtCVTDi2pJsmdE=; b=CXvC5sKOLloHelfA8RK/b3/51OrVe/vwjGfpXQqri6QOfQqx1xMphdlgUd9Ox7eJky JC35huNsyB5pOypBC9NjdCoBSx4wVZnhrUVmfydOHNc+c1REa1Yg9duzM0z83aGWhamb ra9VhkJWsd12Y4xkjRUpWAZlN7/cXBcF1IILVvV1Y2JqPsuksW99FUP++xm0LkBs3BNR EhDCqqgaQV+XKt+dUPI6QsmS2LEGXsuYG78kOzrkmE35LBDqo+yppfrNGP23oAujTJEA UUPoieWTyYI5QGHuwRQ1j88/f/EmqLUU4pHCo7UfzVMs0IySnc25bbHPT2cvdaOoC+kg JTQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=YEuB1pIMWwECXzE/CuHO4Pp/GRo/YxtCVTDi2pJsmdE=; b=Nw3HJYihkeWFZGSeg9Qwd4F8UQHWyssQE774xKvDUajIbHbBukl9T4fMthbitcuyDt sPg1sLtv2Fg7tY6umoUUJRstCTC/tg3ajOmH84YIvY8Vf9fZ2MIebuSMJ4iynvYHqcn+ yKx28mT+vKVGJBRcuK7bYrtffu2wvmZKIhuYHhgpDu5AIgHODN2B43bJUfqVAX+0hnCM UlBPK4shQO1wOVWiymmQFedJlhTOKIPo+2qIra3YaDFlWxMSePdUjNaxfF4nseF533hW JCiqYRbMcFSg9+JApmlC4YSVmGQZzF/9xLzJFs2cK+yK9IM92VQNXz8l+6BkDhWjpmXi v9hg== X-Gm-Message-State: AGi0PuaTsPoL4AZ+EuQS5EQpoGpI0PrDedIIw9tU5lqUUM+VRPyDZ1SP gODEUYge/Hh0MwbXHPTovP1IG8RfbEA= X-Google-Smtp-Source: APiQypILd1ZbSiSLTVjZAwVBUOVkut6Qmy0/jYW9RrtOOUHwbWnEy7lsjGt2Iv0w+E2fkvEVO+nVIw== X-Received: by 2002:adf:8b8e:: with SMTP id o14mr9462266wra.392.1587212184836; Sat, 18 Apr 2020 05:16:24 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id 74sm24056445wrk.30.2020.04.18.05.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:16:24 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 03/30] gnu: jami: Fix downloading by changing the prefix to "jami_"; Use the "release" dir instead of the deprecated "ring-release". References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-3-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:16:23 +0200 In-Reply-To: <20200417003433.5608-3-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:06 +0200") Message-ID: <87imhxj8fc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) You need to add a commit description for this one. What's written in the subject line should instead be part of it. Mathieu > --- > 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 0e6218c4a0..8601ad718d 100644 > --- a/gnu/packages/jami.scm > +++ b/gnu/packages/jami.scm > @@ -63,7 +63,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 debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:24:29 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:24:29 +0000 Received: from localhost ([127.0.0.1]:42100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmWL-0003Kc-45 for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:24:29 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmWJ-0003KP-Gd for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:24:27 -0400 Received: by mail-wr1-f65.google.com with SMTP id b11so6056394wrs.6 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=MxKIA6E1ijQGqPr9ca+y7I4OHcKDJiyWDzvuFjE4d8o=; b=iwyQNeV0WbAjZwVvQPGNAhCVvBKfYFNRP/rLONDni4VhYBFicJ3vkObwS5Mza9u0uB Zhs01zsLepf7hAUaPJC0N47lM98zsnX8P2Rp5Eg/5Zh5O7+jIs442ejjDegXfJGyayej owxOclc/s4Ok72figP+f7orNpICXtHmTV0gVQ6Ro/81B+aptk0xOvT+ywcqfM+84yVPD KaqCHt0UaaKMcSiFyhC1zN9C9JNM1S7ChYXZYBlMYjJy3INQJerPQ0xEwz2WH7SMAWIN rvlnbOhnU49LKpUbMuZJxn31cu+AYNPLTK/pbamgz7LQY6E24UujX0y3/w5nnEaqgZg3 julg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=MxKIA6E1ijQGqPr9ca+y7I4OHcKDJiyWDzvuFjE4d8o=; b=pqqJGh3SxwY3GA8qfzQciyKiWNuqufkqsJ2UJ5NI2a9vy9sY/+ScPJu9OVYrzeKLls F7auXKDjaDZ5v79PbSMr6T9L3OWPm23F1Xq0d+dmX2utw18FvUIV0nr7PhLlI+mb39G9 WnneT5M8AnK6UAF5iTwdsDvd7Fm5QZ0dSfhGWBglRKmby0xBcuMCyzTTdK9zxgDD2L7y i7KIZqbr+EmfrmCjKuBG4qF+8pC2XWi1NY+1XY4OovC07tdPk0R7mpOuNPXz5l2xAO2E KL715dhZCaHEafBt8oAbcAXdXqc7CCSVBcXBSctDDmRZ4Ey+kelG2Mu/fEJctBs2C4VB OpkQ== X-Gm-Message-State: AGi0PuawQF/jtr9P2NRUD/4Oe2d5nLffciZJfo13UvOa1lxIiqRss3qp bvH3uMTuA8XKMRGvqAn2qyZMT4SVwGU= X-Google-Smtp-Source: APiQypLU4IoqAMuQBsDG1r7Ia+z5S8+tY/mg7mFbFBMrX85Lm9wSB0jWtQMXWvBzwGl9RRo5z+TkJA== X-Received: by 2002:adf:f884:: with SMTP id u4mr8665109wrp.171.1587212661427; Sat, 18 Apr 2020 05:24:21 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id c17sm36130961wrp.28.2020.04.18.05.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:24:20 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 04/30] gnu: jami: Add a generalized procedure for applying patches made by Savoir-faire linux to Jami dependencies. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-4-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:24:20 +0200 In-Reply-To: <20200417003433.5608-4-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:07 +0200") Message-ID: <87eeslj823.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > + (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")) Do we have to name the directory this way, or could use something shorter and without spaces :) ? Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:27:13 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:27:13 +0000 Received: from localhost ([127.0.0.1]:42105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmYz-0003Oy-Hc for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:27:13 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmYx-0003Ol-Mg for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:27:12 -0400 Received: by mail-wm1-f67.google.com with SMTP id z6so5733534wml.2 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=XdGSEmAqyCMd6PbP75nk95WIcE2T7SQud84ObP/W0FM=; b=MCIGmyL+Wd06gay+oP92cbhu3s11fjRZ8lxHFhjLUmBIRvGXorBPmH0UUlDdN8e45R uuEFdBxHmrjcRudjvnZJfzIXx9wEhyq+jkjYgUKnZcgVx7trj2DRwnCFW11H1/NpEMZL y/NVslRj2nDeIqeYLQeN3pG1RjwmHq8pyiw564yctPutpsMOgA3Zei5OYHbQzTd3z+AY /pQXNVEmntjKNmaLVO7r531qEati5gHOtX4rmI0K4/TKsfaTMy+npj2bDaltNP0Ri/72 zTZA8GCuvmWkG4sXTmqcft+sWA/KcM9c0cXx11DVI7XqtpRtqgoplnLlYzeoh8jZQ10F xsFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=XdGSEmAqyCMd6PbP75nk95WIcE2T7SQud84ObP/W0FM=; b=Fr2miwlsMYj7zIXX+fib46jW4UEnnUGeQ3v4WS3Dc7JbkqeGgSuEQqx/Yd3kmwN7gz pT6JEw17dnV7Ty70Gl58Uv1sI8HB5TabkH48/y9PM2JSYl09xMwKXDUpP/zKXzIJeJMm hV8DmfslY0Gm76evJVzBSw7bngkFgzrv9E6hiikwqhk9w60E5v+0YaIKQNcSrPy0V+c0 nsXxfnwUzl/VOETA6ZhvbCW9d7VszDnl+7XyONfIFvjsNsfw8pvrRdEetNX5st+IxTsW wEF+KNUb3ksJxz628woiDbuEzfB6LK86LLyUKzA/6Joy3HXvyNhXOYv/KeFnLim8ln2I nrOQ== X-Gm-Message-State: AGi0PubfNJ0W6ms6wREYOGxmHEJdgUYIf15diwPzva6OplLnWf1gbRqC lNxEX7UtVus7lVE/sT9qFkhmrJK97P0= X-Google-Smtp-Source: APiQypKrB1CHATltNNac/+fm9gqvSymg0XuE7N6CZIaUoTorRrccBJ4RHjSUfXwoK7PdEIWuF0QJ5A== X-Received: by 2002:a1c:b38b:: with SMTP id c133mr7846300wmf.24.1587212825749; Sat, 18 Apr 2020 05:27:05 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id t2sm11476532wmt.15.2020.04.18.05.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:27:05 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 05/30] gnu: pjproject-jami: Use the jami-apply-dependency-patches procedure. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:27:04 +0200 In-Reply-To: <20200417003433.5608-5-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:08 +0200") Message-ID: <87a739j7xj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > - (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. You can squash this patch with the previous one. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:31:05 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:31:05 +0000 Received: from localhost ([127.0.0.1]:42117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmci-0003WR-Qe for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:31:04 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmcg-0003Vw-G1 for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:31:02 -0400 Received: by mail-wr1-f66.google.com with SMTP id u13so6089781wrp.3 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=m3Bh2tdGbN8O9vb75Lcr3Szaerb7bCFyZke/moE2rkQ=; b=viJwPLbyd1wfmX0j3VGXHmjSarRwXTawrVdzoPTUoPtTnZWpmX++b0A6pR0wLWucf4 XGEZkwgIjwHbPDb14W2TWo1i4um3w6arhMXtERsfc6Asq1krktAv3vl21iOVPBgCkX52 2QKWecITo9m5TOYiggmeiA6kez3WBCBqvaYGRJ2h1RtbmpbewI6A5k2lz9tjMRhRPIi3 tR2lSjMXYzlib4eVrNyhC3OJwXTv1Yx7JTe75WkWD/KcVORs/QCnh61B0tG8vXL/gGIN XneHcBFlSclqPCxr2mWqyam0hUxDDUd4iCwXifATFdBP0VrRsVMvQfrM3kfBtheQ6Zob 2kyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=m3Bh2tdGbN8O9vb75Lcr3Szaerb7bCFyZke/moE2rkQ=; b=lQtYhqsCRaLNs9K/9gccRFLlTdQ25Ob7A5WlPqH63e107P+fTS1Mj9j0Nk6PMHroG9 /KFCxJ84wpjczEl/AeCp+TKVVnRck3ZS2PxAx1qXwbpaHS7M12JAmw3YmM1mrgIuXOAV Hq758OitoUrHYvjQRS9WW5SxCigg4Cc2Xx5cbNLQkfhIame28i4CitUNooRxVDfw+v5+ NVtCuTTOFwwWky24SUz3OoZVoTVjYnEjFqn32psmKOZwLwf5xzF8aiTYp+z1cQkJlGzr GPnLDTif4Cc6Kya6tYVoKqnLvNjYWRyNYBseCW4ewKvnD0WgFOTQTQ/NP7vnyjRsWg9x e2nA== X-Gm-Message-State: AGi0PuZgcmv5qLr6ISccOexWTIzzcIKEyKQ55lpW8biDUq3NfjzUd07o gq2UugncF3P8geZRd1KI9kzQL/j0rB0= X-Google-Smtp-Source: APiQypJr+AOSPefWs9LqpVCXmuv0WWosYGl5XdjDW8Iqw9znZ9+q4EDJQgFnUCwfKKy4UyLFbub9zw== X-Received: by 2002:adf:e586:: with SMTP id l6mr5033614wrm.184.1587213056568; Sat, 18 Apr 2020 05:30:56 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id o129sm5954292wme.16.2020.04.18.05.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:30:56 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 06/30] gnu: Add libnatpmp. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-6-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:30:55 +0200 In-Reply-To: <20200417003433.5608-6-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:09 +0200") Message-ID: <875zdxj7r4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > + (synopsis "C Library implementing NAT-PMP") "library" > + (description > + "libnatpmp is a portable and asynchronous implementaiton of the NAT Port Mapping Protocol (NAT-PMP) written in C.") This line is over the 78 column limit. Plus you can use texinfo markup for "libnatpmp" as explained here: https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html#Synopses-and-Descriptions. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:33:14 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:33:14 +0000 Received: from localhost ([127.0.0.1]:42122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmeo-0003Zb-5r for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:33:14 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmem-0003ZO-BV for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:33:12 -0400 Received: by mail-wm1-f66.google.com with SMTP id t63so4535065wmt.3 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=CtMPrEwCaWObQxjd3jvP3yYRmKOi37i6Fkj8iW6/h1U=; b=ici2D+kdhiA+umQschJmqF1zaaE65O/rNu1Zqx5FhSU5YZS8lxrKgH5gr7PwOHzLsz OkF5k9hn/K5HMc55PonrBVnAfP3SIjsbpiGUUUKslA7vfsm/woz+QkXsANNiwU/k6fw3 s/WoTLrtiERPHsHUbIGx2jswZ0A0SRMwyxcMQ3i84dXkYUD79qgUrjjumNX2c0uxkDaV CBdOMXtXnnDrHwepB5y1zJTfx/BNQcLEmKnrP4W2Swbj32iEygP/iuuOIgrCmpCyhkmL SK+CKEAvQTlYHYZUxzl+tYN63lBfRqsL52yrGL1QZKd2m67wmP8Sd79fUfS35peFYA8F hAuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=CtMPrEwCaWObQxjd3jvP3yYRmKOi37i6Fkj8iW6/h1U=; b=jDZJkwKEH7M6rY9fOVsDJ/yjoCrAfasNkAfcx/YPIBV/KvdSD1RjP3CDgsuKOfWEyD ms4ZII6nkh81+nJKgRQqX5dYx0PcUsqNVTsWHHcIawi15KB9GceQ3JAftvR9FfxR6QtF IehSCuZBJ39Vq9TZuIuluHmgVlmF/BCZPjTZhG2sRZHMFC82lJySD1Bm+uyg+m4DLiRM Jo6eYdwYwJSEWuibtA+2OcFMzSuWMg5t8uJCcVQSrEQcUkdK2l2ofmnJGzovMQI308Di rns4UXPctBneVXLajR9CDAnJAVXalVGOjNzPLQE6uXy0Mwofgmd+WZ1fP+sKxTnfoKBA eMjw== X-Gm-Message-State: AGi0PuZP/cWsXqPGk7HvZZVx8LE8y3IMC/YNbJ4+MlvNP2xpWCet84rj VbEYjAct1wpOS3XCYoVe+ZxPC8YkmyY= X-Google-Smtp-Source: APiQypI1ftnDdHi2F4XseUR67Cgx744jcfx7YBC1Vc/sv/uYR7MMXTZDEkl0Y+2+6hH5XpKfCNHHcQ== X-Received: by 2002:a1c:2b43:: with SMTP id r64mr8306586wmr.77.1587213186396; Sat, 18 Apr 2020 05:33:06 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id w3sm19219784wrc.18.2020.04.18.05.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:33:05 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 07/30] gnu: libring: Add libnatpmp as an optional dependency; remove unnecessary comment. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-7-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:33:05 +0200 In-Reply-To: <20200417003433.5608-7-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:10 +0200") Message-ID: <871rolj7ni.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) You need to write a commit log message compliant with GNU Coding Standards as explained here: https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:37:42 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:37:42 +0000 Received: from localhost ([127.0.0.1]:42130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmj8-0003fo-10 for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:37:42 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmj6-0003fc-Vb for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:37:41 -0400 Received: by mail-wr1-f68.google.com with SMTP id f13so6046698wrm.13 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=5UhKoALwzMIr72ncpGoZGpMUzK8op9eu05cpwdekFFA=; b=Za+CT2lDp8Qr93TAl4MLoVEjL9O4T4Pbliunt0TUTihzgLqx9x+IKKCJoNu9Ej0V2J VwxRwi4lIPF4u14SX6hTY7DxknOV+mySIk7QYC2GzkjbE6OSmPIQZW90WNbzw6I23YtB g7TKbPwlGwWSsFGC7yQSxAwDy1UpLtTWp9jTBWpuo1yMveEC3c5oBIG8rG9occJm/DiF IcmuWNVCFairliFlkAVcOdxeGYDyFp7Tl/LNRfdTpZ3A9LY3VLaxjlcs6L+tkLcKS4n8 6/Cq4kUQ9/TSq3+bFWY+DLtcSFCQexIbVPKsvdra04Uz75B55+pTaLjud9omisbfp0i5 Rrtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=5UhKoALwzMIr72ncpGoZGpMUzK8op9eu05cpwdekFFA=; b=UfQkcGe6OaNmMuTHvMtPFsisPyJe7JWSmpx4xNa6AocV7wf5JiBSKzQVkTVSBQjB4+ Yeei12RE1tx3estLuF2M+IUChEPMLOyZwYFHeuFfDZVWOaPFp7K3XCZNL7vhXLpq7qbA HFWkxUmBEdoEk20F9QG18wsbgnYfFxz4JfJYX1bNWVOWx1ntT5mLXW8PJcjQKva/gd4j yEOGknUgTM7uGo6kuUkf1p0sJ/DGL7+LATisP0ks+9rUeqli2RRo9aiSo+qv8G9ZZ93N ETIrUcUhtcPo11DdBOhUHKXdJ646YhCFStPMe1r+rEgm6diU9yMKTOEgce8zfxJDlE3n SO4w== X-Gm-Message-State: AGi0PubxWLtMtjKI7UcfXUHVzbarTbOUBJXrRZ7unMk2krNYHUHAr6xF bOcwPh6TULbVw1MM2sdcJ9ParFHow8c= X-Google-Smtp-Source: APiQypLjj7fhLQBRwsJMWZ2Q0NSvPNMmAQUAQ2EpOHk3dpanti8RPhQ9ZdjGOSRDddIDJ82cwtwLBg== X-Received: by 2002:adf:dd8b:: with SMTP id x11mr4014951wrl.342.1587213455065; Sat, 18 Apr 2020 05:37:35 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id q143sm12114500wme.31.2020.04.18.05.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:37:34 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 08/30] gnu: libupnp: Bump to 1.8.6; change the download method to git-fetch; add missing dependencies. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-8-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:37:33 +0200 In-Reply-To: <20200417003433.5608-8-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:11 +0200") Message-ID: <87tv1hhsvm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Do not forget to add your copyright on top of the file. > - (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/mrjimenez/pupnp.git") > + (commit (string-append "release-" version)))) Seems that this url is redirected to https://github.com/pupnp/pupnp. > (sha256 > (base32 > - "0hzsd7rvfa87b4hxg9yj4xhdfxx9sp09r9sqdl3mqhvmcyw018y5")))) > + "1jlb6qh47513h2simy0zxia5q61w1c31mnwmjqpr2nf832lmnpk4")))) > + (native-inputs > + `(("autoconf" ,autoconf) > + ("automake" ,automake) > + ("libtool" ,libtool) > + ("pkg-config" ,pkg-config))) There's a mix of tab and space characters here. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:50:08 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:50:08 +0000 Received: from localhost ([127.0.0.1]:42135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmvA-0003zB-40 for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:50:08 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:36493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmv8-0003yX-NO for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:50:07 -0400 Received: by mail-wr1-f46.google.com with SMTP id u13so6127904wrp.3 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=E2wkcILywtxsQuYO+4QAepq/1a1Cnz0e6RPpCRCayik=; b=Qcq/fd7kX7/+N+FlKo2VFJFtzkoz1sQrp4BkbMYbnGZ84W1Tx7iW7iWS0TQBTZ177P DyW1/zJXnT0Gn0rhCBygFS3mpLeFTm3/QyyKSTdcNAeLaICZr5yW0qIVdTf0jXFLwzJo KsuV//PomqoKECYdZGxgGeXky40NkVezi0Fl/leLiWEbOxbqH3gV0cPz2MgaT6B1l+ht m3FfEqulNQyVAe3YDaAgJfJrN4NORnlimOe6V6yh0Q+PtKZAMSncrCHHl2UaailJeyh0 0JljSiM0mwjV+POcGH8ZhP+x+s3MpwTqy8D7B3dykFhvQcJ+VK0jIh8crfpKPMUURqop yf2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=E2wkcILywtxsQuYO+4QAepq/1a1Cnz0e6RPpCRCayik=; b=ZWwiXez16BNDTEu1IXbMcBZbfoBeGNh1+a5hPrZB/B2OGALmd97ZVj0ojl524NY3mf wLJpbUobYsHpAX2yEIpcqVaR/ztliqgPCjlbaURcGcIKUn5hz1luzYKI11NI3+iU/TFw AMI1kt8VkIKFRyAgezTNyHrO/a8SoLyJof0AgUOsxkRmKIWXjXEUKjSgPh6SJV3y6M9Z E9JEOo1efCe+vjaocEzAsj6JEenGNWdUm7AOpajcQZW1A/j8nDkhUaTlo1MmPUACecIo pkkzcgyXfD+NQqKaRd7PAZOOXWDa3Y4WJTg0dupiQ/vU4hq3oAi+3yWUxRejPsMYlt2u tsVw== X-Gm-Message-State: AGi0PuZx6R4qYINscGnzBKzE1QlStIoG5WDgpDNhpcK/aLoaMnG7E/Xa 5Cc+ONTaWzdLo8lkd9U81NDjS0SKWks= X-Google-Smtp-Source: APiQypIPj1jHRefbs2rszJ85UVI+BdBiVMqu24j9jDNYN+hzfpoFaH6XMzA0AMUdWfUbq/XzHNuR9Q== X-Received: by 2002:adf:fad0:: with SMTP id a16mr9818492wrs.149.1587214200330; Sat, 18 Apr 2020 05:50:00 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id s17sm11873815wmc.48.2020.04.18.05.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:49:59 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 10/30] gnu: Add ffmpeg-jami. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-10-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:49:59 +0200 In-Reply-To: <20200417003433.5608-10-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:13 +0200") Message-ID: <87pnc5hsaw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > +(define-public ffmpeg-jami > + (package > + (inherit ffmpeg) > + (name "ffmpeg-jami") > + (version "4.2.1") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.ffmpeg.org/ffmpeg.git") > + (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) Do we need this particular commit? If so the version should be: --8<---------------cut here---------------start------------->8--- (git-version "4.2.1" revision commit) --8<---------------cut here---------------end--------------->8--- you will find some examples in packages such as guile-webutils, or boost-sync. > + (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 '())))) This long list is a bit scary. Could inherit from the one of ffmpeg and add/remove only what's necessary? The default values should also be omitted. > + ;; Comes from > + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". > + ;; WARNING: These amount for huge changes in pjproject. That's only three patches here? You can maybe remove this comment. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:54:15 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:54:15 +0000 Received: from localhost ([127.0.0.1]:42139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmz8-00045N-RZ for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:54:15 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPmz6-000458-Pz for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:54:13 -0400 Received: by mail-wm1-f66.google.com with SMTP id z6so5784820wml.2 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=iR6+uxXBXjek+I1ZYN2x/Qm7hIVvdarzJFDayxr1vs4=; b=Qdhrcc84UQZWpvcmz9kMZ30GaYHI9ezH2cXveOAjjEnq8ZglVmWKZGYIsUX2Ebs4ol klwhvy71yJ5jUvt/6M+7P913+zx2RhaYGVTsl+G8hYljjXo5h/qF0rZx6tE0iv4r9dez IODyuiP63OOR/VgS8RA81qCwzeL/bErpvRZYIAQR4Gq9CP4obxemcFA15nDi6RU8gmZm u/jdV2qFWNEKW0J4hOVcJJ22eUyfiCpbELnn3hDzpOhc+HQZ6Qs2d96zxw5LzGa6Ix8u 73e7h75kVjqgUeekmNQBY6oNL+zlmlD+67cFqBjgZcHdGnshyv6lymsycKH2emQthtzZ hVWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=iR6+uxXBXjek+I1ZYN2x/Qm7hIVvdarzJFDayxr1vs4=; b=NI0Bb9Aq4p0LBoALy6DWhYJE8yq15SfH6KC424139+JOx4D+UP8OoJ1c4tmObUzqfV emkC89ezqzbiTj8xXkjOvRLiSD+lcCOwQOIbt6z4lV+z9wDWcjsX6EU+in0IWqTUQRhw gYqVpWm452IwEvWZvHOjsHcoIljbf4g1BeOpOa3tAGhd4UMu9a7SU9sQPEQ/D7WuXBBO 47GKHflzFJi1Tcp2xyUgNfxT94kF++dA8blfr5EvHCvj3TraBndROuhKkJ0G+uLmrc69 EStlDa1VZGO++jb+eLMuqc16TJbMta+q/rwh4cotQQZYUCJAR8EmRWQRFERFV4cijaVM CJQw== X-Gm-Message-State: AGi0PubJgKD2XMH12u+8SQOeW7ZEDIQ000ZZXlhCCeB9RTObCTlvGLuL aBCrYhgZ5DV/9BfKiQcoNq2lR6IQIHg= X-Google-Smtp-Source: APiQypLR/9nNUmAvt4AFUTIsxOkm0+fOtqq8eRkzpntT1I20bsho0wqpZKmcEkm/RgUZmlAhAi/iKA== X-Received: by 2002:a05:600c:204b:: with SMTP id p11mr8064955wmg.92.1587214446825; Sat, 18 Apr 2020 05:54:06 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id y63sm11750744wmg.21.2020.04.18.05.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:54:06 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 13/30] gnu: pjproject: Add and apply a patch fixing the crash. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-13-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:54:05 +0200 In-Reply-To: <20200417003433.5608-13-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:16 +0200") Message-ID: <87lfmths42.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > gnu/packages/patches/pjproject-fix.patch | 21 +++++++++++++++++++++ > gnu/packages/telephony.scm | 2 ++ New patches should also be added to 'gnu/local.mk' file. You can find an example here: b03ee02f. You also need to explain where this patch comes from, and why it is necessary. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:55:49 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:55:49 +0000 Received: from localhost ([127.0.0.1]:42143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn0f-00047r-69 for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:55:49 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn0c-00047c-IZ for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:55:46 -0400 Received: by mail-wr1-f65.google.com with SMTP id f13so6080981wrm.13 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=pfRmTnARgqCK79+nL/ujK0hHoH2ZrhBzyNntnniYaVI=; b=YFa/vFIxTmB9/wLRqRh/FVgNOum3u2Q8EFNLwkHKmM88ivp/cXDD1oY0N/zBStQrK+ 3U84aqF43u8xNRwOndje4j8guYBP8OnjoyGUXGglCncS9HeDOrokeMdphCNHyYAqFAHf KVfJ5Oz7drCbeowaMtNs2xVKlOJaIJVyJFojm79clT/b7tGEqDbw8NcZmlrV6Zy4avkn piL5eHf1KK7fp4FT3Wc+khC/LCrJaVTiFUSmHkuN/KVK7umJt1RO4g5QQYIRyZjqt26i QQCfAEgRd/4SwxWlJzyAJRreMDhnaYN89Lx3Y8mmPnGAz+b/fsPRbANptaN4o+yuSvqX Ydgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=pfRmTnARgqCK79+nL/ujK0hHoH2ZrhBzyNntnniYaVI=; b=Jiz2pxlb0Z6tpijDenEwzbMuoe8nx8szHnscLGdoNjG3NEn9c3pvyj7peHAE1UsuxA yCqrBrhZau5tHLbBFFMaFJsvP52a1l2r2Ku7GLU/udbQPLo1tWRdX0jg2c9lO5LeNThL qPa1yeDJNg+A2sprTKH118l9ZbtXA7SLu4KD1te/VQw4361yZHRO73x9cGc6F5hdyhjQ Zh/vMBiCSL2LuEBA5IWasXdiou3PB10Me+R7FfgkQgVYSCag6SKK2Xcpx7nc9UD6xFvZ 83vgzHUpeZ9CLaGVWcJSlyNWxu/gWRd2ZOUUoTEK4otQxjnIG/Pp6eyzoyZPhkT8fRmv P+FQ== X-Gm-Message-State: AGi0PubT4eLbaQOD8P5I74KrPey8KySGpuzGm4oPeb5oWTQ9Ry+cEkrd K7Nbnlrb0DZ/3cUTay7Wx5kIYfssMvY= X-Google-Smtp-Source: APiQypKDleppNcB6XZCL34kJfQpA0/+wSPJ5y5PhuQOw6YZxcnMh5zQCk0BpnN4pA31rF2THxZTIVA== X-Received: by 2002:adf:94a6:: with SMTP id 35mr5821210wrr.420.1587214540330; Sat, 18 Apr 2020 05:55:40 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id h2sm17904263wro.9.2020.04.18.05.55.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:55:39 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 14/30] gnu: jami.scm: Add a missing module. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-14-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:55:39 +0200 In-Reply-To: <20200417003433.5608-14-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:17 +0200") Message-ID: <87h7xhhs1g.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > #:use-module (guix git-download) > - #:use-module (guix packages)) > + #:use-module (guix packages) > + #:use-module (guix utils)) > This should be squashed with the patch that requires those two modules. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 08:56:49 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 12:56:49 +0000 Received: from localhost ([127.0.0.1]:42147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn1d-00049d-Fx for submit@debbugs.gnu.org; Sat, 18 Apr 2020 08:56:49 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn1b-00049P-BG for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 08:56:48 -0400 Received: by mail-wr1-f68.google.com with SMTP id a25so6155471wrd.0 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 05:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=0Y0il6JvRc8o5iyTftJmZg1jGR4snYIkxwtUCBVCjis=; b=JDLzxNnWi+5o1pb0703pqQJVsXhrKTFVp6AkC47kf2FxenawUHRvpws7N32ZThCicZ Ltv38Vq1/23CCHp1oqaSAjt3URjbdZ7X8kzeBUpuDsbQ/qKkX0s+HgK5SGJ3XSqXMPpb 3UD8wRFVi5Ar6O25hCFGaGIgvxlhYCJsG14DWd+3CHfhaCwnupTkDVCfz7wACMIiYHBj xTIvEDu0BUvZW43fugnj0GBDHaQ2VBze8O656TaNurMkFYkWAdKpOlWaYO9fhmCvk6Y+ t9+mD5wKoFHWtux0SYDSZZJp2euTCuhqheyWbsoomdquVQhICI3TYngnz/XCjwCnIWlQ OXvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=0Y0il6JvRc8o5iyTftJmZg1jGR4snYIkxwtUCBVCjis=; b=uRbkBJNnaXxxHCN9larcyVs72gU8xiUo8xknlVndh1d2DPW35c0n5UAxpyIWqU/cDR mruBeLbgXoGgCok7QXTM5D+co0ZZWGVDDoTzk9qS0ebFftD/9QS7kQgWADlZ/1Ko/rGB KlzjIYRMK6vv5i1dkv2r6I/LMF8WgdwPy7yclksusuWVQRicSUiCJcWFNIo1Z8YoaKGR oIyBMPW10SQS1xcH9esC7uYTqYw9UJ2uG5HbBcqfTzyP8TE+7WaX7VF+rnCWYQvQ9AUz BfpIZCdOy56QddTbru/GmvWJu41lchfWwgs4T4v6P59yzW9jkHTUHLzKjhhngOjrcX4/ 39ZQ== X-Gm-Message-State: AGi0PuaIrT0OTXYieVGmjKLaWQJx77G/OmfEllV9gt3XCr2eVeTp9fVJ C8CXdrbKcq5NRQ21G+3Tmi6s+eWdv7M= X-Google-Smtp-Source: APiQypJL4B9DHNMC8xOMhoWSM+KsrHQ8wXrf477xbJ1XfGBTQS/vtSE/CfbQo1Q+TUW0av8N93Ek2w== X-Received: by 2002:a05:6000:1007:: with SMTP id a7mr8515293wrx.279.1587214601286; Sat, 18 Apr 2020 05:56:41 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id a1sm26668942wrn.80.2020.04.18.05.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 05:56:40 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 15/30] gnu: jami: Bump to 20200206.2.996bf03. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-15-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 14:56:40 +0200 In-Reply-To: <20200417003433.5608-15-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:18 +0200") Message-ID: <87d085hrzr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > -(define %jami-version "20200203.1.5ee7e10") > +(define %jami-version "20200206.2.996bf03") There are multiple patches updating this version. They all should be squashed into a single one, so that the serie is shorter and hence easier to review :) Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 09:00:37 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 13:00:37 +0000 Received: from localhost ([127.0.0.1]:42151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn5I-0004Gw-Vt for submit@debbugs.gnu.org; Sat, 18 Apr 2020 09:00:37 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn5H-0004Gi-EE for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 09:00:35 -0400 Received: by mail-wr1-f65.google.com with SMTP id k13so4922450wrw.7 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 06:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=nVaUH2FHzbw70GaqzGuzufu/DskMmBSX/Y4wu6USVLM=; b=U1cHoZ5qf9F7J6D8ddZKXk2gIfIvfv/QO94aLIefA/mCjIgwrExH3IL+M4zOHgDSa5 aG54mt1ySoM8HuIyKSPj32hFpAGcaeFIGEVKsiKXYjxvB2piOaybWJR1f7NgfGy+EB1q iyrv1omSZ/7uW/y39S5RGlHxbGpiMsWGQkB2Xbbfsu4j2zfSQpGIbXiOpYGnOwvwxDJ1 EVTy+Aem7Gwws8Gu8wggZVliahQ0Ypdslg9yeYqt7THLq1HPyP5vddejLFakN9eqzYXB lmIz0seea47PbaY3E3sf2lOKSsTPmBFcETYlMNokmsLb1rYd5MWciCeRVfyKMObBtcm1 s12w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=nVaUH2FHzbw70GaqzGuzufu/DskMmBSX/Y4wu6USVLM=; b=Le/ouOdh6OanDrhzwz+36DY5AXEnk6wiJsbqKzX1Pe1CAmUpX43CAKEeXzILHDpmBi yM9ztKhZ5CPJY2MHcFzt1vIcxe4Bm6AvxUatcaQIuRoxqMTLLSgZRUTnKHRGdm7UmRLI 28lGLHjqQMgVMpoXqVED76v5Jpeb5FlDv6u6yGolxt3lhAxJ8jEFBow4X5xYG2HTL27i Ml3ojfUROGeua8U8T36Ph/MAQIzZr9LNkLFa7Tp1ATkLX4w0oCz1HNU+Rr0G49j7ycrl ixBvfmKm/5KiJfuK5zDns18IGwggAKKSq6YSLL7vyJoNFJK7br09tYbZKmzYyFUMSU/v q08g== X-Gm-Message-State: AGi0PuYjE61n4IYcxlzqDsPVuyxTVYV3URB6kt2DVo/6wRIm+Lct0yM5 fU6FROxkffe67os8LSVVttJ1z7elKYs= X-Google-Smtp-Source: APiQypLPo8AEUiYL9gq+UcRHJeKV9MynG1W60Qo26HPk5Q72SMuVpCwlgeLnFKeqnN8HONLoYArfkw== X-Received: by 2002:a5d:6841:: with SMTP id o1mr8931421wrw.412.1587214829567; Sat, 18 Apr 2020 06:00:29 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id w3sm19315163wrc.18.2020.04.18.06.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 06:00:28 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 16/30] gnu: pjproject-jami: Add a new SFL patch. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-16-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 15:00:28 +0200 In-Reply-To: <20200417003433.5608-16-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:19 +0200") Message-ID: <878sithrtf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > - "disable_local_resolution")) > + "disable_local_resolution" > + "fix_assert_on_connection_attempt")) > #t))) This indentation is wrong here. You should not use tabulations. Also this is over the 78 column limit. A trick to respect it would be to introduce a line break between the '#:inputs' key above and let your editor figure it out. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 09:03:51 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 13:03:51 +0000 Received: from localhost ([127.0.0.1]:42155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn8R-0004Lt-CA for submit@debbugs.gnu.org; Sat, 18 Apr 2020 09:03:51 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPn8P-0004Lh-WE for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 09:03:50 -0400 Received: by mail-wm1-f68.google.com with SMTP id r26so5819882wmh.0 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 06:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=OFRzj90BT8fkxG8qywjfNbAZQlOpfaskpgNwQeoYJ5M=; b=T8JTKefbIO7VuOeO/5M2RSrLq1EWKOKy/rjM8BTzARvz6J6M6CISIPJjB2Im0dPiZR CBzJDNFSTGdXxIahbV4hZg8h5ISAkTxc+Moi1Hyh9tm5odkmZpGl+DhFfUxMe42lvdBU AkXN6eH+8e+tSCzOQWUoTDD5yTS6L2MMgQjHYqPbOygiTuV3i7G60qIqLGn9Le1Pi+FP Zr+M3dUS56Ltsu+odEDSDgpCcA7Mrf8dXCL11XQKdtbGkObxHFf6hCjHK/mm1yNLgvRQ 1ag0Cj1UMODXum0/KItQYxxdFhr2tRvwNAfwmz1mnk1nPR7nc7FfYEzrlvJ67ifaszNW 1Dbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=OFRzj90BT8fkxG8qywjfNbAZQlOpfaskpgNwQeoYJ5M=; b=hESuRGPmTZiOZnOa8hkohIMrjI9i2Xg6omgJUPYp8SFQHXM6ESjs0/iOA0+pJO7irX c03PMcUPClaMQcbmjmHM0bBZZRKJ9dN8BxjnGVqqzhhot0E2vzBwJ5QTY5mG6CHaBAT2 a9PSuWyRYwpIGe3MTOeT0NDPf25pwQXJ8MGQFEDiaL0613XKgIdSx9370u0CkQc14Qdx GvYzBbhadKM1h5Ks/RhFOKroFWazDRB1Bt1jW3IX+rBHQ75F7doU9CmTKjtACJGqd2bI DUF6DlqK1oJzTl0Lx4cj/aKcXMVun8VPEtmQrNmUnlRIIGztZk4a7T1aWr70kUDdFW1+ BeQw== X-Gm-Message-State: AGi0PuaeRTznn97qOlC//N8eOVPM5lI/iUZ/tSGwoHnN+NVBEbGB3KSC wQZ22QwrB2npY7SV8YrWp4AOTIQ5bVc= X-Google-Smtp-Source: APiQypJFLQZmb8jwyGtvwJ5e16TQshcALHzcpKHFO1PZpDjF75JUKKMRGywsJXJ/Oog0qhQkMHlKrw== X-Received: by 2002:a1c:9e43:: with SMTP id h64mr8036363wme.0.1587215023914; Sat, 18 Apr 2020 06:03:43 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id s11sm15778400wrw.71.2020.04.18.06.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 06:03:43 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 23/30] gnu: pjproject, pjproject-jami: Remove broken pjproject package. Make pjproject-jami package stand-alone by moving package code from pjproject into it. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-23-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 15:03:42 +0200 In-Reply-To: <20200417003433.5608-23-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:26 +0200") Message-ID: <874kthhro1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Why is pjproject package "broken"? Could pjproject-jami inherit from it and only change the suitable bits? Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 09:08:34 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 13:08:34 +0000 Received: from localhost ([127.0.0.1]:42160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPnCz-0004TZ-TU for submit@debbugs.gnu.org; Sat, 18 Apr 2020 09:08:34 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPnCx-0004TK-Qg for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 09:08:32 -0400 Received: by mail-wr1-f68.google.com with SMTP id t14so6103140wrw.12 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 06:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=gmdfya0/WK+t9RQ9uk6p80yHbMa+WPoZRIbyb3Mt9O8=; b=D/x6ofL+pZDZGqJs1IkU7w89YSB1V58lpQsxAoY5PpX2uonRG5wvKddgyfyqzkQK2A qIo0MnNgMiL1d8n/8PI8Rbrvpy1J1paPjDSWsnQHdafndXgd+PAZE6eyI60LlVtFzq/y 8Zt0iA4Ocl0f3fyvvArV903MoQfyKRqMHjB0ycG8ozpT98jP9p7VpNABvQnDoWFpgog0 VWKz1ys+hsgMb/1YbLY4DolK0A9E21FBCDrVvdIiR9CSnEjT6EIHx2F11DQyO9J7fi7H WNqydcx9lKi5hwzAdSlz4EcRfEVNnQEcQY3cUGC8RGyrUPiK9pynzMOKplcQ3pPBThIP O7/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=gmdfya0/WK+t9RQ9uk6p80yHbMa+WPoZRIbyb3Mt9O8=; b=k9Dhjf8gQ9yDyyjCcm1auQbUjEYSdNI8ZrFXPfb5nVffIgb2k7peeCyjmJ0pVbeNlw +iL3ERTiPGu8RYNoZykgk3peV8eEEc3w/Rsi1YsaE4jMS8N+0PYeVVUAxkqwtBThOLak K4U2FslVJraQzlisYIiHVrDwE5SZHI76QODFdFLMQuIN3dWmNWs9UW6da2q2d9ikd/rp o94mE8ljHnFNfnYjHED93FwM3caUo8fecQP41MsGlQzNWNlw4NMiPUnTTfZREjy9jyD3 RR3JD210R1QJ3wJ4ZjnCNU8Prj52VCfVydZWkZKmLzCVGWst9/WEg+675EFra5MlHslA vdKw== X-Gm-Message-State: AGi0PuYj4p2eG9JtNfA1Ud3FMx6dnuzs0D7mgUewSdKX47cHQfMb61jG PsOaf1Mp2nBRGtcOXhcRAUK+ocCisdc= X-Google-Smtp-Source: APiQypJtHYWrGUjIP/3ubCTBqQ6t0yXMZ7108LCyyB4LB/DrV/sZAwYOwvhriydxC3v6DGZNGFVBWg== X-Received: by 2002:a5d:6310:: with SMTP id i16mr9018457wru.177.1587215305986; Sat, 18 Apr 2020 06:08:25 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id o16sm36258116wrs.44.2020.04.18.06.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 06:08:25 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 19/30] gnu: jami.scm: Untabify by emacs. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-19-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 15:08:24 +0200 In-Reply-To: <20200417003433.5608-19-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:22 +0200") Message-ID: <87zhb9gcvr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > "--enable-protocol=udp" > "--enable-protocol=unix" > "--enable-protocol=pipe" > - ;; enable muxers/demuxers > + ;; enable muxers/demuxers > "--disable-demuxers" > "--disable-muxers" > "--enable-muxer=rtp" > @@ -260,14 +260,14 @@ > "--enable-demuxer=h263" > "--enable-demuxer=h264" > "--enable-demuxer=hevc" > - ;; enable parsers > + ;; enable parsers > "--enable-parser=h263" All of this patch should be squashed with the previous patches. When working on such a vast topic, the final phase of squashing, renaming and reordering commits can be really cumbersome. However, it is also really important as it makes the serie shorter and easier to review. You can use the interactive rebase mode of Magit to add some fun. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 18 09:13:38 2020 Received: (at 40677) by debbugs.gnu.org; 18 Apr 2020 13:13:38 +0000 Received: from localhost ([127.0.0.1]:42170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPnHt-0004ca-QZ for submit@debbugs.gnu.org; Sat, 18 Apr 2020 09:13:37 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPnHs-0004cM-AX for 40677@debbugs.gnu.org; Sat, 18 Apr 2020 09:13:36 -0400 Received: by mail-wm1-f68.google.com with SMTP id x25so5627029wmc.0 for <40677@debbugs.gnu.org>; Sat, 18 Apr 2020 06:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=LJs0+gBZw7CfZB3xUKPMX9+pG4xXwM4Q6/Qjpph38lk=; b=Um1o2CDtqhqzYKw5/cM6Q616Vk2ZEDcCdjGc4/3wPt3id9uLwJp0e0TPcXMqv+tuTu li6GAkzhPXEssgpp97TU770e+kTb/htLcqjSWt8qR9d/3O1ch0i1OSr5UpoeUJwQEC/F NEYEj18cNXHQfoodFqF2s7ReQ1Y74nCLOMoCCjFendjxJk0ADHcT+0MCrmx908XbNlkP LeMJQRgCdlM+ITRsXjCaNhU/WBuO/cPwOi0GN+Hk1diSSxz+ipIlASMPeRTKPe8wQoIh tbKFcELPgAKDK+U7ZR3La6Vmn5RwdGb2FCDLVSjnMA1sAC7ZkWaSuwmy9sdrM0YJGYzg hVAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=LJs0+gBZw7CfZB3xUKPMX9+pG4xXwM4Q6/Qjpph38lk=; b=B1b0Yo8+CjDvBsqFfvtuaZ1jN4ex2ysA3XnDroRR98sRSD7/SDZDjl4kaK2VD/oFL6 lwrM+9GWgdQpEfAAoUk+1mqC9OUPw4RfWx75I6gzjcH270fLq6be13D9IiKoPxt3fBei WA9rilDEYQFc9/rIiJhJzYOxXm8UVaARGGjMBr2UmewtSK1pS/rMhJ4O8xL66I1x8RY3 O2YGixvKkK7DRsGHfkhiHf5c1NH11f1tKM+nsh6/pOuT4rqTZYKwjkjj2YLz4yp7fSfz 2mmMVNYfMlxwyhCFC7UtaUrvNNoyMBBrXxHUQemgk6ILssdrZmLcwu/Xs1kaaXWqEYRF qY4w== X-Gm-Message-State: AGi0PuZM71RcFa+T3Xp/sklXJOlbuRbe1aP/HbfsGD25PGZhJWHDkQLZ kZxPaWteghrdxp0BKIFKfF3HxnDhcmc= X-Google-Smtp-Source: APiQypIeWMuvMLHh0ooSu0H/PNsMK9QJXJG8W4skAjJlxlHTl7s+IsfxCTKqjzJiz7ddAqBsqHdYpw== X-Received: by 2002:a1c:4304:: with SMTP id q4mr8746190wma.152.1587215610490; Sat, 18 Apr 2020 06:13:30 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:e00f:7613:fa28:d8fd]) by smtp.gmail.com with ESMTPSA id p190sm11556785wmp.38.2020.04.18.06.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 06:13:29 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 30/30] gnu: pjproject-jami: Add the missing "--enable-epoll" flag. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-30-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 18 Apr 2020 15:13:29 +0200 In-Reply-To: <20200417003433.5608-30-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 17 Apr 2020 02:34:33 +0200") Message-ID: <87v9lxgcna.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > "--disable-video" > + "--enable-epoll" ; if have linux > "--enable-ext-sound" If this is a Linux specific flag, you may need to protect it with a "hurd-triplet?" conditional (see libgc package for example). Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 15:45:07 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 19:45:07 +0000 Received: from localhost ([127.0.0.1]:46038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFsI-00072K-Q0 for submit@debbugs.gnu.org; Sun, 19 Apr 2020 15:45:06 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:44117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFsH-00071X-3L for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 15:45:06 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 19 Apr 2020 21:44:57 +0200 (CEST) Date: Sun, 19 Apr 2020 21:44:42 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 23/30] gnu: pjproject, pjproject-jami: Remove broken pjproject package. Make pjproject-jami package stand-alone by moving package code from pjproject into it. Message-ID: <20200419214442.46c665f3@kompiuter> In-Reply-To: <874kthhro1.fsf@gmail.com> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-23-tona_kosmicznego_smiecia@interia.pl> <874kthhro1.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587325498; bh=CJFBMOIsGylYRLpZVE4wKhngO0tY6dThpoSqzSRWiAc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=TjTRBkxq434/eQsQEdCP0JYljmOL8f7TMPrlLakrVhQCxZ3mgE6TqKgK9NM6NLFlC IJfnnc6qK80i/Eg5m+N6T8nYxKjFOpGMJ2NCfD1IWeaC4auGK2739CmsBNgJVh6Ljm ZdW4k4xtzXJ+9QXzSs2k5qMlBNN251HklEHBhOAU= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 18 Apr 2020 15:03:42 +0200 Mathieu Othacehe wrote: > Why is pjproject package "broken"? Could pjproject-jami inherit from > it and only change the suitable bits? > > Mathieu The pjproject package we had in Guix have never worked - the build phase always failed. I attempted to fix it, but never successfully. Jami is also the only package that uses pjproject, but a highly modified version. I did some research about it and it seems pjproject can't even be used as a system-wide library. That's what I found: https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00009.html Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 15:49:22 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 19:49:22 +0000 Received: from localhost ([127.0.0.1]:46042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFwQ-00078K-A6 for submit@debbugs.gnu.org; Sun, 19 Apr 2020 15:49:22 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:55324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFwP-000788-AM for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 15:49:21 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 19 Apr 2020 21:49:15 +0200 (CEST) Date: Sun, 19 Apr 2020 21:49:07 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 16/30] gnu: pjproject-jami: Add a new SFL patch. Message-ID: <20200419214907.4c66c96d@kompiuter> In-Reply-To: <878sithrtf.fsf@gmail.com> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-16-tona_kosmicznego_smiecia@interia.pl> <878sithrtf.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587325755; bh=FksFJOfIk261eMq0y+KVCRtF9iC7ZAPWHZkO5JtiVeE=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=LTBKyrt9d1zBZANcjbtZhFPo3KYNTcpLH8z2RZKM/mm/ZVsvq3x3aCywa1Tuuqir+ 5gUTmzymxPCVraEm7JdIIjuEK4kHyzO/sWIeMBp8m0g9qQGxJMb+qKhcChvpEBK/ya DagqL/lb5uLHA8koZLAONmnYGr1uukVjBqgvsHSU= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 18 Apr 2020 15:00:28 +0200 Mathieu Othacehe wrote: > > - > > "disable_local_resolution")) > > + > > "disable_local_resolution" > > + "fix_assert_on_connection_attempt")) > > #t))) > > This indentation is wrong here. You should not use tabulations. Also > this is over the 78 column limit. A trick to respect it would be to > introduce a line break between the '#:inputs' key above and let your > editor figure it out. > > Mathieu Is there a way to remove tabulations in emacs or to configure emacs so that it won't use tabulations? I tried to correct formatting using the ./etc/indent_code.el or something, but could miss something. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 15:50:12 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 19:50:12 +0000 Received: from localhost ([127.0.0.1]:46046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFxE-00079w-Iq for submit@debbugs.gnu.org; Sun, 19 Apr 2020 15:50:12 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:44823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQFxC-00079d-VJ for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 15:50:11 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 19 Apr 2020 21:50:04 +0200 (CEST) Date: Sun, 19 Apr 2020 21:49:57 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 15/30] gnu: jami: Bump to 20200206.2.996bf03. Message-ID: <20200419214957.3ee4d68e@kompiuter> In-Reply-To: <87d085hrzr.fsf@gmail.com> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-15-tona_kosmicznego_smiecia@interia.pl> <87d085hrzr.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587325805; bh=+KJD5QYJoErnP0Pv2p078a2Rm3vVv94CEikF/oEBjro=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=LFZf7LlMmpsH5VeVNLD12QRHZ8LPiVNVWR+kd9VxiCgt900vJxaX0yIFQVJdnhb/H 2ugOnEAFwFw/AcWJapz1O4cEoaE7MTskjPMJB678ipZ02XnjOkKBFiluyOEEUtDqjj BfZEcxlWRj4Wanv+140qiUuU30cKkj78qNAH7DYA= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 18 Apr 2020 14:56:40 +0200 Mathieu Othacehe wrote: > > -(define %jami-version "20200203.1.5ee7e10") > > +(define %jami-version "20200206.2.996bf03") > > There are multiple patches updating this version. They all should be > squashed into a single one, so that the serie is shorter and hence > easier to review :) > > Mathieu How do I do this gently in git? Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 16:04:17 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 20:04:17 +0000 Received: from localhost ([127.0.0.1]:46059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQGAr-0007Uf-J1 for submit@debbugs.gnu.org; Sun, 19 Apr 2020 16:04:17 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:46427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQGAl-0007UN-Vs for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 16:04:16 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 19 Apr 2020 22:04:04 +0200 (CEST) Date: Sun, 19 Apr 2020 22:03:57 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 10/30] gnu: Add ffmpeg-jami. Message-ID: <20200419220357.1181934c@kompiuter> In-Reply-To: <87pnc5hsaw.fsf@gmail.com> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-10-tona_kosmicznego_smiecia@interia.pl> <87pnc5hsaw.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587326645; bh=Tx66KcqMgRc/eJkGTjYlzXQcvk/nRCFnuIENZfkJsgc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=kr2zZWS1tamJba7MRa4rFwysdJUQ67E2rDZX25UPg9aEyEj1+UjJLu/wVmcKmd3i7 GQ4nHyxtDzVMLqIZK7NPZWQwWEqC6sSqrceR0JZXIFxm3H9V987EWsG0RKjMZ13IiC eqTe41oK8861qFvdrQtkymIhCRWWs2dQosNUFTWk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 18 Apr 2020 14:49:59 +0200 Mathieu Othacehe wrote: > Do we need this particular commit? If so the version should be: > > --8<---------------cut here---------------start------------->8--- > (git-version "4.2.1" revision commit) > --8<---------------cut here---------------end--------------->8--- > > you will find some examples in packages such as guile-webutils, or > boost-sync. Because of the strange bugs I get in Jami, I tried to be as close as possible to the official Jami package. They use this particular commit and if I remember correctly, applying the patches failed without it. The patches add: -Hardware acceleration to use GPU instead CPU to encode/decode video whenever possible -All codecs available (but nor really important, it will be ok with h264 + vp8) -REMB feedback (./ffmpeg/rtp_ext_abs_send_time.patch) to automatically adapt the bitrate and avoid dirty video. > This long list is a bit scary. Could inherit from the one of ffmpeg > and add/remove only what's necessary? The default values should also > be omitted. I tried asking Jami devs how important are these flags, but never got answer. I can ask again, but for now I must check one more thing related to the strange bug I get. > > + ;; Comes from > > + ;; > > "ring-project/daemon/contrib/src/pjproject/rules.mak". > > + ;; WARNING: These amount for huge changes in > > pjproject. > > That's only three patches here? You can maybe remove this comment. > > Mathieu Yes, right. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 16:33:00 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 20:33:00 +0000 Received: from localhost ([127.0.0.1]:46075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQGce-0008EA-8Q for submit@debbugs.gnu.org; Sun, 19 Apr 2020 16:33:00 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:45682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQGcc-0008E2-PD for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 16:32:59 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jQGca-0006uy-RT; Sun, 19 Apr 2020 22:32:56 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jQGcZ-0001re-MO; Sun, 19 Apr 2020 22:32:55 +0200 From: Michael Rohleder To: Jan Subject: Re: [bug#40677] [PATCH 16/30] gnu: pjproject-jami: Add a new SFL patch. References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-16-tona_kosmicznego_smiecia@interia.pl> <878sithrtf.fsf@gmail.com> <20200419214907.4c66c96d@kompiuter> X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Sun, 19 Apr 2020 22:32:35 +0200 In-Reply-To: <20200419214907.4c66c96d@kompiuter> (Jan's message of "Sun, 19 Apr 2020 21:49:07 +0200") Message-ID: <87sggzb4ik.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1587328378;75cc037a; X-HE-SMSGID: 1jQGca-0006uy-RT X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jan writes: > Is there a way to remove tabulations in emacs or to configure emacs so > that it won't use tabulations? this should help: (setq-default indent-tabs-mode nil) =2D-=20 Pandora's Rule: Never open a box you didn't close. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl6ctWQACgkQfHr/vv7y yyUpkAf6A0K0kNagV4B+bwVE8Lz/7FaEY/dlQ9r6+75NjpRDiG91RLrdbLn3eC5G oaRGVGDkqxgBSe0jKI/cVvWdrohk78puF3y3jTFSnkt1EDeTr6hvxiz/zk3s/YC4 37VurcFixPGcKlwn6h05Ln7YsAu0/W1fSlmtAcDh+3mzX0IGtzG32PebWm9rURq5 pBZp6MzHGHhUpyres4N42kg4kxrwKhH80jD05Mb/O4LDokvmjSoL+NMkFkHaV5Vz bmKu10RmNvT+mG+rRI6og6on8JJWa2Zmdvfl+DYaEuuTbQFjQDYCZIYWGUkf+OgY P1P5f2ii1uuLkQYjUZf8XVB+kZb0VA== =cLyw -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 19 18:26:38 2020 Received: (at 40677) by debbugs.gnu.org; 19 Apr 2020 22:26:38 +0000 Received: from localhost ([127.0.0.1]:46159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQIOc-0002Tp-D8 for submit@debbugs.gnu.org; Sun, 19 Apr 2020 18:26:38 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:42531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQIOZ-0002Ta-QO for 40677@debbugs.gnu.org; Sun, 19 Apr 2020 18:26:37 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Mon, 20 Apr 2020 00:26:28 +0200 (CEST) Date: Mon, 20 Apr 2020 00:26:20 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 13/30] gnu: pjproject: Add and apply a patch fixing the crash. Message-ID: <20200420002620.7a9f4fe1@kompiuter> In-Reply-To: <87lfmths42.fsf@gmail.com> References: <20200417003433.5608-1-tona_kosmicznego_smiecia@interia.pl> <20200417003433.5608-13-tona_kosmicznego_smiecia@interia.pl> <87lfmths42.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587335189; bh=bZjd1vUVBBivNzB/rikkjooJ9nZ+qFjM8TzJ7hyyapA=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=PaEwfwu7w4zW0drK1muFNExPNoK6W2lUuaHpzlv9xpw+2OZ2yOUg6/q+izIlKGg9E 5n//J0FbHkJdEcQxWwuwT6Tyogn2DOtFm2Sr8VnpAnf58WgDk5EbFew8EmbiLnHQfG 3q5Xan7O4EAwhzFebLTWh2XkABN7tzpImsl+Lc4g= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 18 Apr 2020 14:54:05 +0200 Mathieu Othacehe wrote: > > gnu/packages/patches/pjproject-fix.patch | 21 +++++++++++++++++++++ > > gnu/packages/telephony.scm | 2 ++ > > New patches should also be added to 'gnu/local.mk' file. You can find > an example here: b03ee02f. > > You also need to explain where this patch comes from, and why it is > necessary. > > Thanks, > > Mathieu I just removed this patch, because the issue was fixed in pjproject 2.10. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 18:55:27 2020 Received: (at 40677) by debbugs.gnu.org; 20 Apr 2020 22:55:27 +0000 Received: from localhost ([127.0.0.1]:48638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQfK3-0000qs-8I for submit@debbugs.gnu.org; Mon, 20 Apr 2020 18:55:27 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:41849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQfJz-0000qb-Kz for 40677@debbugs.gnu.org; Mon, 20 Apr 2020 18:55:24 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA for <40677@debbugs.gnu.org>; Tue, 21 Apr 2020 00:55:16 +0200 (CEST) Date: Tue, 21 Apr 2020 00:55:06 +0200 From: Jan To: 40677@debbugs.gnu.org Subject: Code review problems resolved Message-ID: <20200421005506.7d93ae37@kompiuter> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587423316; bh=RKCr/uV1WLaaNubZJ0t2UCJEmu36fOTyRuOi3f+SmHI=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Subject: Message-ID:X-Mailer:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus; b=U4C3EuFZMocDw35WbVQthoegaUikrZVKFOSeHAjpdeHyDuzgX7sffuouDgHZ/88a3 1Q+T2dreLysym54KnYR1ZDbhQM217xqXYzbdXmJnkKMYnVv+60ottFihvikUFEoAUW 3nPmNK2pHGkMnT4LDRDR6J2Ql4+YEyK37MnkANAY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, I think I addressed the problems Mathieu pointed out. Should I close this issue and open a new one with corrected patches? Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 03:05:03 2020 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 07:05:03 +0000 Received: from localhost ([127.0.0.1]:48927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQmxq-0004YN-Vk for submit@debbugs.gnu.org; Tue, 21 Apr 2020 03:05:03 -0400 Received: from mira.cbaines.net ([212.71.252.8]:34052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQmxp-0004Xv-RA for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 03:05:02 -0400 Received: from localhost (unknown [46.237.173.52]) by mira.cbaines.net (Postfix) with ESMTPSA id F3E7127BBE1; Tue, 21 Apr 2020 08:05:00 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4c84fa9f; Tue, 21 Apr 2020 07:04:58 +0000 (UTC) References: <20200417015857.0650ff6a@interia.pl> <20200421005506.7d93ae37@kompiuter> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: tona_kosmicznego_smiecia@interia.pl Subject: Re: [bug#40677] Code review problems resolved In-reply-to: <20200421005506.7d93ae37@kompiuter> Date: Tue, 21 Apr 2020 08:04:56 +0100 Message-ID: <87sggx48vb.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Jan writes: > I think I addressed the problems Mathieu pointed out. Should I close > this issue and open a new one with corrected patches? Assuming it's the same set of patches, just send them to this bug. You can use -v2 with git send-email when sending the patches to help indicate they're revised. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl6emxhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdgnhAAs0kOiPIvyHna+N495QqM5TByeRHbZ9H9ClptucueysNO/2+sCyT233/g pkSiXLHG82QRpbx7g1N5q+sgEoQ5Fc2OpZ5XOIF5/kkIHaV+0KJxbv+zYr+uhwSx bPaliXcrHYP7uengRDKu4/3kICDPN5Rad4mTkyMlA1mBW/AI2PCi3GKUs9LxUWeN d5C6D991GO36In0oQIJcAbd1kMy/Uw3kEyDi/7HNgMXv+I6VBXDxpNFLK+trKhJr pqXYYNdPD3sP74KNW2XY+LN+lVIPi9jX60Q6i6NBM9bhk8cc88BCkrH9hWfExp03 ndybLBE/MnhPYkd9817eerhwIYJYU/WpYAJj2sUBqidpmO9ANCLyceVrCurrOFxn VfNfqtNljX/vIgPDq6zilwTMfahF5kJBG7ZnTa/y8fszmRCsK9zcr50kg/IrqVmT 8lQkzSIggQc78uhGNhqKePkdaoKrAQ5jSybhE1/AEC+TAsylekIhkVXqY5bHy4HU nbtApcf0CG34JpdxFo4VVY2Km/VR1Dpz7MN04Z5ydWGfrcTFTCczhhMoGXpold53 ERcopVaygMdIWhuN3O/9bzMMjkymIJudqiKS19SAhhm/hCMDgTW7nT032mOuzlXb NC5oYjN08308Ap8FpC3kPR3UZtabv2HaGm3EbinEQmcIx9UHTpA= =gD9R -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 03:28:55 2020 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 07:28:55 +0000 Received: from localhost ([127.0.0.1]:48948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQnKx-00056S-Jc for submit@debbugs.gnu.org; Tue, 21 Apr 2020 03:28:55 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:36280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQnKu-00056E-Re for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 03:28:53 -0400 Received: by mail-wr1-f48.google.com with SMTP id u13so15237294wrp.3 for <40677@debbugs.gnu.org>; Tue, 21 Apr 2020 00:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=4wrHLbHzTG5GKdovE6M2294kztKv8Syyqht+AGok9uM=; b=TtYVGJlXH6Q8psIRNT8ttFb+7KYGKlFxUDtJAjNWIVU3O8CxGH6hAWhCbQancvNMhN 2MiOc7bq9eoGJvX6dKTIm+bqIOtCnzvKUq4xLxcvW4ldEj9rumWzyrfGiLhFgteymIm6 oE10GGDRFfVqsMGbaUyEn8FxIMn3NbGjZaoR7Q8K2bzy9nEkBfvRoA1gLYQEs2d/oiAu 01nW4G8N569Y+3nCkMPOhzVJepYyLg80jsIqnzVeSz1uLKOBL03Nr3WhcfXNdzJDpTFO aVC8fJGeiwJEXykDvj+wE4mnld4ZwmUEhUKNvLJX9CgU/9ob0vMhid6Y9fyd6ZOpet79 nsZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=4wrHLbHzTG5GKdovE6M2294kztKv8Syyqht+AGok9uM=; b=l0d5GHElZLUVVm9f8Ptoz24jUSH4gfoQHD7u3jNn5S8Mr2/BVM/9NsdfX/LYKjZapx IYJ7Qeja2QKp9lXdLAWuY2TeIVpeoSYr55awKQaopwTHelmpvtMinusRAF28bmXRNTKW m89pt2U+eN0yfG7KI/xYsVHOxq1cYRQOn6GwjU/L+EQE4IgptlhTvJPXVfEgbpFSRkGk 7LsWyHnllTQndr687/Tr6a6jx9Nwpyu4yYr+7Re25nxRjaiuFPe45NYqNt2V5ygeHMcu uLflaoBNHjEoS16wFg0dBI3o+fvHaxOM11x32Chl1s31mNgHMK6xOpTdlC5MHu4hdNK7 jyaQ== X-Gm-Message-State: AGi0PuZkm/yZlMhlycX8BXBgszDKHX4i6izWAzZidc2bDLX7xdBJrjSb 7bIC5KiG5jsQGIbkhbxYm5WLBEDo X-Google-Smtp-Source: APiQypKMGcTQhoG9orchQ+tneaTHsXKJZP8d8zDr6Nsw5ZRhjNIFdj5x3Otl6l+JtoXqIN6Piz3XIQ== X-Received: by 2002:adf:e3ca:: with SMTP id k10mr24335798wrm.53.1587454126873; Tue, 21 Apr 2020 00:28:46 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:f9a2:4:b043:a3fb]) by smtp.gmail.com with ESMTPSA id u7sm2561892wmg.41.2020.04.21.00.28.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 00:28:46 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] Code review problems resolved References: <20200417015857.0650ff6a@interia.pl> <20200421005506.7d93ae37@kompiuter> Date: Tue, 21 Apr 2020 09:28:45 +0200 In-Reply-To: <20200421005506.7d93ae37@kompiuter> (Jan's message of "Tue, 21 Apr 2020 00:55:06 +0200") Message-ID: <87v9ltqouq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, Thanks for working on this. No you should use the same bug ticket for new patches revision, until it gets eventually merged. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:22 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 02/18] gnu: jami: Fix downloading. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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))) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:26 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 05/18] gnu: libring: Add libnatpmp as an optional dependency. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:27 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 04/18] gnu: Add libnatpmp. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:27 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 06/18] gnu: libupnp: Bump to 1.8.6; change the download method to git-fetch; add missing dependencies. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:27 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 08/18] gnu: libring: Use ffmpeg-jami instead of ffmpeg. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:27 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 09/18] gnu: restinio: Bump to 0.6.1.1. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:28 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 10/18] gnu: pjproject-jami: Add a new SFL patch. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:28 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 07/18] gnu: Add ffmpeg-jami. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:29 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 11/18] gnu: pjproject: Fix formatting. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:29 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 12/18] gnu: jami: Make gettext a native input. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:38 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- gnu/local.mk | 2 + gnu/packages/jami.scm | 351 +++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 3 files changed, 353 insertions(+), 291 deletio [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: interia.pl] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.74.65.158 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --- 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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:38 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 14/18] gnu: pjproject-jami: Bump to 2.10, apply new SFL patches. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:42 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 15/18] gnu: opendht: Bump to 2.0.0. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:55 2020 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 To: 40677@debbugs.gnu.org Subject: [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. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- 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") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:55 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 03/18] gnu: jami.scm: Add and use a generalized procedure for applying patches made by Savoir-faire linux to Jami dependencies. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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. -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:55 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 16/18] gnu: jami: Bump to 20200401.1.6f090de. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:55 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 17/18] gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 21 12:11:56 2020 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 To: 40677@debbugs.gnu.org Subject: [PATCH 18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 04:59:49 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 08:59:49 +0000 Received: from localhost ([127.0.0.1]:51260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBET-0005xI-FW for submit@debbugs.gnu.org; Wed, 22 Apr 2020 04:59:49 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBER-0005wu-Bv for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 04:59:48 -0400 Received: by mail-wr1-f68.google.com with SMTP id u13so1428215wrp.3 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 01:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=Fx9qe7MfMzKwbumBlLDzH6hI8v1Xii9zJz7IOHwaJCE=; b=S6IBkHbrkdq8qCWUrtu0kREwerKPzr1JHmIyZj9OFddDy1fH/NQGJmptpgYwxWqQAy zkNOcsRAFO1EspIn4bXx03iHj6cmZjaKJzKJcewSPwwf2K+mOWVmEfsbX9NS5lnnEwNA Dt5TCn2/7WqBhgYUwNMRDUKyylkFDbqJwDrFZGH+u+DnDLloVwTJifBNMQf7KosZqloX dXjrfTOUlO7B+BMe3yF82QBJn3Q7te9AVFOoIWMRS7qRuXSl1kpUeJWI/pdVBofaaZfq M7/iIrCGOeaypN/KOXW8EXh4WbLB5YPZXFtNBweiJ+Jqw69gy/umT1LfdF1FS6oIzn1o iIjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=Fx9qe7MfMzKwbumBlLDzH6hI8v1Xii9zJz7IOHwaJCE=; b=VGQss8f163vtGfRWMH81ZpEILmshqiyUGVVsvTnofgX1y1tOCUFtTza4cS68qOp9Zq SzuZUETROizVIDVTxZyZvUIq9r8QkKgk+sZ9+1RFu6XeMSMR2Xh7wXs0kGDvfv0Xm/Zv KaJOou7u19N7UzW+QzezQ/mgneg1gBt0dpTW8afSStoiWP+vnFHhF6cBFT73FSpWlt+l lFxfD0GUgAtwpDcLIcoNHWq+Nl+eHAwgbU4PX34jPZsAE/A+rN5Gy+d5jEdYoA6gs1Y5 cOE2WSe2U+GqBUsYHwanfMhzvrggdow/1KPF6D5bTgao3Y93I9AKELNpz7QXUhXYmGbl 9TPA== X-Gm-Message-State: AGi0PuYrFXfGAqIMmSHvLLaj4VaR4w3K1tCVb+NYuZTVsOBEgSplVZxu F7MDiyP6x310x+thOnFhq4I9eIrr X-Google-Smtp-Source: APiQypI/66j9dSEuquwOk15DnHLy1rK/9VXBI+Qjg5Y1whheD50B1ezZxyLptWbACxl7OYlVe0xvLA== X-Received: by 2002:a5d:6b89:: with SMTP id n9mr23275992wrx.356.1587545981235; Wed, 22 Apr 2020 01:59:41 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id l9sm7377663wrq.83.2020.04.22.01.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 01:59:40 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 10:59:39 +0200 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:15 +0200") Message-ID: <87k127q4jo.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Jan, Thanks for the updated serie. I see it has shrunk a bit, which is good! First two general remarks. As explained by Christopher, you need to make sure that you pass the version of the patchset to git. Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (m.othacehe[at]gmail.com) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hello Jan, Thanks for the updated serie. I see it has shrunk a bit, which is good! First two general remarks. As explained by Christopher, you need to make sure that you pass the version of the patchset to git. You also need to write commit messages respecting this https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs as I already told you. > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2019 Pierre Neidhardt Why is Pierre copyright here? > +;;; Copyright =C2=A9 2019, 2020 Jan Wielkiewicz I'm not sure what's the copyright policy when moving stuff to new files. Someone? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:07:51 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:07:51 +0000 Received: from localhost ([127.0.0.1]:51289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBME-0006Ci-Rf for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:07:51 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBMC-0006CQ-Qu for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:07:49 -0400 Received: by mail-wm1-f65.google.com with SMTP id t63so1400691wmt.3 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=mCRYQS+FWRnSL7YszO/8ycLeICx74MpzxSZrGI6nbNk=; b=nZTsVxCT5FYElrc+/j/YclWUfkMrBun1wljrU9EfohkJFuR/ENQ/VvJFiSkY8FCYS8 LnQvB/r9GQ0/2KDpc7fk0NYN/I0mG1QXjST3XfFQc5uwwbfJTXA8632fWzxE7zOZ0n8s cl0/AKgRnXunZi6dOa2LroX7GTO0f65QCmgQs/MGXuq6V1/hlAayzuhqDtklb8tArFrN Jra4zJjvJbBBWdukR2KrEmxg8yTPl39L9wdPlP3MbEayGXxPaFzEpzG3hSsPvLw+uCVP EaJU2CxL6KTo8ftlYDf/t089ZZUo+t7lmFcSV8hx3duj4AnsKfd39lJtH3Efuvr3K6x8 +uVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=mCRYQS+FWRnSL7YszO/8ycLeICx74MpzxSZrGI6nbNk=; b=qMdmHQ2IL8FwlxDoiZF096o39/3QncyKd0DEE+ZRo7/Kv2iPl7WwAhn5Qwcbb8N6xn gbjRyd+HvAFq/14q8y6UEh7rHx07fwbtkitM3MqV6bY2jQ4Rp/d4ASnyS+2QL2SZusjR R+HqdT6DNlCPVZPaqx6lJN6PTccJGxmJxUFlwdW8QyRbO5Ti7bMCbb+u6TsGbc2UByin PfR7AC6FLOCfeCfLRbXBvx/X6+bpF6juU/1k8my7udK/NWPvwzabiI32j+5RYnkmtiME 0VmzBaVfjmBVc1lQVM5JkC3enZt3uc+imWSDCkwhGpaggojFpKRN/yZOJakNqm8DJsOj jBOg== X-Gm-Message-State: AGi0PuZks/f/t2L3rJLcCn5ht2KaEcsMYxLFg5nkfCC4aJS9990NX+gQ NuxXT/xSvfGXxSKA3TCQ5Z4NkuWx X-Google-Smtp-Source: APiQypLm+H+si3t9e2f8xq7GXvKsJ364ejd/eIwuA7VCJPjuzCzrgllOJwSUJZPuvrAg1rBkbMdNGQ== X-Received: by 2002:a1c:3986:: with SMTP id g128mr9278631wma.8.1587546462651; Wed, 22 Apr 2020 02:07:42 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id s18sm7908859wra.94.2020.04.22.02.07.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:07:41 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [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. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-3-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:07:41 +0200 In-Reply-To: <20200421161032.1847-3-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:17 +0200") Message-ID: <87ftcvq46a.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > +;; 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 This does not need to be public. > - `(("savoir-faire-linux-patches" ,(jami-source)) > + `(("SFL-patches" ,(jami-source)) I do prefer the old version without upper case. > + #:modules ((guix build utils) > + ,@(@@ (guix build-system gnu) %default-modules)) pjproject is using the gnu-build-system which should provide all those modules, so I don't think you need this. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:27:47 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:27:47 +0000 Received: from localhost ([127.0.0.1]:51308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBfX-0006iq-8l for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:27:47 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBfV-0006ib-6c for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:27:45 -0400 Received: by mail-wr1-f65.google.com with SMTP id x17so785436wrt.5 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=NyE+zaP6xgRV92kZZdiunUWOH2QKToHwoce32I6/uWc=; b=LIMGbnlGkEnIfDKbWmnaaamz/xU9iJR1NUC25UBw9Vu1mFOMRt08mOXq46iFPvg4HQ B+02n6+P6m1xoD1T/0QTKR8LfL9gJAsP/E/42e+GcSb8E2rxBGCLA7PPl0XD83B1SS8w khXkZC0h8aOmSRhc7DSTKXOUKFDZNr/z2Pyj0iEaFlsDT/o21+BfDg7cve7FiFnB4PGo 60NWLBq3WZM66E5Q0nmBmttqvKLSbO7kXFZ08ivtcTPGBbs3bJCfUICtfXfHBxSkGrWE n8pZj1sUrTqlworvk/lfZqLFNLz9ASqvKjpjpJIkUoVXwdS8+jxN7+wih99xFhJ+H1Br 2U/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=NyE+zaP6xgRV92kZZdiunUWOH2QKToHwoce32I6/uWc=; b=KK/5ttYWLgb+a7tWw3nO1JwLFMsmiKvDl1bPXxGhTIL+JuD6H3ZrQv0jOjz41zzol3 HqDTznUH5pVY9XhWuzLTcQ0OlDNn/JXu1m5afTbNRaBBPQAmhvVlAvimdDDBTWV80cU1 8QK1RLL5nUuFKIp687MSH1mQPjvwKhUve9BiosYAXrEql6ld9qW84EiqfDSl6Mo3d0NX GX/nm/lE505i0cho7ZNZ35+wbICm3CfbEOlxEufQDxfXXeYKP2ZVpPrymRZXV5YQmPt4 nAlw2ufZhwIQUYFDgFKBLTznY3EzCQzXDve3ECEQBbVCtifNU1WTycvslBcLf+w8h/vD ItOA== X-Gm-Message-State: AGi0Pubt7f12F+iT/ka/Vu054VGHaqZ9poDlCEW5yMG/kUP5pDN0TO5C eFZYwfJrwGH8TlmWmBZjVMiekl2C X-Google-Smtp-Source: APiQypLTCZLVFRYpRWVs7Rc6uund4tgR2btjDT23rY2mDgza/bb1pn3L0wWaUzGx51nRKLIX/SygrA== X-Received: by 2002:a5d:6946:: with SMTP id r6mr20481841wrw.291.1587547658817; Wed, 22 Apr 2020 02:27:38 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id z1sm6905610wmf.15.2020.04.22.02.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:27:38 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:27:37 +0200 In-Reply-To: <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:18 +0200") Message-ID: <87blnjq392.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > + (delete 'configure) > + (delete 'check)) Please add a ;no tests comment. I guess we are dealing with a raw Makefile here. This is bad news because it means that cross-compilation is almost always broken. You can run: --8<---------------cut here---------------start------------->8--- guix build --target=aarch64-linux-gnu libnatpmp --8<---------------cut here---------------end--------------->8--- to check it. Then, you probably need to do something similar as what is done in package "iw" (set CC variable at least). > + #: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 ^ @code{libnatpmp} ^ typo Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:32:26 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:32:26 +0000 Received: from localhost ([127.0.0.1]:51317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBk2-0006r5-6v for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:32:26 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBk0-0006qo-Ac for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:32:24 -0400 Received: by mail-wm1-f65.google.com with SMTP id u16so1507051wmc.5 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=TCVO0wuq8TORD6UDWNWuVDAyti7jBae2kf7ShT9YeEo=; b=dooEYzGbWy2t/GRy/oWzBeRAarOFsEx25/ki0+SYXlJ27gIsQccEwDi3z6m/Q8Vv9B 2bOrgMEDMRfhJjRvmvElIW9sYN3DFVVNQ2yKCJActjwKLBeXYrNM+L/aP6+ZBQvddJH1 Jh6WcjWqamhMvjgKRGsCMbd3bgB7/7oBjZZ/i9I514fFeEgjN2rNV30Diyx+X2IeHxve sSOqBv0YtU78kTe5FvCOsIAWVyvTYSFxM503zxEi7+lqLWe/MUataQT/Gy8v3mOgJmKL lY5XeR7mucIRJelT3rmD9ECBjC6+zg4yPTdyTHT8z6I9+o/EMtX4tCsDm1yK00zsAjZg L1+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=TCVO0wuq8TORD6UDWNWuVDAyti7jBae2kf7ShT9YeEo=; b=ZlJA78rCdyc4DULbV7Lxj03WqWP5wOB/cd0EXCVaw09sDVMwBIqafKYxk8elLxYdUB xjQK823hO4JcxaM8C8bwdTEgpYTJk2DXi/3ewYEzsYmNqRtlIDOKzXryWfOTa1ZJbSSe BBfKENBpryfwO8B1ZYmPxzDordHva/I7CYuxYGTRd+FIZSRljlA7gRFYI8AAeFm4WpN5 oChG6AsWPSpiY89msUcNlTAHnEneGfYM85lU45zx2mdlFdUu7hSxP0YIj+t1EBu9pckw O6TNNp9pajij/DaU74W0VUV4GU4yLa4q1Y1/wG3swWMp/Ty/uzE7Cyyc14/r6F1sJatI geuA== X-Gm-Message-State: AGi0PuaF0IlWPL4NWklbiSaZGfeEhBd86C4b5YACsxbQ2/9Errs+k88/ V6IKSzLxa9ok1K7QL6TU1INdMr8t X-Google-Smtp-Source: APiQypL67JltLXep6gVOlqUxCNB/oL8E6fSoiMqDBFVc+CiWTsrN3n6zJcd1VvoPnYSThLAdagGh6A== X-Received: by 2002:a1c:808c:: with SMTP id b134mr9966033wmd.131.1587547938284; Wed, 22 Apr 2020 02:32:18 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id b82sm7439771wmh.1.2020.04.22.02.32.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:32:17 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 11/18] gnu: pjproject: Fix formatting. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-11-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:32:16 +0200 In-Reply-To: <20200421161032.1847-11-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:25 +0200") Message-ID: <877dy7q31b.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > #:tests? #f > - ;; #:test-target "selftest" > + ;; #:test-target "selftest" Indentation seems off here. Maybe you can drop this patch. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:39:34 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:39:34 +0000 Received: from localhost ([127.0.0.1]:51322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBqv-00070c-U8 for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:39:34 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:40659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBqh-00070C-0Q for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:39:33 -0400 Received: by mail-wr1-f45.google.com with SMTP id k13so1567024wrw.7 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=yoCdjxsfmlVxRyPaZ9r01hFnwg+aQQ2Omdh5/UFMklE=; b=Y0VeZMdaY+s6rsA7qB0/sctBO/E4SBPpdCttA6ORlEfQoDzwxnNz3Rz6/aBF5s233L dnSufaNo1laP+sSL7W7R9whX5AmV+93mGMzsrZbmlBC4og1nXBzpmB2K2ZqH7IiQdfov NNiqGoMJMU23vh8kkehwn4tSYPDQSB0GU0twGT2Xduv80yGg0uDYm31RAHeRHrzGHfl6 VMTK1RNp3fnuyofrN5VMPw7QnlOoQncydknEhFbOoW6IDjOc4grBcvBJClz8ui84ap5N S/VBaSzBqIbm8I0HqBJ9o2E9VE8sau8vEvYBNs2eyr2fKc1Zjps5tQmkzrt7aMqX2ovA 2Xmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=yoCdjxsfmlVxRyPaZ9r01hFnwg+aQQ2Omdh5/UFMklE=; b=Td9LHfNiR3oeKqG47ZxzfBP6Ihio+a3cwDE5StA6BJx6jDh2O/Xo9wtl5u/yxoJp+g Y82G8+jhWe1sU+xTcuCj+UeUHQ0RbJ7azaM8KJSSvvPuZqqFY//bE62zYjR5JJZYfWoT ZKs4xwNDioIGnQoasUcpWrP+aAWt9JDtE5vdSxO718gM50HYTtm5GGKRf8nfsFLfq1oO K0XBFyUVgp/6gUsft+7XP3zxG4kew0gfItbQaTnU9z2sFDiPsL93rUjkRmMSu0QC8frp SQ9E72QwWA7r17mGQ+neYBpDTbz1NlPj2fp0xdGOr0OM2vNso++CDglEp8yDdG39F+Zv 8dwA== X-Gm-Message-State: AGi0PualvAwl0K2/e2ooTDRRe6mK5V9trAtGeFA8ZI5ROyBl3kiZVppL nXyijoyZXeWV93/n3Jr8yS1rHycz X-Google-Smtp-Source: APiQypJKRNd6CbpltFhdQCDKbEB+eDXADA8CHcKSYPaKaBigQfkHgLBJ3Dcm1omT59uuksu6vkJguA== X-Received: by 2002:a5d:6148:: with SMTP id y8mr28007704wrt.236.1587548352874; Wed, 22 Apr 2020 02:39:12 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id 185sm7925272wmc.32.2020.04.22.02.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:39:11 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [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. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-13-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:39:11 +0200 In-Reply-To: <20200421161032.1847-13-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:27 +0200") Message-ID: <87368vq2ps.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > > (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))) pjproject is used by packages such as asterisk (not yet packaged). So I would prefer to keep pjproject, even if it's currently broken. WDYT? Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:41:09 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:41:09 +0000 Received: from localhost ([127.0.0.1]:51326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBsT-00073J-Kr for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:41:09 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBsO-00072f-Jx for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:41:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id g13so1564330wrb.8 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=fg7oyxVcHhIzw5p090pJ56FmP9vyxWjyCUb5tcNvl4o=; b=G1yoeqmsznciWcIQT/zQmBFz9IXXvx9SaAF7vorEFI9V1M3uYLcaCRMLpDaxXjYq2D ZOEkNOmCEG0sQ4ZhGBwUZYCNWn62RxSa5SDGJKLy15+/nW//+YgASNxObvxYdIZZwVIh FwYKnh8NACnZM8qq3G/Zd7YXLXgtgquYNlOcQxBLLes5lg8YlMu6ZcvCjN3rjnSfCTQq ggIGqLleqF3OBu5aApoky6X+8Kr03LsbRwlInDAw9RxrmZ8ypAYOoqZDMRe8CSLUnpnJ yFTbqiR3MK6UNb3NvCnaP6roT9KabSrZ1BCym/LNeDa0Bs3lYra1xzuAlHQs8uopqSZP F0mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=fg7oyxVcHhIzw5p090pJ56FmP9vyxWjyCUb5tcNvl4o=; b=EdNL9FyNSY0WsuWCPtGcyPh72N21SXOnkXQSBw2ihqwr4BfUwfzrKolsaZiaxkX10I 9qAISHga5+9OLpex91sVAeowr/tmydKuCIp8ESTuXx89kqdXqFH4dJ75Kb4I8YHxdvme W51s2O+hUT/YbO53XkaA4/5N48Cqfq3G/cSVAMjeDcz2731ynxshL+CeT26v6waGQOzm znPhBgF7uLYSeUJqNAgWVj5aFX1AfY46HoQriJz5KRyhTtsjkgdpLwQx+fdEx6Fi+I6z 9ty09Dr/ytjEiciNYdgi5lJoyjpxVYt96hEMW+Fg1EokxmM65otMY9gRqa8rQYzDP4/q bLOA== X-Gm-Message-State: AGi0PuZEkU+fjKPOnigvoO1Lm65fCe4XE/pj3R3aGL+uH7OQvr2i29sX 1+9ubA4XpMRnpMxzuNZ0G6VEINkl X-Google-Smtp-Source: APiQypKUHR5Sf5Ulg0WhNM7CgwO7j7nZCvKj0rCdhGyPTL03C+jnx6a7FSrDzsToq5N/sn4McsiBHQ== X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr27676164wrs.32.1587548458758; Wed, 22 Apr 2020 02:40:58 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id y18sm7580157wmc.45.2020.04.22.02.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:40:58 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 14/18] gnu: pjproject-jami: Bump to 2.10, apply new SFL patches. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-14-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:40:57 +0200 In-Reply-To: <20200421161032.1847-14-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:28 +0200") Message-ID: <87y2qnoo2e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > - (list "--disable-oss" > + (list ;;"--disable-oss" ; do we need this? Do not introduce commented code. If you think we do not need this flag, you can remove it and explain why in the commit message. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 05:44:34 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 09:44:34 +0000 Received: from localhost ([127.0.0.1]:51339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBvm-00078S-2a for submit@debbugs.gnu.org; Wed, 22 Apr 2020 05:44:34 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRBvj-00078F-Qe for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 05:44:32 -0400 Received: by mail-wr1-f66.google.com with SMTP id j1so1608773wrt.1 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 02:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=2Fy/VBZRrDFUEZ0Nv71/sNgk8l2VWonb8Hvob7y0jic=; b=u0UcgeqEeP3QIxOJb/u9Tw9iYXIWxVcPDqrcoe/2IbjXZvq+1Or6wcAtE451x89FPy RpPRHpVl2EmkSj7eTbGsUvVYVF9rvlJHcqJ7ptUYHfZm8q3D28NISf6NsUoKj4Hsywfr ZvQUca3zsREWxlP3/7bMXlhmqelbCg2Xy+8ZutBib6YSlknlhDXmTVSLtRwkppVXE0+Q 3i9SNTGreCXpUDUXh7xLLth2QCZjAwSY08mB/6QwE7/V8wK4VpIBLp2mvsLwenQgfocK JHpeMmBzrP1J+Ba2qgvZoBqPYum95/wm6n+GZmyG/pljlGpVpxFHmZcgBQi7uITL5vKx vloA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=2Fy/VBZRrDFUEZ0Nv71/sNgk8l2VWonb8Hvob7y0jic=; b=XccJoBTE8XxfL5yBsMFeBZS0pfpo4QQ0YQ7UntGOy0D51yS24WA9OgGKL0xpIayUhH 4yM6/x6upxAhUIRevYDksvvRUoRuG1LLG4zAAl9fI77FqZKAFhMfxpYlu8dUbgGynvr0 DzW8tcEJfsY/TeM93n+S3fw8UrZBjkIFWA9+ePSGHbSWTydqYHtXEWd4+neC3RNrqFoe LrurDl/3eIlnP1P0X1Cq9xkb0y9i6zxMv76O0KkItwXc8kzaYVrUCtwIlcxOHZwFfvYl 4YM+ntLxtvAsT2sYpYgGcOSP6m6+KVfjKgPPlfmVzdkD9Uu5av5DYXXW7S07GuXHJEuO aYaw== X-Gm-Message-State: AGi0PuYfEoSNzy8jz86QdNlkT3KnxZUH4RbHJUvxJMCzCwR75dtG9BbH BjxZlZqcH3fjvCQ8YnNrtvjQjCCj X-Google-Smtp-Source: APiQypL3K/ynogP9ZkEWfsqW9uuqev0OuXxNj6PAYOtKgPkFlnsmRmvlMq6LU3Lg1JfyXoF+KgfHtQ== X-Received: by 2002:a5d:4fc6:: with SMTP id h6mr30466220wrw.277.1587548665688; Wed, 22 Apr 2020 02:44:25 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id n131sm7363631wmf.35.2020.04.22.02.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:44:25 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH 18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl> Date: Wed, 22 Apr 2020 11:44:24 +0200 In-Reply-To: <20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Tue, 21 Apr 2020 18:10:32 +0200") Message-ID: <87tv1bonwn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > - "--disable-l16-codec" > - "--disable-gsm-codec" > - "--disable-g722-codec" > - "--disable-g7221-codec" > - "--disable-speex-codec" You should fix indentation in a separate commit, otherwise its hard to see get what's going on here. > + ;; The following flag is linux specific > + ,@(if (hurd-triplet? (or (%current-system) > + (%current-target-system))) > + '("--enable-epoll") > + '()) Don't we want to add this flag only on Linux platform? I think you should transpose the if branches. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 06:43:16 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 10:43:16 +0000 Received: from localhost ([127.0.0.1]:51378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRCqa-0000Jk-1y for submit@debbugs.gnu.org; Wed, 22 Apr 2020 06:43:16 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:55533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRCqX-0000JU-29 for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 06:43:14 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Wed, 22 Apr 2020 12:43:05 +0200 (CEST) Date: Wed, 22 Apr 2020 12:42:53 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. Message-ID: <20200422124253.18543e01@kompiuter> In-Reply-To: <87k127q4jo.fsf@gmail.com> References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <87k127q4jo.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587552185; bh=Q+4WG0jxMMhKfPJENzmsf6rLzt2eiuiZXyjanoaXyv0=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=RpaX6a4oU/3H5YWmiv4AOpGnUflJ7MMdGFx5AegZyQ/9IIYGDVFKetpiAcXQXwN2a xw9h0xB5OjBBhbdocJmPraycQ1kOnc0HEhpnlMK5ZIM/tolhtWbzBYXuGfDTM2W2sx kmBCsbbLC6FhayIhGxzT67j2sBXxnphwxkjLgRq8= X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Wed, 22 Apr 2020 10:59:39 +0200 Mathieu Othacehe wrote: > Hello Jan, > > Thanks for the updated serie. I see it has shrunk a bit, which is > good! First two general remarks. As explained by Christopher, you > need to make sure that you pass the version of [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.74.65.158 listed in list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) On Wed, 22 Apr 2020 10:59:39 +0200 Mathieu Othacehe wrote: > Hello Jan, >=20 > Thanks for the updated serie. I see it has shrunk a bit, which is > good! First two general remarks. As explained by Christopher, you > need to make sure that you pass the version of the patchset to git. I passed the "-v2", didn't it wrok? > You also need to write commit messages respecting this > https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs > as I already told you. I have to read it one more time then, it's a bit unintuitive and complicated. > > +;;; GNU Guix --- Functional package management for GNU > > +;;; Copyright =C2=A9 2019 Pierre Neidhardt =20 >=20 > Why is Pierre copyright here? As far as I know he was an original author or maintainer of the packages. Isn't it required when copying a copyrighted work? > > +;;; Copyright =C2=A9 2019, 2020 Jan Wielkiewicz > > =20 >=20 > I'm not sure what's the copyright policy when moving stuff to new > files. Someone? >=20 > Thanks, >=20 > Mathieu Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 07:42:22 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 11:42:22 +0000 Received: from localhost ([127.0.0.1]:51428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRDlm-00048v-E2 for submit@debbugs.gnu.org; Wed, 22 Apr 2020 07:42:22 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:43301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRDlj-00048b-SG for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 07:42:20 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Wed, 22 Apr 2020 13:42:12 +0200 (CEST) Date: Wed, 22 Apr 2020 13:42:08 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [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. Message-ID: <20200422134208.1c7fe35e@kompiuter> In-Reply-To: <87368vq2ps.fsf@gmail.com> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-13-tona_kosmicznego_smiecia@interia.pl> <87368vq2ps.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587555733; bh=iM9nF1/exD1FGj6Z0jzMy7V9EkxW6J0Ce8vG8ozxc+Y=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=OCYJ3sxZyIIVNJVuu4Ti7L7YLX9VBCmcSZFg4ipxWP3cF/HsThQju+EJaNALaoLGw 6G7+DWglTEkT3J+kx8VcmqZFD5CqHjQbNQQLWah4kJ99aACenx16XvjBxHAsfvXc47 2Ybdqv+mb5xcSKSFPHOo1QOczuBT7LGvVRMShhPY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, 22 Apr 2020 11:39:11 +0200 Mathieu Othacehe wrote: > > > > (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))) > > pjproject is used by packages such as asterisk (not yet packaged). So > I would prefer to keep pjproject, even if it's currently broken. > > WDYT? > > Mathieu Should I revert the change and make pjproject-jami inherit from it again? Is inheriting from a dead package even worth it for just two packages? Moving the code from pjproject to pjproject-jami actually made it easier to maintain. If someone packages asteriks, they will have to copy the code, modify it with configure flags, add missing dependencies and use a different version, because Jami uses a custom version so patching work. We can keep the broken package, but I would like to keep my pjproject-jami without inheritance as it is after my changes. It is just easier to maintain this way. But if I'm wrong, then I can just inherit from pjproject as it was before. I'm not an experienced contributor after all. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 07:42:48 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 11:42:49 +0000 Received: from localhost ([127.0.0.1]:51431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRDm6-00049S-Ny for submit@debbugs.gnu.org; Wed, 22 Apr 2020 07:42:48 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRDm4-00049E-Da for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 07:42:40 -0400 Received: by mail-wm1-f67.google.com with SMTP id y24so1974708wma.4 for <40677@debbugs.gnu.org>; Wed, 22 Apr 2020 04:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=luRqbu4w69cIBnDR37+s7V3nLM+6i9w5sH0g75DB1FA=; b=UQelUNt/uGYc526WOJhpGprdRiaMkEG+JMkGRXxfyBCBhNJx7vKghLzLPQQj3siEpp tNak2JIdRju4UhNwAhuNiO/0smsKvs81oMRtENbcyd9VmW28VNbb/jx9N6dCtoQArPTe fA2u8Ihzi5ZZNlb1LkYMA9VSxmGDfpS7vcIRiMJ/LHNPpvS+thH122SRSIoNdMiwmK4g mzjpHmrTW1iGEFVl2QdeEfGP0g80su32DWS0ZkLBDbItvGByQzID18WPDUkztAs5t90y eagKLiKhVjm53gv5UYpwms1n0kjXRgduZs9N868qmFisC5nQ20R6mA0vNTowVOn+c/Kv ZOQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=luRqbu4w69cIBnDR37+s7V3nLM+6i9w5sH0g75DB1FA=; b=KYoVyEND7BjznM2Xq3MRG24brGXGIHQn6c56j4s3p5xXF+LO/rzYtK+O5BadG+8AP4 7ASTTFi39ajHlQJgxKEuJR5w4sGmD3JR19iXwyJHjTAw/DWqlWXocdvXSbnIzab67MYm GrSvLgbOWkNmaqZn3fP+TLo+J96ekCEtcm+yz4L7Fu5tCNaJkL4EIsA/DKF9QMtgP2rs uC2IlpYyG2K86qG+R5rzfsukigER0HmVjNDBgKuVa7mRZ3AYhpdO8/0Uwg870K9FCpvS S0Yica0ZF2CRtAIr8eeapnTk+lWAIGDpvS5rYQxTYuRwe5JqF1RH7d10k9KJuDJWsdzJ YU3Q== X-Gm-Message-State: AGi0Pubp1NNTA6/I4itBVRhmK9mz6OPkj183BoufvwztZ8gPhB7yqnuJ eYGuspONtGYtqhhzEMofyUb+K/b4 X-Google-Smtp-Source: APiQypIJL/5WZ4RjRk/cmDPjZrin4x0it0EQLRRcceEct6FimutGlfyhP+XNi16LvhfzdMAweuoGhw== X-Received: by 2002:a1c:e906:: with SMTP id q6mr9690864wmc.62.1587555754320; Wed, 22 Apr 2020 04:42:34 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1d35:d245:4470:8434]) by smtp.gmail.com with ESMTPSA id n7sm7365075wmd.11.2020.04.22.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 04:42:33 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <87k127q4jo.fsf@gmail.com> <20200422124253.18543e01@kompiuter> Date: Wed, 22 Apr 2020 13:42:33 +0200 In-Reply-To: <20200422124253.18543e01@kompiuter> (Jan's message of "Wed, 22 Apr 2020 12:42:53 +0200") Message-ID: <87pnbzoifq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: > I passed the "-v2", didn't it wrok? No, I would expect the patch subject to look like "[PATCH v2 x/y]". What I do is to run git format-patch this way: --88--- git format-patch -4 --cover-letter --subject-prefix="PATCH v2" --88--- Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (m.othacehe[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > I passed the "-v2", didn't it wrok? No, I would expect the patch subject to look like "[PATCH v2 x/y]". What I do is to run git format-patch this way: --8<---------------cut here---------------start------------->8--- git format-patch -4 --cover-letter --subject-prefix=3D"PATCH v2" --8<---------------cut here---------------end--------------->8--- there might better ways though. > >> You also need to write commit messages respecting this >> https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs >> as I already told you. > I have to read it one more time then, it's a bit unintuitive and > complicated. Yes, you can browse the git log for examples. > >> > +;;; GNU Guix --- Functional package management for GNU >> > +;;; Copyright =C2=A9 2019 Pierre Neidhardt =20=20 >>=20 >> Why is Pierre copyright here? > As far as I know he was an original author or maintainer of the > packages. > Isn't it required when copying a copyrighted work? Ok, then you might want to add Ludo and Vincent copyrights that appear to have modified those packages according to git blame. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 22 12:08:46 2020 Received: (at 40677) by debbugs.gnu.org; 22 Apr 2020 16:08:46 +0000 Received: from localhost ([127.0.0.1]:53011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRHva-0004mr-El for submit@debbugs.gnu.org; Wed, 22 Apr 2020 12:08:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:35906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRHvY-0004mi-07 for 40677@debbugs.gnu.org; Wed, 22 Apr 2020 12:08:44 -0400 Received: from localhost (unknown [46.237.173.52]) by mira.cbaines.net (Postfix) with ESMTPSA id A9DF727BBE1; Wed, 22 Apr 2020 17:08:42 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 94b9e05d; Wed, 22 Apr 2020 16:08:39 +0000 (UTC) References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <87k127q4jo.fsf@gmail.com> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. In-reply-to: <87k127q4jo.fsf@gmail.com> Date: Wed, 22 Apr 2020 17:08:36 +0100 Message-ID: <87mu734i63.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org, Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Mathieu Othacehe writes: > Thanks for the updated serie. I see it has shrunk a bit, which is good! > First two general remarks. As explained by Christopher, you need to > make sure that you pass the version of the patchset to git. Well, passing the version isn't a very hard requirement. But it can be helpful when working out what's the latest set of patches. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl6gbARfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xf27Q//fB5Plx6NEEKKS1FKHOG+emTH7RwTAGsWGY1ETrCddM31IUUXt8voewaf ZFht3OuozE6C68B86TKBC+wTaSGpg5YXOuBwXb3yFv8i7xO8xvnq4KXfJPAybzRZ 5sX/s6wtwIfYvTzWV4uoWaeB7QXbSRORfG4fgLIuriG4tHPBsaKUDVDITwBQxujV gUl63xNs6gErJwJwB9zA3CRxbVOx76BzOl8hzHxAHvRe8O9nMh8+SgKHwVurPArt PA4mi7/klwm/0AWZ4gCyWCz1VNTeyXj5+9sywWrnIYzXZjHjp8KEfx6/OTD46xlQ t+aktWXHWfcJWusmJBs33pnzFLhymHRlarYaqHJoeF0qAWi+u8iO1SR5tUMgkcDx kkUd+sI+oUWmwepeP6HIsX1EZAtQt63SSx9RdxkMje8HbXCbx1AnuwJqhGv0Mt8p HvvCnj3DhTUbgIrX5X7B9w6V0HJqjzrdgQSKIYMYDOX0aUNj2mthFuiprIsxpTLN TUYfjrB4YmVX8VBhft2GLvr41GTIn4yM6ohEJG914q6TBifNmcpLr8qOx8CdiMKx wkQAlZLXEL36tUPUbVTZXTBq8BmNnfG67HKE40XiPXG9onnnHWYPpyYbcySM74Y2 V3+EUTbEwdLu3mXfLfuuoVmzeE1PEhI2ZhU0Iub3ghYib+hAIG0= =iVms -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 27 18:55:21 2020 Received: (at 40677) by debbugs.gnu.org; 27 Apr 2020 22:55:21 +0000 Received: from localhost ([127.0.0.1]:38382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTCen-0005bg-Ep for submit@debbugs.gnu.org; Mon, 27 Apr 2020 18:55:21 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:33466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTCel-0005bQ-32 for 40677@debbugs.gnu.org; Mon, 27 Apr 2020 18:55:20 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 28 Apr 2020 00:55:11 +0200 (CEST) Date: Tue, 28 Apr 2020 00:55:00 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. Message-ID: <20200428005500.7114c2b1@kompiuter> In-Reply-To: <87blnjq392.fsf@gmail.com> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> <87blnjq392.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588028112; bh=+aViwOKQreAALsPUp+k27SDNXcPRKqzk+lRChpcIyb8=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=V5lGes34RrvYVMA8VBComHSL3k6h3m5AW2zJvOx2OXCrdnEjK73OknQw3LsjOG3xp FZo7z3qRJMmnM+2W3ohfrdp7oigvjy2iqNPZQV9Iw9UIcFqzXV5PPmqzBi/z6pwnGo Z0Ts//dHVJCoXljexnQxGFak6IZ3M2ltDRL1DjYw= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, 22 Apr 2020 11:27:37 +0200 Mathieu Othacehe wrote: > > + (delete 'configure) > > + (delete 'check)) > > Please add a ;no tests comment. Done. > I guess we are dealing with a raw Makefile here. This is bad news > because it means that cross-compilation is almost always broken. > > You can run: > > --8<---------------cut here---------------start------------->8--- > guix build --target=aarch64-linux-gnu libnatpmp > --8<---------------cut here---------------end--------------->8--- It was built successfully, it works then I guess. > to check it. Then, you probably need to do something similar as what > is done in package "iw" (set CC variable at least). Where can I read about this CC thing more? Is it needed when cross-compilation works? > > > + #: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 > ^ > @code{libnatpmp} ^ > typo Fixed. > Thanks, > > Mathieu Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 27 19:18:57 2020 Received: (at 40677) by debbugs.gnu.org; 27 Apr 2020 23:18:57 +0000 Received: from localhost ([127.0.0.1]:38408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTD1d-0008HK-2V for submit@debbugs.gnu.org; Mon, 27 Apr 2020 19:18:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:49282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTD1a-0008H2-Gv for 40677@debbugs.gnu.org; Mon, 27 Apr 2020 19:18:56 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 28 Apr 2020 01:18:47 +0200 (CEST) Date: Tue, 28 Apr 2020 01:18:44 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. Message-ID: <20200428011837.3880ecc0@kompiuter> In-Reply-To: <87pnbzoifq.fsf@gmail.com> References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <87k127q4jo.fsf@gmail.com> <20200422124253.18543e01@kompiuter> <87pnbzoifq.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588029527; bh=47iK69pC+dvwfUPgOqPvAeujsK615DsVDfcgWamHj+Y=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=EmS6o6iNMps6jga8Pk8Y8K0mdeeoyY0bHveaylNEMOeyssWdCjvuvpSAKIJEnspY2 P/Z/ltjpllyGknp6K/Ri49sBpO9cd0gLe2vOjUHQb3ixXYzRYfwz3rxuF2v9IBh5eF SVOIaQfR/6+hfvb9Ut3slfq+HAdioLy13wbXX2L8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, one more question about writing these commit messages. Do you want me to correct just the patch fixing downloading or the whole patch series? As for the rest, I almost corrected everything. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 28 03:15:01 2020 Received: (at 40677) by debbugs.gnu.org; 28 Apr 2020 07:15:01 +0000 Received: from localhost ([127.0.0.1]:38702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTKSL-0005uW-8j for submit@debbugs.gnu.org; Tue, 28 Apr 2020 03:15:01 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTKSJ-0005u9-DC for 40677@debbugs.gnu.org; Tue, 28 Apr 2020 03:14:59 -0400 Received: by mail-wm1-f65.google.com with SMTP id y24so1586527wma.4 for <40677@debbugs.gnu.org>; Tue, 28 Apr 2020 00:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=EQ6efEgNHGLYpd3hQiyAVrbrzmWMhndM6JbkYVWOH+w=; b=hxuesz9AzZopc3oHtn2sas6/6nPOVBFT5gfzlJ0C5fViCOFedrxAt4MFBTSLWfiL2m Jo3fCVRGJH7wBOwv2JCpMzWggCh1vBbIPl4UU3SvigDT0s9WWmL7SGKNo79MGfgX81cz Oy+9zHd3atSzs03gvUf1nWALp+moWB2bPttswOZeEEVeSn3JOuf7aqetmv+BYSZdu1x1 lXAZIny6i1qNJYc8DUgD675DUt8sCFAfACVIV6b7YwY5XsS72KqZ/Rg5jiiQBWKEcAzZ QsmYGfixri7cFJwjk3lmLhuY38CMg2GFcEGEkRq0MsW02itO9PcK/9x4wQ7mC0w8XhIY X8EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=EQ6efEgNHGLYpd3hQiyAVrbrzmWMhndM6JbkYVWOH+w=; b=c+KemMxVO2eFukPVMLldLQPWD057cTN/SMsDi+YR1u/OmJY7Eq2pTjIZ7+IlpqD1ai wA6r18x+ZFcz9Mh0UncInn/53vv81Yztilj7uxmTQLO6UBL4DXdr9ok9hqbtqTpXytwu RVbFT/D6W7CIATLfdEGUqoQ21EUfbua2tm/+AhaKEwYrh2vRstiARtsKxlKTpWslCvFD zaNdL/OeLdMX6xV+RgQU4HT8CKS0R1bEgcEkADwCcAbvtRBs7n+uB3RUIrVjRofrIDXu Hp+5QKiKDhg3e853f5U9WbtaT1lfKiv1Sz8xp7vQVRyn/sj6tiHMyaSECLQeERsrWn+8 oCSQ== X-Gm-Message-State: AGi0PuYtiI9JPy2QivB36kK9j0OhM5Ti/1Fo9urfjilxrL25GPOEzCcI 80u3gW+26ZoKAS045DJL0rI0J4JHXzI= X-Google-Smtp-Source: APiQypIxxkerh29JI44sSYOpW0TNh9xyggGYKbck2+O24NcP6w/G5mWCbZzw0TJjHE3DuHyTQW2j1w== X-Received: by 2002:a1c:44b:: with SMTP id 72mr2883556wme.58.1588058093160; Tue, 28 Apr 2020 00:14:53 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:34f1:1844:8b95:b14d]) by smtp.gmail.com with ESMTPSA id c10sm23131688wru.48.2020.04.28.00.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 00:14:52 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH 01/18] gnu: jami: Move Jami and its dependencies to jami.scm. References: <20200417015857.0650ff6a@interia.pl> <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <87k127q4jo.fsf@gmail.com> <20200422124253.18543e01@kompiuter> <87pnbzoifq.fsf@gmail.com> <20200428011837.3880ecc0@kompiuter> Date: Tue, 28 Apr 2020 09:14:51 +0200 In-Reply-To: <20200428011837.3880ecc0@kompiuter> (Jan's message of "Tue, 28 Apr 2020 01:18:44 +0200") Message-ID: <874kt4w07o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, > one more question about writing these commit messages. Do you want me > to correct just the patch fixing downloading or the whole patch series? > As for the rest, I almost corrected everything. No the whole patch serie, you can have a look to the git log for examples. Good job fixing the rest :) Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 28 03:19:10 2020 Received: (at 40677) by debbugs.gnu.org; 28 Apr 2020 07:19:10 +0000 Received: from localhost ([127.0.0.1]:38706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTKWL-00062K-Sf for submit@debbugs.gnu.org; Tue, 28 Apr 2020 03:19:10 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTKWK-000624-W6 for 40677@debbugs.gnu.org; Tue, 28 Apr 2020 03:19:09 -0400 Received: by mail-wr1-f68.google.com with SMTP id j2so23348649wrs.9 for <40677@debbugs.gnu.org>; Tue, 28 Apr 2020 00:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=JI7yoYQBwOrLSP0atwfCEcle2MGvm6LksS+ZWjxSjGk=; b=oQyCY7T6PzWnxS6pfQr8bPnsRyINiDcjFqtx0Wx89alzosolCqIcGcRMJQuLnPPIJ+ poE631ftqIdJTVkzT83jZpufyYrFCmB4rsadqyv40BTq8dPumuUFhTiRXnC7Cx2hXWuP lPAEeOvYVhUgVzZ2gz5qQPjmjZapR2bvKCnQyXe7GfUa+Bi052btkz6vxuCsMDGk/U0Z x9az17MnEvMn7nDvwWwNCOqCl/63rRg/w0DuPti1G3wipwBIwV64uppPiClK56omq0q/ dfom+MqtZS5cM0caG2cpljrPBcOYRcpnqP0NJ1ZKG/1DQtqXsZFgEPz+zuTLoTPJJU1L YBGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=JI7yoYQBwOrLSP0atwfCEcle2MGvm6LksS+ZWjxSjGk=; b=Fef28Ghd0vaG4m5fuiQqht/6pnDPQtQa5qE0Ru63wYknCVAbDaLRzYFxely9tMwVLD 8idqiu8Iuo4iTr1v3GT0BTFzx69ZuRHud4VkfxlX3TiNg7IEsFbz+n97dn2QE+WLSUwu fk0527zA7PHIA03yXyUDzAhI+KTp7uKMCfsxbUb5P7bgCFNGw9mnSgRkcPVfOF8r2Nxe LGdUELhx/e4sae0raCowvTV+iqA1xtXS6Woi6USlzvRK1Nyfb01Ybj6o0O83ZUoXnhGb G0ftN1Cze72HcKPaTk9irrEcANUJhEWpZeYeNQKKEYBA3DSj2bblaz+GkW+0ebD0Cpb0 luhA== X-Gm-Message-State: AGi0PubD8DCdP9ZLGIEPW3k7GPf0rSkeR3iMK8+HQLqPnDGNm4lIINqf MT6lwXo4A7p2FJErT66TxcQ4cO1BAkM= X-Google-Smtp-Source: APiQypIM5oNEidbBQfWlBHLpq90TkjkJIXzp24Q2tZnBfymnPOC81FCQV2pSM4VPP7ELfYA53fz+YQ== X-Received: by 2002:a5d:4005:: with SMTP id n5mr31040772wrp.242.1588058343043; Tue, 28 Apr 2020 00:19:03 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:34f1:1844:8b95:b14d]) by smtp.gmail.com with ESMTPSA id j11sm24415297wrr.62.2020.04.28.00.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 00:19:02 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> <87blnjq392.fsf@gmail.com> <20200428005500.7114c2b1@kompiuter> Date: Tue, 28 Apr 2020 09:19:01 +0200 In-Reply-To: <20200428005500.7114c2b1@kompiuter> (Jan's message of "Tue, 28 Apr 2020 00:55:00 +0200") Message-ID: <87zhawulga.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, >> --8<---------------cut here---------------start------------->8--- >> guix build --target=aarch64-linux-gnu libnatpmp >> --8<---------------cut here---------------end--------------->8--- > > It was built successfully, it works then I guess. > > >> to check it. Then, you probably need to do something similar as what >> is done in package "iw" (set CC variable at least). > Where can I read about this CC thing more? Is it needed when > cross-compilation works? The build may succeed but if the native GCC compiler was picked, then it's a native build and not a cross-build. You can run the following command: --8<---------------cut here---------------start------------->8--- file the-binary-or-library --8<---------------cut here---------------end--------------->8--- and see what it reports. You can also have a look to maradns package for an example of how to deal with CC variable. Don't hesitate if you have further questions, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 29 18:31:51 2020 Received: (at 40677) by debbugs.gnu.org; 29 Apr 2020 22:31:51 +0000 Received: from localhost ([127.0.0.1]:44840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTvF9-0000um-Gj for submit@debbugs.gnu.org; Wed, 29 Apr 2020 18:31:51 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.157]:42118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTvF6-0000uW-Tn for 40677@debbugs.gnu.org; Wed, 29 Apr 2020 18:31:49 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Thu, 30 Apr 2020 00:31:41 +0200 (CEST) Date: Thu, 30 Apr 2020 00:31:23 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. Message-ID: <20200430003123.19e8afab@kompiuter> In-Reply-To: <87zhawulga.fsf@gmail.com> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> <87blnjq392.fsf@gmail.com> <20200428005500.7114c2b1@kompiuter> <87zhawulga.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588199502; bh=ZIQmkwf9m+alIif5OXZqrOwFsPP8X/uBu+47ukNKYoE=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=tYoIq2GugXDyTOZhVdoEws+ZwjD9iWcehv22hEcsqUDUnJFMTuWhFM/p0b7zjX7JY pG5/A6m8bohazkX15IwckFKBtvM//diTSiQxQ7EOxveVyHVkhruK/afoHnk3d952Pu l5nEjECXsnE6wRKb7l+leunBPAsSv7ekAtLd1HKQ= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Tue, 28 Apr 2020 09:19:01 +0200 Mathieu Othacehe wrote: > Hello, > > >> --8<---------------cut here---------------start------------->8--- > >> guix build --target=aarch64-linux-gnu libnatpmp > >> --8<---------------cut here---------------end--------------->8--- > > > > It was built successfully, it works then I guess. > > > > > >> to check it. Then, you probably need to do something similar as > >> what is done in package "iw" (set CC variable at least). > > Where can I read about this CC thing more? Is it needed when > > cross-compilation works? > > The build may succeed but if the native GCC compiler was picked, then > it's a native build and not a cross-build. You can run the following > command: > > --8<---------------cut here---------------start------------->8--- > file the-binary-or-library > --8<---------------cut here---------------end--------------->8--- > > and see what it reports. You can also have a look to maradns package > for an example of how to deal with CC variable. > > Don't hesitate if you have further questions, > > Mathieu I copied the code from the "iw" package, and the output of file is now "ARM aarch64" instead of the previous "x86-64". That's success, right? Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 30 03:05:08 2020 Received: (at 40677) by debbugs.gnu.org; 30 Apr 2020 07:05:08 +0000 Received: from localhost ([127.0.0.1]:45245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU3Fs-00031W-FT for submit@debbugs.gnu.org; Thu, 30 Apr 2020 03:05:08 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU3Fp-00030u-Ur for 40677@debbugs.gnu.org; Thu, 30 Apr 2020 03:05:06 -0400 Received: by mail-wr1-f66.google.com with SMTP id e16so331717wra.7 for <40677@debbugs.gnu.org>; Thu, 30 Apr 2020 00:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=CLwlCQOWscoF0gzWmbNKo8YxngTWFfTAL6BFebl6k5o=; b=fHskG8bB8MThYCT567VIC4T9LWDRZ/HJB5TKutdeXvL28p43Yh2sq4ZBIzLDgLiO+J XCmV5F6vnk0Asl0FqmczQxiwhflmbbrh23nBoboNA0PooMDoCjhBrz+4m1fgKNxAjlI7 37/qTWUmcb1BtqCZH58iRT4xbr4UPatf8D0HcNq24BRYWoE/HmQuCLiAHs+za7Whu6Pb 7trL5O4C2QNn9O8YRm0GvGFVDtpXbWbapzjESu8JHezuVmSxNIwp2WND/N4Rp/wnUzfO 2YVHj71D+Xwch4EF8eRQLfQkHJBqHGZEAYEsgwtDdQwlLHdUjO9ZMHJ23ho7W7C2eE1l rfTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=CLwlCQOWscoF0gzWmbNKo8YxngTWFfTAL6BFebl6k5o=; b=Vuvlzy6nAY4Wiqp3QRdu9omggJMmenZ46xnj4MHWjm0vpb5Eb9FtgbaFGB9FSsQp5Q J10TY/vy2yxxigldC2UDz6hoyM/br8RVPgCQbJcjNnf6cPiyOtAkGCOt2PtgDiNjAL6Y s2ABE+I1d7aymHUi4dbSvNGN2VymD2s0KD0ygUY7OioTJGsAkAlCPJVw+/EPYncNLbtq PQCce7vr9ZK8ZGCe01DoSmYrzM/yjO6bIfdruvwAi9tBv5vOM4aIz2NuJ/jGJY5qw1Px qvb2GplYo+Nd0fT1lf2M1OGe9Bj8FATa2EzP/U7lJlcwcAP7XfRYs/FRuwCKR7D/7RMl GT6g== X-Gm-Message-State: AGi0PuY6bmqoKDltjtluz0MjRQIeR9U77ZokixWmjGF2Ey4sMTXDjFSE cKhDbiTXlCiFUubfzJ8jpyF9fmNzGJA= X-Google-Smtp-Source: APiQypK5uOBugjuVLI797U1HR6YT3LAc2Iy3yc6eRdd57DJenrbUXEh3IKz5VTO5r32WniZA8MZy5g== X-Received: by 2002:adf:f58e:: with SMTP id f14mr2071407wro.79.1588230300014; Thu, 30 Apr 2020 00:05:00 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:b84b:8214:5edc:7c49]) by smtp.gmail.com with ESMTPSA id r17sm2554168wrn.43.2020.04.30.00.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 00:04:59 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH 04/18] gnu: Add libnatpmp. References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> <20200421161032.1847-4-tona_kosmicznego_smiecia@interia.pl> <87blnjq392.fsf@gmail.com> <20200428005500.7114c2b1@kompiuter> <87zhawulga.fsf@gmail.com> <20200430003123.19e8afab@kompiuter> Date: Thu, 30 Apr 2020 09:04:57 +0200 In-Reply-To: <20200430003123.19e8afab@kompiuter> (Jan's message of "Thu, 30 Apr 2020 00:31:23 +0200") Message-ID: <87v9lhwj1i.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > I copied the code from the "iw" package, and the output of file is > now "ARM aarch64" instead of the previous "x86-64". That's success, > right? Yes it looks good! Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:25:48 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:25:48 +0000 Received: from localhost ([127.0.0.1]:50954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgua-0005Ae-1F for submit@debbugs.gnu.org; Fri, 01 May 2020 21:25:48 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUguX-0005AO-N7 for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:25:46 -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; Sat, 2 May 2020 03:15:09 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 05/15] gnu: libring: Add libnatpmp as an optional dependency. Date: Sat, 2 May 2020 03:14:40 +0200 Message-Id: <20200502011450.2676-6-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382109; bh=LU/84hfMqyy/R36YUy2bhduwr5CBYJVPBnxU6G9nckU=; 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=PchBVd/0XMNx4VSn/DtJU40SZqwn1Cdl6LnqrwGtg/BxRRsd/CYB+jW/SL73C3lmJ rh1Vis5laWMmCK53dLo73vOH/ePyVl1WnMiI1EjYu0AinQCyumYmlVErqNHeDlPNLO hirnI6eL/FT7mJvHNEKcKWLAAzZS3grYF71+ZMe4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (libring)[inputs]: Add libnatpmp. This library isn't mandatory, but it works better with new routers than libupnp. --- 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 2bee3ac143..8d34029918 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -193,7 +193,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++) @@ -204,6 +203,7 @@ ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) + ("libnatpmp" ,libnatpmp) ("libogg" ,libogg) ("libva" ,libva) ("opendht" ,opendht) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:25:51 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:25:51 +0000 Received: from localhost ([127.0.0.1]:50957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgud-0005Ax-As for submit@debbugs.gnu.org; Fri, 01 May 2020 21:25:51 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:60057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgub-0005AU-QV for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:25:50 -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; Sat, 2 May 2020 03:15:08 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 03/15] gnu: jami.scm: Add and use a generalized procedure for applying patches to Jami dependencies. Date: Sat, 2 May 2020 03:14:38 +0200 Message-Id: <20200502011450.2676-4-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382108; bh=UikJsVFZi46/AspPWJWGpBYneNM/e2ltIMyUFoN1Yzc=; 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=DYjlI41n917HlYkuB0gedyMQ1hkn51TgHQ3AKx6tTI4O+pMMdfHIWdfXpWo/rkdAY x9HVpwtaxodVJgin3hlfDL70yT3MpyR63aKOEmO0srMs5jcDKN3U3sJC7S6M+rz/sN mURcx/pS1ullcXw1cev/uPhUf6eIFiY1JKGDRhZ0= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (jami-apply-dependency-patches): Add procedure. (pjproject-jami)[arguments]: Use it. Remove the old one. [native-inputs]: Rename the source to sfl-patches in order to satisfy the procedure. --- gnu/packages/jami.scm | 80 ++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 44a57c9bfb..2bee3ac143 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 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 @@ -124,40 +143,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. -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:25:57 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:25:57 +0000 Received: from localhost ([127.0.0.1]:50961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUguj-0005BL-Jq for submit@debbugs.gnu.org; Fri, 01 May 2020 21:25:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:57208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUguh-0005Ao-Fm for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:25:55 -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; Sat, 2 May 2020 03:15:11 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 12/15] gnu: jami: Bump to 20200401.1.6f090de. Date: Sat, 2 May 2020 03:14:47 +0200 Message-Id: <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382112; bh=PXwYi4k3OGkBLtoQrYrDYz970BSCLuoWWJZWS8B5GFg=; 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=PufgAXpSjjUXZVd7g9Z09CIlIWFNK+8iqxYiMcSq9gXQJiP506VHH9xnxZLgxp5Ke uAh84uArSCFIGOff93TMRCrbJ8F6EKhyiOKVPlJCq55NCwwm6dSpit6L6WKc4C/bSw wGSpdAY7nxhNgu00Ao1Fa/YhWzVinh3HmBwLpy3k= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (%jami-version): Change to 20200401.1.6f090de. (jami-source): Adjust the control sum. --- 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 86745e8be1..4b2a553f71 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 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:25:58 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:25:58 +0000 Received: from localhost ([127.0.0.1]:50963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUguj-0005BN-Sh for submit@debbugs.gnu.org; Fri, 01 May 2020 21:25:58 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:57229) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUguh-0005Ap-G8 for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:25:56 -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; Sat, 2 May 2020 03:15:08 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 04/15] gnu: Add libnatpmp. Date: Sat, 2 May 2020 03:14:39 +0200 Message-Id: <20200502011450.2676-5-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382109; bh=qUmmbPXysckjISImBELqzvYAWnX/FwhEc2r0uhTDgqU=; 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=pN3lcgUaFBsyqp3BoPuHvgqBzhqs3V0yFoCYvyDTR5xxg62kq3sAM7VSb+fO0D1Hn EOZxQh3Bylbj8u+ftXZHU4WgEDzwc5RJHzL+sTp4MaRUhxCVAKBmrysXvY9PCCXlEh LqA4SXuXx1yvh7WW78XCZlLJ2YlY4mHMr/wXsABA= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/networking.scm (libnatpmp): New variable. --- gnu/packages/networking.scm | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 94b521584f..603d8b8e3a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -426,6 +426,46 @@ 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) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check)) ; no tests + #:make-flags + (let* ((target ,(%current-target-system)) + (gcc (if target (string-append target "-gcc") "gcc")) + (pkg-config (if target + (string-append target "-pkg-config") + "pkg-config"))) + (list + (string-append "CC=" gcc) + (string-append "PKG_CONFIG=" + (assoc-ref %build-inputs "pkg-config") + "/bin/" pkg-config) + (string-append "PREFIX=" (assoc-ref %outputs "out")))))) + (home-page "http://miniupnp.free.fr/libnatpmp.html") + (synopsis "C library implementing NAT-PMP") + (description + "@code{libnatpmp} is a portable and asynchronous implementation 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") -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:26:03 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:26:03 +0000 Received: from localhost ([127.0.0.1]:50969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgup-0005CB-5I for submit@debbugs.gnu.org; Fri, 01 May 2020 21:26:03 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:47008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgun-0005BJ-VL for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:26:02 -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; Sat, 2 May 2020 03:15:09 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 07/15] gnu: Add ffmpeg-jami. Date: Sat, 2 May 2020 03:14:42 +0200 Message-Id: <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382110; bh=PHZlNFIm4mwUmI1Q3e5NBOmN7j0dqzY4OBrlWSBXT0E=; 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=SnBGzHRQjqs9isg4EAJZj/na0V6gYtoM0anbGrgB6VROMnEtXhCdLzexLOiJUH5TE s55v99oWHXBJLO1kWE1exMd83RNxnlGv7Kx4vvToLBBUzWPwDJLg2skXCmYH93OBZG ucEbnQOj6xlN6rxToSwqHmnLU181EatAWtS9ZEp0= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This package is needed, because Jami uses a modified version of ffmpeg, which provides GPU hardware acceleration, automatical adapting of bitrate and extra codecs. * gnu/packages/jami.scm (ffmpeg-jami): New variable. --- gnu/packages/jami.scm | 239 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8d34029918..0fc03b6088 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -186,6 +186,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") -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:35 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:35 +0000 Received: from localhost ([127.0.0.1]:50976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgy0-0005HR-Sy for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:35 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:45203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgxz-0005H7-KF for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29: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; Sat, 2 May 2020 03:15:10 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 09/15] gnu: restinio: Bump to 0.6.1.1. Date: Sat, 2 May 2020 03:14:44 +0200 Message-Id: <20200502011450.2676-10-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382111; bh=hGYiWJJ6M6/XDzvHswE0X4n5DdD1SIk+3nnCMCEbabc=; 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=HQK37j+Sw3ji5ZgmYbHNUuddB2W8iKa4O4fG3rvss/w1ujVZgnSt1K0O6MF7P/G+c PkkVsFZfzpyqkZncJdeLQOyMU+hX0GrqmuXm4Px8av0kdy6LWMzTpG0CnAutXyqNxi uw2MS9F2yQW8lnbKETsFGyvWA7kk3qLIdONEjjv8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (restinio): Bump to 0.6.1.1. --- 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 603d8b8e3a..e3a1b06b4d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2673,7 +2673,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 @@ -2682,7 +2682,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) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:36 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:36 +0000 Received: from localhost ([127.0.0.1]:50984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyF-0005IP-Si for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:36 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgy0-0005H9-8p for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29: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; Sat, 2 May 2020 03:15:11 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 10/15] gnu: jami: Make gettext a native input. Date: Sat, 2 May 2020 03:14:45 +0200 Message-Id: <20200502011450.2676-11-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382111; bh=YuuuJvImLEPJ2+b+Cc03NwKwh3hCePIybWN3BhqkGCY=; 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=pXXRVGGihyMEfAy7uyzzq3XIFiwvBLYUDBGBJIse9szP2/PqqV/W0IoYD3iTPiF2Q 7CMcT3R+e208gyUCs5ON7HVAs0Yoyt+I+UP2pRh9KRrK1/uRFGd3AK82e9D39gazU1 z/kBv7kra3lQl38MQIxbYQap+TzuvEK9aL7SA/GQ= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (jami): Move gettext from inputs to native-inputs. --- 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 0e49b31f84..eb699a5b33 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -548,7 +548,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 @@ -565,6 +564,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 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:46 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:47 +0000 Received: from localhost ([127.0.0.1]:50986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyG-0005IW-3G for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:46 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgy0-0005H8-87 for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:28 -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; Sat, 2 May 2020 03:15:07 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 01/15] gnu: telephony.scm: Move Jami and its dependencies to jami.scm. Date: Sat, 2 May 2020 03:14:36 +0200 Message-Id: <20200502011450.2676-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382107; bh=zIyLRMa9q7BB0W/0P9zZDakH2cKDWfnRcUKlvdxhH4k=; 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=FkHsKGJFLt0sCXF/2T7XFFHocYG6mRGZ8RVmkaTNl/r7ir9M2hDER2lN4YB6ksTcj BvZd0B5/xAl877EpeL2NRRD4t3IfRjsOg+kaGKbPZzo7PAwVX73orBY2lJkyvxs8cK h/axZKQzMANrL1LGyzu9ESSE9DqU5gBk36zz1Vss= X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Jami is a massive package and its developers modify many libraries. Keeping them in a single file makes maintaining easier. * gnu/local.mk (GNU_SYSTEM_MODULES): Add jami.scm. * gnu/packages/jami.scm: Add file. (%jami-version, jami-source, pjproject-jami, libring, libringclient, jami, jami-client-gnome): New variables. Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Jami is a massive package and its developers modify many libraries. Keeping them in a single file makes maintaining easier. * gnu/local.mk (GNU_SYSTEM_MODULES): Add jami.scm. * gnu/packages/jami.scm: Add file. (%jami-version, jami-source, pjproject-jami, libring, libringclient, jami, jami-client-gnome): New variables. Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tona_kosmicznego_smiecia[at]interia.pl) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Jami is a massive package and its developers modify many libraries. Keeping them in a single file makes maintaining easier. * gnu/local.mk (GNU_SYSTEM_MODULES): Add jami.scm. * gnu/packages/jami.scm: Add file. (%jami-version, jami-source, pjproject-jami, libring, libringclient, jami, jami-client-gnome): New variables. * gnu/packages/telephony.scm: (%jami-version, jami-source, pjproject-jami, libring, libringclient, jami, jami-client-gnome): Remove variables. --- 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 26d26ee215..812253b192 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -33,6 +33,7 @@ # Copyright © 2020 Michael Rohleder # Copyright © 2020 Felix Gruber # Copyright © 2020 Ryan Prior +# Copyright © 2020 Jan Wielkiewicz # # This file is part of GNU Guix. # @@ -278,6 +279,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 7b20954120..747b0d75a1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -734,297 +734,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") -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:47 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:47 +0000 Received: from localhost ([127.0.0.1]:50990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyQ-0005J4-Uz for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:47 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:46729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgy8-0005HX-Lz for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:29 -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; Sat, 2 May 2020 03:15:09 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 06/15] gnu: libupnp: Bump to 1.8.6 Date: Sat, 2 May 2020 03:14:41 +0200 Message-Id: <20200502011450.2676-7-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382109; bh=vWpq468DXPckZxRTVzcIhanIv//LZRXTjSEm6q/AIvQ=; 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=CLsJzluWtdaRYK1y3jJO/oYyUZVkhXi3y6fA2kIWAOn3ZRjRWEwMx5iXCyemiYAET nmuM8XHbig+t5Dj0u4p7JlrrJKPiUyyxTOHDHvapln6Um3fAjlmAhJ3KF5qCql4w92 v+zVusEcDuSnHI0c0rwjyrDl1NBLbSYGNWdwrGow= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/upnp.scm (libupnp): Bump to 1.8.6. Update hash. [source]: Use git-fetch and the new official repo. [native-inputs]: Add autoconf, automake, libtool and pkg-config. --- 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 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:47 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:47 +0000 Received: from localhost ([127.0.0.1]:50992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyR-0005JB-7x for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:47 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyC-0005Hd-Ki for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:32 -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; Sat, 2 May 2020 03:15:07 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 02/15] gnu: jami: Fix downloading. Date: Sat, 2 May 2020 03:14:37 +0200 Message-Id: <20200502011450.2676-3-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382108; bh=lz0t3ioVQxR6hvlIiTXmJUjb30FeOwVt8aUloIaS6os=; 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=WqRKBb3BqXTZJexpr1J0rjQaH4L9DA3LABwNz+9yM5OLcT8cYrzd3TibK+fbaH5n7 U/8gX6CgMbIFmzQZWlRWJOtH6swtO/7ncCCDyAJ1Nx+i/UeBB5f1j3A3PPOrrEVrrM U13uk6063cIdg6G+H2jjKwncoB3HeHBnUrcji29I= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The package name changed from Ring to Jami. Package tarballs start now with "jami_" prefix. The "ring-release" folder is also deprecated, let's use the "release" folder instead. * gnu/packages/jami.scm (jami-source)[origin]: Change the uri from "https://dl.jami.net/ring-release/tarballs/ring_" to "https://dl.jami.net/release/tarballs/jami_". --- 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))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:47 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:47 +0000 Received: from localhost ([127.0.0.1]:50994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyR-0005JI-F3 for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:47 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyC-0005Hc-Kf for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:33 -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; Sat, 2 May 2020 03:15:11 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 11/15] gnu: pjproject, pjproject-jami: Bump to 2.10, apply new SFL patches. Date: Sat, 2 May 2020 03:14:46 +0200 Message-Id: <20200502011450.2676-12-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382111; bh=Xq5jcZ0kQ5xpE/Wa/BPZEFv5jQYd4aXrGqokMkNPSHs=; 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=S/1v7aai2Xs/2SFW5fxt5vvpCPfBmwxKxQkvJA5drLToSkqkkifrE6u4d4m82xWYZ uOhIedyzWxuSW1KmAPLvkyN352vJfZEmivstdnsgDJQWy8+uqUH2J8L+pLXSQDRMUr 2m6n/yvRogt6Tq1fLp6G72LMkO4JTtuuwvm/11HY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telephony.scm (pjproject): Bump the version to 2.10. * gnu/packages/jami.scm (pjproject-jami)[arguments]: Use the new patches instead of the old. --- gnu/packages/jami.scm | 27 ++++++++++----------------- gnu/packages/telephony.scm | 6 +++--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index eb699a5b33..86745e8be1 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -107,7 +107,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" @@ -151,22 +151,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")) + '("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 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 747b0d75a1..ba0d96ba93 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -651,13 +651,13 @@ calls and messages") (define-public pjproject (package (name "pjproject") - (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 @@ -690,7 +690,7 @@ calls and messages") (file-name (git-file-name name version)) (sha256 (base32 - "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:51 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:51 +0000 Received: from localhost ([127.0.0.1]:50996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyR-0005JQ-OM for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:51 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:46789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgy8-0005HY-Pr for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:34 -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; Sat, 2 May 2020 03:15:13 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 15/15] gnu: opendht: Bump to 2.0.0. Date: Sat, 2 May 2020 03:14:50 +0200 Message-Id: <20200502011450.2676-16-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382113; bh=Fc1kc3D7MWygNAl6HWwhe36e4NMyiyMEeANro8C33MU=; 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=cCAABokWEyDZ+VTPCrlhK8p13UGfOINueSHFhRu1joke63qaKDd+b+6l2LMntHpdL X3c5IaOq5BzaO7cDfK0aRNVqIKeA5fyV0FQEebeI1+Ll/KHF1V6j6KR5bimWmY7iuv B1CawAwRtGniiXjiv7yfI4jLfIdObKo0kQASDaWs= X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (opendht): Bump to 2.0.0. --- 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 e3a1b06b4d..28c0d35a7c 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 @@ -2715,7 +2715,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 @@ -2724,7 +2724,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 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:29:51 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:29:52 +0000 Received: from localhost ([127.0.0.1]:50998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyV-0005Ja-Kd for submit@debbugs.gnu.org; Fri, 01 May 2020 21:29:51 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:44814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyF-0005Hu-6w for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:35 -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; Sat, 2 May 2020 03:15:10 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 08/15] gnu: libring: Use ffmpeg-jami instead of ffmpeg. Date: Sat, 2 May 2020 03:14:43 +0200 Message-Id: <20200502011450.2676-9-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382110; bh=2q72wZrKPX/eiU8PMkSExb/i3XGQK6tCCAuWGCs5jUA=; 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=ZXx+UdTciKvAfCvTGgG+0kXa7FdUZmUKNIz0Eq6uE5jcK+r7UTHOcS+M7+t46AjOE 6OsqBs0H14Wh2cuMGni2GSdSapiANpocZVT4RU71KHqreT4dH6AE08kayIcsL+eULj jWmFEDVl2iGQz/TFT9am9pBwKE0w0wpVnhx159O8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (libring)[inputs]: Use ffmpeg-jami instead of ffmpeg. --- 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 0fc03b6088..0e49b31f84 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -436,7 +436,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:30:04 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:30:04 +0000 Received: from localhost ([127.0.0.1]:51000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyV-0005Jh-Ur for submit@debbugs.gnu.org; Fri, 01 May 2020 21:30:04 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:44813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyF-0005Hv-6w for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:37 -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; Sat, 2 May 2020 03:15:06 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 00/15] Jami patches. Date: Sat, 2 May 2020 03:14:35 +0200 Message-Id: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382107; bh=zjN4NTZyzzSfbFWEAJtUEL8vX17G12ugF/mtKBJb+p0=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding: X-Interia-Antivirus; b=ZUSbP4i6VMfCvS2Q30zMHSNNsN97SsoFkI8txpCoBa5kfbWqwbDGQ3TbV+gNd3FLg 9o/b9Y6sbkzSMVfUfrKZUxLG+aIceZejPdH/DSU4tGvt3L4SDKm0sl3KLx77LKKNTA n6v0DGAoj6Bpmr93f+K2alz2Fk2ebdIGoAL3XTJ8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) *** BLURB HERE *** Hello, I hope my commit messages are good now. I removed some unnecessary commits. Jan Wielkiewicz (15): gnu: telephony.scm: Move Jami and its dependencies to jami.scm. gnu: jami: Fix downloading. gnu: jami.scm: Add and use a generalized procedure for applying patches to Jami dependencies. gnu: Add libnatpmp. gnu: libring: Add libnatpmp as an optional dependency. gnu: libupnp: Bump to 1.8.6 gnu: Add ffmpeg-jami. gnu: libring: Use ffmpeg-jami instead of ffmpeg. gnu: restinio: Bump to 0.6.1.1. gnu: jami: Make gettext a native input. gnu: pjproject, pjproject-jami: Bump to 2.10, apply new SFL patches. gnu: jami: Bump to 20200401.1.6f090de. gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. gnu: opendht: Bump to 2.0.0. gnu/local.mk | 2 + gnu/packages/jami.scm | 599 ++++++++++++++++++++++++++++++++++++ gnu/packages/networking.scm | 50 ++- gnu/packages/telephony.scm | 297 +----------------- gnu/packages/upnp.scm | 18 +- 5 files changed, 662 insertions(+), 304 deletions(-) create mode 100644 gnu/packages/jami.scm -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:30:04 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:30:04 +0000 Received: from localhost ([127.0.0.1]:51006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyi-0005L8-2H for submit@debbugs.gnu.org; Fri, 01 May 2020 21:30:04 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:40833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyH-0005Hx-8J for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:37 -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; Sat, 2 May 2020 03:15:12 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 13/15] gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. Date: Sat, 2 May 2020 03:14:48 +0200 Message-Id: <20200502011450.2676-14-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382112; bh=YYkAQmpSNO8thGZNT0rHXYFt0xeiQjpmsCQsyMl1K+U=; 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=igbOVxpUGWUYYDbBMuUNyuan+FDg+7WqZ2iFZjYT2zLNYSahm3WfqoeMrytgGa5Jr wFMIifjIYp5DiwJSsoCsxQsLQe/KAZAGAVXfJQNwJUGJNndXIEBJBRqH18U9kIxlVa aSF3ZtnA/DBcGZPcVg5Q8ByivdtgxQV0X9Ks1A8s= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (jami)[native-inputs]: Replace gettext with gettext-minimal. --- 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 4b2a553f71..68b3dbcf74 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -557,7 +557,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 -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 21:30:04 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 01:30:04 +0000 Received: from localhost ([127.0.0.1]:51008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyi-0005LH-DV for submit@debbugs.gnu.org; Fri, 01 May 2020 21:30:04 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.208]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUgyP-0005Iq-Ab for 40677@debbugs.gnu.org; Fri, 01 May 2020 21:29:45 -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; Sat, 2 May 2020 03:15:12 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH V3 14/15] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. Date: Sat, 2 May 2020 03:14:49 +0200 Message-Id: <20200502011450.2676-15-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588382113; bh=tW14Em1V3rCNOQGjajAwDCnXEPNiD1XSkx6XihsDzlk=; 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=P5vi8fkFPJAk67MPlKqUsgXojPCjHMWzR61yBB8D5x7P+KwoS9Qfx/jAsBpQytYMU Uag/NvsnS+UiwUCi37j1hlLS4emWhu3iybk+LekSVbax6RKc1gd9XGiFV1hloR6pHy DUI9Dw78NMgobpBX5m4eWYpf1QfSUpsEn+WtkjTo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/jami.scm (pjproject-jami)[arguments]: Add the "--enable-epoll" flag, if not on the Hurd. --- gnu/packages/jami.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 68b3dbcf74..54fa6453cf 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) @@ -110,6 +111,11 @@ (list "--disable-oss" ; do we need this? "--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" -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:22:56 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:22:56 +0000 Received: from localhost ([127.0.0.1]:51168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnQG-0001I2-J0 for submit@debbugs.gnu.org; Sat, 02 May 2020 04:22:56 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnQF-0001Hd-7N for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:22:55 -0400 Received: by mail-wr1-f66.google.com with SMTP id f13so14516305wrm.13 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=bQ+vvppz2PwWXfbULnqASIb2DWcfLjoqaEHroBDScbM=; b=B3d931cHd6DdQ5jyQwiKZjUp1p+JUnCISIviy2gzwDgDINfH6mQ0hYEEeNigHr3amg xdxZv8y0+PjNKNJ2dM0kzVHeNBNHewRynbnvX4QDBp1Vt5W7QA+5HZ2l5VvpZVWfhqSW C1tB3Me6YiGdVPxUOcBJgo9Ha1ARfOp+ZEyQgZQTxjGFt1iwk0SbVIHZoyBsQkmYpqR+ WnAUOE0P3G7GiOzg+xay0cBQWAdoMuaZK8kmm3t5WZ3iC4YIq/jLrel4K3M/4LJcPuYl TuAcFAsAFiJCD7Gn5yZYwwOfhLdHUf0ymEY3I3oR6t2lYf3xwjNnKdm4DtMX8W6Vl+Qa gVog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=bQ+vvppz2PwWXfbULnqASIb2DWcfLjoqaEHroBDScbM=; b=B6G+DRfU0xA5ESuoPRvPUYRpzL9ovw7tJ9kXcVjmYGrPCToAPrsy96p2SLIFWnzEZp DatnUW6FaRfYQh6aB7F4nb16uD/8PN+Fke1po7OXA71EUkLQxuXRaHXDipZ42OL5XT3v fdteuOe13v8SVxz4H8tXlRcRc8PVMjENH1hT1dxySDvq6Ip6ZoCSk9rPUu5VPr5ExK7Z BZroyBScdYva8PqWwpQ4rPSCpeTsug15G5TFKZbdw8bjbLDMJ6KB/FdbdewlS9tkDipq aWMBCxlevun81Z/DdOM7R8B/9n6h13+rU07mFg/k6YBWc4kBOhCXTD9u7HUpFp99ydaa NCdg== X-Gm-Message-State: AGi0PubynfaO6D1asJ4F48tDm8Bo/jBC6nKjcT3VmNdoZd6yYA7/pSYd FpOEJ/gqYZHzznxuCzXw5N2sEu3l X-Google-Smtp-Source: APiQypJLVF9h/yrCG2rSLSORgXFNUHCzkIdQw8E0WJc9Vd/WInNFvBpfSoHfjL4EsVjE+K/OD/kS9w== X-Received: by 2002:adf:f5ce:: with SMTP id k14mr8945123wrp.39.1588407769200; Sat, 02 May 2020 01:22:49 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id r17sm8086071wrn.43.2020.05.02.01.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:22:48 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 04/15] gnu: Add libnatpmp. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-5-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:22:48 +0200 In-Reply-To: <20200502011450.2676-5-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:39 +0200") Message-ID: <87tv0y3fvr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, Thanks for this v3! I applied this one with the following edits: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 603d8b8e3a..431b0fafd4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -439,8 +439,6 @@ files contain direct mappings of the abstractions provi= ded by the =C3=98MQ C API.") (base32 "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1")))) (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) (arguments `(#:phases (modify-phases %standard-phases @@ -448,16 +446,13 @@ files contain direct mappings of the abstractions pro= vided by the =C3=98MQ C API.") (delete 'check)) ; no tests #:make-flags (let* ((target ,(%current-target-system)) - (gcc (if target (string-append target "-gcc") "gcc")) - (pkg-config (if target - (string-append target "-pkg-config") - "pkg-config"))) + (gcc (if target + (string-append target "-gcc") + "gcc"))) (list (string-append "CC=3D" gcc) - (string-append "PKG_CONFIG=3D" - (assoc-ref %build-inputs "pkg-config") - "/bin/" pkg-config) - (string-append "PREFIX=3D" (assoc-ref %outputs "out")))))) + (string-append "INSTALLPREFIX=3D" (assoc-ref %outputs "out")) + (string-append "LDFLAGS=3D-Wl,-rpath=3D" %output "/lib"))))) (home-page "http://miniupnp.free.fr/libnatpmp.html") (synopsis "C library implementing NAT-PMP") (description --8<---------------cut here---------------end--------------->8--- Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:30:46 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:30:46 +0000 Received: from localhost ([127.0.0.1]:51173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnXq-0001V1-CJ for submit@debbugs.gnu.org; Sat, 02 May 2020 04:30:46 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:55125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnXo-0001Uo-4X for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:30:44 -0400 Received: by mail-wm1-f43.google.com with SMTP id h4so2513179wmb.4 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=zc2/EbobtUj5iVrk6khH3f4br10+4+8FolTsVK5bN70=; b=Q5zeessm4s9YPEPQq/SoIBf2W5cHxWL67gXB+p+FWUZjr5GNDMWRnXFCIqqXrRsNC4 3QwSBKoHY6HJPCFh10STqgK/s9HCMOagb+FfHvjP/z5vPuqaqmMg8jpyQRZghGKb67bl Cd4H5QftAxV1iYbx5xBDjf7I0IJw26rEqZlizuK2a9khEDDrrt/ZXI0tn3IVzrxgFTU9 +mCUSF8uXrG13capF+1CJfQP8TZhKOgLc7ylxqgs2W+qUWS+0ucgF889DNN1j+39B7Sm PQYPlL0HPokHLLgBbMu+QJmTNzp+SNjVbfz/AFvr6tSrWgp9Kl8UBCKGa+a4X4JCtPjH pQ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=zc2/EbobtUj5iVrk6khH3f4br10+4+8FolTsVK5bN70=; b=miuUolHrcjs+XLt8dQUBj2RLCz8AHb0Cq5LKd0wR6wcxEnzOkILlJuxtwjFpKy/04X 0ZLAlMDOOaSgC4WDm1QbOlpbSAiA84dXpPlgdc3zVrqy+dikZOsz1QYgjXJRgbexjcst FI3maGDYYubdNOTRxrO0AgXR3EJxVv/S0HUNTaJP+VmPCyYfdnnPY+VzfivrkNuulY/L WbwKLza6gBLoQHSus9LHxQu9o2n8fKELaJASPZXhyvhDfCfhSHpzI7lFV2CG15HMTDoq YCOsMkXU7Vns2tGfk6K2PdeOPV2CTb1B54kaBF0gIJAIrzmzQeSuZYQShJxX7QCNhPur sKGw== X-Gm-Message-State: AGi0PuY5KTgnE7F4J8ds2EXUep6yMwK3e16PAGXo0JM6Rf0GH/AAWEXH GYyvFpR0z2L9gVTYA/g103bI0SoP X-Google-Smtp-Source: APiQypJO3+Ffo7woz04VATvGpYe0zBGgXUCscMuTG4525X+FgT4HmT0HH9mFNuE9Vou0lwqJ/vbrRA== X-Received: by 2002:a05:600c:2306:: with SMTP id 6mr3843049wmo.17.1588408238190; Sat, 02 May 2020 01:30:38 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id s9sm9021971wrg.27.2020.05.02.01.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:30:37 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 06/15] gnu: libupnp: Bump to 1.8.6 References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-7-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:30:36 +0200 In-Reply-To: <20200502011450.2676-7-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:41 +0200") Message-ID: <87mu6q3fir.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied with an edited commit message, Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:33:04 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:33:04 +0000 Received: from localhost ([127.0.0.1]:51178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUna3-0001Yc-Ob for submit@debbugs.gnu.org; Sat, 02 May 2020 04:33:04 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:33987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnZn-0001Xr-Er for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:33:02 -0400 Received: by mail-wr1-f51.google.com with SMTP id j1so14610480wrt.1 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=62zQcqmEppxvKDSkSTFjv9Dd6BFQLTj8AdUluabdQBs=; b=cTBTuLfhYaVNLNHUY738XJf/3CqEmyKyYUIiIgKNvRb0xaaQ7CjJmdH2srUmQBS62q ewtFoShu+fjF2m21yLp92iMN0w0XzCphV8tHaauzd+IUIjjIam9kDcF2yNyzogV6imEx BpTR/XW5d1T+GIXVa2DXTfAOKbrIM1iG0yR7iJE5dAAsYs5/zIUbJ8C7dFko1K659DoM zpphXIm3JE0ETMO2jIxMlxlnOZ6iEyx9LhHkKUDm/YRJoQpFreLjkYi4h4m+3qQUrGGu Z84Iq3uLWzGJ2pMBRn5b18hRiZRfjFQjpY4S2OdGBj2Rt+dibuCDXGbadOiyRBKi7kmI ecgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=62zQcqmEppxvKDSkSTFjv9Dd6BFQLTj8AdUluabdQBs=; b=WxUDcU4gvLo/HwQHOzjFD9/6B9yGeL+f0Sgynua3LIajRVabhTltwBKH/GW9T0LpJj KiOq63DQsfKVZIADeYC/rCZX1N58cLLuNPFKae3HMJAOHNTXQzdX3q2QPMPE8uRoS5da 9ZPNaXnAO1schb2b1dwH9e0G2s8EUVqQfArQbgvRTP9qD+eexOsoemMuj2ngyOFy4Qqz JeUsV/qDlWXTreq/qZajD0yn1IgqEupe60eQO407tgclqsM+4ttuQkC2O83hZ29xDsbc YXF0XIHMxGpbORupXhOIfIyMGwKYjrW3mMIzkK20rsw/yj1brBidwlYE2ZvVoopljO/k jorA== X-Gm-Message-State: AGi0Pua7GAh6l/n+f+zcQnIVIXMAkugeVV1RaEJS81m04ed6Z/huo3gx 6onak2w4yVqIHObrhRTq6gz4vBRO X-Google-Smtp-Source: APiQypLvz3rnXeQcjvGC7ME17r7tZRbet/c1rLqPseQ6sasFZ8NYRaPmapV6qVThJVbMy0Zb6C5h+g== X-Received: by 2002:a05:6000:1044:: with SMTP id c4mr8951864wrx.57.1588408361493; Sat, 02 May 2020 01:32:41 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id o129sm3413229wme.16.2020.05.02.01.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:32:40 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 09/15] gnu: restinio: Bump to 0.6.1.1. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-10-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:32:40 +0200 In-Reply-To: <20200502011450.2676-10-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:44 +0200") Message-ID: <87imhe3ffb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied with an edited commit message (s/bump/update). Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:39:05 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:39:05 +0000 Received: from localhost ([127.0.0.1]:51182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnft-0001hV-AC for submit@debbugs.gnu.org; Sat, 02 May 2020 04:39:05 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51885) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnfq-0001h0-W2 for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:39:03 -0400 Received: by mail-wm1-f68.google.com with SMTP id x4so2540996wmj.1 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=jquDJka7G/hs+7JbMoxIaABQb0mqQwE0EyIGoOj9RXA=; b=Kb6aFg7Ggo9iPLJQz+rlSxwigY45cpttvdYKlvzaFfKqpZdkuTxfb348UzDJ58WQbA 7r/q1cqhx0KzVkBpc2DwNcM/U0rHbCYcZmCUCQMlEhB+cuopVK7NC8/0+Z14R//uTlk/ JCWRHefOHcl/jbdUmVoK49BmFnwzQ5vRfcoekqv/B+xuH39sNluRZnrpM84GhsLR8X7L mx63mjSx0O+AB9+Oc8axCEA/AO81EtvVVqZvoX6nGuDpwhArsbUmbcJR5T75Hsno+peA B8igeIZJZhCaB//Mg8qmvp2gK/h0FEdf8QG8o+rzoG8JIeVeIALKpSmMjIB/2LGYKJZO QmUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=jquDJka7G/hs+7JbMoxIaABQb0mqQwE0EyIGoOj9RXA=; b=LQKfbbu/MMAZri6zIxsr1X80lATZd4dnkAaNXUen5xZICePIJAwcW3qbIgOsMfZaUM fc+eD6DUlA1d2UYko5ulbLS1EMPjb+D3jrwnbb2/w+1+mWFmB/re9zyMJbWLQd9JEWtE vil60w2nW2Um4GPj/NWoMa7IIotRz8QMff+meyujFg86BlovlCJnjOgh+9IhksHGmcW1 HHrBsKFw1JwZtqALwEsV+QMvgsMMQ3NUGgVcS0IOlTNXExNOWGPxCVB9WEX1hA9fuPau iI0eFLrbPZYKMTdUlBIUaRLihtWVSf8XXupRhO0sLGyud6XsJFrFFgQWBR1KAcHQX7ot Gmww== X-Gm-Message-State: AGi0Pua6KH8nFzLJ6xSbNsMueEziCcmrMWkvtUVQy8qFxYv6YiIANAqG 0zQcHT/LvvldMhpauJCeC0Cvr61+ X-Google-Smtp-Source: APiQypIoKFCITgYyXn6YrLq2wyiDsrYGZh0Ogvm7wEFXFqzXkj//bmkFDhMiaQcXUHrPvy89oxu2uQ== X-Received: by 2002:a1c:c302:: with SMTP id t2mr3766208wmf.85.1588408737029; Sat, 02 May 2020 01:38:57 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id v16sm3206990wml.30.2020.05.02.01.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:38:56 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 15/15] gnu: opendht: Bump to 2.0.0. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-16-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:38:55 +0200 In-Reply-To: <20200502011450.2676-16-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:50 +0200") Message-ID: <87ees23f4w.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Seems like the 2.1.0 is about to be released. But let's go with 2.0.0 for now. Applied! Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:47:44 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:47:44 +0000 Received: from localhost ([127.0.0.1]:51189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnoG-0001uw-4v for submit@debbugs.gnu.org; Sat, 02 May 2020 04:47:44 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnoA-0001uT-53 for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:47:42 -0400 Received: by mail-wm1-f66.google.com with SMTP id 188so2542269wmc.2 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=LQnJa7m19kinJFkpUgMPUH1NbZDhJwaOuPR3nfNMTxg=; b=gcweCKy9cA4kG1ZEZqkc/u7jL0sdy7tW6Qumi0QWW2ErqGW3k2jK8qovuDgvPy5NoI HV8Kkse13vJmH8+NEoZoN+ApMuq1IaUvUb7BS0qUHgyG1nmj/iD7qV9nk3iANY17gVTE pCJ7Z3OJKzzWYMplqmA7kAA1cVGG1coueE8xQLp5iZoye59xpXriEqjZnHsN7IIMuEWb pUF8tF4zVcCSVOjH6KHuEf2i6B+zz2AiEB12aLq0wThuNqAv8lDqEFX+a5Yx/AbdtvOh 7EJX9BYnVt0rlt0Er4IY/L0PXc8welMPNMKDHRPW48hwA20tIze83dcMic+8BQpcTAN3 EDUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=LQnJa7m19kinJFkpUgMPUH1NbZDhJwaOuPR3nfNMTxg=; b=AUWz/u5JpmEBeR/4VwhUYxkSapYvX5Ooy2DYdJXuC40WYMR4wAno9L6GFxAB/TWSqK kvKfYLXmnOCZd+0np6JcVWPIfjZ7x2LlLmNv1U2kNJZ8W+Li65INJ2liKDWmcs2xKsMV EMhw481DnOxz1IjHO60gDQpl3l2tn2QHJ52avkuu+2tltUC4KBQ23WtGv9QhX0QBsUON Pgo1Pr04vuMCwkMLckcQX1eCa91f00EzNVrf9GRHw+mIYpkfS5Wy0o7SV+/AupT6Twhn lV7G7DO7sRyHGo6tzLjn+CNnAIzLStJ/D+iMcJgbF+LXOzqRNTfaACsC3+gHRQfCz9KB AVgQ== X-Gm-Message-State: AGi0PuZ8u4ZESXqQU/EUHVdgHRdf42RwrlFOpWCUTdvHfB4a03ZqtiPE eHjsw2fXezcuJcwn0Kd/Hn6laPnB X-Google-Smtp-Source: APiQypIifhgV5nTqnamIjUKTZZhchNrmZR6BTtOpJXYu+K1NMGGNahd/proJv7eXD9GKPcEez79Gjg== X-Received: by 2002:a1c:64c5:: with SMTP id y188mr3572154wmb.130.1588409245193; Sat, 02 May 2020 01:47:25 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id e13sm6568346wrw.88.2020.05.02.01.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:47:24 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 02/15] gnu: jami: Fix downloading. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-3-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:47:23 +0200 In-Reply-To: <20200502011450.2676-3-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:37 +0200") Message-ID: <875zde3eqs.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied, thanks! Mathieu > The package name changed from Ring to Jami. > Package tarballs start now with "jami_" prefix. > The "ring-release" folder is also deprecated, let's use the > "release" folder instead. > > * gnu/packages/jami.scm (jami-source)[origin]: > Change the uri from "https://dl.jami.net/ring-release/tarballs/ring_" > to "https://dl.jami.net/release/tarballs/jami_". > --- > 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 debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:54:27 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:54:27 +0000 Received: from localhost ([127.0.0.1]:51209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnul-00025q-8K for submit@debbugs.gnu.org; Sat, 02 May 2020 04:54:27 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:47054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnuj-00025c-6b for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:54:26 -0400 Received: by mail-wr1-f66.google.com with SMTP id f13so14573729wrm.13 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=lnuHaB9NTPnLPJM23dpiB07cj3LAjJ8fBmlOj2Qn7DM=; b=kqub4UnQSZYmE6gc0cPdVAfj6Olt+GQkyOcUo6NinSeqe+FMA50T8ODUCzMLw/p9Gh R5nWoUtSXUmV0dok+Z4biwAQAL2UWC7Tk/9s/kj7SCSWqrtCWEF7EHE7cgNbM04c2t2/ cQdeBmQbqhOG85k9ykBZhrQ3psDjs0Xs0NJ4okHrLfsg9Gc3hOa4fsYY+wzHjT+wBHwY 5MizdS3wPzb1eG56ZL/LACQ8NvPt4Lz3w+dfUUBnJoH/tBtHO3ZsXBmYdJSwpWsVYsOb Sj5uj0b59JDtCOpvOK0WyRCBjg6oHIDY0U9zs9/sTPLUKDoUjv7NGUiaCom0vVX5irp+ 0OMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=lnuHaB9NTPnLPJM23dpiB07cj3LAjJ8fBmlOj2Qn7DM=; b=l2OGl1kqN+ynolTYW4AOD0pW9aOajQZImWGrpxt839RoTw8Is/4lVPDHaQ+iZv9Q4J Cwcd85uDYlv+pKVN4+ccMwZzRslhANeBtAl/laxW8+Un/jDikX+fr9Bi5de/Upevx//v heIqJJdXezz5gLKFHifejA5RHWh9ZaQKoR3TKv4Q4w9QUn3AgR7nDOBaMN7tbG+zJXEc xXdLHfeUShDmbEHIKFwIozJpPtRoQteGnE+X+fnDrv7EjaH6wrBki+mDXbRYzw/D5kCU pQShG4zciJOCvqEqAYcel5O+KUhznu5rcia7rluLCH+hfwVQ67d3XbMOYVE7FuQBSXfr yWTg== X-Gm-Message-State: AGi0PuYTzpF0aHSJyV8K5Ya0KDacnXOgFnv68lHT1WNw/aCa1mSfrVCJ ZuZbajIwo30A7VwsqRJebfGAnKPY X-Google-Smtp-Source: APiQypLC0KGlu6rLt1JRcE/mjyLU0OfnThQZc1MM0N10EpiLEZjPK4ciWMCJWH+9flsh3KolmQXCfA== X-Received: by 2002:a5d:5386:: with SMTP id d6mr8268046wrv.222.1588409659175; Sat, 02 May 2020 01:54:19 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id a187sm3263879wmh.40.2020.05.02.01.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:54:18 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 03/15] gnu: jami.scm: Add and use a generalized procedure for applying patches to Jami dependencies. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-4-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:54:18 +0200 In-Reply-To: <20200502011450.2676-4-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:38 +0200") Message-ID: <871ro23ef9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Edited the commit message and applied, Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:54:29 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:54:29 +0000 Received: from localhost ([127.0.0.1]:51212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnun-000265-HI for submit@debbugs.gnu.org; Sat, 02 May 2020 04:54:29 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnul-00025g-OV for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:54:28 -0400 Received: by mail-wm1-f68.google.com with SMTP id g12so2734458wmh.3 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=lWER/7vdVcL01oIZOjVc7A88RCh6iVoiSarRT8NGHSo=; b=RkJivfJAD2Mq23RFBbzu13PRssGWjCtmGRKJeK4Cce1AJ52rutrTaPfYbFXp0gzCto rjSbQ53B1V8T0ctJtrrRJHKTp06oamUyuidCsLNsh5HHZ7CAI/UrHbp55S2xcXXvoOFD WJkyooDQoIMrpo0sHa2tYjLFUcG4meAQ052DL/2Ul9ju9S6tGDuZ5OqjC6I/IjYmCXMB 1gwfsLc9yFS3Yw/KW0zPjRxRW5DFsyAPAhPgQ1e6oxvtaVUXfHV/bx7/NbttxDY3tXnm QzHX1H6IazUGWtPdY1EcCJH9WTk6JCl10ne5eKiWlicDSkYRbWGKSy+lE2Cp3FxMBNQz oqdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=lWER/7vdVcL01oIZOjVc7A88RCh6iVoiSarRT8NGHSo=; b=nu/xi0fDgAHs8zenVgF0qTlRhEDZ/hGGNtwqUpuPJZEsmNW/gsMzc56nEcM0+MhnMC LqebN9mNf7HQviRbtDK4F0LQvbgbEDKvHNCzkXSIIP96+rWPRm4IlhxF/czAKeQ91eVw cQ0YQgxA4w+f72MNEAGGDEso41hl2GkPk17aGApve+B/1F27NsUy4gXP0v5JOHFlRwzV JzBfPKomHc2JPRm8B8JhWo5X9unVsojHDzp0929FKQen5HN7v1B0fnON9tJUdKrU66KI see6uj7ezsK5HUg9h7hCqF4450twkGVbacFiEjM8OrqeEPCCRQwzVD0OQyJCLnrh07PF MyYA== X-Gm-Message-State: AGi0PuYD8CG/yPxQmvA8Z7peWGsrhaHnWHw3psBebf29eY/VmI6VsQjh MpZ/uJhOK0f4/jIJhuenYw12g1ZE X-Google-Smtp-Source: APiQypIUWZgy7g2FFFBvTTQa8xZ5tI0fYK7GPObKM4fTjmKbQ1JWY76gQb/p6kqHOMirrFPofPl00w== X-Received: by 2002:a1c:1d4b:: with SMTP id d72mr3508703wmd.19.1588409143688; Sat, 02 May 2020 01:45:43 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id b4sm8038517wrv.42.2020.05.02.01.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:45:43 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 01/15] gnu: telephony.scm: Move Jami and its dependencies to jami.scm. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-2-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:45:42 +0200 In-Reply-To: <20200502011450.2676-2-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:36 +0200") Message-ID: <87a72q3etl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I added Vicent copyright to jami.scm, edited the commit message and applied. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:56:54 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:56:54 +0000 Received: from localhost ([127.0.0.1]:51217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnwt-00029g-TG for submit@debbugs.gnu.org; Sat, 02 May 2020 04:56:54 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:54108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnws-00029S-1h for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:56:38 -0400 Received: by mail-wm1-f48.google.com with SMTP id k12so2541443wmj.3 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=3UGtShjG19CodhGdX0MuyDvmUeI21M19Hhpyj8NXVhQ=; b=mRzum1SuYnuRk6DxwNlBdIiWSJjy3jjR1H3g/8soPDv0XXXXFNkLqE7UPJE5zN/FRd YVep+dctTp8GRj3d8gsXKfVLCy6Hjp2dNKEO6WiwXQRyIVmz4UwnpV9zGIrDnUxgYH7N Agtwo4L4LtojLZNReu7pW7i87VyTDIsWHCL2Xs1pmHKH6HF23FpZE5CGmWTSxOViFqz2 C1E4NskUJQDF0CvBGYxcIw/0QKqbht3B3YHCj+fdaGn5ZGamzI98fwXJv0PPpvsT3Ws7 Rsw7R0Xt/VNxhodOijdAwlINdrrArC1sJZ1z7Lxwr6ess05ED27LRvl2e81KGuxuR8Zx +5Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=3UGtShjG19CodhGdX0MuyDvmUeI21M19Hhpyj8NXVhQ=; b=jTTjWAyECrqVNEBFiv6/lrwYlsXsdLIQo2IWruMzWtbs+VjbZzyHr174IXcjSEumNs gCAGin7N8i0aIRG+QyJ0eAx8nqV3CXqqa1H3tyUGeSTB+11Ll9mErX/5jSLPW3dReRLM zmy7D2V+f3NbmiMyaTnLFAnQpOQR0B9CzTvhqlLhUMKsAdEitGfcR6sA1nd8+On8ONf0 efG9gCABanma97IpvbskqvOUjLb+antw/yWP/eORoQjp1tYPA7NrVU/967mAJce+GuFk 8e1vR8EGeJaHP+BpfSym0zyHLH1GJgfcunGxcz4Ml95PIk3wEkdKmIOUMHwtREraRoi5 tU+A== X-Gm-Message-State: AGi0Puan9/Rv5iCyvAuC7aD9csRb9Xn9PwTAXg4PL+zR8PwHyMN55IRR OJt7malDnJk9YkUemJScHSfaH/64 X-Google-Smtp-Source: APiQypLnp7GFGl6/tbsXFhK362d+hX3ezz+DjE0HgPUCODbmqRySgaTwWxAo+aGpeFlp9vRn82cAoQ== X-Received: by 2002:a05:600c:441a:: with SMTP id u26mr3972361wmn.154.1588409792197; Sat, 02 May 2020 01:56:32 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id h1sm3396470wme.42.2020.05.02.01.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:56:31 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 05/15] gnu: libring: Add libnatpmp as an optional dependency. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-6-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:56:31 +0200 In-Reply-To: <20200502011450.2676-6-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:40 +0200") Message-ID: <87wo5u1zr4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Same here, applied! Thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:59:15 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 08:59:15 +0000 Received: from localhost ([127.0.0.1]:51221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnzL-0002DH-0t for submit@debbugs.gnu.org; Sat, 02 May 2020 04:59:15 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:46872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnz4-0002CZ-SH for 40677@debbugs.gnu.org; Sat, 02 May 2020 04:59:09 -0400 Received: by mail-wr1-f51.google.com with SMTP id f13so14582121wrm.13 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 01:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=wOOWQI40/jRnNnizTeRVv2NMHhbOfa3edlHiiNWniyM=; b=Sq+m9wANdk/hoQuVkcsXFKFH+gX1luuR4t59pRmF9RVxRPLferIc0bDufK0Mp0b/pp maW6nYtxPmnr/nXD/c2ovr08IbkqQVcm8DyKfwKGr1vS1C4OorZQGn3nJOS1yszPo+hf p+epwdqixue5k8ZlcdVmZ/uHeBsVL/Mt7rLm6M1GYN4uYF5eIQtW/iBkxrflxC2HKbpj OH3XpJneW3KYkZ9IcU0fuC0VPeUoH4VclPzTVUdAZLwgBpRB5iVTjnEA5fHp10rXeFiv Q4LxIIb48Rn//awhEZyaLFx2LAsRu/vBfVvGVQvzcNv3Ka6z/k1XQafvkBZILJGr+Qa1 WrcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=wOOWQI40/jRnNnizTeRVv2NMHhbOfa3edlHiiNWniyM=; b=Bkmkp6q8EVUNvNnYQpMm7TzWHOlckxx8sAGj92qSo+1mXw5U+A7RkyLWhS5s0DPfMq inh01/QxN60gMpUdJyBpAIkyznC+W7NodCcGOUz848YeOHS1A0JGJSyo6UJYVVEoKF7D l1GWedvwk5FN4eB6rlfAiU9bubnLD8mZ1RRTgidqaVspbaU7YW01oIST+7IkAZShz8wA l1LlDnY66aVGtAkAI2VDCTsiynCtsckjrFtIzBBqgmMOFsEC4dPbWRph7UrVw+JAlPyD GkXwPlgucIAegZoezy4ftIQy49dCGqeGi6aj8svhrD+uA9rF9G5dbP5qi9LxN4OmJtqg MOYA== X-Gm-Message-State: AGi0Pua17B5NOYY5eln0IaIb9tb9HvnmSR6YUwol86sWsuEp9p1Ls/Ip wPJMKljgbfG9kyPFZ/zUT+NLyZ/b X-Google-Smtp-Source: APiQypJ+5DcJy0jJH3BwGsvB48KM435lp78ngBQM2NDbBVgkZ27WWV2aopiCN9qUdzb5htagnWdsmQ== X-Received: by 2002:adf:ab18:: with SMTP id q24mr8199291wrc.214.1588409929091; Sat, 02 May 2020 01:58:49 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id j13sm8014234wro.51.2020.05.02.01.58.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 01:58:48 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 10/15] gnu: jami: Make gettext a native input. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-11-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 10:58:48 +0200 In-Reply-To: <20200502011450.2676-11-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:45 +0200") Message-ID: <87sggi1znb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied, Thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:14:23 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:14:23 +0000 Received: from localhost ([127.0.0.1]:51230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoE3-0002ZT-Jt for submit@debbugs.gnu.org; Sat, 02 May 2020 05:14:23 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoE1-0002ZF-HP for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:14:22 -0400 Received: by mail-wr1-f65.google.com with SMTP id e16so9534977wra.7 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=0GfIkGvZ7EJk+0Do4OqGWkhT3Z6xFFSkkAc0wpxjX+4=; b=SCSpaB130EIwp6aDUFERvYfR6J0rEP3OpzCMTbqzGGlyauTKLBx66Nd9cwMIvHxlYR tJUiu8xSTIv5vnCVU9/MdTu5rI6p6uVLlMavXVIBYSpXCV4VjRAhAxXOcXJtCCm9NgWP 8K/3oioPT0khW4/i2vPKit9QGORQEGNLgkrFgo7Fd5GTwFlNGoyKVd7U3ycDGyi53iM+ PtsJLZC1xvX2VF3mluYfWt9T0fXaEH/6Vtqnr2nQu2cOcLcnya9Jmm2GROf2VAd3fv05 1eCfbzQazJDIU2K6e8n3S+xViCx+WGK+IKxEi660Z1OoyRJ8IGT9PwT+T3dlEoV3UYds P1Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=0GfIkGvZ7EJk+0Do4OqGWkhT3Z6xFFSkkAc0wpxjX+4=; b=uXJCPgdDx/2ARykB0Cc7PcKCoPAGeBMUn8XyswjSqtSXwcH37jBQsUNyMAcHMx61pp 4cri5iC0AbeIW+1jMpR4j2wP7+h7U2wyXrPErO4yfBGzGrY5+DFLWFUs2I1DZr9yQrL+ 86DxmNj1QzEUs46jf59fq8SvM9U62xxikDfgBzxpyelYz1bBpOUZypiNBrQwbl0C0mjs y/WmGo7eZjNHYHrrdGPdMob0rK7+orlBC5nI+cz1YLIVDewCLUvC2Ryq/B5JmffgHQ5O 6ie4i8OF0zD79ARuMDK6jlIa0fR9eQNU2A4uSy5JXc9vYtYR9ZL2gSaVmnC1VsWaXHWt cnsQ== X-Gm-Message-State: AGi0PuZHiiZCZgdWjO9V3LatsrDEWbtm6jkyFvFGaseLfqPjYAd9mHwL +5JL5QYaq5Y12tOJR26xfISAvcQZ X-Google-Smtp-Source: APiQypK06qbFtBYhUwQaR3YNblknfZBwUTY0PVHCamW25Q6FWM7Rzd7QxYHC3pdEfgpSZpnpfGkORQ== X-Received: by 2002:a5d:54ce:: with SMTP id x14mr9252514wrv.103.1588410855436; Sat, 02 May 2020 02:14:15 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id a205sm3478859wmh.29.2020.05.02.02.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:14:14 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 11/15] gnu: pjproject, pjproject-jami: Bump to 2.10, apply new SFL patches. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-12-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:14:14 +0200 In-Reply-To: <20200502011450.2676-12-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:46 +0200") Message-ID: <87o8r61yxl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > * gnu/packages/telephony.scm (pjproject): Bump the version to 2.10. s/bump/update > + (list "--disable-oss" ; do we need this? If we don't need this you can remove it. Otherwise no need to add a comment. You shouldn't hardcode the commit corresponding to the tag. You can do this instead: --8<---------------cut here---------------start------------->8--- (url "https://github.com/pjsip/pjproject.git") - (commit "3e7b75cb2e482baee58c1991bd2fa4fb06774e0d"))) + (commit version))) --8<---------------cut here---------------end--------------->8--- With this commit, neither pjproject nor pjproject-jami build for me. Could you check why? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:19:48 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:19:48 +0000 Received: from localhost ([127.0.0.1]:51239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoJI-0002hW-Hi for submit@debbugs.gnu.org; Sat, 02 May 2020 05:19:48 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:45441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoJG-0002hI-VO for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:19:47 -0400 Received: by mail-wr1-f47.google.com with SMTP id o27so9354151wra.12 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=30Dc+z2O3i2iTJIxMH8ePbeDyJBiP33cxLxJiMPNQU4=; b=K+/xTcQtiMzXLABM+CrwqQuBn96hIcNKcHse8wmrspycW6awha4VBBkfkfXvZWe76/ 2snoWp0G7wXUTYqEhXujT52fLO4U6HYumcKyUzVXu7ToXPHum2e9dlPuVgxJifP+01Tm UWh7KSkaiteOn1v1V3Z0wAPqdQw0aJadFTrEKVVeKSP0zj3beMiqhcgjYEkn+/NoJz/N jqjeH5iEC/C4VJO3Wgt5XD8RJNowGYaXa0hBsdITh/R9e2KczPUWYsbrSg3YRsOtqYIi nnsgISwcZ58UoI1smYNOQndJDoJnxeayxQorKF6VHbqV7YX/EzbhMUjFBiKE5JEECOdy 4bmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=30Dc+z2O3i2iTJIxMH8ePbeDyJBiP33cxLxJiMPNQU4=; b=B9SmPJLMS9AoIOfrWeJADWDdlvpOUKYFNnJPlXOBlHCPLMimm30sElcEQCz4YcvHm/ c0lWK28ZfQPJD62nJhDXD8YEv+IgkVG4+gJ3ge4P1RjNoCOi74Ql1vYbG+lo8OqV/ZKD ylXgQhvqD7vja7tjQJpiXyGtCk1eJrVs59EpP5VVC8P0I+exqOBXeWutu9YBKb37lgbg i7MT9qPXi81mXJ6XsS0fpNos90izfeXlLwcw9A+eRjnBYbpF+h38Y7YkKnOxcONJXON2 qB+ol9xH/Calp1u4NRJe286hJCz4R91/Av+fszRoEp0e1gbPw8mCR+5V7EB5vkGMvura TpPQ== X-Gm-Message-State: AGi0Pua0zSl6j07/hDk+QdCdNgVtrebPXBuvyPlifbJovaLb24Yts2tp zbSKNvBf5r8T3EfRvn3wo3Q9cMx/ X-Google-Smtp-Source: APiQypK64pJ4KokiW9suXrdgzesaUzulTLM/8btpA5eU+imrU+qCUJ+b4NtWhS9a/DNfxBEwOMH79Q== X-Received: by 2002:a5d:4dcb:: with SMTP id f11mr8305887wru.174.1588411181077; Sat, 02 May 2020 02:19:41 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id e2sm8232951wrv.89.2020.05.02.02.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:19:40 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 12/15] gnu: jami: Bump to 20200401.1.6f090de. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:19:39 +0200 In-Reply-To: <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:47 +0200") Message-ID: <87k11u1yok.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > -(define %jami-version "20191101.3.67671e7") > +(define %jami-version "20200401.1.6f090de") Turns out this one needs to be applied before the pjproject update. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:26:06 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:26:06 +0000 Received: from localhost ([127.0.0.1]:51249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoPO-0002rp-5I for submit@debbugs.gnu.org; Sat, 02 May 2020 05:26:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoPM-0002rL-6f for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:26:04 -0400 Received: by mail-wm1-f68.google.com with SMTP id r26so2821220wmh.0 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Rc8ozKA4aIiuaaI0LO5kECSSxANSTySSVtBg4f/hbEQ=; b=WXLNDpyldoi+ASgcnrzDDZub5RmF31aK9C7JWanuj57fyTjzahGTp9i/Eh9kzSSkBP uNCDCxT+0kYuOWGyPPUCc19NsVWu2Jx+zEK23z1ToGqejw8sk/A5DoesfLcJ4jTK1Z5v ax5/DId0DXlyIIriWFQqK28Pne5s8oAXdgrxiZs9X3JfLnVt5Qa9Hi4MN5mHpqbcQLhj +YEeEjRgMU7UkcWYCuwDopys1KwdnW/xtvdXNlxLMV7rPnx9W4S6zzCueDX+daDSlgyW mURTqa8VtlQNwmw6pCjLOz5mnDq4EVVdgdizN4tr52kcMO6Vuf/Q2kiCvefKqcmDndXy meNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Rc8ozKA4aIiuaaI0LO5kECSSxANSTySSVtBg4f/hbEQ=; b=uR1FWFpfCm2XDdig1LjXjA+yyfXeK85BUWoAe867HU5FZFByAutFVLtrF5ig5pIuqa N0i11zRMdItT5YLs5xi/xfQ1yI1cvO7XDveuPNVAigZqsD/6c7zMTcZSdOAC2nUed2X2 YKYaQV+ssmtV48tn6TuWqXjWu9pXHBCjRSixfdDQpNWro4wcL5sfhbglSlXx5TQOFioD PLmt8Umy9QZx3lK/Gd9OTwqW6kCnV5n/2KVphKZdzrJqr05wp/WjeXrYMI2awDW735/0 xjAyJUbt5irW/fycmsX/v83m23YtdjMdHpEp1S7DWCQBHQosXOsGxjA5Gxxsq8ICRe07 KLbg== X-Gm-Message-State: AGi0PuYGsarVa0shpveqXrUu+r03mAiR6djslQNCyAHzyzy1eD0ttLpw rf6Sdac/XM/SryKtqWKjoe3WoHNk X-Google-Smtp-Source: APiQypJE8a5Za1XZHWoOry12Z2ngwe/NiQmwsdv6vWOpQIVzF/YXxHdY4+NMnkEZoyQIKm8EdsXZhQ== X-Received: by 2002:a1c:e0c3:: with SMTP id x186mr3783472wmg.146.1588411558115; Sat, 02 May 2020 02:25:58 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id x13sm3711656wmc.5.2020.05.02.02.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:25:57 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 12/15] gnu: jami: Bump to 20200401.1.6f090de. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:25:56 +0200 In-Reply-To: <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:47 +0200") Message-ID: <87ftci1ye3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > -(define %jami-version "20191101.3.67671e7") > +(define %jami-version "20200401.1.6f090de") Ok, so I merged this one with the previous one. As you noted pjproject still fails to build in 2.10. Even if Jami variant is now ok, it would be great if you could fix pjproject build too. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:28:46 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:28:46 +0000 Received: from localhost ([127.0.0.1]:51253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoRy-0002vK-HN for submit@debbugs.gnu.org; Sat, 02 May 2020 05:28:46 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoRw-0002v6-FJ for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:28:44 -0400 Received: by mail-wm1-f66.google.com with SMTP id u16so2794150wmc.5 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=zc2/EbobtUj5iVrk6khH3f4br10+4+8FolTsVK5bN70=; b=KuOi+2HNVFjlZVcErwCnpXZLcri8fJRTCIidbCGNqGvfbRhf+p0CCV63I0O0foD+DX Ykf6/XyLH9ovIw8q5TuozG0efOMeTWJQbCZHRKNPmyaYhUzSVa2x5leWmNSKdrtYr677 qzE+WzwENCDYQchjrhISQ0uEHYv/UrNtertUuhNmW/Oda88zvZjo6lNlSyJoMf/8qGuB S8ICyOB9HbdVerbYLaPTDZrWLBGEFeEv2MR9lXYF28IsUmYaerTnVo1gFkd3PhTVStE7 Cd6z4ocsrzChgcTh6aB8JaExYMJCryapzQAMXH1PdGtLcfuZtrVftUrdMHYO0OP+1qrz NO8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=zc2/EbobtUj5iVrk6khH3f4br10+4+8FolTsVK5bN70=; b=YDPeZkaDPwcTXuEt8njwUnb/NRQBjTN11TatvOMpViLLsy3dbJivUR21FgKie3yQYe cPJqS+PidccnKzjPEOjwUVBBrCcC5ifz3SbvRbvaJS1FRoe4whHdEjB3Dt/OrASTeF+K e8a13LgtZCe8CD4OH4dKN/uuMdJ/uOtOiWDozQcWMKtYyZFWB92J6c9gmgOKkrDrl9Zs wl9xqbY58iVKMgcadpDYFxZKc7fC+Lmo5T2Bowl9/S877dK9id629lpNZYprbm25oRU2 xwbdgpg/XEreXuoEl1Di359hvY/J+79vpG98b2SCugz0z8JWnyz6LHtScbc4Mn9oECfX MV/Q== X-Gm-Message-State: AGi0PubIRjGuyZBtjo8fkY+D/CuaM6/Ul0ne0Z7c19+CkvKeTlo+7HCQ OCsWUClQHlBxAfUVDp/4g8nnDKSp X-Google-Smtp-Source: APiQypIflvTY5nk+J+Vkxrt+mGfz3INvO46/4ty1xyz6xJCWGDOr7TY2KifYQBUiXkMB7i1Pzz3/pg== X-Received: by 2002:a1c:9a13:: with SMTP id c19mr3652305wme.159.1588411718673; Sat, 02 May 2020 02:28:38 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id i13sm8043092wro.50.2020.05.02.02.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:28:38 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 13/15] gnu: jami: Replace gnu-gettext with gettext-minimal, just like on master. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-14-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:28:37 +0200 In-Reply-To: <20200502011450.2676-14-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:48 +0200") Message-ID: <87bln61y9m.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied with an edited commit message, Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:33:09 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:33:09 +0000 Received: from localhost ([127.0.0.1]:51262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoWD-00033d-7a for submit@debbugs.gnu.org; Sat, 02 May 2020 05:33:09 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:35241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoWB-00033P-AD for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:33:07 -0400 Received: by mail-wr1-f49.google.com with SMTP id x18so14707838wrq.2 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=NoE3sdC2RroDanuY0bgDVIAPLXKHyxyxs9I77aNPAOc=; b=TXW09npMLkUkXUFcOjG72xVyFKpVWQPVbF/goXzvMRJnXYRDAe0a2zrLzyOzskduNX tBNjjB+/cCox9A72Li67l012U+HvFFaYs+dWBNf4hJoWeOwAfYGXdkquIcTUGcndAdEE lvdhL6CLhkt4TDUlIgGRriX+Fwu1/TF/clZqOwi/ihElBugZDYLqpUWiPc8dJyaJgg/N LGTuNMSebKuaD/S56jk7rv5Zzbk0hqX3aU8WpUQS4wRIQ493nCE953oLccCJfRnNNFJl IPxyuGNSlnMdjp+htQv20V1C2ZRZxSKIPYGD+Q/XcjwlAloMxOyvD9F8Ga/ecrb7IKjT aR1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=NoE3sdC2RroDanuY0bgDVIAPLXKHyxyxs9I77aNPAOc=; b=CY7NYm3Gz58Pfg7W2EN7U2l5EsnmUaLHRsrvKfZ47XxOBC7XaOyW6o/uGXEV/GNTV2 e0BDO61vp4hJ6tJ1HyYBl1bv7sLwU9ETkJyFAqZcvJc8Wqb/EUQr8/kmWhQaIkVI+TkH r7+ob729I8PgW2SySRxIUh5NWu2hi9YPpoA5rbRuf3kj6mFfnz2pM92ZEas2PK2XEZHA qz9mBRP1LQ/yanrbCXcyu3qHDNjesOBRmSjP8qCJQA5y9Mm7xAkFjllKsHYkKONS5vGc 4uaan5Oqd4U7khXrwFGppNUOiuiAlYfkipn7YsBdp2eLbdTnVhif16UXhW0XXPj0kvC1 7row== X-Gm-Message-State: AGi0PuZRMUgd32Zv0LqRxhXTRK4A2jamg6ZkkpJgPGaq42FgA5zJYXu9 7B84zB5jdP8nZdYU2e6B9gbKlxJj X-Google-Smtp-Source: APiQypKKhsqZ8H2ZOwK/VCVWEgiqx++TKfqPG92tuT3X6uyUt0qhKqi2GBINPXZ4Aab/4GlFFQUEhA== X-Received: by 2002:adf:ee4c:: with SMTP id w12mr9424471wro.347.1588411981227; Sat, 02 May 2020 02:33:01 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id w83sm3482596wmb.37.2020.05.02.02.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:33:00 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 14/15] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-15-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:32:59 +0200 In-Reply-To: <20200502011450.2676-15-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:49 +0200") Message-ID: <877dxu1y2c.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Applied, Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:36:41 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:36:41 +0000 Received: from localhost ([127.0.0.1]:51266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoZd-00038V-Ld for submit@debbugs.gnu.org; Sat, 02 May 2020 05:36:41 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoZZ-00038G-M3 for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:36:41 -0400 Received: by mail-wr1-f68.google.com with SMTP id o27so9385589wra.12 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=F/HJdwFr2m4TTvKtOHlN3EUMkxvizvWheYvDhgv+sLg=; b=c267lKRPn554/9IeZdvfbiLrdkHrKaxAuijQ9NnD3rUDQJ7BqcpKV0D0V4Mp2ne8DP qJRVodeQZ5g9BfAXL7809RLWyOO4uiDSGUOR3XwEbztQ4ZTT+c2ry8gb9yuSjecgHpso 2x3+rerSbM1RaA4lbBM5uZ+lQNsZYO9phAr4ueLWyCwbGjtE/kRiVsqBunhZSk7fyI01 RoH+AFaDqLK2RKB7eF9FkJEEqXi2En1lIhz17Mnc0EPZYJkeFrQ3webSknHiAC9NXYqG eR0ZdwW05i2CBFYqnSYI8uYqmK0zshyhpcETq5ghRwWGAR7A5IQKJNJ/fshBTUbiFh3Y +MnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=F/HJdwFr2m4TTvKtOHlN3EUMkxvizvWheYvDhgv+sLg=; b=uAtXyG5aSnrlkVkuXTcMoFwcpOCYBTAFAxHqRpC+yJpzUMASDS/WQ9jV/9aYPLSXL6 3dMtpbel7WfF6NRVDoXnhLoRPVYjM2zoIh5xwiqVYiVpbwZLBx7jppIhS3EmQs/c9mxf K+znA8lQPYuFsPBd3k9KlFFczfFzX5wIGEaeMIqh/YTMjPhwxMWtEpNlA97PuuZ/SxdM ZZDtJm9sh/weySOspzqW3Cr7J2FHFXs1iQU/BR1uOO9rCyAmAxYuw9K7opHX3MHviqxh 0FUXZBW4orn1wSmAf9NCVU8ZMTjSXnp8gEVoYFDdY/Ee6+ZFgcOeKxKiNOgYp7eg9e9X jNOg== X-Gm-Message-State: AGi0PuZSefSG4Rn5xAmkLZm0U170XzHWVdrvkorXREcSRrZxXSmVwCI8 k8kv9qoeS0kNobZ14WDxlVuVASkF X-Google-Smtp-Source: APiQypLoERiqa4PCk3z9OUahWiNXk17rPycc6Ruwe3Ad3gvu0k3JUmMSuY+xabZHD3BK3+h/qf8mtw== X-Received: by 2002:adf:f785:: with SMTP id q5mr9061341wrp.313.1588412191918; Sat, 02 May 2020 02:36:31 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id p6sm8051519wrt.3.2020.05.02.02.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:36:31 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:36:30 +0200 In-Reply-To: <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:42 +0200") Message-ID: <87368i1xwh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ok, last one! As discussed before I'm not very comfortable with this very long list of configuration options. Are the ffmpeg configuration options needed by Jami described somewhere? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:52:28 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 09:52:28 +0000 Received: from localhost ([127.0.0.1]:51278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoot-0003Ur-U2 for submit@debbugs.gnu.org; Sat, 02 May 2020 05:52:28 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:43405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoos-0003UZ-Aq for 40677@debbugs.gnu.org; Sat, 02 May 2020 05:52:26 -0400 Received: by mail-wr1-f41.google.com with SMTP id i10so14698080wrv.10 for <40677@debbugs.gnu.org>; Sat, 02 May 2020 02:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kLcPRJdZGd6xcPjfWycAi15Sf1SQDpqphk4Er8QUgV0=; b=HskUwyMUgIoELjEfbf8E6LwvtcdmzYub9YvVvnOxTBJ7OWQ6+za4n3vvzFGGFQ4NAK g9huyWGCr936O62KVDvQcCfibE/RwOpwI/e1hS+sAc7nTQxMKdB9gsNqiJY6AGYjMn4h 7l5qRmxBMskL+X0O1MqhW05u9UrH/mADYzA/tPNodmEIHvAnSO58bJVMHy6RZj6ZLxpt 7HxIawT+AVg4x9SUIx8geWsHXPIgI9auOrFfGfhpX3tjMMEmbgxqClFPX4LRIuAKgCI7 odWKg0sQBWvjMf1ccLB7MnGu04npVIPQw6cVxIGDYIASMZ7fR3jrfhYenHLdxfW4PP/H qNxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kLcPRJdZGd6xcPjfWycAi15Sf1SQDpqphk4Er8QUgV0=; b=szS5RW2WDkmtsSihnoz5yzJy+6QPTYHuBznX1iI4YGuc5bqORUqJgvLdmRUY6qYAWZ 3aZnU+J82SxuYnPbsv0+vG1eYAyfbkbZkw4KIfde4SJlmo2faER+Cs69BbiyCCvsmqUo 9Y75MmSqUVmVCTireEnb5L08rcoZB72JzdLlYGzzdLanG+h30Pu33lIPJVFaQrHRNj2D uox6yX8wvKrSVv4WzfFCY6p40hrV3U3yHWje2ohaMQKWhm/ZtzeuFOtckB2ZsUvL65Um jq76egk+94DrhAwVdI95sJdaieoVDDaZ066FNcnoQlWDjj44jiP3OcxQgTNHA2oS9Dlv 639w== X-Gm-Message-State: AGi0PuatO+lESbnDpCzcshYFahrr2rJ24yreUxd9CWhF2FoRON51UbTY iC1V4IPniEMbF8OFj6kMqYveZPEI X-Google-Smtp-Source: APiQypIaqwdZiFikgyvTR3nu/9hwLEVn+iVpvsJxfH6NQxbgZCdWkOUvQEG62evOZU7QExqFfkduvQ== X-Received: by 2002:adf:f5ce:: with SMTP id k14mr9307742wrp.39.1588413140167; Sat, 02 May 2020 02:52:20 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:5142:5b8b:1d3f:ecc5]) by smtp.gmail.com with ESMTPSA id r17sm8426925wrn.43.2020.05.02.02.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 02:52:19 -0700 (PDT) From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH V3 00/15] Jami patches. References: <20200417015857.0650ff6a@interia.pl> <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> Date: Sat, 02 May 2020 11:52:18 +0200 In-Reply-To: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Sat, 2 May 2020 03:14:35 +0200") Message-ID: <87y2qazmst.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, Thanks for this v3, I pushed everything except for the ffmpeg patches. When trying Jami on Ubuntu, I have the following errors: --8<---------------cut here---------------start------------->8--- ** (jami-gnome:3720): WARNING **: 11:46:10.955: Error : dring is not available, make sure it is running Gtk-Message: 11:46:11.008: Failed to load module "canberra-gtk-module" Gtk-Message: 11:46:11.009: Failed to load module "canberra-gtk-module" ** (jami-gnome:3720): WARNING **: 11:46:11.010: Error : dring is not available, make sure it is running (jami-gnome:3720): Gtk-WARNING **: 11:46:11.012: Theme parsing error: :1:273: not a number ** (jami-gnome:3720): WARNING **: 11:46:11.116: dring has possibly crashed, or has been killed... will wait 2.5 seconds and try to reconnect ** (jami-gnome:3720): WARNING **: 11:46:13.623: Error : dring is not available, make sure it is running ** (jami-gnome:3720): WARNING **: 11:46:13.623: Error : dring is not available, make sure it is running ** (jami-gnome:3720): WARNING **: 11:46:13.623: could not reconnect to the daemon --8<---------------cut here---------------end--------------->8--- The problem is the same with the jami-20191101.3.67671e7 revision. Do you know why? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 07:26:36 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 11:26:36 +0000 Received: from localhost ([127.0.0.1]:51417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqHz-0005wk-Sp for submit@debbugs.gnu.org; Sat, 02 May 2020 07:26:36 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:36406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqHx-0005wU-Nx for 40677@debbugs.gnu.org; Sat, 02 May 2020 07:26:34 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 13:26:26 +0200 (CEST) Date: Sat, 2 May 2020 13:26:17 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 00/15] Jami patches. Message-ID: <20200502132617.308b9658@kompiuter> In-Reply-To: <87y2qazmst.fsf@gmail.com> References: <20200417015857.0650ff6a@interia.pl> <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <87y2qazmst.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588418786; bh=zOYvouO5AJdYLS4LHcH7ewfECxVkKNJpoPLVj7bTFCk=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=e8HHibHF8JFPYo6PMQDY1ZQBWNb08uI5VSuVoNbRm2881Ps3stpNol44eWbh+4cCq OGMFxxTWmW1Zi72s48jPWlgBAaG3ctBz1ZtlYKRoaGbuCEwZt0jnpYYc6OdRYHDmvy pQ903NpSmGQKcvJpILhG6x0YDhqh3uZtNTPXuTPw= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:52:18 +0200 Mathieu Othacehe wrote: > Hello Jan, > > Thanks for this v3, I pushed everything except for the ffmpeg patches. > When trying Jami on Ubuntu, I have the following errors: > > --8<---------------cut here---------------start------------->8--- > ** (jami-gnome:3720): WARNING **: 11:46:10.955: Error : dring is not > available, make sure it is running Gtk-Message: 11:46:11.008: Failed > to load module "canberra-gtk-module" Gtk-Message: 11:46:11.009: > Failed to load module "canberra-gtk-module" > > ** (jami-gnome:3720): WARNING **: 11:46:11.010: Error : dring is not > available, make sure it is running > > (jami-gnome:3720): Gtk-WARNING **: 11:46:11.012: Theme parsing error: > :1:273: not a number > > ** (jami-gnome:3720): WARNING **: 11:46:11.116: dring has possibly > crashed, or has been killed... will wait 2.5 seconds and try to > reconnect > > ** (jami-gnome:3720): WARNING **: 11:46:13.623: Error : dring is not > available, make sure it is running > > ** (jami-gnome:3720): WARNING **: 11:46:13.623: Error : dring is not > available, make sure it is running > > ** (jami-gnome:3720): WARNING **: 11:46:13.623: could not reconnect > to the daemon --8<---------------cut > here---------------end--------------->8--- > > The problem is the same with the jami-20191101.3.67671e7 revision. Do > you know why? > > Thanks, > > Mathieu To be honest, I don't know why this happens. I was too focused on correcting the commit messages I forgot about testing. Let me test it now. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 07:31:28 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 11:31:28 +0000 Received: from localhost ([127.0.0.1]:51433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqMi-0007Or-3H for submit@debbugs.gnu.org; Sat, 02 May 2020 07:31:28 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:33584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqMg-0007I2-3V for 40677@debbugs.gnu.org; Sat, 02 May 2020 07:31:27 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 13:31:20 +0200 (CEST) Date: Sat, 2 May 2020 13:31:18 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. Message-ID: <20200502133118.72a69372@kompiuter> In-Reply-To: <87368i1xwh.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588419080; bh=otyLIjH7VgDZx0DwDNDYLAZj0lT3gmYpf0jRxMedAxg=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=P64BkxLOISLXuMJLF/IdrY7Nrx9asvZxq1mZo2TUCpvliHgYc1vjp4uCkWdLTOeKE 9fzLWXOLKVnIrpmtgCjPMyvvhhsLYedzyezS+h/L2pMcAZPn2XMoFPg5gcF1wS3L7F gL/DpA8tT4OlXyXPP+iRn68Cf2g7jDAk688GHWuI= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:36:30 +0200 Mathieu Othacehe wrote: > Ok, last one! As discussed before I'm not very comfortable with this > very long list of configuration options. > > Are the ffmpeg configuration options needed by Jami described > somewhere? > > Thanks, > > Mathieu I copied it from ring-project/daemon/contrib/src/ffmpeg/rules.mak. Tarballs are here: https://dl.jami.net/ring-release/tarballs/ Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 07:33:49 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 11:33:49 +0000 Received: from localhost ([127.0.0.1]:51446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqOy-0008FO-UU for submit@debbugs.gnu.org; Sat, 02 May 2020 07:33:49 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:47319) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUqOw-0008FB-OQ for 40677@debbugs.gnu.org; Sat, 02 May 2020 07:33:47 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 13:33:40 +0200 (CEST) Date: Sat, 2 May 2020 13:33:38 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 12/15] gnu: jami: Bump to 20200401.1.6f090de. Message-ID: <20200502133338.38c2c02c@kompiuter> In-Reply-To: <87k11u1yok.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> <87k11u1yok.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588419221; bh=lsHDJhqcKuGtYETAX4zvYthcaJAblDdBLxK+P3zfNoQ=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=BhzojhwQgipiA2rsrBCvVjqt3QmXCbYRF1Df3189fj5QSlitzYsw9k6+bfhouUX5i OJgHt/yBr1BwZL6Q9CQRxCG/ynj57cM53oMybECxDpFpg+uGT3bxCWcxt44i5Xm/zK 2VeSRd3/xfm6/Ks8ZVn3OjzG4/TkZB3xU7JSE4Vs= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:19:39 +0200 Mathieu Othacehe wrote: > > -(define %jami-version "20191101.3.67671e7") > > +(define %jami-version "20200401.1.6f090de") > > Turns out this one needs to be applied before the pjproject update. > > Mathieu Yes, this can be the case. Patches are taken from jami-source and if the version isn't updated it can break. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 10:59:15 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 14:59:15 +0000 Received: from localhost ([127.0.0.1]:53675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUtbn-0003KP-BC for submit@debbugs.gnu.org; Sat, 02 May 2020 10:59:15 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:37506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUtbk-0003KA-5K for 40677@debbugs.gnu.org; Sat, 02 May 2020 10:59:13 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 16:59:04 +0200 (CEST) Date: Sat, 2 May 2020 16:58:55 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 00/15] Jami patches. Message-ID: <20200502165855.2ff4b856@kompiuter> In-Reply-To: <87y2qazmst.fsf@gmail.com> References: <20200417015857.0650ff6a@interia.pl> <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <87y2qazmst.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588431545; bh=N1ZqBkcvMhSyrbF6mMaakhHpLkaQkndj5OiWuC7g/xg=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=FL42ujVP4/AEGEk0Ul+559p2d8e95/lvccz8OeHmMIulY6ea0tmVZEpmqADemjuqk JbCJvr59vk0KTKUqBOQWn4l3ijdzj6HLTNMbPtlknPeFkEMHM7KCRoDDCTpXnbzpv1 qSlrrbXg5JKyIps/rzQob1yc71y4/wmV8CSsTaKo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:52:18 +0200 Mathieu Othacehe wrote: > The problem is the same with the jami-20191101.3.67671e7 revision. Do > you know why? > Okay I know the cause - I forgot to replace one occurrence of "SFL-patches" in ffmpeg-jami with "sfl-patches". Could you fix it for me or should I send the corrected version? It works after changing it. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 11:04:16 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 15:04:16 +0000 Received: from localhost ([127.0.0.1]:53684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUtge-0003Tk-30 for submit@debbugs.gnu.org; Sat, 02 May 2020 11:04:16 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:53535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUtgc-0003T5-MG for 40677@debbugs.gnu.org; Sat, 02 May 2020 11:04:15 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 17:04:08 +0200 (CEST) Date: Sat, 2 May 2020 17:04:05 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 12/15] gnu: jami: Bump to 20200401.1.6f090de. Message-ID: <20200502170405.650b500f@kompiuter> In-Reply-To: <87ftci1ye3.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-13-tona_kosmicznego_smiecia@interia.pl> <87ftci1ye3.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588431849; bh=LT6fGtRY+Ivo4BrgVVAXjRxNEgo/EZsYp1C+Mdd/IVg=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=eXC3/rj2xchi1dKbg9sluIaZRSYtmCP8X5puidVVnEr8kUDBT7TCcCWIFy+NyAESq 2aYIvEkhTHS2wPHtZlbkfihzCll5cjEo5ORw8DdZ3qA542m2NaWxQhMg5Qxjp8d39U aTOvXuF6PmKGflSmykcqIPXi2EOX7D/i86HexkOQ= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:25:56 +0200 Mathieu Othacehe wrote: > > -(define %jami-version "20191101.3.67671e7") > > +(define %jami-version "20200401.1.6f090de") > > Ok, so I merged this one with the previous one. As you noted pjproject > still fails to build in 2.10. Even if Jami variant is now ok, it would > be great if you could fix pjproject build too. I can try, but haven't succeeded so far. > Thanks, > > Mathieu Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 11:17:31 2020 Received: (at 40677) by debbugs.gnu.org; 2 May 2020 15:17:31 +0000 Received: from localhost ([127.0.0.1]:53689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUttT-0003mN-9s for submit@debbugs.gnu.org; Sat, 02 May 2020 11:17:31 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.237]:36946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUttQ-0003m8-Fh for 40677@debbugs.gnu.org; Sat, 02 May 2020 11:17:29 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sat, 2 May 2020 17:17:21 +0200 (CEST) Date: Sat, 2 May 2020 17:17:18 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 11/15] gnu: pjproject, pjproject-jami: Bump to 2.10, apply new SFL patches. Message-ID: <20200502171718.447a69c1@kompiuter> In-Reply-To: <87o8r61yxl.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-12-tona_kosmicznego_smiecia@interia.pl> <87o8r61yxl.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588432641; bh=LvJJE4uFyQFC4pGE+uyhuC1UGTcJNPaNrz5TU3T3bDw=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=AQ3DH9CGZeCCQepnZv3HWreUDTgETf5EPxdERqHCeIEqPEjqmkBop0hguLHnUvcCX g+FG+FYNMUvbRqPr4kb0SSXBGUHjqImbAQOiHBSRpC6wjGTd4i83PDhFOZ80trv4hy djvuHDqnMyfjYhBvu28xC4988TI2HxA2odQJ0JCY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:14:14 +0200 Mathieu Othacehe wrote: > > * gnu/packages/telephony.scm (pjproject): Bump the version to > > 2.10. > s/bump/update > > > + (list "--disable-oss" ; do we need this? I can remove it then. > If we don't need this you can remove it. Otherwise no need to add a > comment. > > You shouldn't hardcode the commit corresponding to the tag. You can do > this instead: > > --8<---------------cut here---------------start------------->8--- > (url "https://github.com/pjsip/pjproject.git") > - (commit "3e7b75cb2e482baee58c1991bd2fa4fb06774e0d"))) > + (commit version))) > --8<---------------cut here---------------end--------------->8--- > > With this commit, neither pjproject nor pjproject-jami build for > me. Could you check why? > > Thanks, > > Mathieu Are you between my commits? My commits are effect of over 6 months of work and experimenting. The patches for pjproject are from jami source tarball and change over time. Patching pjproject will only work with if both version of Jami and pjproject are compliant. The commit updating Jami should go before pjproject-jami update, then it should work. Anyway, everything works on my machine now. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Sun May 03 03:35:03 2020 Received: (at 40677) by debbugs.gnu.org; 3 May 2020 07:35:03 +0000 Received: from localhost ([127.0.0.1]:54583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV99Q-0003m6-2o for submit@debbugs.gnu.org; Sun, 03 May 2020 03:35:03 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV99O-0003lt-Jc for 40677@debbugs.gnu.org; Sun, 03 May 2020 03:34:59 -0400 Received: by mail-wm1-f67.google.com with SMTP id v8so13012095wma.0 for <40677@debbugs.gnu.org>; Sun, 03 May 2020 00:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=nuR29gGXEu7WrG/SmHwu/DqRJqb2ROXwYnfSsnwFL9w=; b=fjSQCZcU4+EpD7ylUI+NbdnBSLcZnfJH78hNemQZHHEjHh1H/hzY+yujGv8DvnJEKl xoz2eolzELtdUo56oR9zJy0KBveHdqo9EKzkwuOidMetqVfngj98HgoSBlUcgyvyoJTZ UrTUY+ffdShY+lwiN8hWgEWXxC2KlmyvWkPrgPurBfWUYIjV62sSDHnnEhETZm8uDsFs ylArffW9Qu6GxG7Is3AQ1/llXM5TGSjfByungdjNgBnp6kWsIp4imQ5kKucV00IZktoi MwF/fmrIMRE6f2GZJuvlWJ44BxJ4+oX6ag1LBwZ5sziam9Qp3l9l1djkXFwiJlZRk9ks l6Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=nuR29gGXEu7WrG/SmHwu/DqRJqb2ROXwYnfSsnwFL9w=; b=sSXXP+8rcyQAPcdVrkugarc/n+nUzbBcZrxf1IGvqMLbaFM7ODB6nk3YNcglTimerL tHEOQ4w55geup53Pev73hlBXZIDy4I0tDpRpLxCs3V5MjFWhvp1MZbcIhVfc3uoXLbuj 1ZU1XFc/itSyrW/6/vRFmgJzpZQBfFMrZpa/Zd3AEAHkPgARuYxdAfx7vJEs89I/0z/Y dE82mJV2VTicRBNGKqxT3JAOuut5sCF6m3++Glbitx4QnMrpT3cX8GGnxfc1BqdGrlOc u+h/BUPPbYKeLtKu+izg9SxSPio1Tg9PtGyxSGgPLhnmFCyKARph7HX1gLXDofFNNR/b 1Nsw== X-Gm-Message-State: AGi0PuYEk0BQiCOSkLbmlRzgoKllLhoAfAPffFiB4RhF/TDJvO1EzpIq xmHhRew0FyoRHT5ZcxV7zF8hQa2u X-Google-Smtp-Source: APiQypKG1bwGxr/ue7WHdHFuOsDvhi7+xdTZhR7aOyVkCPU0G69hwKLnhIjVdk9cvm77OsgGf15zXQ== X-Received: by 2002:a05:600c:2645:: with SMTP id 5mr8073179wmy.168.1588491292240; Sun, 03 May 2020 00:34:52 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:1cf0:acc0:9003:83d6]) by smtp.gmail.com with ESMTPSA id y11sm11729057wrh.59.2020.05.03.00.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 00:34:51 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH V3 00/15] Jami patches. References: <20200417015857.0650ff6a@interia.pl> <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <87y2qazmst.fsf@gmail.com> <20200502132617.308b9658@kompiuter> Date: Sun, 03 May 2020 09:34:50 +0200 In-Reply-To: <20200502132617.308b9658@kompiuter> (Jan's message of "Sat, 2 May 2020 13:26:17 +0200") Message-ID: <87k11tzd2d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, > To be honest, I don't know why this happens. I was too focused on > correcting the commit messages I forgot about testing. Let me test it > now. I think the problem is that when starting "jami-gnome", the "dring" daemon is started by D-Bus. On a foreign distro, this cannot work. So I tried to start dring manually[1] but I have the following error: --8<---------------cut here---------------start------------->8--- /gnu/store/chb71qh7dprrdgn7d3g08d2pbii57v2v-libring-20200401.1.6f090de/lib/ring/dring -cdp Jami Daemon 9.1.0, by Savoir-faire Linux 2004-2019 https://jami.net/ [Video support enabled] [1588491116.175|28401|ringbufferpool.cpp:118 ] Ringbuffer created with id 'audiolayer_id' [1588491116.411|28401|video_device.h :129 ] Default video settings: 800x480, 30 FPS [1588491116.529|28401|video_device.h :129 ] Default video settings: 960x540, 30 FPS [1588491116.532|28401|manager.cpp :676 ] Not initialized [1588491116.532|28401|manager.cpp :676 ] Not initialized 09:31:56.533 os_core_unix.c !pjlib 2.10 for POSIX initialized [1588491116.534|28401|manager.cpp :738 ] Using PJSIP version 2.10 for x86_64-unknown-linux-gnu [1588491116.534|28401|manager.cpp :739 ] Using GnuTLS version 3.6.13 [1588491116.534|28401|manager.cpp :740 ] Using OpenDHT version 2.0.0 [1588491116.535|28401|manager.cpp :751 ] Configuration file path: /home/mathieu/.config/jami/dring.yml [1588491116.537|28401|manager.cpp :2738 ] invalid node; first invalid key: "preferences": Preferences node unserialize error: [1588491116.538|28401|manager.cpp :452 ] Errors while parsing /home/mathieu/.config/jami/dring.yml [1588491116.538|28401|manager.cpp :777 ] Restoring last working configuration [1588491116.540|28401|sipvoiplink.cpp :550 ] Using SIP nameserver: 127.0.0.53 [1588491116.540|28401|siptransport.cpp :188 ] SipTransportBroker@0x125c3d0 [1588491116.541|28401|sipvoiplink.cpp :641 ] SIPVoIPLink@0x1297410 [1588491116.541|28407|sip_utils.cpp :203 ] Registered thread 0x7f132bc5f4d0 (0x6EF1) [1588491116.541|28401|manager.cpp :2738 ] invalid node; first invalid key: "preferences": Preferences node unserialize error: [1588491116.541|28401|manager.cpp :452 ] Errors while parsing /home/mathieu/.config/jami/dring.yml [1588491116.542|28401|sipvoiplink.cpp :646 ] ~SIPVoIPLink@0x1297410 [1588491116.542|28401|siptransport.cpp :193 ] ~SipTransportBroker@0x125c3d0 [1588491116.542|28401|siptransport.cpp :200 ] destroying SipTransportBroker@0x125c3d0 dring: ../src/pj/os_core_unix.c:1325: pj_mutex_unlock: Assertion `mutex->owner == pj_thread_this()' failed. Aborted (core dumped) --8<---------------cut here---------------end--------------->8--- Maybe we should fix it, wrapping jami binary, so that it also starts this daemon? WDYT? Thanks, Mathieu [1]: https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions From debbugs-submit-bounces@debbugs.gnu.org Sun May 03 10:32:33 2020 Received: (at 40677) by debbugs.gnu.org; 3 May 2020 14:32:33 +0000 Received: from localhost ([127.0.0.1]:57542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVFfU-0004Ik-PX for submit@debbugs.gnu.org; Sun, 03 May 2020 10:32:33 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.238]:51925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVFfS-0004Cv-KT for 40677@debbugs.gnu.org; Sun, 03 May 2020 10:32:31 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 3 May 2020 16:32:23 +0200 (CEST) Date: Sun, 3 May 2020 16:32:20 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 00/15] Jami patches. Message-ID: <20200503163220.1dfb463e@kompiuter> In-Reply-To: <87k11tzd2d.fsf@gmail.com> References: <20200417015857.0650ff6a@interia.pl> <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <87y2qazmst.fsf@gmail.com> <20200502132617.308b9658@kompiuter> <87k11tzd2d.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588516343; bh=k2PltSC7ssDO5E+fscGO97lDQ2LWddA5i36wGW4l3Kw=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=k4sRhWYJOPVwzEZTyFSUrLKNST38DhGcWaE7Q/2YctQhiEXxlTUlJq+1j1qG0ni8H zMNMdp1My6r6s+uMCVrLt4CNDaUsr4IETHJszdqvSf5wzL2bSOIMoIn8xnjpZY3+Ys cx1fujV2jVfCqPF6HmByPjFDXvcusxSBW4kMwbuY= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sun, 03 May 2020 09:34:50 +0200 Mathieu Othacehe wrote: > Hello, > > > I think the problem is that when starting "jami-gnome", the "dring" > daemon is started by D-Bus. On a foreign distro, this cannot work. So > I tried to start dring manually[1] but I have the following error: > > --8<---------------cut here---------------start------------->8--- > /gnu/store/chb71qh7dprrdgn7d3g08d2pbii57v2v-libring-20200401.1.6f090de/lib/ring/dring > -cdp Jami Daemon 9.1.0, by Savoir-faire Linux 2004-2019 > https://jami.net/ > [Video support enabled] > > [1588491116.175|28401|ringbufferpool.cpp:118 ] Ringbuffer created > with id 'audiolayer_id' [1588491116.411|28401|video_device.h :129 > ] Default video settings: 800x480, 30 FPS > [1588491116.529|28401|video_device.h :129 ] Default video > settings: 960x540, 30 FPS > [1588491116.532|28401|manager.cpp :676 ] Not initialized > [1588491116.532|28401|manager.cpp :676 ] Not initialized > 09:31:56.533 os_core_unix.c !pjlib 2.10 for POSIX initialized > [1588491116.534|28401|manager.cpp :738 ] Using PJSIP version > 2.10 for x86_64-unknown-linux-gnu > [1588491116.534|28401|manager.cpp :739 ] Using GnuTLS version > 3.6.13 [1588491116.534|28401|manager.cpp :740 ] Using OpenDHT > version 2.0.0 [1588491116.535|28401|manager.cpp :751 ] > Configuration file path: /home/mathieu/.config/jami/dring.yml > [1588491116.537|28401|manager.cpp :2738 ] invalid node; first > invalid key: "preferences": Preferences node unserialize error: > [1588491116.538|28401|manager.cpp :452 ] Errors while > parsing /home/mathieu/.config/jami/dring.yml > [1588491116.538|28401|manager.cpp :777 ] Restoring last > working configuration [1588491116.540|28401|sipvoiplink.cpp :550 ] > Using SIP nameserver: 127.0.0.53 > [1588491116.540|28401|siptransport.cpp :188 ] > SipTransportBroker@0x125c3d0 > [1588491116.541|28401|sipvoiplink.cpp :641 ] SIPVoIPLink@0x1297410 > [1588491116.541|28407|sip_utils.cpp :203 ] Registered thread > 0x7f132bc5f4d0 (0x6EF1) [1588491116.541|28401|manager.cpp :2738 > ] invalid node; first invalid key: "preferences": Preferences node > unserialize error: [1588491116.541|28401|manager.cpp :452 ] > Errors while parsing /home/mathieu/.config/jami/dring.yml > [1588491116.542|28401|sipvoiplink.cpp :646 ] > ~SIPVoIPLink@0x1297410 [1588491116.542|28401|siptransport.cpp :193 > ] ~SipTransportBroker@0x125c3d0 > [1588491116.542|28401|siptransport.cpp :200 ] destroying > SipTransportBroker@0x125c3d0 dring: ../src/pj/os_core_unix.c:1325: > pj_mutex_unlock: Assertion `mutex->owner == pj_thread_this()' failed. > Aborted (core dumped) --8<---------------cut > here---------------end--------------->8--- This error is strange. I get nothing like this on Devuan - Jami just starts automatically as the system loads. > Maybe we should fix it, wrapping jami binary, so that it also starts > this daemon? I can try. Is it something similar to what we already have in jami package - sqlite wrapper or should I just add dbus to propagated inputs? > WDYT? > > Thanks, > > Mathieu > > [1]: > https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions From debbugs-submit-bounces@debbugs.gnu.org Mon May 04 14:26:48 2020 Received: (at 40677) by debbugs.gnu.org; 4 May 2020 18:26:48 +0000 Received: from localhost ([127.0.0.1]:33943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVfnk-0003Ea-3q for submit@debbugs.gnu.org; Mon, 04 May 2020 14:26:48 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.235]:60247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVfni-0003EK-2x for 40677@debbugs.gnu.org; Mon, 04 May 2020 14:26:47 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Mon, 4 May 2020 20:26:38 +0200 (CEST) Date: Mon, 4 May 2020 20:26:31 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. Message-ID: <20200504202631.1ebaf90b@kompiuter> In-Reply-To: <87368i1xwh.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588616799; bh=4gG7zWu3ScBX4iFm6545V8kcpoqJB2Nc43FlP0IvNZc=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=UFW71xBjdU1cIGsQgslyL/R7MePGr57dm1bV2qw6AQQBRw0lrP+VW4EFlwjx0Af9Q ouQ03+CZ/zETJwEvx6pa+Kqyt8BcruNbJuEVWbW0xHAzD3/qmpJiCYFyUrl5pIYxSW WuHncwQBSB1VUWXU97UOQY1AVheZ3FVDIRATOCqI= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, 02 May 2020 11:36:30 +0200 Mathieu Othacehe wrote: > Ok, last one! As discussed before I'm not very comfortable with this > very long list of configuration options. > > Are the ffmpeg configuration options needed by Jami described > somewhere? > > Thanks, > > Mathieu So I compared the list of flags turned off by default with ffmpeg package currently in guix with ffmpeg-jami package and I managed to shorten the list from 107 to 95. It isn't worth the effort. I tried looking for the flags needed in the documentation, but I couldn't find anything. There's only the rules.mak file in Jami source code and they use these flags. There are only few comments: #disable everything #enable muxers/demuxers #enable parsers #encoders/decoders #decoders for ringtones and audio streaming #encoders/decoders for images #filters #platform specific options #Android Linux #Desktop Linux ... That's all. I see no point in comparing these flags every release just for 12 of them I can inherit from the default ffmpeg package. I prefer just copy the list from rules.mak. What I could do is defining a separate "ffmpeg-configure-flags" variable somewhere near ffmpeg-jami and use it, instead of having the bloated list inside the package definition (if that's even possible). Correct me if I'm wrong or suggest a reasonable solution, because I have no idea how to deal with it right now. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Tue May 05 03:19:08 2020 Received: (at 40677) by debbugs.gnu.org; 5 May 2020 07:19:08 +0000 Received: from localhost ([127.0.0.1]:34648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVrrA-0003L3-9R for submit@debbugs.gnu.org; Tue, 05 May 2020 03:19:08 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVrr7-0003KZ-U9 for 40677@debbugs.gnu.org; Tue, 05 May 2020 03:19:06 -0400 Received: by mail-wm1-f68.google.com with SMTP id u127so1065159wmg.1 for <40677@debbugs.gnu.org>; Tue, 05 May 2020 00:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=yCYCMTFcu4Bk/Eskt5RPY6lmY86uDmLPH/lserFcVJ4=; b=oNNgLtPpJnpM0ZrI0Wak4aN0oVeoe3edy8jAlVtUqBhGS8KvnvNOkyMTGGcGgkTJgi 0oS2qYCIBGehtoAVzZZVrajr5AK7VBmUrSXtaHNx8R33a2QIbXv80FLSzK3mJBX287DY Z28pNYbQSY5I/qtMjcNMemeU4ceW3wl4ysRMLpVDhfSdnb1jEk/WFuVenRrJRy0si+4F Kfq6cG3hp7kXhg+3bHspKd86Qll56lQHShIFkfJ9Imr5UcG4Yc5ieKwgnQ7KKCK5qxOb /l0818epkse6DpAi2RN+FDtTEvuvIPKKJANV7akCwN5s5VAKygI4oifZ4l3WnAJXkeaU 7+qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=yCYCMTFcu4Bk/Eskt5RPY6lmY86uDmLPH/lserFcVJ4=; b=KIWaSATdDc9nGXO8ayKMCMj+zbdAAIRFd17VpiJ/U3GxqyK1PozaVyXyaeDxhtmCdN HCR+MKmpYV+mh5o92/Q1Gw4T6WLR68hruZix6XD/tmmrF2tcX7nIwFDOjA8FiCfY1h3I 50VcobSSIkU/o5E/rmq3bjreMNFczQS7iwlHjhIWS4UiAmfVVBF1XYeRcGECK9I3U7Pv /X+i1GU8B5TYmNSLIRrMIfUq1AD0L+VtWMo5WarIp/bSgnoRsl6CM4i5hdzaLdftTDZW /+YwnSI9urkwnn3gxpDvqu9FDSMau5rbrTJ2retAYQJb4Bk6HARnN+unLHrhK8JhiH25 96Uw== X-Gm-Message-State: AGi0PuZ1w/8ibFy1ybxkYNhH0KH9FctkPT21QnnvHPxhznisoQDSwNU5 RqeW6cy7survN6ULjSVslfzlL+tF X-Google-Smtp-Source: APiQypK/NQEeZvC5fNSJcOmRAWmGAmq93Usk45NJxy7ZawDaRGpdSGvviOrzDPaVUBLnCZULVIGaGg== X-Received: by 2002:a7b:ce88:: with SMTP id q8mr1949440wmj.161.1588663139638; Tue, 05 May 2020 00:18:59 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:7097:5e4f:8b60:ade7]) by smtp.gmail.com with ESMTPSA id n7sm1593418wrm.86.2020.05.05.00.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 00:18:58 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200504202631.1ebaf90b@kompiuter> Date: Tue, 05 May 2020 09:18:58 +0200 In-Reply-To: <20200504202631.1ebaf90b@kompiuter> (Jan's message of "Mon, 4 May 2020 20:26:31 +0200") Message-ID: <87d07ietnh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, > So I compared the list of flags turned off by default with ffmpeg > package currently in guix with ffmpeg-jami package and I managed to > shorten the list from 107 to 95. It isn't worth the effort. Oh that's a disappointment indeed. Among those 95 flags I'm pretty sure most of them match the default, but going through all of them feels like a burden. > I prefer just copy the list from rules.mak. What I could do is defining > a separate "ffmpeg-configure-flags" variable somewhere near ffmpeg-jami > and use it, instead of having the bloated list inside the package > definition (if that's even possible). > Correct me if I'm wrong or suggest a reasonable solution, because I have > no idea how to deal with it right now. Ok, this seems fine. Don't hesitate to add a link to a Web view of the rules.mak file, so that it's clear where those flags come from. Another remark on this part, > "--enable-encoder=h264_nvenc" > "--enable-encoder=hevc_nvenc")) > ((string?= (%current-system) "aarch64-linux") '("--arch=aarch64")) > ((string?= (%current-system) "arm64-linux") '("--arch=aarch64")) "arm64-linux" is not a valid system, you can remove it. > ((string?= (%current-system) "arm") '("--arch=arm")) I think the right system here is "armhf-linux". However, you would also need to support cross-compilation when %current-target-system is set. In that case, the value looks like "aarch64-linux-gnu" and "arm-linux-gnueabihf". If you add support for those plaforms you need to test it by building ffmpeg-jami with "--system" and "--target" flags. As this is a complex package with a lot of dependencies (probably failing to cross-compile), it would be fine with me if you just drop support for other systems/targets. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed May 06 20:22:52 2020 Received: (at 40677) by debbugs.gnu.org; 7 May 2020 00:22:52 +0000 Received: from localhost ([127.0.0.1]:41571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWUJQ-0002nH-5B for submit@debbugs.gnu.org; Wed, 06 May 2020 20:22:52 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.154]:32866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWUJO-0002n1-64 for 40677@debbugs.gnu.org; Wed, 06 May 2020 20:22:51 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Thu, 7 May 2020 02:22:42 +0200 (CEST) Date: Thu, 7 May 2020 02:22:30 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. Message-ID: <20200507022230.71ed5ea6@kompiuter> In-Reply-To: <87d07ietnh.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200504202631.1ebaf90b@kompiuter> <87d07ietnh.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588810963; bh=9l/YtqMVoNiNXaxBg1IkHXm9FUzT1gUH/VS9BlXCQN0=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=UN2hlIP7GDYYopaIUt+0N1ndZWkB7/cGyhs2HOjkPAHiiryFzTzS7Ah1dJ1vInJKr xcSEhYt1YJYe+Q+fmAkyrSyqWINg9Bdq5AobaxSJyl6ZNLYePAsuex9padNfbsqAA8 cddS/eJMqlu+fZrxbaWyLk+nQkXJ4+vcMTc/1GIs= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi again! On Tue, 05 May 2020 09:18:58 +0200 Mathieu Othacehe wrote: > Hello Jan, > > Oh that's a disappointment indeed. Among those 95 flags I'm pretty > sure most of them match the default, but going through all of them > feels like a burden. > > Ok, this seems fine. Don't hesitate to add a link to a Web view of the > rules.mak file, so that it's clear where those flags come from. Done. > Another remark on this part, > > > "--enable-encoder=h264_nvenc" > > "--enable-encoder=hevc_nvenc")) > > ((string?= (%current-system) "aarch64-linux") > > '("--arch=aarch64")) ((string?= (%current-system) "arm64-linux") > > '("--arch=aarch64")) > > "arm64-linux" is not a valid system, you can remove it. Done. > > ((string?= (%current-system) "arm") '("--arch=arm")) > > I think the right system here is "armhf-linux". However, you would > also need to support cross-compilation when %current-target-system is > set. In that case, the value looks like "aarch64-linux-gnu" and > "arm-linux-gnueabihf". I added "%current-target-system" to support cross-compilation. Also fixed the drunk "string?=" uses - there's "string=?" actually and I replaced it with "string-prefix?". What's the difference between "arm-linux-gnueabihf" and "aarch64-linux-gnu"? Are they synonyms? Should it be: if "arm-linux-gnueabihf" or "aarch64-linux-gnu" use "--arch=armhf-linux"? > If you add support for those plaforms you need to test it by building > ffmpeg-jami with "--system" and "--target" flags. As this is a complex > package with a lot of dependencies (probably failing to > cross-compile), it would be fine with me if you just drop support for > other systems/targets. I want to try anyway. Jami supports Raspbian, so it is worth trying. > Thanks, > > Mathieu Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 16:04:13 2020 Received: (at 40677) by debbugs.gnu.org; 7 May 2020 20:04:13 +0000 Received: from localhost ([127.0.0.1]:44025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWmkf-0004Bk-7k for submit@debbugs.gnu.org; Thu, 07 May 2020 16:04:13 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.154]:58331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWmkc-0004BS-V8 for 40677@debbugs.gnu.org; Thu, 07 May 2020 16:04:11 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from kompiuter (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Thu, 7 May 2020 22:04:02 +0200 (CEST) Date: Thu, 7 May 2020 22:03:55 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. Message-ID: <20200507220355.5de8f9e0@kompiuter> In-Reply-To: <87d07ietnh.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200504202631.1ebaf90b@kompiuter> <87d07ietnh.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1588881843; bh=D63scVIfMeqsWtkgv26COtjW+cnLS3lOvwZBwf/Y224=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=ehq/WchJ2MbnQiKRb/6ucKUOPZRIM+hcFUsU6LysORpbPCYBvSsw41YS7np7gTqs4 msDmKuEn71v1Y9G0PP0ovLmV8cXD9Ay7Rnb+SEeDvQfyIDysa1pZ42BPUJfrB9z+bh ZcmJA3ESAYgKUNEoTe2v28oLm0kJzqt5bRR+1b8c= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, I tried fixing cross-compilation but there are several problems: - dav1d fails, because "meson doesn't support cross-compilation" - perl fails during installation and if I checked correctly, guix doesn't have support for perl on armhf or aarch64 - glib fails, because "meson doesn't support cross-compilation" And other possible problems I didn't get to. With dav1d I could just disable it, because it's just one codec. I also disabled perl, but disabling glib won't work. This isn't a good advertisement for this meson build system :P Should I proudly drop all the support for cross compilation? Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 04:35:42 2020 Received: (at 40677) by debbugs.gnu.org; 8 May 2020 08:35:42 +0000 Received: from localhost ([127.0.0.1]:44561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWyTt-0000ME-Or for submit@debbugs.gnu.org; Fri, 08 May 2020 04:35:41 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:34162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWyTr-0000Lx-2f for 40677@debbugs.gnu.org; Fri, 08 May 2020 04:35:40 -0400 Received: by mail-wm1-f68.google.com with SMTP id g14so567698wme.1 for <40677@debbugs.gnu.org>; Fri, 08 May 2020 01:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=uhKtIUjddXUoJAcyJ1vm6zCjNt1xbYIuebb9GHqXgfY=; b=B8oDBvDZYQXL5n6c97YEyqSnGPQ7oCTWQB/j0445WM8sqzzW2mQRnOKzXluNij50wA XxnBGpug01mLbHi2cM3PJkINyAMxwO0NCD6MnBWub0P6RjhZhmMIFPWSXMI4nC7NSVkw 4XTrkknRoiGp74g8unw9uVARKWK84RMya+JPNBeqtGAtkcNfOXULoBwS6NPnABKWpfE5 HBkfRBNqGMrJIxCfc23ONoFN7L5ErZwbYeLWa5fgHZS8YyL2myax1DfWaCtPI6Ax1YLk iuQRUoX88DFxzuLPVGgQELKYG9w9lh0y8YLYPZAKTGgBrAOWyJ7i4fycTi768Yzg8ZD7 gUvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=uhKtIUjddXUoJAcyJ1vm6zCjNt1xbYIuebb9GHqXgfY=; b=gaj+jjyCVOo+eoaw8WmpDOSJiYnA8vssu08ilgAco3jlCHoPvrZCqP2C5i+Xffda6p uOqO7lTuPMJ9PTxMvxBKP3Oak5TeU0yE85vj3ear6x+5Ur1TJW4LTMbrgiI6Xaik99e8 cDRhH9R6ADSGCZqeeluxBfrxN7EwtTmvFtUwGv/K2pKegXgKkqzeIW1OPNU88zem5MWO xIPn6YCqO4aQcC6aSl6YW9EQnX6mrTSTTuFnBMWlmp9a94AogBPV2GrJapNChcZ9IDKR vpZjojCeTB5iYzQKwBdAYMHThj8lvBnV1rbkPJ1ybl+mAOFr5IB3cp+UGyVoMbpp50fw 4yUg== X-Gm-Message-State: AGi0PuZxYT6f1uMdZ9KXtDGI5UP2MDNxPXWtxl0WtGatzFkscyT70vj0 mQJk2QH+PrnGZVf0QuoPCZV2iYCk X-Google-Smtp-Source: APiQypLA2efzaA0q7EVvt1Q5SnIYwVdlnWAbV5BZA4mOfHtS/zI26gTDRyfrO6hTCog+p4s4VoUz1A== X-Received: by 2002:a1c:35c3:: with SMTP id c186mr15863721wma.66.1588926932641; Fri, 08 May 2020 01:35:32 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:d130:8dab:4aff:8b2]) by smtp.gmail.com with ESMTPSA id g69sm13125651wmg.17.2020.05.08.01.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 01:35:31 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200504202631.1ebaf90b@kompiuter> <87d07ietnh.fsf@gmail.com> <20200507220355.5de8f9e0@kompiuter> Date: Fri, 08 May 2020 10:35:31 +0200 In-Reply-To: <20200507220355.5de8f9e0@kompiuter> (Jan's message of "Thu, 7 May 2020 22:03:55 +0200") Message-ID: <87h7wqlt7w.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, > - dav1d fails, because "meson doesn't support cross-compilation" > - perl fails during installation and if I checked correctly, guix > doesn't have support for perl on armhf or aarch64 > - glib fails, because "meson doesn't support cross-compilation" > And other possible problems I didn't get to. With dav1d I could just > disable it, because it's just one codec. I also disabled perl, but > disabling glib won't work. > > This isn't a good advertisement for this meson build system :P > Should I proudly drop all the support for cross compilation? On core-updates the cross-compilation support is a bit better (perl at least should be fixed), but it won't get you much further. So yes you can drop cross compilation. You can still check that native compilation for armv7 and aarch64 works with "--system armhf-linux" and "--system aarch64-linux". Note that you will need to setup binfmt. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 04:43:42 2020 Received: (at 40677) by debbugs.gnu.org; 8 May 2020 08:43:42 +0000 Received: from localhost ([127.0.0.1]:44565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWybe-0000YD-K9 for submit@debbugs.gnu.org; Fri, 08 May 2020 04:43:42 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWybc-0000Xy-UO for 40677@debbugs.gnu.org; Fri, 08 May 2020 04:43:41 -0400 Received: by mail-wm1-f68.google.com with SMTP id y24so9754181wma.4 for <40677@debbugs.gnu.org>; Fri, 08 May 2020 01:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8lTRsuQ/dfPz9bQviJinZ1wNyaQr+VMrEaooloO2MyY=; b=VVcBuHhSYUebyEUmAfDg7x1tZYjEAW84U0txJ5Jr11MSdhWT/l5TOdJuV1gAiWN4pZ 5VYEnj08DDGDVANMEVLHcYBKySeKZYRIZwMwd4r+ZaZB7vZD2zPWp6DTZmDefELF/D5P FrN67/8K/mu+X6mjCi01F4JoMYN7ZYl2LV6wGER2dpkHeJoULOnMby5ChZf0pXF/kuGr xzgKoZmede0GP8Y3TVOnwUGptT+pnY7RYm9sLlR02PJFb4jOUSqsBcHn/rBGgke98HY7 BmiroO84ppl4HinLma1t85bu/jfVhGX+4jYSzgz3tyTrucfIpQ6Tqvg1KTsIHOIvVZFr 7ksg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8lTRsuQ/dfPz9bQviJinZ1wNyaQr+VMrEaooloO2MyY=; b=GFaVMdbmQOEECzaW6/kzoM50Cs9s2mUIep9zW79I2Tqb3G/LxrVHhC4SJOY5wQrwlw cOcxgWungIvT080YI5A7cDjOfopjc02A4+PlSQcYjU1HKLLEX1o/0gQi9gWdE1D8ARrb USCsOs6CMqcGmwlY6iwrOyt15DKxdyEIYgP//PcoebP4IgcFalmTzLOjG6aN1BZkhAWG 47zqB5Kjbw36DhoF5mlCyGvq6yendavVeqvw4P/YKiJUT7hLVaLYnqKbqgQZWjidaiN1 NG7koMuGAJFvq7qSVQJR2P585RObUa2pl8wahZm1/OzTS+R7Rp2k+0qmy6Dybz3vXFDg JSyg== X-Gm-Message-State: AGi0PubHZy8i+YtO0AnZSOiOQqox2nPTB3Fp0n+vZDuUEU0Ko3uoMsVn jSZOsPaAXztKiGaTDaL/SpSwHt7S X-Google-Smtp-Source: APiQypLFkKx8tZnf82xDFhH3AjHirnbdF3pPmYez6Ueq/M1lAO28ZZPE0DN6VMVUgJ1bpsxwojwwug== X-Received: by 2002:a1c:f012:: with SMTP id a18mr14332804wmb.41.1588927414825; Fri, 08 May 2020 01:43:34 -0700 (PDT) Received: from cervin ([2a01:cb18:832e:5f00:d130:8dab:4aff:8b2]) by smtp.gmail.com with ESMTPSA id a67sm12903933wmc.30.2020.05.08.01.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 01:43:34 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200504202631.1ebaf90b@kompiuter> <87d07ietnh.fsf@gmail.com> <20200507022230.71ed5ea6@kompiuter> Date: Fri, 08 May 2020 10:43:33 +0200 In-Reply-To: <20200507022230.71ed5ea6@kompiuter> (Jan's message of "Thu, 7 May 2020 02:22:30 +0200") Message-ID: <87d07elsui.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hey, > What's the difference between "arm-linux-gnueabihf" and > "aarch64-linux-gnu"? Are they synonyms? No, "arm-linux-gnueabihf" is for ARMv7 systems with hardware floating point support. "aarch64-linux-gnu" is for ARMv8 processors. This is quite confusing! Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed May 13 10:57:49 2020 Received: (at 40677) by debbugs.gnu.org; 13 May 2020 14:57:49 +0000 Received: from localhost ([127.0.0.1]:59059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYspR-00053q-Ht for submit@debbugs.gnu.org; Wed, 13 May 2020 10:57:49 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:47944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYspP-00053a-BU for 40677@debbugs.gnu.org; Wed, 13 May 2020 10:57:48 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.42.134 X-Interia-R-Helo: Received: from kompiuter (89-64-42-134.dynamic.chello.pl [89.64.42.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Wed, 13 May 2020 16:57:39 +0200 (CEST) Date: Wed, 13 May 2020 16:57:29 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. Message-ID: <20200513165729.518bd858@kompiuter> In-Reply-To: <87368i1xwh.fsf@gmail.com> References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1589381860; bh=T8ZGx8LO7fIfZCKtezHTif59Rc4zd+/trDS3iwpIqVs=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=eAi01CDmcMizzo+C9+7LZm+zCjyYZAnk06bq0NjYy+KcphRwKjUQHwMreDYwvnxkS GJPRSqgmp5iSicu+ooMjl4bnajEOljiw3cqjXngN2XyU4OzvCK4ak0yr1gr6IHvKhF l9gNt88eCUR7CPYaoD8UHiInsjvT6MfOByR0M7Q4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, I had a success building ffmpeg-jami on both aarch64-linux and armhf-linux (through qemu). I have one question regarding the naming convention of variables. Why do some variables start with "%"? I couldn't find any explanation in the documentation nor in the source code. Say I want to add a variable called "ffmpeg-linux-configure-flags". Should I start it with "%" - "%fmpeg-linux-configure-flags" or not? Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Wed May 13 11:51:41 2020 Received: (at 40677) by debbugs.gnu.org; 13 May 2020 15:51:42 +0000 Received: from localhost ([127.0.0.1]:59133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYtfZ-0006So-M7 for submit@debbugs.gnu.org; Wed, 13 May 2020 11:51:41 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYtfX-0006Sc-80 for 40677@debbugs.gnu.org; Wed, 13 May 2020 11:51:39 -0400 Received: by mail-wr1-f68.google.com with SMTP id s8so21515312wrt.9 for <40677@debbugs.gnu.org>; Wed, 13 May 2020 08:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ui0phadXm86pg2ASxJlCQcTuj/lxlGf74dYruvuBizU=; b=PIKRefMEMbdRQQQG4mbWkMFshTrZoo4sukBk8YPlOiGfDuvnhoSV961CXxCrc1oYnq g7JeMElJKdJ9n7OMx9qmiHqaKJfjNkZ15bm+zPY6+sHUs4bAml5uvswt9jQmqUQJaox4 Q+Ewl5E5V4lLLZplUnDiw9hQMj+mah0zqgxonbg4HA6VcJqAk6d7q9jFwuxyQl2iv39D vktIriGZptI+JXufmkmdcD/bk8Lq5AUzup/cWTMdMU6h8saZ/8AXt5GoiNrXqq6Ro2vC SxUR4NgaduQrbUqiCrEXJ6pNdpej9C/+dUco09Xl/8r6miDLThiowjLhUBSn/e3JCqMG D/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ui0phadXm86pg2ASxJlCQcTuj/lxlGf74dYruvuBizU=; b=Txj6Q8TsDRlVFV1x6gU6yXjDrTc0uNSGYdBwglKgZhgCGuoQG4XTY3WuhKrPwz2pPu TutKwND/ny0qazCvZKMfvT3KVKSXul2d8ZwTgAXAyr7fCYckVxR8rtDwKKxLTxTNGEoh QyGGAl4TxDDaB1m3AryqYJEQPyFIXxqLn06rK9dMdRwhXLop12DkuD8pmYMGb8g+xPy3 9BKBbAlGfMwhDGpaOBwHmq5TI/xYp+/m4SN/0snVziCdKHeMtQJtKt/z4beG1GkPtUt2 DH/1FtJC1F0eiyvxVHLhtdz6L31D/N6uOnwBuqb4Q/AXHikacPg4GwtCdnZB10rKZlUp 0RQg== X-Gm-Message-State: AGi0PuZQAF0gQ0iopmE0GqLSwHJypTd/g/jSmZ4eW5h1jPWFVOIgJtCm MHcOqdQQgOyMu6p9MjO0EPgtoklX X-Google-Smtp-Source: APiQypKZClVHcm7D+skqYMp99Uk0pggMYCDN7Gy9iKeB5wUNh4rPGn991houO8M2EvQ6kdefr6Djkg== X-Received: by 2002:adf:e788:: with SMTP id n8mr30559309wrm.317.1589385093015; Wed, 13 May 2020 08:51:33 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:b0b0:93dd:fa22:31bf]) by smtp.gmail.com with ESMTPSA id g25sm35747569wmh.24.2020.05.13.08.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 08:51:32 -0700 (PDT) From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH V3 07/15] gnu: Add ffmpeg-jami. References: <20200502011450.2676-1-tona_kosmicznego_smiecia@interia.pl> <20200502011450.2676-8-tona_kosmicznego_smiecia@interia.pl> <87368i1xwh.fsf@gmail.com> <20200513165729.518bd858@kompiuter> Date: Wed, 13 May 2020 17:51:31 +0200 In-Reply-To: <20200513165729.518bd858@kompiuter> (Jan's message of "Wed, 13 May 2020 16:57:29 +0200") Message-ID: <874ksj4yv0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Jan, > I had a success building ffmpeg-jami on both aarch64-linux and > armhf-linux (through qemu). I have one question regarding the naming > convention of variables. Why do some variables start with "%"? I > couldn't find any explanation in the documentation nor in the source > code. Say I want to add a variable called > "ffmpeg-linux-configure-flags". Should I start it with "%" - > "%fmpeg-linux-configure-flags" or not? Good job! Variables prefixed by '%' often denote parameters (see: https://www.gnu.org/software/guile/manual/html_node/Parameters.html). I guess something like: --8<---------------cut here---------------start------------->8--- (define %fmpeg-linux-configure-flags '("--flag-1" "--flag-2")) --8<---------------cut here---------------end--------------->8--- would be fine. But using "ffmpeg-linux-configure-flags" would also be correct. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Wed May 13 14:12:59 2020 Received: (at 40677) by debbugs.gnu.org; 13 May 2020 18:12:59 +0000 Received: from localhost ([127.0.0.1]:59509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYvsI-0003qS-F3 for submit@debbugs.gnu.org; Wed, 13 May 2020 14:12:59 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:51396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYvsG-0003qC-01 for 40677@debbugs.gnu.org; Wed, 13 May 2020 14:12:57 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.42.134 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-42-134.dynamic.chello.pl [89.64.42.134]) (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; Wed, 13 May 2020 20:12:48 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH v4] gnu: Add ffmpeg-jami. Date: Wed, 13 May 2020 20:12:34 +0200 Message-Id: <20200513181234.27548-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1589393569; bh=Ebg5XyeiWl5QABQDaWCsdQ6OLK1gPPaV9tCLOb3AHQo=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding: X-Interia-Antivirus; b=HPOh3p2HAeHW9tT9w0f/pKZ6JuRrvvw19BeIawz1e3csCuo4uhmuk07fzUPYrAhiV sjCP1n74a9P9810LaeG4VNGZnIn0WrDG/mxh0VHe0OQUqBUIeCTRzBszePUiicpjFr GO5JSU6+AJL7IwZKVz5+QNyr2RYrj17DmKa42WY4= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This package is needed, because Jami uses a modified version of ffmpeg, which provides GPU hardware acceleration, automatical adapting of bitrate and extra codecs. Because of the configure flags list being long, it is better to keep them separated in variables, instead of littering the package definition. * gnu/packages/jami.scm (ffmpeg-jami, %ffmpeg-default-configure-flags, %ffmpeg-linux-configure-flags, %ffmpeg-linux-x86-configure-flags): New variables. (ffmpeg-compose-configure-flags): New procedure. (libring)[inputs]: Use ffmpeg-jami instead of ffmpeg. --- gnu/packages/jami.scm | 255 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index dda787b3cd..2cf2f3aa10 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) (define %jami-version "20200401.1.6f090de") @@ -186,6 +187,256 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +;; The following variables are configure flags used by ffmpeg-jami. +;; They're from the ring-project/daemon/contrib/src/ffmpeg/rules.mak +;; file. We try to keep it as close to the official Jami package as +;; possible to provide all the codecs and extra features that are +;; the effect of patching ffmpeg. +;; +;; Web view of the file: +;;https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak +(define %ffmpeg-default-configure-flags + '(;; disable everything + "--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=hevc" + "--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")) + +(define %ffmpeg-linux-configure-flags + '("--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-hwaccel=hevc_vaapi" + "--enable-encoder=h264_vaapi" + "--enable-encoder=vp8_vaapi" + "--enable-encoder=mjpeg_vaapi" + "--enable-encoder=hevc_vaapi")) + +;; ffnvcodec is not supported on ARM then we enable it here for i386 and x86_64 +(define %ffmpeg-linux-x86-configure-flags + '("--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")) + +;; This procedure composes the configure flags list for ffmpeg-jami. +(define (ffmpeg-compose-configure-flags) + (let* ((flags %ffmpeg-default-configure-flags) + (append-flags (lambda (l) + (set! flags (append flags l)))) + (system=? (lambda (s) + (string-prefix? %current-system s)))) + (if (string-contains %current-system "linux") + (begin (append-flags %ffmpeg-linux-configure-flags) + (cond ((or (system=? "i686") + (system=? "x86_64")) + (append-flags %ffmpeg-linux-x86-configure-flags)) + ((system=? "x86_64") + (append-flags '("--arch=x86_64"))) + ((system=? "aarch64") + (append-flags '("--arch=aarch64"))) + ((system=? "armhf") + (append-flags '("--arch=armhf")))))) + flags)) + +(define-public ffmpeg-jami + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (native-inputs + `(("sfl-patches" ,(jami-source)) + ("libiconv" ,libiconv) + ,@(package-native-inputs ffmpeg))) + (supported-systems '("x86_64-linux" "i686-linux" + "aarch64-linux" "armhf-linux")) + (arguments + (append + '(#:tests? #f) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags '()) + (ffmpeg-compose-configure-flags)) + ((#: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") @@ -197,7 +448,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Thu May 14 03:05:19 2020 Received: (at 40677) by debbugs.gnu.org; 14 May 2020 07:05:19 +0000 Received: from localhost ([127.0.0.1]:60077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ7vh-0001hv-5b for submit@debbugs.gnu.org; Thu, 14 May 2020 03:05:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ7vc-0001hd-C2 for 40677@debbugs.gnu.org; Thu, 14 May 2020 03:05:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55222) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ7vW-0008GV-Nd; Thu, 14 May 2020 03:05:06 -0400 Received: from [2a01:cb18:832e:5f00:8906:a4cb:3f4a:242f] (port=47574 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jZ7vV-0004K8-Pp; Thu, 14 May 2020 03:05:06 -0400 From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH v4] gnu: Add ffmpeg-jami. References: <20200417015857.0650ff6a@interia.pl> <20200513181234.27548-1-tona_kosmicznego_smiecia@interia.pl> Date: Thu, 14 May 2020 09:05:03 +0200 In-Reply-To: <20200513181234.27548-1-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Wed, 13 May 2020 20:12:34 +0200") Message-ID: <87zhab2e00.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Jan, > +;; This procedure composes the configure flags list for ffmpeg-jami. > +(define (ffmpeg-compose-configure-flags) > + (let* ((flags %ffmpeg-default-configure-flags) > + (append-flags (lambda (l) > + (set! flags (append flags l)))) It's better to avoid using "set!". > + (system=? (lambda (s) > + (string-prefix? %current-system s)))) This should be (%current-system), plus I think arguments should be transposed. > + (if (string-contains %current-system "linux") > + (begin (append-flags %ffmpeg-linux-configure-flags) > + (cond ((or (system=? "i686") > + (system=? "x86_64")) > + (append-flags %ffmpeg-linux-x86-configure-flags)) > + ((system=? "x86_64") > + (append-flags '("--arch=x86_64"))) If the first branch of the cond succeeds, we will never add this flag. Plus, it seems than ffmpeg is able to detect the running system. So I would suggest to do this: --8<---------------cut here---------------start------------->8--- ;; This procedure composes the configure flags list for ffmpeg-jami. (define (ffmpeg-compose-configure-flags) (define (system=? s) (string-prefix? s (%current-system))) `(,@%ffmpeg-default-configure-flags ;; Add Linux specific flags. ,@(if (string-contains %current-system "linux") %ffmpeg-linux-configure-flags '()) ,@(if (or (system=? "i686") (system=? "x86_64")) %ffmpeg-linux-x86-configure-flags '()))) --8<---------------cut here---------------end--------------->8--- What do you think? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu May 14 08:43:48 2020 Received: (at 40677) by debbugs.gnu.org; 14 May 2020 12:43:48 +0000 Received: from localhost ([127.0.0.1]:60588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZDDF-0001rN-8G for submit@debbugs.gnu.org; Thu, 14 May 2020 08:43:48 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:50736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZDDD-0001r8-6k for 40677@debbugs.gnu.org; Thu, 14 May 2020 08:43:43 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.42.134 X-Interia-R-Helo: Received: from kompiuter (89-64-42-134.dynamic.chello.pl [89.64.42.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Thu, 14 May 2020 14:43:36 +0200 (CEST) Date: Thu, 14 May 2020 14:43:24 +0200 From: Jan To: Mathieu Othacehe Subject: Re: [bug#40677] [PATCH v4] gnu: Add ffmpeg-jami. Message-ID: <20200514144324.346f0bc5@kompiuter> In-Reply-To: <87zhab2e00.fsf@gnu.org> References: <20200417015857.0650ff6a@interia.pl> <20200513181234.27548-1-tona_kosmicznego_smiecia@interia.pl> <87zhab2e00.fsf@gnu.org> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1589460217; bh=vpQlCAJ2ExEmtaqSIKhUH/NVaFQV2db9xHCqQr4narg=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Cc: Subject:Message-ID:In-Reply-To:References:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=BhP19b4BU2rWIjFpy71RnqASoSpgI5xOI00Vq7Mmm+LqYCdJ0HIUj790scuzoPJaw BMtsThsPMMFfi3qj0vzT6aHJO+2wTDShaE1L37q/2GDhf6AfNyS7AmjV92zhKG/I72 atMdyh9ZrDvESLgWtMhz/XuNR+7jhPio4hXokgJo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, 14 May 2020 09:05:03 +0200 Mathieu Othacehe wrote: > Hello Jan, > > > It's better to avoid using "set!". > What should I use instead? > > + (system=? (lambda (s) > > + (string-prefix? %current-system s)))) > > This should be (%current-system), plus I think arguments should be > transposed. Okay > > + (if (string-contains %current-system "linux") > > + (begin (append-flags %ffmpeg-linux-configure-flags) > > + (cond ((or (system=? "i686") > > + (system=? "x86_64")) > > + (append-flags > > %ffmpeg-linux-x86-configure-flags)) > > + ((system=? "x86_64") > > + (append-flags '("--arch=x86_64"))) > > If the first branch of the cond succeeds, we will never add this flag. That's what happens when you code late in night :) I should sit down with a cup of coffee and read Guile's manual seriously this time. Sorry for making your code review harder. > Plus, it seems than ffmpeg is able to detect the running system. So I > would suggest to do this: > > --8<---------------cut here---------------start------------->8--- > ;; This procedure composes the configure flags list for ffmpeg-jami. > (define (ffmpeg-compose-configure-flags) > (define (system=? s) > (string-prefix? s (%current-system))) > > `(,@%ffmpeg-default-configure-flags > ;; Add Linux specific flags. > ,@(if (string-contains %current-system "linux") > %ffmpeg-linux-configure-flags > '()) > ,@(if (or (system=? "i686") (system=? "x86_64")) > %ffmpeg-linux-x86-configure-flags > '()))) > --8<---------------cut here---------------end--------------->8--- > > What do you think? I think %ffmpeg-linux-x86-configure-flags should be added only if linux is present, not just when on i686 or x86_64. I called it "%ffmpeg-linux-x86...", because it was inside of the "ifdef HAVE_LINUX" condition. But there was also a comment saying "Desktop Linux", which as always means very little. I'm not sure if it really requires the Linux kernel there or what. What about the output of the procedure? Is it okay for the list to be not proper? It will look something like this: ((flag1 flag2 ... flagN) (flag1 flag2 ... flagN)) Is it okay because everything is treated as a pair in a recursive manner? Other than this, it will be good. > Thanks, > > Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu May 14 20:47:33 2020 Received: (at 40677) by debbugs.gnu.org; 15 May 2020 00:47:33 +0000 Received: from localhost ([127.0.0.1]:35217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZOVg-00051O-Vb for submit@debbugs.gnu.org; Thu, 14 May 2020 20:47:33 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:50375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZOVe-000515-9F for 40677@debbugs.gnu.org; Thu, 14 May 2020 20:47:31 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.42.134 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-42-134.dynamic.chello.pl [89.64.42.134]) (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; Fri, 15 May 2020 02:47:23 +0200 (CEST) From: Jan Wielkiewicz To: 40677@debbugs.gnu.org Subject: [PATCH v5] gnu: Add ffmpeg-jami. Date: Fri, 15 May 2020 02:47:05 +0200 Message-Id: <20200515004705.11286-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1589503643; bh=8RtQeN0yCHHFjstJx5QU+uDdEcYooDynVfWFwUYrQRo=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding: X-Interia-Antivirus; b=cWzM7+9gG6BJLp/wEjRxzljZ90CFdHEQhI6M+A79RNl3v+oBBh6XFvSdwPhMjJpCq mwRmIo9NDdN0jcyHqG3Nl0wrMBhS2Z2KaxvxlDBP5EcLf3CLkftPIVLHp9ZfukIh/D r6xa+E6H9QKuOJPL8orxdHgewi10BvLEa0CCSCNk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40677 Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This package is needed, because Jami uses a modified version of ffmpeg, which provides GPU hardware acceleration, automatical adapting of bitrate and extra codecs. Because of the configure flags list being long, it is better to keep them separated in variables, instead of littering the package definition. * gnu/packages/jami.scm (ffmpeg-jami, %ffmpeg-default-configure-flags, %ffmpeg-linux-configure-flags, %ffmpeg-linux-x86-configure-flags): New variables. (ffmpeg-compose-configure-flags): New procedure. (libring)[inputs]: Use ffmpeg-jami instead of ffmpeg. --- gnu/packages/jami.scm | 248 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 246 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index dda787b3cd..dea5e7d3b8 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) (define %jami-version "20200401.1.6f090de") @@ -186,6 +187,249 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +;; The following variables are configure flags used by ffmpeg-jami. +;; They're from the ring-project/daemon/contrib/src/ffmpeg/rules.mak +;; file. We try to keep it as close to the official Jami package as +;; possible to provide all the codecs and extra features that are +;; the effect of patching ffmpeg. +;; +;; Web view of the file: +;;https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak +(define %ffmpeg-default-configure-flags + '(;; disable everything + "--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=hevc" + "--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")) + +(define %ffmpeg-linux-configure-flags + '("--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-hwaccel=hevc_vaapi" + "--enable-encoder=h264_vaapi" + "--enable-encoder=vp8_vaapi" + "--enable-encoder=mjpeg_vaapi" + "--enable-encoder=hevc_vaapi")) + +;; ffnvcodec is not supported on ARM then we enable it here for i386 and x86_64 +(define %ffmpeg-linux-x86-configure-flags + '("--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")) + +;; This procedure composes the configure flags list for ffmpeg-jami. +(define (ffmpeg-compose-configure-flags) + (define (system=? s) + (string-prefix? s (%current-system))) + `(,@%ffmpeg-default-configure-flags + ,@(if (string-contains (%current-system) "linux") + (if (or (system=? "i686") + (system=? "x86_64")) + (append %ffmpeg-linux-configure-flags + %ffmpeg-linux-x86-configure-flags) + %ffmpeg-linux-configure-flags) + '()))) + +(define-public ffmpeg-jami + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (native-inputs + `(("sfl-patches" ,(jami-source)) + ("libiconv" ,libiconv) + ,@(package-native-inputs ffmpeg))) + (supported-systems '("x86_64-linux" "i686-linux" + "aarch64-linux" "armhf-linux")) + (arguments + (append + '(#:tests? #f) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags '()) + (ffmpeg-compose-configure-flags)) + ((#: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") @@ -197,7 +441,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri May 15 02:59:51 2020 Received: (at 40677) by debbugs.gnu.org; 15 May 2020 06:59:51 +0000 Received: from localhost ([127.0.0.1]:35729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZUJy-00078b-NQ for submit@debbugs.gnu.org; Fri, 15 May 2020 02:59:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZUJw-00078L-OK for 40677@debbugs.gnu.org; Fri, 15 May 2020 02:59:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52278) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZUJq-0002rY-OD; Fri, 15 May 2020 02:59:42 -0400 Received: from [2a01:cb18:832e:5f00:5cdd:cc67:a2e1:e2f0] (port=57890 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jZUJq-00070c-Ad; Fri, 15 May 2020 02:59:42 -0400 From: Mathieu Othacehe To: Jan Subject: Re: [bug#40677] [PATCH v4] gnu: Add ffmpeg-jami. References: <20200417015857.0650ff6a@interia.pl> <20200513181234.27548-1-tona_kosmicznego_smiecia@interia.pl> <87zhab2e00.fsf@gnu.org> <20200514144324.346f0bc5@kompiuter> Date: Fri, 15 May 2020 08:59:40 +0200 In-Reply-To: <20200514144324.346f0bc5@kompiuter> (Jan's message of "Thu, 14 May 2020 14:43:24 +0200") Message-ID: <87r1vlwun7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40677 Cc: 40677@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey, > What should I use instead? Here you can create the list statically using quasi-quotes. >> If the first branch of the cond succeeds, we will never add this flag. > That's what happens when you code late in night :) > I should sit down with a cup of coffee and read Guile's manual seriously > this time. Sorry for making your code review harder. No worries. > > I think %ffmpeg-linux-x86-configure-flags should be added only if > linux is present, not just when on i686 or x86_64. I called it > "%ffmpeg-linux-x86...", because it was inside of the "ifdef HAVE_LINUX" > condition. But there was also a comment saying "Desktop Linux", which > as always means very little. I'm not sure if it really requires the > Linux kernel there or what. Yes you are right. > What about the output of the procedure? Is it okay for the list to be > not proper? It will look something like this: > ((flag1 flag2 ... flagN) (flag1 flag2 ... flagN)) > Is it okay because everything is treated as a pair in a recursive > manner? Nope the list should be flat, see: https://www.gnu.org/software/guile/manual/html_node/Expression-Syntax.html. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri May 15 03:11:25 2020 Received: (at 40677-done) by debbugs.gnu.org; 15 May 2020 07:11:25 +0000 Received: from localhost ([127.0.0.1]:35739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZUVB-0007R9-4C for submit@debbugs.gnu.org; Fri, 15 May 2020 03:11:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZUV8-0007Qt-Rw for 40677-done@debbugs.gnu.org; Fri, 15 May 2020 03:11:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52410) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZUV2-0006fI-UN; Fri, 15 May 2020 03:11:16 -0400 Received: from [2a01:cb18:832e:5f00:5cdd:cc67:a2e1:e2f0] (port=58060 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jZUV2-00050W-9u; Fri, 15 May 2020 03:11:16 -0400 From: Mathieu Othacehe To: Jan Wielkiewicz Subject: Re: [bug#40677] [PATCH v5] gnu: Add ffmpeg-jami. References: <20200417015857.0650ff6a@interia.pl> <20200515004705.11286-1-tona_kosmicznego_smiecia@interia.pl> Date: Fri, 15 May 2020 09:11:14 +0200 In-Reply-To: <20200515004705.11286-1-tona_kosmicznego_smiecia@interia.pl> (Jan Wielkiewicz's message of "Fri, 15 May 2020 02:47:05 +0200") Message-ID: <87mu69wu3x.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40677-done Cc: 40677-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Pushed with minor modifications. Thanks for your work, Mathieu Jan Wielkiewicz writes: > This package is needed, because Jami uses a modified version > of ffmpeg, which provides GPU hardware acceleration, automatical > adapting of bitrate and extra codecs. Because of the configure flags > list being long, it is better to keep them separated in variables, > instead of littering the package definition. > > * gnu/packages/jami.scm (ffmpeg-jami, %ffmpeg-default-configure-flags, > %ffmpeg-linux-configure-flags, %ffmpeg-linux-x86-configure-flags): > New variables. > (ffmpeg-compose-configure-flags): New procedure. > (libring)[inputs]: Use ffmpeg-jami instead of ffmpeg. > --- > gnu/packages/jami.scm | 248 +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 246 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm > index dda787b3cd..dea5e7d3b8 100644 > --- a/gnu/packages/jami.scm > +++ b/gnu/packages/jami.scm > @@ -59,7 +59,8 @@ > #:use-module (guix download) > #:use-module (guix git-download) > #:use-module (guix packages) > - #:use-module (guix utils)) > + #:use-module (guix utils) > + #:use-module (srfi srfi-1)) > > (define %jami-version "20200401.1.6f090de") > > @@ -186,6 +187,249 @@ > "selftest: pjlib-test pjlib-util-test pjmedia-test")) > #t))))))) > > +;; The following variables are configure flags used by ffmpeg-jami. > +;; They're from the ring-project/daemon/contrib/src/ffmpeg/rules.mak > +;; file. We try to keep it as close to the official Jami package as > +;; possible to provide all the codecs and extra features that are > +;; the effect of patching ffmpeg. > +;; > +;; Web view of the file: > +;;https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak > +(define %ffmpeg-default-configure-flags > + '(;; disable everything > + "--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=hevc" > + "--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")) > + > +(define %ffmpeg-linux-configure-flags > + '("--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-hwaccel=hevc_vaapi" > + "--enable-encoder=h264_vaapi" > + "--enable-encoder=vp8_vaapi" > + "--enable-encoder=mjpeg_vaapi" > + "--enable-encoder=hevc_vaapi")) > + > +;; ffnvcodec is not supported on ARM then we enable it here for i386 and x86_64 > +(define %ffmpeg-linux-x86-configure-flags > + '("--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")) > + > +;; This procedure composes the configure flags list for ffmpeg-jami. > +(define (ffmpeg-compose-configure-flags) > + (define (system=? s) > + (string-prefix? s (%current-system))) > + `(,@%ffmpeg-default-configure-flags > + ,@(if (string-contains (%current-system) "linux") > + (if (or (system=? "i686") > + (system=? "x86_64")) > + (append %ffmpeg-linux-configure-flags > + %ffmpeg-linux-x86-configure-flags) > + %ffmpeg-linux-configure-flags) > + '()))) > + > +(define-public ffmpeg-jami > + (package > + (inherit ffmpeg) > + (name "ffmpeg-jami") > + (native-inputs > + `(("sfl-patches" ,(jami-source)) > + ("libiconv" ,libiconv) > + ,@(package-native-inputs ffmpeg))) > + (supported-systems '("x86_64-linux" "i686-linux" > + "aarch64-linux" "armhf-linux")) > + (arguments > + (append > + '(#:tests? #f) > + (substitute-keyword-arguments (package-arguments ffmpeg) > + ((#:configure-flags '()) > + (ffmpeg-compose-configure-flags)) > + ((#: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") > @@ -197,7 +441,7 @@ > ("boost" ,boost) > ("dbus-c++" ,dbus-c++) > ("eudev" ,eudev) > - ("ffmpeg" ,ffmpeg) > + ("ffmpeg" ,ffmpeg-jami) > ("flac" ,flac) > ("gmp" ,gmp) > ("gsm" ,gsm) From unknown Wed Jun 18 22:58:58 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 12 Jun 2020 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator