From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaGlO-0006xU-4f for guix-patches@gnu.org; Thu, 28 Nov 2019 05:11:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaGlK-0008PW-Gx for guix-patches@gnu.org; Thu, 28 Nov 2019 05:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iaGlK-0008O1-5g for guix-patches@gnu.org; Thu, 28 Nov 2019 05:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iaGlK-0000db-0D for guix-patches@gnu.org; Thu, 28 Nov 2019 05:11:02 -0500 Subject: [bug#38211] [PATCH 0/9] Update Jami to 20111101 Resent-Message-ID: From: Pierre Neidhardt In-Reply-To: References: <20191114180422.5592-1-mail@ambrevar.xyz> <87imn5a5iw.fsf@ambrevar.xyz> Date: Thu, 28 Nov 2019 11:10:42 +0100 Message-ID: <87wobk8g65.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Arun Isaac Cc: 38211@debbugs.gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable What the hell?!? Yes I did. I don't get this. I'm attaching them here, seems like git send-email fails to send those 2 patches for some reason. =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl3fnSIACgkQm9z0l6S7 zH9rhgf+MRPkvD2UOwl7NURUnGMVpNZY5ZmS8xWdSKr8Z+Ha+G4TrfclArn1wmLw i6Nmmge865lqIYh3geI5w81qXlINp7GoRpWUQKen27cLGVfLFTCi2St1FyU3RqXS 1LV6eYfI+xP1qaQ35+sTlWz+Huo6/kDWzEpM1FyoKS/fR/6zbrgMnqXaOPIo8A/H y4KeM/CCnDtpVY0ZGFHLGs8jCTxKLnkFucPd0FU7Fj7qHvyu1RZnv/GQ4JE3ovNl y4ELHueg0jxXnfIfV90vdVBtk2AlUxgSvDXJFfXZmQ1aQFrwwGXhMiVeUt6gn/jN 1K4foEAzlI7RpxYRtnzTOit3y5TuRQ== =D1Rv -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-pjproject-Update-to-2.9.patch >From 0b9e60dbd4c3cd9a20d1273517c8a501fa252449 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 14 Nov 2019 18:03:12 +0100 Subject: [PATCH 5/9] gnu: pjproject: Update to 2.9. * gnu/packages/telephony.scm (pjproject): Update to 2.9. --- gnu/packages/telephony.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index abb68f62b2..ce65648e76 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -553,29 +553,32 @@ calls and messages") (define-public pjproject (package (name "pjproject") - (version "2.7.2") + (version "2.9") (source (origin - (method url-fetch) - (uri (string-append - "http://www.pjsip.org/release/" ; - version "/" name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject.git") + (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4"))) (modules '((guix build utils))) (snippet '(begin (let ((third-party-directories - (list "BaseClasses" "bdsound" "bin" "g7221" "gsm" - "ilbc" "lib" "milenage" "mp3" "speex" "srtp" - "resample" + ;; Things we don't need: + ;; BaseClasses - contains libraries from Windows SDK + ;; we don't need it, at least not now. + (list "BaseClasses" "g7221" "ilbc" "milenage" + "speex" "threademulation" "yuv" "bdsound" + "gsm" "mp3" "resample" "srtp" "webrtc" ;; Keep only resample, build and README.txt. "build/baseclasses" "build/g7221" "build/gsm" - "build/ilbc" "build/milenage" "build/samplerate" - "build/speex" "build/srtp" - "build/resample" "build/yuv"))) + "build/ilbc" "build/milenage" "build/resample" + "build/samplerate" "build/speex" "build/srtp" + "build/webrtc" "build/yuv"))) ;; Keep only Makefiles related to resample. - (for-each (lambda (file) + (for-each (lambda (directory) (delete-file-recursively - (string-append "third_party/" file))) + (string-append "third_party/" directory))) third-party-directories) #t) (let ((third-party-dirs @@ -586,9 +589,10 @@ calls and messages") (substitute* "third_party/build/os-linux.mak" (((string-append "DIRS += " dirs)) ""))) third-party-dirs)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w")))) + "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393")))) (build-system gnu-build-system) (inputs `(("portaudio" ,portaudio))) @@ -598,6 +602,7 @@ calls and messages") `(("speex" ,speex) ("libsrtp" ,libsrtp) ("gnutls" ,gnutls) + ("resample", resample) ("util-linux" ,util-linux))) (native-inputs `(("autoconf" ,autoconf) @@ -615,7 +620,7 @@ calls and messages") (lambda _ (invoke "make" "dep"))) (add-before 'patch-source-shebangs 'autoconf (lambda _ - (invoke "autoconf" "-vfi" "-o" + (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 -- 2.23.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-gnu-jami-Update-to-20191101.3.67671e7.patch >From 298c0fb463306846f3e97f6a89b9a78bef036599 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 14 Nov 2019 18:03:44 +0100 Subject: [PATCH 6/9] gnu: jami: Update to 20191101.3.67671e7. * gnu/packages/telephony.scm (jami): Update to 20191101.3.67671e7. --- gnu/packages/telephony.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index ce65648e76..e6d52bc832 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -636,12 +636,12 @@ calls and messages") Initiation Protocol (SIP) and a multimedia framework.") (license license:gpl2+))) -(define %jami-version "20190319.4.a16a99f") +(define %jami-version "20191101.3.67671e7") (define* (jami-source #:key without-daemon) (origin (method url-fetch) - (uri (string-append "http://dl.jami.net/ring-release/tarballs/ring_" + (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_" %jami-version ".tar.gz")) (modules '((guix build utils))) @@ -652,7 +652,7 @@ Initiation Protocol (SIP) and a multimedia framework.") #f)) (sha256 (base32 - "1c6n6sm7skw83v25g33g4jzbragz9j4przbzaz7asxw54jy33dwl")))) + "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0")))) (define-public pjproject-jami (package @@ -699,7 +699,6 @@ Initiation Protocol (SIP) and a multimedia framework.") ;; Comes from ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". ;; WARNING: These amount for huge changes in pjproject. - ;; Particularly, they add support for GnuTLS. (savoir-faire-linux-patches '("gnutls" "rfc2466" -- 2.23.0 --=-=-=--