Re: Maintaining GNU Jami package for Guix

[Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>]

[-- Attachment #1: Type: text/plain, Size: 55 bytes --]

Sorry, wrong command, sending the patch again...


Jan

[-- Attachment #2: jami-wip.patch --]
[-- Type: text/x-patch, Size: 12000 bytes --]

From 2f67e4c77ffb675bed3019b4289b3135db140015 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sun, 27 Oct 2019 01:16:52 +0200
Subject: [PATCH 1/9] change the fetch method of pjproject to git; fetch the
 exact commit needed for Jami; do not remove folders, which are not present in
 the checkout

---
 gnu/packages/telephony.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 127a856cc3cc65ccc29b99d4e5d83143400b741e..d17124ed4b22139f87a1efa3010153e97dfd5bb2 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -555,10 +555,10 @@ calls and messages")
     (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
@@ -566,9 +566,9 @@ calls and messages")
 		  ;; Things we don't need:
 		  ;; BaseClasses - contains libraries from Windows SDK
 		  ;; we don't need it, at least not now.
-                  (list "BaseClasses" "bin" "g7221" "ilbc" "milenage"
+                  (list "BaseClasses" "g7221" "ilbc" "milenage"
 			"speex" "threademulation" "yuv" "bdsound"
-			"gsm" "lib" "mp3" "resample" "srtp" "webrtc"
+			"gsm" "mp3" "resample" "srtp" "webrtc"
                         ;; Keep only resample, build and README.txt.
                         "build/baseclasses" "build/g7221" "build/gsm"
 			"build/ilbc" "build/milenage" "build/resample"
@@ -591,7 +591,7 @@ calls and messages")
 	)
        (sha256
         (base32
-	 "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"))))
+	 "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393"))))
     (build-system gnu-build-system)
     (inputs
      `(("portaudio" ,portaudio)))
-- 
2.23.0


From a25f5ad984f01f41400a54a2dde07b6aee6e9e6c Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sun, 27 Oct 2019 14:26:08 +0100
Subject: [PATCH 2/9] add libresample needed for Jami

---
 gnu/packages/audio.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 110903e2fe6b094f8021e4fb29eff3720fcf6511..63dbb1fd0ef20853d5d13e5ae70c4b54b3879c8b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2299,6 +2299,29 @@ aimed at audio/musical applications.")
                  (base32
                   "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr")))))))
 
+(define-public resample
+  (package
+   (name "resample")
+   (version "1.8.1")
+   (source (origin
+	    (method url-fetch)
+	    (uri (string-append "https://ccrma.stanford.edu/~jos/gz/resample-" version
+				".tar.gz"))
+	    (sha256 (base32
+		     "074zj8ydp05yy1hjcglfv3hkvj4cm50f9nralka1992pm6yf8yvy"))))
+   (build-system gnu-build-system)
+   ;; (inputs)
+   ;; (propagated-inputs)
+   (native-inputs
+    `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)
+       ("libtool" ,libtool)))
+   (synopsis "")
+   (description "")
+   (license license:lgpl2.1+)
+   (home-page "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html")))
+
 (define-public rubberband
   (package
     (name "rubberband")
-- 
2.23.0


From bf8d0a15b289f7cb80f7f6d1b640163130a4fa27 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sun, 27 Oct 2019 14:33:17 +0100
Subject: [PATCH 3/9] adding resample as a pjproject dependency

---
 gnu/packages/telephony.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index d17124ed4b22139f87a1efa3010153e97dfd5bb2..2dc3ccfe596dd0e66e5e0e02f1eb6bd3e991b472 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -601,6 +601,7 @@ calls and messages")
      `(("speex" ,speex)
        ("libsrtp" ,libsrtp)
        ("gnutls" ,gnutls)
+       ("resample", resample)
        ("util-linux" ,util-linux)))
     (native-inputs
      `(("autoconf" ,autoconf)
-- 
2.23.0


From c7e4ff2c7eec7671efd0886c229dde82358e38f1 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sun, 27 Oct 2019 14:38:51 +0100
Subject: [PATCH 4/9] bump jami version to 20191025.1.074a237

---
 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 2dc3ccfe596dd0e66e5e0e02f1eb6bd3e991b472..1bd508accc778f107244e37701189951906837e6 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -635,7 +635,7 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
 
-(define %jami-version "20191022.1.f180b15")
+(define %jami-version "20191025.1.074a237")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -651,7 +651,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        #f))
     (sha256
      (base32
-      "006ssrip7zhg544292p62rrvk1rwk339g5rgj1lbji7b4vhspr4s"))))
+      "10w2rsvin8jrrjgwr1n5rxc5w1j53cag0mh31c7c49md17z2wzm3"))))
 
 (define-public pjproject-jami
   (package
-- 
2.23.0


From 1ec979f8407bb0c1af40524885d3f14e4ffdc776 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Wed, 30 Oct 2019 23:26:49 +0100
Subject: [PATCH 5/9] bump jami to 20191029.2.32830e6

---
 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 1bd508accc778f107244e37701189951906837e6..ae91052372db97ca96e7fba1a71d0b71dc59e98d 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -635,7 +635,7 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
 
-(define %jami-version "20191025.1.074a237")
+(define %jami-version "20191029.2.32830e6")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -651,7 +651,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        #f))
     (sha256
      (base32
-      "10w2rsvin8jrrjgwr1n5rxc5w1j53cag0mh31c7c49md17z2wzm3"))))
+      "1hw7bzapfygjxc52bagzgv4g8dd1d0gr4c7s051idflhaydc6wf6"))))
 
 (define-public pjproject-jami
   (package
-- 
2.23.0


From 202b08374d575550866aff84bb499abc2975b377 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Thu, 31 Oct 2019 20:01:40 +0100
Subject: [PATCH 6/9] bump gnutls to 3.6.10, the version Jami is going to use
 soon

---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 73bd0ded23c1ab647316c4f91b22a3db717bc85e..b6c7289be679b2ddc01f8d54862ae68a07d90b6b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -162,7 +162,7 @@ living in the same process.")
 (define-public gnutls
   (package
     (name "gnutls")
-    (version "3.6.9")
+    (version "3.6.10")
     (source (origin
              (method url-fetch)
              (uri
@@ -174,7 +174,7 @@ living in the same process.")
              (patches (search-patches "gnutls-skip-trust-store-test.patch"))
              (sha256
               (base32
-               "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3"))))
+               "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
     (build-system gnu-build-system)
     (arguments
      `(; Ensure we don't keep a reference to this buggy software.
-- 
2.23.0


From 08c86a33046bda83d6000dda58854ebab743d5b6 Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Fri, 1 Nov 2019 00:59:38 +0100
Subject: [PATCH 7/9] bump Jami to 20191031.3.40360d8

---
 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 ae91052372db97ca96e7fba1a71d0b71dc59e98d..00bf26d252e1769ea0328cfb1bfe09f43e96c62c 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -635,7 +635,7 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
 
-(define %jami-version "20191029.2.32830e6")
+(define %jami-version "20191031.3.40360d8")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -651,7 +651,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        #f))
     (sha256
      (base32
-      "1hw7bzapfygjxc52bagzgv4g8dd1d0gr4c7s051idflhaydc6wf6"))))
+      "1169m52wi4qsy4fqfd49m6x3b6hhg706angr9n3wc2dskrm9jz30"))))
 
 (define-public pjproject-jami
   (package
-- 
2.23.0


From b7b7f6470f15eb770d799777063b14297454c7ed Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sat, 2 Nov 2019 01:16:43 +0100
Subject: [PATCH 8/9] bump jami to 20191101.3.67671e7

---
 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 00bf26d252e1769ea0328cfb1bfe09f43e96c62c..1c56d2308f15822d11f60a1a9e80e603aadfbc5b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -635,7 +635,7 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
 
-(define %jami-version "20191031.3.40360d8")
+(define %jami-version "20191101.3.67671e7")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -651,7 +651,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        #f))
     (sha256
      (base32
-      "1169m52wi4qsy4fqfd49m6x3b6hhg706angr9n3wc2dskrm9jz30"))))
+      "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0"))))
 
 (define-public pjproject-jami
   (package
-- 
2.23.0


From ee164ce65a59119689b9997122ddad65fad959fe Mon Sep 17 00:00:00 2001
From: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Date: Sun, 3 Nov 2019 11:48:05 +0100
Subject: [PATCH 9/9] make files in pjproject writeable; improve formatting

---
 gnu/packages/telephony.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 1c56d2308f15822d11f60a1a9e80e603aadfbc5b..dfd360e7d28a2b4eca4fa35c4f00e5ef6f83d00b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -692,6 +692,10 @@ Initiation Protocol (SIP) and a multimedia framework.")
              "--with-external-srtp")
        #: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")
@@ -703,19 +707,19 @@ Initiation Protocol (SIP) and a multimedia framework.")
                     '("add_dtls_transport"
 		      "android"
 		      "disable_local_resolution"
-		      "fix_ebusy_turn" ; fails
+		      "fix_ebusy_turn"            ; fails
 		      "fix_first_packet_turn_tcp" ; fails
 		      "fix_ioqueue_ipv6_sendto"
 		      "fix_turn_alloc_failure"
 		      "fix_turn_connection_failure" ; fails
 		      "fix_turn_fallback"
-		      "ice_config" ; fails
+		      "ice_config"      ; fails
 		      "ignore_ipv6_on_transport_check"
 		      "ipv6"
 		      "multiple_listeners" ; fails
 		      "pj_ice_sess"
 		      "rfc2466"
-		      "rfc6544" ; fails
+		      "rfc6544"         ; fails
 		      "sip_config"
 		      "uwp_vs"
 		      "win32_vs_gnutls"
-- 
2.23.0