From unknown Sat Aug 16 20:58:32 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#39005 <39005@debbugs.gnu.org> To: bug#39005 <39005@debbugs.gnu.org> Subject: Status: [PATCH 00/22] Maintaining Jami. Reply-To: bug#39005 <39005@debbugs.gnu.org> Date: Sun, 17 Aug 2025 03:58:32 +0000 retitle 39005 [PATCH 00/22] Maintaining Jami. reassign 39005 guix-patches submitter 39005 Jan severity 39005 normal tag 39005 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 03:27:02 2020 Received: (at submit) by debbugs.gnu.org; 7 Jan 2020 08:27:02 +0000 Received: from localhost ([127.0.0.1]:47229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iokCb-0003K9-Qn for submit@debbugs.gnu.org; Tue, 07 Jan 2020 03:27:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:53329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iokCa-0003Jh-AA for submit@debbugs.gnu.org; Tue, 07 Jan 2020 03:27:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60478) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iokCW-0003Ea-SB for guix-patches@gnu.org; Tue, 07 Jan 2020 03:26:58 -0500 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 1iokCV-0002DA-4H for guix-patches@gnu.org; Tue, 07 Jan 2020 03:26:56 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:42827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iokCU-0002BF-DZ for guix-patches@gnu.org; Tue, 07 Jan 2020 03:26:55 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA for ; Tue, 7 Jan 2020 01:29:08 +0100 (CET) Date: Tue, 7 Jan 2020 01:29:00 +0100 From: Jan To: guix-patches@gnu.org Subject: [PATCH 00/22] Maintaining Jami. Message-ID: <20200107012900.7cf19eb6@interia.pl> X-Mailer: Claws Mail 3.17.4 (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=1578356948; bh=FXUzwYTJdvjhD3EJDFW/NmB0gXse780Yk1afxBzEGsw=; 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=lEj+ILqRBk5Uhxjfl+FXFSfwotLGjN+Yp0c6qbK7pi16f13ODr3o4AkagOKMzIY0i 5kV2w4uXiywMLQkDU1UOuCYKOVKg5ADeRXumNOl61f9dcXU3R3Y3DZD8Jdom02pByQ 3Wu8BAu+8eLOdiHKIiD7B73xglymDn0VCtL0gLrQ= X-EOM: H-lo10 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.239 X-Spam-Score: 0.6 (/) 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: -2.4 (--) Maintaining Jami - mostly updating, adding new deps and updating old, improving some things, for example moving Jami and its deps to jami.scm. Changes: gnu: jami: Bump to 20191227.2.74b55b6. gnu: pjproject-jami: Apply a missing patch. gnu: libring: Use ffmpeg-jami instead of ffmpeg. gnu: jami: Bump to 20191224.1.5c0154a gnu: jami.scm: Fix formatting. No code changes! gnu: pjproject-jami: Remove unnecessary lambda, which came from doing rebase improperly; jami.scm: untabify, remove trailing whitespace. gnu: pjproject-jami: Fix formatting - replace a tab sign with a space. No code changes! gnu: restinio: Bump to 0.6.1.1. gnu: opendht: Bump to 2.0.0beta3. gnu: jami: bump to 20191217.1.ce5f295. gnu: ffmpeg-jami: skip tests. gnu: jami: Bump to 20191214.1.07edb5e. gnu: Add gnutls-jami (not yet working). gnu: jami: Bump to 20191209.1.4b48135. gnu: Add ffmpeg-jami. gnu: jami: Fix the procedure for applying patches. Use the procedure correctly in pjproject-jami. gnu: jami: Move Jami and its dependencies to a separate file (jami.scm). gnu: Jami: add libnatpmp (an optional dependency) gnu: libupnp: Bump to 1.8.3; change fetch-method; add missing dependencies. gnu: Add libnatpmp. gnu: jami: fix downloading by changing the prefix to jami_ ed57ae4b5a. gnu: jami: Bump to 20191128.1.4c44bb7. gnu: jami: Bump to 20191227.2.74b55b6. Statistics for each change (If there's a way do do this better, please tell me what command does it): gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: pjproject-jami: Apply a missing patch. gnu/packages/jami.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) gnu: libring: Use ffmpeg-jami instead of ffmpeg. gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) gnu: jami: Bump to 20191224.1.5c0154a gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: jami.scm: Fix formatting. No code changes! gnu/packages/jami.scm | 640 +++++++++++++++++++++++++------------------------- 1 file changed, 320 insertions(+), 320 deletions(-) gnu: pjproject-jami: Remove unnecessary lambda, which came from doing rebase improperly; jami.scm: untabify, remove trailing whitespace. gnu/packages/jami.scm | 591 +++++++++++++++++++++++--------------------------- 1 file changed, 277 insertions(+), 314 deletions(-) gnu: pjproject-jami: Fix formatting - replace a tab sign with a space. No code changes! gnu/packages/jami.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) gnu: restinio: Bump to 0.6.1.1. gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: opendht: Bump to 2.0.0beta3. gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: jami: bump to 20191217.1.ce5f295. gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: ffmpeg-jami: skip tests. gnu/packages/jami.scm | 335 ++++++++++++++++++++++++++------------------------ 1 file changed, 172 insertions(+), 163 deletions(-) gnu: jami: Bump to 20191214.1.07edb5e. gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: Add gnutls-jami (not yet working). gnu/packages/jami.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) gnu: jami: Bump to 20191209.1.4b48135. gnu/packages/jami.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) gnu: Add ffmpeg-jami. gnu/packages/jami.scm | 213 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) gnu: jami: Fix the procedure for applying patches. Use the procedure correctly in pjproject-jami. gnu/packages/jami.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) gnu: jami: Move Jami and its dependencies to a separate file (jami.scm). gnu/packages/jami.scm | 352 +++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 ------------------------------------- 2 files changed, 352 insertions(+), 291 deletions(-) gnu: Jami: add libnatpmp (an optional dependency) gnu/packages/telephony.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) gnu: libupnp: Bump to 1.8.3; change fetch-method; add missing dependencies. gnu/packages/upnp.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) gnu: Add libnatpmp gnu/packages/networking.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) gnu: jami: fix downloading by changing the prefix to jami_ gnu/packages/telephony.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) gnu: jami: Bump to 20191128.1.4c44bb7. Jan Wielkiewicz From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:18:08 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:18:08 +0000 Received: from localhost ([127.0.0.1]:47283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolw8-00062J-4G for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:08 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:35713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolw6-00061m-JW for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:07 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:00 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 08/22] gnu: Add ffmpeg-jami. Date: Tue, 7 Jan 2020 11:17:27 +0100 Message-Id: <20200107101741.970-8-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392281; bh=2sHQ4vx7ZAF6ptYMvh27conh2HIMRq/+ru/S34XZqfE=; 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=T2nknrU5NGxoNO3HXmCUCsqkiRLkqDZ5fTjSevXDPtHIjuen4DTm/91jScHAyWRrH qnNCFNeh8T18aa7Qdk0ixDNtl4UdSJ281QC7/m95nVR2FOwM33nG4+30yzTbGWilPJ +OPkdqwB0iuGWfroutDAgp1iViAg8ZgshYIGL6R8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 213 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 1 deletion(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index f257767a85..7320104c88 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -56,7 +56,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix git-download)) + #:use-module (guix git-download) + #:use-module (guix utils)) (define-public jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) @@ -218,6 +219,216 @@ "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)) + ,@(package-native-inputs ffmpeg))) + (arguments + (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" + "--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-parser=h263" + "--enable-parser=h264" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + "--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" + "--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" + "--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" + "--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") + (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" + "--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")) + (if (string?= (%current-system) "aarch64-linux") + '("--arch=aarch64")) + (if (string?= (%current-system) "arm64-linux") + '("--arch=aarch64")))) + ((#:phases phases) + `(modify-phases ,phases + (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.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:18:16 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:18:16 +0000 Received: from localhost ([127.0.0.1]:47286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwA-00062c-NS for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:16 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:44652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolw6-00061h-EM for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:08 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:59 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 06/22] gnu: jami: Move Jami and its dependencies to a separate file (jami.scm). Date: Tue, 7 Jan 2020 11:17:25 +0100 Message-Id: <20200107101741.970-6-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392280; bh=BRCUq6mvx446EAOo8xeNZqPcKFQ5R1l9nr1R7aVNq7M=; 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=aTRdohm/bq3JVlnjCTMXa2NuIxzM1WuLSZJ5gtdPrToWLJ6JYTGloFWaTBi/k9k8I /hvjYAYM4SFdXJ5zyXS07krX1D7VibWSKq35bBHFiDiwCmy58BRH6V8wmqNVT8zmmf DwKfAtj2esxEYhqBVJVpqcgMv97vFqDZ+H5vsS7k= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 352 +++++++++++++++++++++++++++++++++++++ gnu/packages/telephony.scm | 291 ------------------------------ 2 files changed, 352 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..c6f38d4a8c --- /dev/null +++ b/gnu/packages/jami.scm @@ -0,0 +1,352 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019 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 (gnu packages) + #: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 (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download)) + +(define %jami-version "20191128.1.4c44bb7") + +(define* (jami-source #:key without-daemon) + (origin + (method url-fetch) + (uri (string-append "https://dl.jami.net/ring-release/tarballs/jami_" + %jami-version + ".tar.gz")) + (modules '((guix build utils))) + (snippet + (if without-daemon + '(begin + (delete-file-recursively "daemon/contrib")) + #f)) + (sha256 + (base32 + "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v")))) + +(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 + `(("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) + ("libnatpmp" ,libnatpmp) + ("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 a2970c817b..dc3a545011 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -656,294 +656,3 @@ calls and messages") (description "PJProject provides an implementation of the Session Initiation Protocol (SIP) and a multimedia framework.") (license license:gpl2+))) - -(define %jami-version "20191128.1.4c44bb7") - -(define* (jami-source #:key without-daemon) - (origin - (method url-fetch) - (uri (string-append "https://dl.jami.net/ring-release/tarballs/jami_" - %jami-version - ".tar.gz")) - (modules '((guix build utils))) - (snippet - (if without-daemon - '(begin - (delete-file-recursively "daemon/contrib")) - #f)) - (sha256 - (base32 - "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v")))) - -(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 - `(("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) - ("libnatpmp" ,libnatpmp) - ("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)) -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:18:16 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:18:17 +0000 Received: from localhost ([127.0.0.1]:47290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwG-00062x-Bs for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:16 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:40412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolw8-000624-37 for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:09 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:02 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 12/22] gnu: ffmpeg-jami: skip tests. Date: Tue, 7 Jan 2020 11:17:31 +0100 Message-Id: <20200107101741.970-12-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392282; bh=/wl753SFD3vv45l8bvXTj6x3AF8OumpAImQI+tawwv4=; 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=GvzaUPCs2xzPhAvmc4Akv7NdHCsYUrpuBTFAJ/Q+qntRouJZLxsTaH4uUD0LGoZo7 h1xlIljudd2nac6TD31yo2Iqys3dF05Jcv72IB0YVYE8pIXeMZKVs2D+tuI0kxQ8vR g7FY3vzIAgTZvP0LU5X546rkzd64zJXbYaP1oalM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 335 ++++++++++++++++++++++-------------------- 1 file changed, 172 insertions(+), 163 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 9197c4e6a4..a48bc7f286 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -286,152 +286,155 @@ "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))) (native-inputs `(("savoir-faire-linux-patches" ,(jami-source)) + ("libiconv" ,libiconv) ,@(package-native-inputs ffmpeg))) (arguments - (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" - "--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-parser=h263" - "--enable-parser=h264" - "--enable-parser=mpeg4video" - "--enable-parser=vp8" - "--enable-parser=vp9" - "--enable-parser=opus" - "--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" - "--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" - "--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" - "--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") - (if (string-contains (%current-system) "linux") + (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" + "--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-parser=h263" + "--enable-parser=h264" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + "--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" + "--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" + "--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" + "--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") + (if (string-contains (%current-system) "linux") '("--enable-pic" "--extra-cxxflags=-fPIC" "--extra-cflags=-fPIC" @@ -460,25 +463,31 @@ "--enable-hwaccel=mjpeg_nvdec" "--enable-encoder=h264_nvenc" "--enable-encoder=hevc_nvenc")) - (if (string?= (%current-system) "aarch64-linux") - '("--arch=aarch64")) - (if (string?= (%current-system) "arm64-linux") - '("--arch=aarch64")))) - ((#:phases phases) - `(modify-phases ,phases - (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))))))))) + (if (string?= (%current-system) "aarch64-linux") + '("--arch=aarch64") + '()) + (if (string?= (%current-system) "arm64-linux") + '("--arch=aarch64") + '()))) + ((#: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 -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:18:17 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:18:17 +0000 Received: from localhost ([127.0.0.1]:47292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwG-00063A-Vf for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:17 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:60512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwA-000627-6P for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:12 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:04 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 17/22] gnu: pjproject-jami: Remove unnecessary lambda, which came from doing rebase improperly; jami.scm: untabify, remove trailing whitespace. Date: Tue, 7 Jan 2020 11:17:36 +0100 Message-Id: <20200107101741.970-17-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392284; bh=/bCU5qDS4jkOQpNwkpeQKXZ3diXCFuv4BrzZMGdlLLw=; 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=WP3DUgAJZ75W52s6FxfINC7GwcTnSCKpwjZ3zM1unz9f1TVpKVPe0H1+qnia3bX8M 9Pe8mhlocncxrf41UvLnU9c6PaFKHJsfTJNLHdXHFb7yt8ZxEREQHuttcbtz3bGecu Rg/vIiNITwAEOBngSYcesaDupf3sOOT4aSPDahZ8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 591 ++++++++++++++++++++---------------------- 1 file changed, 277 insertions(+), 314 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 92a89f8dc6..a9af081450 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -62,18 +62,18 @@ (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 + (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"))) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-directory "/" + file ".patch"))) patches)))) (define %jami-version "20191217.1.ce5f295") @@ -142,83 +142,48 @@ (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)) - (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 "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. - (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))))))) + (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 "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. + (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 gnutls-jami (package @@ -244,31 +209,31 @@ "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) (arguments (substitute-keyword-arguments (package-arguments gnutls) - ((#:configure-flags '()) - '("--disable-gtk-doc" - "--without-p11-kit" - "--disable-cxx" - "--disable-srp-authentication" - "--disable-psk-authentication-FIXME" - "--with-included-libtasn1" - "--with-included-unistring" - "--disable-openpgp-authentication" - "--disable-openssl-compatibility" - "--disable-guile" - "--disable-nls" - "--disable-dtls-srtp-support" - "--without-libintl-prefix" - "--without-idn")) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "gnutls" - #:patches - '("downgrade-gettext-requirement")) - #t))))))))) + ((#:configure-flags '()) + '("--disable-gtk-doc" + "--without-p11-kit" + "--disable-cxx" + "--disable-srp-authentication" + "--disable-psk-authentication-FIXME" + "--with-included-libtasn1" + "--with-included-unistring" + "--disable-openpgp-authentication" + "--disable-openssl-compatibility" + "--disable-guile" + "--disable-nls" + "--disable-dtls-srtp-support" + "--without-libintl-prefix" + "--without-idn")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "gnutls" + #:patches + '("downgrade-gettext-requirement")) + #t))))))))) (define-public ffmpeg-jami (package @@ -278,9 +243,9 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://git.ffmpeg.org/ffmpeg.git") - (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) - (file-name (git-file-name "ffmpeg" version)) + (url "https://git.ffmpeg.org/ffmpeg.git") + (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635"))) + (file-name (git-file-name "ffmpeg" version)) (sha256 (base32 "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2")))) @@ -292,202 +257,202 @@ (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" - "--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-parser=h263" - "--enable-parser=h264" - "--enable-parser=mpeg4video" - "--enable-parser=vp8" - "--enable-parser=vp9" - "--enable-parser=opus" - "--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" - "--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" - "--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" - "--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") - (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" - "--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")) - (if (string?= (%current-system) "aarch64-linux") - '("--arch=aarch64") - '()) - (if (string?= (%current-system) "arm64-linux") - '("--arch=aarch64") - '()))) - ((#: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)))))))))) + ((#: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" + "--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-parser=h263" + "--enable-parser=h264" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + "--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" + "--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" + "--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" + "--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") + (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" + "--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")) + (if (string?= (%current-system) "aarch64-linux") + '("--arch=aarch64") + '()) + (if (string?= (%current-system) "arm64-linux") + '("--arch=aarch64") + '()))) + ((#: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 @@ -662,5 +627,3 @@ This package provides the Jami client for the GNOME desktop.") (define-public jami-client-gnome (deprecated-package "jami-client-gnome" jami)) - - -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:18:18 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:18:18 +0000 Received: from localhost ([127.0.0.1]:47295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwH-00063E-R6 for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:18 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:36969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolwA-000628-Ml for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:18:12 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:04 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 18/22] gnu: jami.scm: Fix formatting. No code changes! Date: Tue, 7 Jan 2020 11:17:37 +0100 Message-Id: <20200107101741.970-18-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392285; bh=sjUNxPG2UW19/dDNrJRN6I6BO3oBEArbYyOjx8RjfHs=; 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=PsJ4+MIoboFMLq3+pZuvMfr7/ri3H/8gVA8QFVFzi+TcK5lOS/XcTDbsbs8E+SfHP Dpna0BPmqGIkhDPXvNP9CZAGFYahGaml4fDZsEBsVuRgyNXVAxaddRauKPRe083lRW +db445wYQwb+QqskJrRfAyxgpJa/aio1M7zLIeNk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 640 +++++++++++++++++++++--------------------- 1 file changed, 320 insertions(+), 320 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index a9af081450..c6d65d5688 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -62,19 +62,19 @@ (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)))) + (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 %jami-version "20191217.1.ce5f295") @@ -87,9 +87,9 @@ (modules '((guix build utils))) (snippet (if without-daemon - '(begin - (delete-file-recursively "daemon/contrib")) - #f)) + '(begin + (delete-file-recursively "daemon/contrib")) + #f)) (sha256 (base32 "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06")))) @@ -142,317 +142,317 @@ (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 "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. - (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))))))) + (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 "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. + (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 gnutls-jami (package - (inherit gnutls) - (name "gnutls-jami") - (native-inputs - `(("savoir-faire-linux-patches" ,(jami-source)) - ("automake" ,automake) - ("autoconf" ,autoconf) - ("datefudge" ,datefudge) - ("openssl" ,openssl) - ,@(package-native-inputs gnutls))) - (version "3.6.10") + (inherit gnutls) + (name "gnutls-jami") + (native-inputs + `(("savoir-faire-linux-patches" ,(jami-source)) + ("automake" ,automake) + ("autoconf" ,autoconf) + ("datefudge" ,datefudge) + ("openssl" ,openssl) + ,@(package-native-inputs gnutls))) + (version "3.6.10") (source (origin - (method url-fetch) - (uri - (string-append "mirror://gnupg/gnutls/v" - (version-major+minor version) - "/gnutls-" version ".tar.xz")) - ;;(patches (search-patches "gnutls-skip-trust-store-test.patch")) - (sha256 - (base32 - "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) - (arguments - (substitute-keyword-arguments (package-arguments gnutls) - ((#:configure-flags '()) - '("--disable-gtk-doc" - "--without-p11-kit" - "--disable-cxx" - "--disable-srp-authentication" - "--disable-psk-authentication-FIXME" - "--with-included-libtasn1" - "--with-included-unistring" - "--disable-openpgp-authentication" - "--disable-openssl-compatibility" - "--disable-guile" - "--disable-nls" - "--disable-dtls-srtp-support" - "--without-libintl-prefix" - "--without-idn")) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'apply-patches - (lambda* (#:key inputs #:allow-other-keys) - (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "gnutls" - #:patches - '("downgrade-gettext-requirement")) - #t))))))))) + (method url-fetch) + (uri + (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + ;;(patches (search-patches "gnutls-skip-trust-store-test.patch")) + (sha256 + (base32 + "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) + (arguments + (substitute-keyword-arguments (package-arguments gnutls) + ((#:configure-flags '()) + '("--disable-gtk-doc" + "--without-p11-kit" + "--disable-cxx" + "--disable-srp-authentication" + "--disable-psk-authentication-FIXME" + "--with-included-libtasn1" + "--with-included-unistring" + "--disable-openpgp-authentication" + "--disable-openssl-compatibility" + "--disable-guile" + "--disable-nls" + "--disable-dtls-srtp-support" + "--without-libintl-prefix" + "--without-idn")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "gnutls" + #:patches + '("downgrade-gettext-requirement")) + #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" - "--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-parser=h263" - "--enable-parser=h264" - "--enable-parser=mpeg4video" - "--enable-parser=vp8" - "--enable-parser=vp9" - "--enable-parser=opus" - "--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" - "--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" - "--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" - "--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") - (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" - "--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")) - (if (string?= (%current-system) "aarch64-linux") - '("--arch=aarch64") - '()) - (if (string?= (%current-system) "arm64-linux") - '("--arch=aarch64") - '()))) - ((#: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)))))))))) + (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" + "--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-parser=h263" + "--enable-parser=h264" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + "--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" + "--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" + "--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" + "--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") + (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" + "--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")) + (if (string?= (%current-system) "aarch64-linux") + '("--arch=aarch64") + '()) + (if (string?= (%current-system) "arm64-linux") + '("--arch=aarch64") + '()))) + ((#: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 -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:20:50 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:20:50 +0000 Received: from localhost ([127.0.0.1]:47319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyk-00069X-BH for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:50 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:37169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyh-000697-UO for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:48 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:59 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 05/22] gnu: Jami: add libnatpmp (an optional dependency) Date: Tue, 7 Jan 2020 11:17:24 +0100 Message-Id: <20200107101741.970-5-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392279; bh=EDmheO+rnuhYnMBisMP/QJ0XwpVTGfW5y4h/OzDBbV4=; 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=M6Nq9UfGQFk8tZBp7X2WbMN4hYPDUYizUcSMMuBzvL7waM5isfd09zErlKt124SAA vkVg/JdlgdXsNf55qIu/9K5kKDVYdt2jPtOr7a11X1+byTgN/JUgWK8Zf6kznb9Vmj QAxjF0BVWbRCBAOD0pO5suCgeIBACXLYY6PhGR4o= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e6660c00e1..a2970c817b 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -781,7 +781,6 @@ Initiation Protocol (SIP) and a multimedia framework.") (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++) @@ -802,6 +801,7 @@ Initiation Protocol (SIP) and a multimedia framework.") ("libsndfile" ,libsndfile) ("speex" ,speex) ("speexdsp" ,speexdsp) + ("libnatpmp" ,libnatpmp) ("libupnp" ,libupnp) ("libvorbis" ,libvorbis) ("libx264" ,libx264) -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:20:50 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:20:51 +0000 Received: from localhost ([127.0.0.1]:47321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyk-00069a-Jc for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:50 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:37171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyh-000698-UP for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:48 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:06 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 22/22] gnu: jami: Bump to 20191227.2.74b55b6. Date: Tue, 7 Jan 2020 11:17:41 +0100 Message-Id: <20200107101741.970-22-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392287; bh=QdIUdsl/ySoOkoZ/FkpDbFskWeWev8OcLO3emVBUxgg=; 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=Ld7la1UbqthHHdJqOMiXb2kZ2XZGz6j8y/+cm8A0pxQL610bjAoVok8+GbQfBgqAR e3AMopTNJNcCvYvgKk4iTuXilHRM/dbQ8090W3/3JJ/teb+RyM1WBy9ioYPmEQ3hvY ABdOSLWSi+OpaqwJGXYTtffuRuyiaqtAfm3F7iBw= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 22c86e9b5b..7012f5c9bc 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -76,7 +76,7 @@ file ".patch"))) patches)))) -(define %jami-version "20191224.1.5c0154a") +(define %jami-version "20191227.2.74b55b6") (define* (jami-source #:key without-daemon) (origin @@ -92,7 +92,7 @@ #f)) (sha256 (base32 - "1mrnc4m2xmrb5b4bkm4hmh514g2hixin3dqxmi3z0adw5ay6ivr2")))) + "1x9alsb8r1vvcxml4mlla8v4ckylfh8ad0falxg1a78dj0lslw4d")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:20:51 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:20:51 +0000 Received: from localhost ([127.0.0.1]:47323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyk-00069h-SF for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:51 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:37170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolyh-000699-Ub for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:20:48 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:03 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 14/22] gnu: opendht: Bump to 2.0.0beta3. Date: Tue, 7 Jan 2020 11:17:33 +0100 Message-Id: <20200107101741.970-14-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392283; bh=6osj57Kj5ceIbn5aa1W0JXS7zbSgqHrgv2hKVUvxvDE=; 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=rArFHVTcJ33sZOjh9nt5v2Hkz1KUfkGMXJLNuXp5KJiDMGYBPVftt9jwYB5bTFCf9 Pao58n982XqxVlNP09FNsoBfzPU1gAZgxdXw7uM7Fp3Ndx56EaJupmEUMJLM4dmgTa Yh1X/p24Qa9HaOcLe8Y2MH5N5E/ot2FVHXn7aMl8= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 76a36111f1..42d8b01007 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2594,7 +2594,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.0.0beta2") + (version "2.0.0beta3") (source (origin (method git-fetch) (uri (git-reference @@ -2603,7 +2603,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5")))) + "0y9br1g1y5gf4v0v6n3lfnx7mpd238rigc94nl7h8f9pfhbk86jl")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:21:25 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:21:25 +0000 Received: from localhost ([127.0.0.1]:47334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzJ-0006CP-5x for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:25 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:36293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzH-0006Bw-Dz for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:23 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:57 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 01/22] gnu: jami: Bump to 20191128.1.4c44bb7. Date: Tue, 7 Jan 2020 11:17:20 +0100 Message-Id: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 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=1578392278; bh=BTMTeVlhSdEpClLl6JYlHY5JvCL67eLcqmKQbF2kAzM=; 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=jPzp8Io9Ry1z0emhVsNEZ0fwhiaNGwHBV/e21FVJIhVSKr81HatM9mLLp7rPb/eUY 8Dz7ItY7+ZMBdmbqoNV/ejezTzmIL9gi6kWeSyqpiQfVeOECD7hdaeTI8hbwolwE+L rn7mghTtP62+iF2GmC2ZwPmLzZOrZPVLXTS6maoQ= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 is my first patch ever, hope I won't break anything :P My changes: Updating Jami and it's dependencies, moving Jami and modified deps to jami.scm, improving quality of packages by applying patches and configure flags to dependencies modified by Jami developers, fixing formatting. Jan Wielkiewicz --- 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 0c9de8bd0c..d923882e6b 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -657,7 +657,7 @@ calls and messages") Initiation Protocol (SIP) and a multimedia framework.") (license license:gpl2+))) -(define %jami-version "20191101.3.67671e7") +(define %jami-version "20191128.1.4c44bb7") (define* (jami-source #:key without-daemon) (origin @@ -673,7 +673,7 @@ Initiation Protocol (SIP) and a multimedia framework.") #f)) (sha256 (base32 - "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) + "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:21:25 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:21:25 +0000 Received: from localhost ([127.0.0.1]:47336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzJ-0006CR-Dm for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:25 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:36292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzH-0006Bx-E9 for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:23 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:02 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 13/22] gnu: jami: bump to 20191217.1.ce5f295. Date: Tue, 7 Jan 2020 11:17:32 +0100 Message-Id: <20200107101741.970-13-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392283; bh=gAseXy1GHOkVdT6S99zSLQcYJr/xOAavgdJxSd5G3IM=; 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=h6UyZaRrCqJc1xTKX/TDD1PFyPzqqVI0y6Oa0xxpcCThlby1OXXotOWnJPgJiq0p+ SLzX78t1FbMOu2QTtDup8gkDBeYUdoirWyaTXpT7s36o/drF4FdEMfM8WBfd0PISWx xHSD1sil7oi7zPoKobckKT3DnX6m2HNKHka93rD4= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 a48bc7f286..fe797a78ea 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -76,7 +76,7 @@ file ".patch"))) patches)))) -(define %jami-version "20191214.1.07edb5e") +(define %jami-version "20191217.1.ce5f295") (define* (jami-source #:key without-daemon) (origin @@ -92,7 +92,7 @@ #f)) (sha256 (base32 - "1g5crffqfw7rb96iqamsfv63pjql9dli9m3nd1hsx28apkffkbnd")))) + "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:21:26 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:21:26 +0000 Received: from localhost ([127.0.0.1]:47338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzJ-0006CY-NU for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:25 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:36291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzH-0006Bv-E1 for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:24 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:01 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 10/22] gnu: Add gnutls-jami (not yet working). Date: Tue, 7 Jan 2020 11:17:29 +0100 Message-Id: <20200107101741.970-10-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392281; bh=0CKXtvXJLanQEigTR3qhi9tAc3L+84/9w+zJ1gcy40A=; 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=SMypfCS3J/M2cX9/HGE7OINSKgyqizi5IbXChbt+8x/pOr+E+/wiskPRZKLxrugnk cyNGV3xHmB5KEReLQgPNWfaF040zdbysjPYYSFzpuTnfpfHluw8dq0iSRfIOk9ML6G jdgpCaqUzIWCHdqUNSW1c6bvMB0rOrNVyfMa6iRI= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8b24984bd5..db2e52d27f 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages telephony) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages video) @@ -219,6 +220,56 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +(define-public gnutls-jami + (package + (inherit gnutls) + (name "gnutls-jami") + (native-inputs + `(("savoir-faire-linux-patches" ,(jami-source)) + ("automake" ,automake) + ("autoconf" ,autoconf) + ("datefudge" ,datefudge) + ("openssl" ,openssl) + ,@(package-native-inputs gnutls))) + (version "3.6.10") + (source (origin + (method url-fetch) + (uri + (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + ;;(patches (search-patches "gnutls-skip-trust-store-test.patch")) + (sha256 + (base32 + "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) + (arguments + (substitute-keyword-arguments (package-arguments gnutls) + ((#:configure-flags '()) + '("--disable-gtk-doc" + "--without-p11-kit" + "--disable-cxx" + "--disable-srp-authentication" + "--disable-psk-authentication-FIXME" + "--with-included-libtasn1" + "--with-included-unistring" + "--disable-openpgp-authentication" + "--disable-openssl-compatibility" + "--disable-guile" + "--disable-nls" + "--disable-dtls-srtp-support" + "--without-libintl-prefix" + "--without-idn")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "gnutls" + #:patches + '("downgrade-gettext-requirement")) + #t))))))))) + (define-public ffmpeg-jami (package (inherit ffmpeg) -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:21:31 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:21:31 +0000 Received: from localhost ([127.0.0.1]:47341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzP-0006Cz-1N for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:31 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:39799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iolzN-0006CH-Ai for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:21:29 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:58 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 02/22] gnu: jami: fix downloading by changing the prefix to jami_ Date: Tue, 7 Jan 2020 11:17:21 +0100 Message-Id: <20200107101741.970-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392278; bh=+B4D3UthQyIcn8DsUZrhsNw7/JSQ8T12J8PulVIKfKE=; 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=DZmXsjOa6GG3Jsxq7Ma+W+XeXBEzINrQot9TijANeyRubo+t8T1BX46yHSt8/i0XW 0xOMOf5G3jxuVaYQXRB6gYC+bPzPgwkrDGRw5+Hv4QSmTndg1tJhKVYvStE7RiLDBI FYwb2hglUnozjwH1AGWTgsxeue5ndhJCaZCmC5CY= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index d923882e6b..e6660c00e1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -662,7 +662,7 @@ Initiation Protocol (SIP) and a multimedia framework.") (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/ring-release/tarballs/jami_" %jami-version ".tar.gz")) (modules '((guix build utils))) -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:26:11 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:26:11 +0000 Received: from localhost ([127.0.0.1]:47357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3u-0006NA-Ra for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:11 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:46543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3t-0006Mg-28 for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:09 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:58 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 04/22] gnu: libupnp: Bump to 1.8.3; change fetch-method; add missing dependencies. Date: Tue, 7 Jan 2020 11:17:23 +0100 Message-Id: <20200107101741.970-4-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392279; bh=/+lx5mm72nXaWzGDYPsxSldnaul22ucPdLE+MD7yZ0o=; 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=aLPj4w+EuVpxLny0kl3JLc6T5NLoXSFnrkjoRABV4f/Pq5n5WLewT8BL1od5wy+xC /GspIkcJrr0Pv4iiovKKupFsRrIdbuxD+9mTHl3SYDJOnTHFiggOjkWyee8nYqZU7O tovpJsFxZU23o0Qie+0PVQYUXz9otixoXhewALVc= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 390a3387ab..4ba696e8ba 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -92,15 +92,20 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.6.25") + (version "1.8.3") (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")))) + "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (build-system gnu-build-system) (arguments ;; The tests require a network device capable of multicasting which is -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:26:11 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:26:11 +0000 Received: from localhost ([127.0.0.1]:47359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3v-0006NC-1U for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:11 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:46545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3t-0006Mh-2A for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:09 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:05 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 20/22] gnu: libring: Use ffmpeg-jami instead of ffmpeg. Date: Tue, 7 Jan 2020 11:17:39 +0100 Message-Id: <20200107101741.970-20-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392286; bh=AMyPrKcqWjAL9bwPlw1hNuJs6J0AOwkbulzBMmKqp88=; 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=EdhYi+mzCowf/wKxB1awy7JNqJldfncfUAyieB4paEqEfb2YbOXzUcl2XZJYZ+APc CQjimColf3xoN4G2kowEo9Cf6oxfkRiRvKSJV0vsKkgekSbZMzdorEwh8bcbzI6lBE FK8wlqe0Lebd2CtyMBPs4de9hUzOvxfcJjIuG1MU= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 b13dce8154..ea66bed8a5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -465,7 +465,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 05:26:11 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 10:26:11 +0000 Received: from localhost ([127.0.0.1]:47361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3v-0006NK-AM for submit@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:11 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:46546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iom3t-0006Mi-2O for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 05:26:09 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:01 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 11/22] gnu: jami: Bump to 20191214.1.07edb5e. Date: Tue, 7 Jan 2020 11:17:30 +0100 Message-Id: <20200107101741.970-11-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392282; bh=UkvT4bLBcmOGDd/+mMfbWF1BcVwx4b3nPAjBXuPu0OA=; 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=tlKh3erHf8PJj7N3aNmgxURT+cNZhru8Gf+d9O1FHZAQm+wDTg18Q46tzfFIvGoxl KvgBxvgNeZQ1gE7u2lx7xhXf+rEbGaCiVA371EpatufvqFvAXrNWyh+qQ1h56fXk0i c0wkxOHNa14aoeRwGcPOni4f4VL9mm0K8IHf6f0E= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 db2e52d27f..9197c4e6a4 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -76,7 +76,7 @@ file ".patch"))) patches)))) -(define %jami-version "20191209.1.4b48135") +(define %jami-version "20191214.1.07edb5e") (define* (jami-source #:key without-daemon) (origin @@ -92,7 +92,7 @@ #f)) (sha256 (base32 - "1mdaqamx12dimvpvr5cr2c12v7cwwx28a2cqpp3c720v8c2hl74g")))) + "1g5crffqfw7rb96iqamsfv63pjql9dli9m3nd1hsx28apkffkbnd")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:48:40 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:48:41 +0000 Received: from localhost ([127.0.0.1]:47412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionLk-0008UV-LP for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:40 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:48868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionLj-0008UB-8F for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:39 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:00 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 07/22] gnu: jami: Fix the procedure for applying patches. Use the procedure correctly in pjproject-jami. Date: Tue, 7 Jan 2020 11:17:26 +0100 Message-Id: <20200107101741.970-7-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392280; bh=dYdSVXkCLavh33e2x2yzKkRYClNCbhoZZBQyq9XHp4Q=; 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=TtnNbT1tWFbNY53ukTFOQP2zFyC27opvgrcx3jorKKtklhwnXJ42lufE9sQwFDuej r52FJ3ma7KKFgZgTFN+hkYr43s7NEnShTEzNy5VrR7il0t8x3JphiYb+Fw6XRnpgIJ bLv9gp8IVLS4exlFl8TIUTOJcfmVZ2dB/WAQcA/Y= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index c6f38d4a8c..f257767a85 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -58,6 +58,22 @@ #:use-module (guix download) #:use-module (guix git-download)) +(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 %jami-version "20191128.1.4c44bb7") (define* (jami-source #:key without-daemon) @@ -115,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 @@ -157,6 +175,31 @@ file ".patch"))) savoir-faire-linux-patches)) #t)) + (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 "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.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:48:41 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:48:41 +0000 Received: from localhost ([127.0.0.1]:47414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionLk-0008UX-TY for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:41 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:48869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionLj-0008UC-B2 for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:39 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:17:58 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 03/22] gnu: Add libnatpmp Date: Tue, 7 Jan 2020 11:17:22 +0100 Message-Id: <20200107101741.970-3-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392279; bh=rubd6J5oYWIrBgL1FbO0jdifDJb5BCnkO8vI9pM1/1E=; 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=t/xsdM7pc4ZE/9NiKJZvF11GwssCY+9qZiF8GmqMComY/cBeHQK8zZWtZ7rYfc34Q vyoaG49ejMuHNLZSSpKV8Vrdh62u4MEFkavwSTDXoqbRQiJPQWfsTHCj+4yKEszG4x Ozh787R0Y8aIHAW5T1F/QTktKa3jKePC6ZAfrPEc= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 482305de35..76a36111f1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -367,6 +367,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.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:48:59 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:48:59 +0000 Received: from localhost ([127.0.0.1]:47417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionM3-0008VB-78 for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:59 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:60826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionM1-0008Uv-PR for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:48:58 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:01 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 09/22] gnu: jami: Bump to 20191209.1.4b48135. Date: Tue, 7 Jan 2020 11:17:28 +0100 Message-Id: <20200107101741.970-9-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392281; bh=Tg9g1zhVKGrNSjLa2YYqVTN6nhlK0kLcgO7QbJ4GmAM=; 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=Bwk/v5kZ6xcOhEkscLHvsD0uTrjENaRj32KhEKHLw9NOJJBgNrMizyTZ/06FR9k+G v40elLWU+kYXrmfMkr4dzqwv2tqWtnYFGmaTiM9f73XhyxD1w9uEBrRKIgjUasK4mR Q4VOrefJY8s0j4I20eDphIY+xN/hxD/r6PxXV0MI= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 7320104c88..8b24984bd5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -75,7 +75,7 @@ file ".patch"))) patches)))) -(define %jami-version "20191128.1.4c44bb7") +(define %jami-version "20191209.1.4b48135") (define* (jami-source #:key without-daemon) (origin @@ -91,7 +91,7 @@ #f)) (sha256 (base32 - "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v")))) + "1mdaqamx12dimvpvr5cr2c12v7cwwx28a2cqpp3c720v8c2hl74g")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:49:36 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:49:36 +0000 Received: from localhost ([127.0.0.1]:47430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionMd-00005Z-RL for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:49:36 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:56876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionMb-0008WN-Dm for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:49:33 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:03 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 16/22] gnu: pjproject-jami: Fix formatting - replace a tab sign with a space. No code changes! Date: Tue, 7 Jan 2020 11:17:35 +0100 Message-Id: <20200107101741.970-16-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392284; bh=cL7ktaoOgeCmtk5XIgnxFS/h8qAUEK4If8WFnaA6umw=; 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=gI2fArsvAd13jjlaKag9r1eGtmfKqZy87+udalJxUKDhJJZ13gXuSHhdYMUBb1kHW rj08EkMTls0GAIwmKk1ddjCSROSl/8+MFLVHCnkKWBE5vqsSNmdbVZ8H9QDCTul0Py X+aobtnFfSjWDCjN+uWm0sOwPlWqRJiFMv4YroeU= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 fe797a78ea..92a89f8dc6 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -134,7 +134,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 -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:49:36 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:49:36 +0000 Received: from localhost ([127.0.0.1]:47432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionMe-00005c-4e for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:49:36 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:56875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionMb-0008WO-Dz for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:49:33 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:06 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 21/22] gnu: pjproject-jami: Apply a missing patch. Date: Tue, 7 Jan 2020 11:17:40 +0100 Message-Id: <20200107101741.970-21-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392286; bh=qTAVXpbHTJuwx0B6II1wxUyivTMpcx29VNgexP0zLhg=; 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=nP+xccY4jOFEiwr/IcHpKafedVzqFdGbkcWcgBKGvYoW1mS8rd+n2FC1iJbjXpPSf nJnrwatbqi1uL0eW39lfee0wvST3hZ9QXuG9gSFt9ZNij7eBaoblUWTnxTnFes0Oim 4EJQqX0cnQErDE6GKxccL0YoehyHeP6879du90tY= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 ea66bed8a5..22c86e9b5b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -165,7 +165,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.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:50:32 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:50:32 +0000 Received: from localhost ([127.0.0.1]:47446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionNY-00008R-FW for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:50:32 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:53635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionNW-000088-2C for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:50:30 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:05 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 19/22] gnu: jami: Bump to 20191224.1.5c0154a Date: Tue, 7 Jan 2020 11:17:38 +0100 Message-Id: <20200107101741.970-19-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392285; bh=VQvHhbex36LFmdzvGBlI3QTexJlRm1tpAS306cbb3Pw=; 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=iPGe9HVe8E0Hi1ccvF2nr27DeEuRlhISma4UWa1wIipDNBSskjnqz5LGcgHmN0nq8 CHfQGEtHFEi4Wzl7jaCkcEFVSZg+F7nER4QArHBhiYxk4VATXcscswDbSC8s3vjMwj As4PT6v36jvygltN5lavTkXnCGsWBoL/5soFgB6E= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 c6d65d5688..b13dce8154 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -76,7 +76,7 @@ file ".patch"))) patches)))) -(define %jami-version "20191217.1.ce5f295") +(define %jami-version "20191224.1.5c0154a") (define* (jami-source #:key without-daemon) (origin @@ -92,7 +92,7 @@ #f)) (sha256 (base32 - "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06")))) + "1mrnc4m2xmrb5b4bkm4hmh514g2hixin3dqxmi3z0adw5ay6ivr2")))) (define-public pjproject-jami (package -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 07 06:50:33 2020 Received: (at 39005) by debbugs.gnu.org; 7 Jan 2020 11:50:33 +0000 Received: from localhost ([127.0.0.1]:47448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionNY-00008U-N5 for submit@debbugs.gnu.org; Tue, 07 Jan 2020 06:50:33 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:53632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ionNW-000087-2G for 39005@debbugs.gnu.org; Tue, 07 Jan 2020 06:50:30 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 7 Jan 2020 11:18:03 +0100 (CET) From: Jan Wielkiewicz To: 39005@debbugs.gnu.org Subject: [PATCH 15/22] gnu: restinio: Bump to 0.6.1.1. Date: Tue, 7 Jan 2020 11:17:34 +0100 Message-Id: <20200107101741.970-15-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107101741.970-1-tona_kosmicznego_smiecia@interia.pl> References: <20200107101741.970-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=1578392283; bh=1j68N7IsEIUKY7XmIGKvAwUhH4Pn/XHOGfFk0EBVScw=; 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=R28FPtk3P+tj8P3PKqUjejkGD5ujRqtd8lI9SZWk3qMoyG4/xC2fnpqKJm38zmXut go9yq7n578IJYqR6io+ath+0Iudm7O9RT7S+y78rqZqf3K1tmBRjvSBjlAkxscTj9D pFhsnqlk2fl46CfjlV13PD6arYGF5VnXyzbJOSfI= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005 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 42d8b01007..697668f9d1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2552,7 +2552,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 @@ -2561,7 +2561,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.24.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 09 18:13:15 2020 Received: (at 39005-done) by debbugs.gnu.org; 9 Feb 2020 23:13:15 +0000 Received: from localhost ([127.0.0.1]:53387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0vlL-0001sw-CY for submit@debbugs.gnu.org; Sun, 09 Feb 2020 18:13:15 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.236]:38930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0vlJ-0001sd-2u for 39005-done@debbugs.gnu.org; Sun, 09 Feb 2020 18:13:14 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from kompiuter (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (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 <39005-done@debbugs.gnu.org>; Mon, 10 Feb 2020 00:13:06 +0100 (CET) Date: Mon, 10 Feb 2020 00:12:56 +0100 From: Jan To: 39005-done@debbugs.gnu.org Subject: Closing the issue, will post not messy patches soon Message-ID: <20200210001256.681f9551@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=1581289986; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; 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=O8bh88raLR9SAwlygvY+tLXHmTExLoYdG6aumqNJjjtNP7F2+atAGgoPBgUV72MK4 o7lev/BrwIVwE4bvgMwsJlqKvM8qhI2cWhBPk3xWvcwxq8zPRlHig+f97cNielO72a 095hJ9cpehsB3kdgEj3UIpgxCHHDgCm+6+e/0FG8= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39005-done 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 (-) From unknown Sat Aug 16 20:58:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 09 Mar 2020 11:24:04 +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