[bug#40264] Linphone

[bug#40264] Linphone

[Raghav Gururajan]

Hello Guix!

I am creating this thread for Linphone packaging. I will be sending patches one by one with-in this thread. :-)

Regards,
RG.

[bug#40264] Linphone: 1-create-linphone-module

[Raghav Gururajan]

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



[-- Attachment #2: 1-create-linphone-module.patch --]
[-- Type: application/octet-stream, Size: 516 bytes --]

From 30b69c57dc5ded37e14fdf85448a9aa2ef6e9b45 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 27 Mar 2020 16:28:52 -0400
Subject: [PATCH] gnu: packages: Create linphone.scm

* gnu/packages/linphone.scm: New module.
---
 gnu/packages/linphone.scm | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gnu/packages/linphone.scm

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.26.0

[bug#40264] Linphone: 2-update-linphone-module

[Raghav Gururajan]

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



[-- Attachment #2: 2-update-linphone-module.patch --]
[-- Type: application/octet-stream, Size: 1822 bytes --]

From f97ba7b56f65af8cfae5a4a12858e9785ae264c7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 27 Mar 2020 16:44:25 -0400
Subject: [PATCH 2/2] gnu: packages: Update linphone.scm

* gnu/packages/linphone.scm: Update module.
---
 gnu/packages/linphone.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index e69de29bb2..35c9ec955f 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -0,0 +1,30 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages linphone)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system qt))
-- 
2.26.0

[bug#40264] Linphone: 3-add-bcunit

[Raghav Gururajan]

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



[-- Attachment #2: 3-add-bcunit.patch --]
[-- Type: application/octet-stream, Size: 2222 bytes --]

From fe32f106ca646c357c958e1b5ebd375b942f4f3c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 27 Mar 2020 17:19:45 -0400
Subject: [PATCH 3/3] gnu: packages: linphone: Add bcunit

* gnu/packages/linphone.scm (bcunit): New variable.
---
 gnu/packages/linphone.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 35c9ec955f..974fc62792 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -20,6 +20,7 @@
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages ncurses)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -28,3 +29,40 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt))
+
+(define-public bcunit
+ (package
+  (name "bcunit")
+   (version "3.0.2")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
+ (build-system cmake-build-system)
+ (arguments
+  '(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_AUTOMATED=ON"
+      "-DENABLE_BASIC=ON"
+      "-DENABLE_CONSOLE=ON"
+      "-DENABLE_CURSES=ON"
+      "-DENABLE_DOC=ON"
+      "-DENABLE_EXAMPLES=ON"
+      "-DENABLE_TEST=OFF" ; Undefined reference to CU_trace_handler
+      "-DENABLE_MEMTRACE=ON"
+      "-DENABLE_DEPRECATED=OFF"))) ; Not required
+ (inputs
+  `(("curses" ,ncurses)))
+ (synopsis "Belledonne Communications Unit Testing Framework")
+ (description "BCUnit is a fork of the defunct project CUnit,
+with several fixes and patches applied.  It is an unit testing
+framework for writing, administering, and running unit tests in C.")
+ (home-page "https://gitlab.linphone.org/BC/public/bcunit")
+ (license license:lgpl2.0+)))
-- 
2.26.0

[bug#40264] Linphone: 3-add-bcunit

[Maxim Cournoyer]

Hello Raghav,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> From fe32f106ca646c357c958e1b5ebd375b942f4f3c Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Fri, 27 Mar 2020 17:19:45 -0400
> Subject: [PATCH 3/3] gnu: packages: linphone: Add bcunit
                          ^ You can drop the 'packages: linphone:' part
                          and add a dot.
>
> * gnu/packages/linphone.scm (bcunit): New variable.
> ---
>  gnu/packages/linphone.scm | 38 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
>
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 35c9ec955f..974fc62792 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -20,6 +20,7 @@
>  (define-module (gnu packages linphone)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages base)
> +  #:use-module (gnu packages ncurses)
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
>    #:use-module (guix download)
> @@ -28,3 +29,40 @@
>    #:use-module (guix build-system gnu)
>    #:use-module (guix build-system python)
>    #:use-module (guix build-system qt))
> +
> +(define-public bcunit
> + (package
> +  (name "bcunit")
> +   (version "3.0.2")
> +   (source
> +    (origin
> +     (method url-fetch)
> +     (uri
> +      (string-append "https://www.linphone.org/releases/sources/" name
> +                     "/" name "-" version ".tar.gz"))
> +     (sha256
> +      (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
> + (build-system cmake-build-system)
> + (arguments
> +  '(#:tests? #f ; No test target
> +    #:configure-flags
> +     (list
> +      "-DENABLE_SHARED=YES"
> +      "-DENABLE_STATIC=YES"
> +      "-DENABLE_AUTOMATED=ON"
> +      "-DENABLE_BASIC=ON"
> +      "-DENABLE_CONSOLE=ON"
> +      "-DENABLE_CURSES=ON"
> +      "-DENABLE_DOC=ON"
> +      "-DENABLE_EXAMPLES=ON"
> +      "-DENABLE_TEST=OFF" ; Undefined reference to CU_trace_handler
> +      "-DENABLE_MEMTRACE=ON"
> +      "-DENABLE_DEPRECATED=OFF"))) ; Not required

Please only activate the switches which need to be activated (let's not
repeat the default values to keep the noise level/verbosity as low as
possible).  You can usually see the defaults by inspecting the
CMakeLists.txt file at the root of the project.

> + (inputs
> +  `(("curses" ,ncurses)))
> + (synopsis "Belledonne Communications Unit Testing Framework")
> + (description "BCUnit is a fork of the defunct project CUnit,
> +with several fixes and patches applied.  It is an unit testing
                                                  ^ a
> +framework for writing, administering, and running unit tests in C.")
> + (home-page "https://gitlab.linphone.org/BC/public/bcunit")
> + (license license:lgpl2.0+)))

The first 3 commits of this series should be squashed together.

Also, please run the indent-code.el script for proper indentation.

Thank you!

Maxim

[bug#40264] Linphone: 4-add-bctoolbox

[Raghav Gururajan]

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



[-- Attachment #2: 4-add-bctoolbox.patch --]
[-- Type: application/octet-stream, Size: 2240 bytes --]

From 5d9f271736ea1ee23e8af3c8f2b981fbd191a54c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 27 Mar 2020 19:18:38 -0400
Subject: [PATCH 5/5] gnu: packages: linphone: Add bctoolbox

* gnu/packages/linphone.scm (bctoolbox): New variable.
---
 gnu/packages/linphone.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 974fc62792..551e64e748 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -21,6 +21,8 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pth)
+  #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -66,3 +68,38 @@ with several fixes and patches applied.  It is an unit testing
 framework for writing, administering, and running unit tests in C.")
  (home-page "https://gitlab.linphone.org/BC/public/bcunit")
  (license license:lgpl2.0+)))
+
+(define-public bctoolbox
+ (package
+  (name "bctoolbox")
+   (version "0.6.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
+ (build-system cmake-build-system)
+ (arguments
+  '(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=ON"
+      "-DENABLE_STATIC=ON"
+      "-DENABLE_POLARSSL=OFF" ; Deprecated in favor of MbedTLS
+      "-DENABLE_MBEDTLS=ON"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TESTS_COMPONENT=ON"
+      "-DENABLE_TESTS=ON")))
+ (inputs
+  `(("mbedtls" ,mbedtls-apache)
+    ("threads" ,pth)))
+ (propagated-inputs
+  `(("bcunit" ,bcunit)))
+ (synopsis "Belledonne Communications Tool Box")
+ (description "BcToolBox is an utilities library used by Belledonne
+Communications softwares like belle-sip, mediastreamer2 and linphone.")
+ (home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 5-add-belr

[Raghav Gururajan]

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



[-- Attachment #2: 5-add-belr.patch --]
[-- Type: application/octet-stream, Size: 2144 bytes --]

From 315036b468313b5a2f360e1d091c5e33f9166dfe Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 14:38:33 -0400
Subject: [PATCH 7/7] gnu: packages: linphone: Add belr

* gnu/packages/linphone.scm (belr): New variable.
---
 gnu/packages/linphone.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 551e64e748..a4ed7ece5e 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -20,6 +20,8 @@
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pth)
   #:use-module (gnu packages tls)
@@ -103,3 +105,33 @@ framework for writing, administering, and running unit tests in C.")
 Communications softwares like belle-sip, mediastreamer2 and linphone.")
  (home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
  (license license:gpl2+)))
+
+(define-public belr
+ (package
+  (name "belr")
+   (version "0.1.3")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=ON"
+      "-DENABLE_STATIC=ON"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TOOLS=YES")))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)))
+ (synopsis "Belledonne Communications Language Recognition Library")
+ (description "Belr is Belledonne Communications' language recognition library,
+written in C++11.  It parses text inputs formatted according to a language
+defined by an ABNF grammar, such as the protocols standardized at IETF.")
+ (home-page "https://gitlab.linphone.org/BC/public/belr")
+ (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 6-add-belcard

[Raghav Gururajan]

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



[-- Attachment #2: 6-add-belcard.patch --]
[-- Type: application/octet-stream, Size: 1733 bytes --]

From 3fe87d6df3b14f99637cdfc3ad68d1ef52fc6859 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 15:36:58 -0400
Subject: [PATCH 8/8] gnu: packages: linphone: Add belcard

* gnu/packages/linphone.scm (belcard): New variable.
---
 gnu/packages/linphone.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index a4ed7ece5e..7c506fe219 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -135,3 +135,33 @@ written in C++11.  It parses text inputs formatted according to a language
 defined by an ABNF grammar, such as the protocols standardized at IETF.")
  (home-page "https://gitlab.linphone.org/BC/public/belr")
  (license license:gpl3+)))
+
+(define-public belcard
+ (package
+  (name "belcard")
+   (version "1.0.2")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=ON"
+      "-DENABLE_STATIC=ON"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TOOLS=YES"
+      "-DENABLE_UNIT_TESTS=YES")))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)
+    ("belr" ,belr)))
+ (synopsis "Belledonne Communications VCard Library")
+ (description "Belcard is a C++ library to manipulate VCard standard format.")
+ (home-page "https://gitlab.linphone.org/BC/public/belcard")
+ (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 7-add-bcmatroska2

[Raghav Gururajan]

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



[-- Attachment #2: 7-add-bcmatroska2.patch --]
[-- Type: application/octet-stream, Size: 2073 bytes --]

From 5cfd74bf6b906fc1eba3c84491fb8685201259e8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 17:18:43 -0400
Subject: [PATCH 9/9] gnu: packages: linphone: Add bcmatroska2

* gnu/packages/linphone.scm (bcmatroska2): New variable.
---
 gnu/packages/linphone.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7c506fe219..9908490d28 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -165,3 +165,42 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
  (description "Belcard is a C++ library to manipulate VCard standard format.")
  (home-page "https://gitlab.linphone.org/BC/public/belcard")
  (license license:gpl3+)))
+
+(define-public bcmatroska2
+ (package
+  (name "bcmatroska2")
+   (version "0.23")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_EBML_WRITING=ON"
+      "-DENABLE_EBML_UNICODE=ON"
+      "-DENABLE_DEBUGCHECKS=ON"
+      "-DENABLE_STDIO=ON"
+      "-DENABLE_FILEPOS_64=ON"
+      "-DENABLE_DEBUG_LEAKS=ON")))
+ (synopsis "Belledonne Communications Media Container")
+ (description "BcMatroska is a free and open standard multi-media
+container format.  It can hold an unlimited number of video, audio,
+picture, or subtitle tracks in one file. ")
+ (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
+ (license
+  (list
+   ;; For Core C and LibEBML2
+   ;; https://www.matroska.org/node/47
+   license:bsd-4
+   ;; For LibMatroska2
+   ;; https://www.matroska.org/node/47
+   license:lgpl2.1+))))
-- 
2.26.0

[bug#40264] Linphone: 8-add-bcg729

[Raghav Gururajan]

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



[-- Attachment #2: 8-add-bcg729.patch --]
[-- Type: application/octet-stream, Size: 1707 bytes --]

From 900c3158a401b32f0dba570e1198fe2030961fae Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 17:32:16 -0400
Subject: [PATCH 10/10] gnu: packages: linphone: Add bcg729

* gnu/packages/linphone.scm (bcg729): New variable.
---
 gnu/packages/linphone.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 9908490d28..fb4ec5f803 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -204,3 +204,31 @@ picture, or subtitle tracks in one file. ")
    ;; For LibMatroska2
    ;; https://www.matroska.org/node/47
    license:lgpl2.1+))))
+
+(define-public bcg729
+ (package
+  (name "bcg729")
+   (version "1.0.4")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:configure-flags
+    (list
+     "-DENABLE_SHARED=YES"
+     "-DENABLE_STATIC=YES"
+     "-DENABLE_TESTS=YES")))
+ (synopsis "Belledonne Communications G729 Codec")
+ (description "BcG729 is an implementation of both encoder and decoder of
+the ITU G729 speech codec.  The library written in C 99 is fully portable and
+can be executed on many platforms including both ARM and x86 processors.  It
+supports concurrent channels encoding and decoding for multi call application
+such as conferencing.")
+ (home-page "https://gitlab.linphone.org/BC/public/belcard")
+ (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 9-add-ortp

[Raghav Gururajan]

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



[-- Attachment #2: 9-add-ortp.patch --]
[-- Type: application/octet-stream, Size: 2223 bytes --]

From b72ce987283d3f8afb55a66c53118a1c160f1fe0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 18:10:01 -0400
Subject: [PATCH 11/11] gnu: packages: linphone: Add ortp

* gnu/packages/linphone.scm (ortp): New variable.
---
 gnu/packages/linphone.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index fb4ec5f803..c8735bfa87 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -21,6 +21,8 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pth)
@@ -232,3 +234,40 @@ supports concurrent channels encoding and decoding for multi call application
 such as conferencing.")
  (home-page "https://gitlab.linphone.org/BC/public/belcard")
  (license license:gpl3+)))
+
+(define-public ortp
+ (package
+  (name "ortp")
+   (version "1.0.2")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_DOC=YES"
+      "-DENABLE_NTP_TIMESTAMP=NO" ; "ORTP_TIMESTAMP" redefined [-Werror]
+      "-DENABLE_PERF=YES"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TESTS=YES"
+      "-DENABLE_DEBUG_LOGS=YES")))
+ (native-inputs
+  `(("dot" ,graphviz)
+    ("doxygen" ,doxygen)
+    ("threads" ,pth)))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)))
+ (synopsis "Belledonne Communications RTP Library")
+ (description "oRTP is a C library implementing the RTP protocol.  It uses
+RFC 3550 standard.")
+ (home-page "https://gitlab.linphone.org/BC/public/ortp")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 10-add-bzrtp

[Raghav Gururajan]

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



[-- Attachment #2: 10-add-bzrtp.patch --]
[-- Type: application/octet-stream, Size: 2124 bytes --]

From 9b7896aa9a18c7dc1a1938f84716d25323f20992 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 18:34:05 -0400
Subject: [PATCH 12/12] gnu: packages: linphone: Add bzrtp

* gnu/packages/linphone.scm (bzrtp): New variable.
---
 gnu/packages/linphone.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index c8735bfa87..074665af03 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -26,7 +26,9 @@
   #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pth)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages xml)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -271,3 +273,37 @@ such as conferencing.")
 RFC 3550 standard.")
  (home-page "https://gitlab.linphone.org/BC/public/ortp")
  (license license:gpl2+)))
+
+(define-public bzrtp
+ (package
+  (name "bzrtp")
+   (version "1.0.6")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; CTest errors
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_ZIDCACHE=YES"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TESTS=YES")))
+ (native-inputs
+  `(("sqlite3" ,sqlite)
+    ("xml2" ,libxml2)))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)))
+ (synopsis "Belledonne Communications ZRTP Library")
+ (description "BZRTP is an implementation of ZRTP keys exchange
+protocol, written in C.  It is fully portable and can be executed on many
+platforms including both ARM and x86.")
+ (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 11-add-mediastreamer

[Raghav Gururajan]

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



[-- Attachment #2: 11-add-mediastreamer.patch --]
[-- Type: application/octet-stream, Size: 6375 bytes --]

From 01f3b21057b3c118c710602949248b5c9f62731d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 29 Mar 2020 04:55:23 -0400
Subject: [PATCH 14/14] gnu: packages: linphone: Add mediastreamer

* gnu/packages/linphone.scm (mediastreamer): New variable.
---
 gnu/packages/linphone.scm | 147 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 074665af03..62be01d43e 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -19,16 +19,29 @@
 
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages pth)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -307,3 +320,137 @@ protocol, written in C.  It is fully portable and can be executed on many
 platforms including both ARM and x86.")
  (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
  (license license:gpl2+)))
+
+(define-public mediastreamer
+ (package
+  (name "mediastreamer")
+   (version "2.16.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
+     (patches
+      (list
+       ;; For srtp2 compatibility.
+       (origin
+        (method url-fetch)
+        (uri
+         (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit/"
+                        "97903498364ae2596e790cb2c2ce9ac76c04d64a.diff"))
+        (file-name "srtp.patch")
+        (sha256
+         (base32 "1k1cj72gyzb05ann6amc54gim19mwqz84y36kk5sb77p5qwg50hf")))
+       ;; For fixing definitions.
+       (origin
+        (method url-fetch)
+        (uri
+         (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit/"
+                        "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
+        (file-name "msfactory.patch")
+        (sha256
+         (base32 "18lsn9fc9di8bzr12ck3h9k9h8xvvhjzgkimbj9p4vmxxwhjaxn2")))))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      ;; To detect the required directory.
+      (string-append "-DSRTP_INCLUDE_DIRS="
+       (string-append (assoc-ref %build-inputs "srtp") "/include"))
+      ;; To detect the required directory.
+      (string-append "-DSRTP_LIBRARIES="
+       (string-append (assoc-ref %build-inputs "srtp") "/lib"))
+      ;; *** Generic ***
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_DEBUG_LOGS=YES"
+      "-DENABLE_DOC=YES"
+      "-DENABLE_NON_FREE_CODECS=NO" ; XXX-Hazardous-XXX
+      "-DENABLE_PCAP=YES"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_RELATIVE_PREFIX=YES"
+      "-DENABLE_TOOLS=YES"
+      "-DENABLE_UNIT_TESTS=YES"
+      ;; *** Encryption ***
+      "-DENABLE_SRTP=NO" ; Undefined references
+      "-DENABLE_ZRTP=YES"
+      ;; *** Audio ***
+      "-DENABLE_SOUND=YES"
+      "-DENABLE_ALSA=YES"
+      "-DENABLE_ANDROIDSND=NO" ; Not compatible
+      "-DENABLE_ARTSC=NO" ; Not available
+      "-DENABLE_MACSND=NO" ; Not compatible
+      "-DENABLE_MACAQSND=NO" ; Not compatible
+      "-DENABLE_QSA=NO" ; Not available
+      "-DENABLE_OSS=NO" ; Deprecated
+      "-DENABLE_PORTAUDIO=NO" ; Parsing errors
+      "-DENABLE_PULSEAUDIO=YES"
+      ;; *** Standards ***
+      "-DENABLE_G726=YES"
+      "-DENABLE_GSM=NO" ; Need recompilation with -fPIC
+      "-DENABLE_BV16=NO" ; Not available
+      "-DENABLE_OPUS=YES"
+      "-DENABLE_SPEEX_CODEC=YES"
+      "-DENABLE_SPEEX_DSP=YES"
+      "-DENABLE_G729=YES"
+      "-DENABLE_G729B_CNG=YES"
+      "-DENABLE_RESAMPLE=YES"
+      ;; *** Video ***
+      "-DENABLE_VIDEO=YES"
+      "-DENABLE_FFMPEG=YES"
+      "-DENABLE_GL=YES"
+      "-DENABLE_GLX=YES"
+      "-DENABLE_SDL=YES"
+      "-DENABLE_V4L=YES"
+      "-DENABLE_X11=YES"
+      "-DENABLE_XV=YES"
+      "-DENABLE_THEORA=YES"
+      "-DENABLE_VPX=YES"
+      ;; *** Formats ***
+      "-DENABLE_MKV=YES"
+      "-DENABLE_QNX=NO" ; Not available
+      "-DENABLE_VT_H264=NO" ; Not available
+      "-DENABLE_JPEG=YES")))
+ (native-inputs
+  `(("dot" ,graphviz)
+    ("doxygen" ,doxygen)
+    ("python" ,python)))
+ (inputs
+  `(("alsa" ,alsa-lib)
+    ("ffmpeg" ,ffmpeg)
+    ("glew" ,glew)
+    ("glu" ,glu)
+    ("glx" ,mesa-utils)
+    ("gsm" ,gsm)
+    ("opengl" ,mesa)
+    ("opus" ,opus)
+    ("pcap" ,libpcap)
+    ("portaudio" ,portaudio)
+    ("pulseaudio" ,pulseaudio)
+    ("spandsp" ,spandsp)
+    ("speex" ,speex)
+    ("speexdsp" ,speexdsp)
+    ("srtp" ,libsrtp)
+    ("theora" ,libtheora)
+    ("turbojpeg" ,libjpeg-turbo)
+    ("v4l" ,v4l-utils)
+    ("vpx" ,libvpx)
+    ("x11" ,libx11)
+    ("xv" ,libxv)))
+ (propagated-inputs
+  `(("bcg729" ,bcg729)
+    ("bcmatroska2" ,bcmatroska2)
+    ("bctoolbox" ,bctoolbox)
+    ("zrtp", bzrtp)
+    ("ortp" ,ortp)))
+ (synopsis "Belledonne Communications Streaming Engine")
+ (description "Mediastreamer is a powerful and lightweight streaming
+engine for telephony applications.  This media processing and streaming toolkit
+is responsible for receiving and sending all multimedia streams in Linphone,
+including media capture, encoding and decoding, and rendering.")
+ (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 12-add-belle-sip

[Raghav Gururajan]

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



[-- Attachment #2: 12-add-belle-sip.patch --]
[-- Type: application/octet-stream, Size: 2063 bytes --]

From 689093f6902fdb39b05489972a4cf9ec8f0d9d75 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 29 Mar 2020 22:42:21 -0400
Subject: [PATCH 16/16] gnu: packages: linphone: Add belle-sip

* gnu/packages/linphone.scm (belle-sip): New variable.
---
 gnu/packages/linphone.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 62be01d43e..9e113b531d 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -454,3 +454,41 @@ is responsible for receiving and sending all multimedia streams in Linphone,
 including media capture, encoding and decoding, and rendering.")
  (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
  (license license:gpl2+)))
+
+(define-public belle-sip
+ (package
+  (name "belle-sip")
+   (version "1.6.3")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; CTest errors
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_RTP_MAP_ALWAYS_IN_SDP=ON"
+      "-DENABLE_STRICT=YES"
+      "-DENABLE_TUNNEL=OFF" ; Not available
+      "-DENABLE_TESTS=ON")))
+ (inputs
+  `(("antlr3" ,antlr3-3.3)
+    ("antlr3c" ,libantlr3c)
+    ("threads" ,pth)
+    ("java" ,icedtea)
+    ("zlib" ,zlib)))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)))
+ (synopsis "Belledonne Communications SIP Library")
+ (description "Belle-sip is a modern library implementing SIP transport,
+transaction and dialog layers.  It is written in C, with an object-oriented
+API.  It also comprises a simple HTTP/HTTPS client implementation.")
+ (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 12-add-belle-sip

[Danny Milosavljevic]

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

Missing definition of libantlr3c?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 12-add-belle-sip

[Raghav Gururajan]

> Missing definition of libantlr3c?

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40291

:-)

[bug#40264] Linphone: 12-add-belle-sip

[Maxim Cournoyer]

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

>> Missing definition of libantlr3c?
>
> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40291
>
> :-)

This has now been reviewed & merged.

[bug#40264] Linphone: 13-add-linphone

[Raghav Gururajan]

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



[-- Attachment #2: 13-add-linphone.patch --]
[-- Type: application/octet-stream, Size: 5075 bytes --]

From 5811e98c252d28390cfddf339341f43dff5d3127 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 30 Mar 2020 05:43:44 -0400
Subject: [PATCH 18/18] gnu: packages: linphone: Add linphone

* gnu/packages/linphone.scm (linphone): New variable.
---
 gnu/packages/linphone.scm | 107 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 9e113b531d..e2cd6de2f6 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -21,19 +21,25 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pth)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -492,3 +498,102 @@ transaction and dialog layers.  It is written in C, with an object-oriented
 API.  It also comprises a simple HTTP/HTTPS client implementation.")
  (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
  (license license:gpl2+)))
+
+(define-public linphone
+ (package
+  (name "linphone")
+   (version "3.12.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))
+     (patches
+      (list
+       ;; For csharp-wrapper's syntactical error.
+       (origin
+        (method url-fetch)
+        (uri
+         (string-append "https://gitlab.linphone.org/BC/public/liblinphone/commit/"
+                        "cb84ac9a36e1771b7e5112164355c939b858c353.diff"))
+        (file-name "csharp-wrapper.patch")
+        (sha256
+         (base32 "1iimwws2j5hcidj82kwzzp6v9nhmq8m5bbycl4szhm5ddlsl8lqf")))))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR="
+       (string-append (assoc-ref %build-inputs "gtk2") "/lib/gtk-2.0/include"))
+      (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
+       (string-append (assoc-ref %build-inputs "glib") "/lib/glib-2.0/include"))
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_CONSOLE_UI=YES"
+      "-DENABLE_DATE=YES"
+      "-DENABLE_DAEMON=YES"
+      "-DENABLE_DOC=YES"
+      "-DENABLE_JAVADOC=NO" ; Translation errors
+      "-DENABLE_GTK_UI=YES"
+      "-DENABLE_LDAP=YES"
+      "-DENABLE_SQLITE_STORAGE=YES"
+      "-DENABLE_LIME=YES"
+      "-DENABLE_NOTIFY=YES"
+      "-DENABLE_RELATIVE_PREFIX=YES"
+      "-DENABLE_STRICT=NO" ; -Werror=unused-but-set-variable
+      "-DENABLE_TOOLS=YES"
+      "-DENABLE_TUNNEL=NO" ; Not available
+      "-DENABLE_TUTORIALS=YES"
+      "-DENABLE_UNIT_TESTS=YES"
+      "-DENABLE_UPDATE_CHECK=YES"
+      "-DENABLE_VIDEO=YES"
+      "-DENABLE_ASSISTANT=YES"
+      "-DENABLE_DEBUG_LOGS=YES"
+      "-DENABLE_NLS=YES"
+      "-DENABLE_VCARD=YES"
+      "-DENABLE_ROOTCA_DOWNLOAD=YES"
+      "-DENABLE_CXX_WRAPPER=YES"
+      "-DENABLE_CSHARP_WRAPPER=ON")
+    #:phases
+     (modify-phases %standard-phases
+      (add-after 'unpack 'patch
+       (lambda _
+        (substitute* "gtk/main.c"
+         (("#include \"liblinphone_gitversion.h\"")
+          ""))
+        #t)))))
+ (native-inputs
+  `(("dot" ,graphviz)
+    ("doxygen" ,doxygen)
+    ("gettext" ,gettext-minimal)
+    ("iconv" ,libiconv)
+    ("intl" ,intltool)
+    ("python" ,python)
+    ("xml2" ,libxml2)
+    ("zlib" ,zlib)))
+ (inputs
+  `(("gtk2" ,gtk+-2)
+    ("glib" ,glib)
+    ("java" ,icedtea "jdk")
+    ("notify" ,libnotify)
+    ("pystache" ,python-pystache)
+    ("six" ,python-six)
+    ("sqlite" ,sqlite)
+    ("udev" ,eudev)))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)
+    ("belcard" ,belcard)
+    ("bellesip" ,belle-sip)
+    ("bzrtp", bzrtp)
+    ("mediastreamer2" ,mediastreamer)
+    ("ortp" ,ortp)))
+ (synopsis "Belledonne Communications Softphone")
+ (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+ (home-page "https://linphone.org")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt.patch --]
[-- Type: application/octet-stream, Size: 2767 bytes --]

From 795ec318d7adf774d8c7c6e1696771afab4ccbcf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 30 Mar 2020 12:46:26 -0400
Subject: [PATCH 19/19] gnu: packages: linphone: Add linphoneqt

* gnu/packages/linphone.scm (linphoneqt): New variable.
---
 gnu/packages/linphone.scm | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index e2cd6de2f6..518b3dca8c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -25,6 +25,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -40,6 +41,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -597,3 +599,50 @@ and instant messaging.  It is fully SIP-based, for all calling, presence
 and IM features.")
  (home-page "https://linphone.org")
  (license license:gpl2+)))
+
+(define-public linphoneqt
+ (package
+  (name "linphoneqt")
+   (version "4.1.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/" name
+                     "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_DBUS=YES"
+      "-DENABLE_UPDATE_CHECK=YES")
+    #:phases
+     ;; For replacing undeclared variable.
+     (modify-phases %standard-phases
+      (add-after 'unpack 'patch
+       (lambda _
+        (substitute* "src/app/AppController.cpp"
+         (("LINPHONE_QT_GIT_VERSION")
+          "\"4.1.1\""))
+        #t)))))
+ (native-inputs
+  `(("gcc" ,gcc-5))) ; Required for libstd.h
+ (inputs
+  `(("qtbase" ,qtbase)
+    ("qtdeclarative" ,qtdeclarative)
+    ("qtquickcontrols2" ,qtquickcontrols2)
+    ("qtsvg" ,qtsvg)
+    ("qttools" ,qttools)))
+ (propagated-inputs
+  `(("bctoolbox" ,bctoolbox)
+    ("belcard" ,belcard)
+    ("linphone" ,linphone)))
+ (synopsis "Belledonne Communications Softphone")
+ (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+ (home-page "https://linphone.org")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 15-add-msamr

[Raghav Gururajan]

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



[-- Attachment #2: 15-add-msamr.patch --]
[-- Type: application/octet-stream, Size: 1737 bytes --]

From 2ec49a2326b88189aeeefa6f09371d8f7afc189d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 31 Mar 2020 09:41:01 -0400
Subject: [PATCH 22/22] gnu: packages: linphone: Add msamr

* gnu/packages/linphone.scm (msamr): New variable.
---
 gnu/packages/linphone.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 518b3dca8c..b5bf773c3e 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -646,3 +646,35 @@ and instant messaging.  It is fully SIP-based, for all calling, presence
 and IM features.")
  (home-page "https://linphone.org")
  (license license:gpl2+)))
+
+(define-public msamr
+ (package
+  (name "msamr")
+   (version "1.1.3")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/plugins/"
+                     name "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_NARROWBAND=YES"
+      "-DENABLE_WIDEBAND=YES")))
+ (inputs
+  `(("mediastreamer2" ,mediastreamer)
+    ("opencoreamr" ,opencore-amr)
+    ("ortp" ,ortp)
+    ("voamrwbenc" ,vo-amrwbenc)))
+ (synopsis "Media Streamer AMR Codec")
+ (description "MSAMR is a plugin of MediaStreamer, adding support for
+AMR codec.  It is based on the opencore-amr implementation.")
+ (home-page "https://gitlab.linphone.org/BC/public/msamr")
+ (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 16-add-openh264

[Raghav Gururajan]

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



[-- Attachment #2: 16-add-msopenh264.patch --]
[-- Type: application/octet-stream, Size: 2119 bytes --]

From 8441e8eec7f8420f51b0f80c18522d0a692b0712 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 31 Mar 2020 10:09:19 -0400
Subject: [PATCH 23/23] gnu: packages: linphone: Add msopenh264

* gnu/packages/linphone.scm (msopenh264): New variable.
---
 gnu/packages/linphone.scm | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index b5bf773c3e..8ff2a2cf2e 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -678,3 +678,44 @@ and IM features.")
 AMR codec.  It is based on the opencore-amr implementation.")
  (home-page "https://gitlab.linphone.org/BC/public/msamr")
  (license license:gpl3+)))
+
+(define-public msopenh264
+ (package
+  (name "msopenh264")
+   (version "1.2.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/plugins/"
+                     name "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
+     (patches
+      (list
+       ;; For support for OpenH264 version >= 2.
+       (origin
+        (method url-fetch)
+        (uri
+         (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
+                        "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
+        (file-name "openh264.patch")
+        (sha256
+         (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_DECODER=YES")))
+ (inputs
+  `(("mediastreamer2" ,mediastreamer)
+    ("openh264" ,openh264)
+    ("ortp" ,ortp)))
+ (synopsis "Media Streamer H.264 Codec")
+ (description "MsOpenH264 is an  H.264 encoder/decoder plugin for
+mediastreamer2 based on the openh264 library.")
+ (home-page "https://gitlab.linphone.org/BC/public/msopenh264")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 17-add-mssilk

[Raghav Gururajan]

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



[-- Attachment #2: 17-add-mssilk.patch --]
[-- Type: application/octet-stream, Size: 1654 bytes --]

From 674bede190fb565649f6ea29a6aa30608c3237ff Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 31 Mar 2020 10:22:41 -0400
Subject: [PATCH 24/24] gnu: packages: linphone: Add mssilk

* gnu/packages/linphone.scm (mssilk): New variable.
---
 gnu/packages/linphone.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 8ff2a2cf2e..74b814046f 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -719,3 +719,31 @@ AMR codec.  It is based on the opencore-amr implementation.")
 mediastreamer2 based on the openh264 library.")
  (home-page "https://gitlab.linphone.org/BC/public/msopenh264")
  (license license:gpl2+)))
+
+(define-public mssilk
+ (package
+  (name "mssilk")
+   (version "1.1.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/plugins/"
+                     name "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES")))
+ (inputs
+  `(("mediastreamer2" ,mediastreamer)
+    ("ortp" ,ortp)))
+ (synopsis "Media Streamer SILK Codec")
+ (description "MSSILK is a plugin of MediaStreamer, adding support for
+AMR codec.  It is based on the Skype's SILK implementation.")
+ (home-page "https://gitlab.linphone.org/BC/public/mssilk")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 18-add-mswebrtc

[Raghav Gururajan]

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



[-- Attachment #2: 18-add-mswebrtc.patch --]
[-- Type: application/octet-stream, Size: 1819 bytes --]

From 4d93f360048bc75a10c8078505e736e677062bd1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 31 Mar 2020 10:46:55 -0400
Subject: [PATCH 25/25] gnu: packages: linphone: Add mswebrtc

* gnu/packages/linphone.scm (mswebrtc): New variable.
---
 gnu/packages/linphone.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 74b814046f..8c17ef30c9 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -747,3 +747,36 @@ mediastreamer2 based on the openh264 library.")
 AMR codec.  It is based on the Skype's SILK implementation.")
  (home-page "https://gitlab.linphone.org/BC/public/mssilk")
  (license license:gpl2+)))
+
+(define-public mswebrtc
+ (package
+  (name "mswebrtc")
+   (version "1.1.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.linphone.org/releases/sources/plugins/"
+                     name "/" name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
+ (build-system cmake-build-system)
+ (arguments
+  `(#:tests? #f ; No test target
+    #:configure-flags
+     (list
+      "-DENABLE_SHARED=YES"
+      "-DENABLE_STATIC=YES"
+      "-DENABLE_AEC=YES"
+      "-DENABLE_AECM=YES"
+      "-DENABLE_ISAC=YES"
+      "-DENABLE_ILBC=YES")))
+ (inputs
+  `(("bctoolbox" ,bctoolbox)
+    ("mediastreamer2" ,mediastreamer)
+    ("ortp" ,ortp)))
+ (synopsis "Media Streamer WebRTC Codec")
+ (description "MSWebRTC is a plugin of MediaStreamer, adding support for
+WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
+ (home-page "https://gitlab.linphone.org/BC/public/mswebrtc")
+ (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 3-add-bcunit-v2

[Raghav Gururajan]

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



[-- Attachment #2: 3-add-bcunit-v2.patch --]
[-- Type: application/octet-stream, Size: 2684 bytes --]

From 66fd5e5e0f32389484b30e8df8cdb0e64c8b4442 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 15:50:15 -0400
Subject: [PATCH] gnu: Add bcunit

* gnu/packages/linphone.scm (bcunit): New variable.
---
 gnu/packages/linphone.scm | 52 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 gnu/packages/linphone.scm

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
new file mode 100644
index 0000000000..4262d00c21
--- /dev/null
+++ b/gnu/packages/linphone.scm
@@ -0,0 +1,52 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages linphone)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages base)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu))
+
+(define-public bcunit
+  (package
+    (name "bcunit")
+    (version "3.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (synopsis "Belledonne Communications Unit Testing Framework")
+    (description "BCUnit is a fork of the defunct project CUnit,
+with several fixes and patches applied.  It is an unit testing
+framework for writing, administering, and running unit tests in C.")
+    (home-page "https://gitlab.linphone.org/BC/public/bcunit")
+    (license license:lgpl2.0+)))
-- 
2.26.0

[bug#40264] Linphone: 3-add-bcunit-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit d5a8e391ac2546241d0ff60c9a1fd2fb8ff57536.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 4-add-bctoolbox-v2

[Raghav Gururajan]

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



[-- Attachment #2: 4-add-bctoolbox-v2.patch --]
[-- Type: application/octet-stream, Size: 2022 bytes --]

From 406bce0fb53e366d96aab4c927911c4a1487ff06 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:10:42 -0400
Subject: [PATCH 2/2] gnu: Add bctoolbox

* gnu/packages/linphone.scm (bctoolbox): New variable.
---
 gnu/packages/linphone.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 4262d00c21..d5aea75665 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -20,6 +20,7 @@
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -50,3 +51,30 @@ with several fixes and patches applied.  It is an unit testing
 framework for writing, administering, and running unit tests in C.")
     (home-page "https://gitlab.linphone.org/BC/public/bcunit")
     (license license:lgpl2.0+)))
+
+(define-public bctoolbox
+  (package
+    (name "bctoolbox")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=OFF")))        ; Not required
+    (inputs
+     `(("bcunit" ,bcunit)
+       ("mbedtls" ,mbedtls-apache)))
+    (synopsis "Belledonne Communications Tool Box")
+    (description "BcToolBox is an utilities library used by Belledonne
+Communications softwares like belle-sip, mediastreamer2 and linphone.")
+    (home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 4-add-bctoolbox-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit bfaabfebac0fc6c3fba2ed4358556b393ef535ce.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 5-add-belr-v2

[Raghav Gururajan]

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



[-- Attachment #2: 5-add-belr-v2.patch --]
[-- Type: application/octet-stream, Size: 1809 bytes --]

From 7d9cb7cdd3eb3a2e0c1a8d34b397baa0ac4b7df7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:18:14 -0400
Subject: [PATCH 3/3] gnu: Add belr

* gnu/packages/linphone.scm (belr): New variable.
---
 gnu/packages/linphone.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index d5aea75665..862b2fc8f9 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -78,3 +78,30 @@ framework for writing, administering, and running unit tests in C.")
 Communications softwares like belle-sip, mediastreamer2 and linphone.")
     (home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
     (license license:gpl2+)))
+
+(define-public belr
+  (package
+    (name "belr")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=OFF")))        ; Not required
+    (inputs
+     `(("bctoolbox" ,bctoolbox)))
+    (synopsis "Belledonne Communications Language Recognition Library")
+    (description "Belr is Belledonne Communications' language recognition library,
+written in C++11.  It parses text inputs formatted according to a language
+defined by an ABNF grammar, such as the protocols standardized at IETF.")
+    (home-page "https://gitlab.linphone.org/BC/public/belr")
+    (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 5-add-belr-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit 63c73bcad0ccd44363611162010b24e2b60629f4.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 6-add-belcard-v2

[Raghav Gururajan]

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



[-- Attachment #2: 6-add-belcard-v2.patch --]
[-- Type: application/octet-stream, Size: 1684 bytes --]

From b73266845e0ac73ed53b75bebd2192d542517fe1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:30:24 -0400
Subject: [PATCH 4/4] gnu: Add belcard

* gnu/packages/linphone.scm (belcard): New variable.
---
 gnu/packages/linphone.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 862b2fc8f9..c95f44afe4 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -105,3 +105,29 @@ written in C++11.  It parses text inputs formatted according to a language
 defined by an ABNF grammar, such as the protocols standardized at IETF.")
     (home-page "https://gitlab.linphone.org/BC/public/belr")
     (license license:gpl3+)))
+
+(define-public belcard
+  (package
+    (name "belcard")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=OFF")))        ; Not required
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belr" ,belr)))
+    (synopsis "Belledonne Communications VCard Library")
+    (description "Belcard is a C++ library to manipulate VCard standard format.")
+    (home-page "https://gitlab.linphone.org/BC/public/belcard")
+    (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linphone: 6-add-belcard-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit c8f69ec27b4d492f63edc71f0a83ec413ea85b96.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 7-add-bcmatroska2-v2

[Raghav Gururajan]

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



[-- Attachment #2: 7-add-bcmatroska2-v2.patch --]
[-- Type: application/octet-stream, Size: 1942 bytes --]

From f161e6b0e1d3b240c4f247a0717eaf0c07c8bf1b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:38:01 -0400
Subject: [PATCH 5/5] gnu: Add bcmatroska2

* gnu/packages/linphone.scm (bcmatroska2): New variable.
---
 gnu/packages/linphone.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index c95f44afe4..13d0157b88 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -131,3 +131,35 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
     (description "Belcard is a C++ library to manipulate VCard standard format.")
     (home-page "https://gitlab.linphone.org/BC/public/belcard")
     (license license:gpl3+)))
+
+(define-public bcmatroska2
+  (package
+    (name "bcmatroska2")
+    (version "0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (synopsis "Belledonne Communications Media Container")
+    (description "BcMatroska is a free and open standard multi-media
+container format.  It can hold an unlimited number of video, audio,
+picture, or subtitle tracks in one file. ")
+    (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
+    (license
+     (list
+      ;; For Core C and LibEBML2
+      ;; https://www.matroska.org/node/47
+      license:bsd-4
+      ;; For LibMatroska2
+      ;; https://www.matroska.org/node/47
+      license:lgpl2.1+))))
-- 
2.26.0

[bug#40264] Linphone: 7-add-bcmatroska2-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit 28f6f1e0da2481ce854a893d72d6bdfc5ce97952.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 8-add-bcg729-v2

[Raghav Gururajan]

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



[-- Attachment #2: 8-add-bcg729-v2.patch --]
[-- Type: application/octet-stream, Size: 1762 bytes --]

From c36b4563a5e536f29f88df852147a9fcbeac8d33 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:44:35 -0400
Subject: [PATCH 6/6] gnu: Add bcg729

* gnu/packages/linphone.scm (bcg729): New variable.
---
 gnu/packages/linphone.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 13d0157b88..bc22288aee 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -163,3 +163,30 @@ picture, or subtitle tracks in one file. ")
       ;; For LibMatroska2
       ;; https://www.matroska.org/node/47
       license:lgpl2.1+))))
+
+(define-public bcg729
+  (package
+    (name "bcg729")
+    (version "1.0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (synopsis "Belledonne Communications G729 Codec")
+    (description "BcG729 is an implementation of both encoder and decoder of
+the ITU G729 speech codec.  The library written in C 99 is fully portable and
+can be executed on many platforms including both ARM and x86 processors.  It
+supports concurrent channels encoding and decoding for multi call application
+such as conferencing.")
+    (home-page "https://gitlab.linphone.org/BC/public/belcard")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 8-add-bcg729-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit 02d5d72cfc525e1ec53a02f3a201872f261c7c37.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 9-add-ortp-v2

[Raghav Gururajan]

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



[-- Attachment #2: 9-add-ortp-v2.patch --]
[-- Type: application/octet-stream, Size: 2029 bytes --]

From fffce16eeb811e28baadee0b129b4c33c9435862 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 18:54:53 -0400
Subject: [PATCH 7/7] gnu: Add ortp

* gnu/packages/linphone.scm (ortp): New variable.
---
 gnu/packages/linphone.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index bc22288aee..233041afd8 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -20,6 +20,8 @@
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -190,3 +192,32 @@ supports concurrent channels encoding and decoding for multi call application
 such as conferencing.")
     (home-page "https://gitlab.linphone.org/BC/public/belcard")
     (license license:gpl2+)))
+
+(define-public ortp
+  (package
+    (name "ortp")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)))
+    (synopsis "Belledonne Communications RTP Library")
+    (description "oRTP is a C library implementing the RTP protocol.  It uses
+RFC 3550 standard.")
+    (home-page "https://gitlab.linphone.org/BC/public/ortp")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 9-add-ortp-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit 13f401d3665a246f5e7d3a9076fdedfe744dd3fd.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 10-add-bzrtp-v2

[Raghav Gururajan]

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



[-- Attachment #2: 10-add-bzrtp-v2.patch --]
[-- Type: application/octet-stream, Size: 2046 bytes --]

From e99463b8de624ff642ae35f344f0ad8180eb0de7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 19:03:00 -0400
Subject: [PATCH 8/8] gnu: Add bzrtp

* gnu/packages/linphone.scm (bzrtp): New variable.
---
 gnu/packages/linphone.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 233041afd8..3be35bdb74 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -22,7 +22,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages xml)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -221,3 +223,32 @@ such as conferencing.")
 RFC 3550 standard.")
     (home-page "https://gitlab.linphone.org/BC/public/ortp")
     (license license:gpl2+)))
+
+(define-public bzrtp
+  (package
+    (name "bzrtp")
+    (version "1.0.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("sqlite3" ,sqlite)
+       ("xml2" ,libxml2)))
+    (synopsis "Belledonne Communications ZRTP Library")
+    (description "BZRTP is an implementation of ZRTP keys exchange
+protocol, written in C.  It is fully portable and can be executed on many
+platforms including both ARM and x86.")
+    (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 10-add-bzrtp-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit f3697439cd226f769cdc5ce962f08ad3a1a8bfd6.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 11-add-mediastreamer-v2

[Raghav Gururajan]

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



[-- Attachment #2: 11-add-mediastreamer-v2.patch --]
[-- Type: application/octet-stream, Size: 4207 bytes --]

From 3cf73361203f7833c61a24f69b9ab4bb4da358ce Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 20:18:20 -0400
Subject: [PATCH 9/9] gnu: Add mediastreamer

* gnu/packages/linphone.scm (mediastreamer): New variable.
---
 gnu/packages/linphone.scm | 83 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 3be35bdb74..ce3ffa763b 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -19,12 +19,24 @@
 
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -252,3 +264,74 @@ protocol, written in C.  It is fully portable and can be executed on many
 platforms including both ARM and x86.")
     (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
     (license license:gpl2+)))
+
+(define-public mediastreamer
+  (package
+    (name "mediastreamer")
+    (version "2.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
+       (patches
+        (list
+         ;; For fixing definitions.
+         (origin
+           (method url-fetch)
+           (uri
+            (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit/"
+                           "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
+           (file-name "mediastreamer-msfactory.patch")
+           (sha256
+            (base32 "18lsn9fc9di8bzr12ck3h9k9h8xvvhjzgkimbj9p4vmxxwhjaxn2")))))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_SRTP=NO"             ; Using ZRTP instead
+        "-DENABLE_STATIC=NO"           ; Not required
+        "-DENABLE_GSM=NO"              ; Need recompilation with -fPIC
+        "-DENABLE_BV16=NO")))          ; Not available
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)
+       ("python" ,python)))
+    (inputs
+     `(("alsa" ,alsa-lib)
+       ("bcg729" ,bcg729)
+       ("bcmatroska2" ,bcmatroska2)
+       ("bctoolbox" ,bctoolbox)
+       ("ffmpeg" ,ffmpeg)
+       ("glew" ,glew)
+       ("glu" ,glu)
+       ("glx" ,mesa-utils)
+       ("gsm" ,gsm)
+       ("opengl" ,mesa)
+       ("opus" ,opus)
+       ("ortp" ,ortp)
+       ("pcap" ,libpcap)
+       ("portaudio" ,portaudio)
+       ("pulseaudio" ,pulseaudio)
+       ("spandsp" ,spandsp)
+       ("speex" ,speex)
+       ("speexdsp" ,speexdsp)
+       ("srtp" ,libsrtp)
+       ("theora" ,libtheora)
+       ("turbojpeg" ,libjpeg-turbo)
+       ("v4l" ,v4l-utils)
+       ("vpx" ,libvpx)
+       ("x11" ,libx11)
+       ("xv" ,libxv)
+       ("zrtp", bzrtp)))
+    (synopsis "Belledonne Communications Streaming Engine")
+    (description "Mediastreamer is a powerful and lightweight streaming
+engine for telephony applications.  This media processing and streaming toolkit
+is responsible for receiving and sending all multimedia streams in Linphone,
+including media capture, encoding and decoding, and rendering.")
+    (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 11-add-mediastreamer-v2

[Danny Milosavljevic]

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

Hello everyone,

On Thu, 02 Apr 2020 00:20:04 +0000
"Raghav Gururajan" <raghavgururajan@disroot.org> wrote:
> +        (list

> +         ;; For fixing definitions.

Yes, but why?  What would happen if we didn't do it?

> +         (origin
> +           (method url-fetch)
> +           (uri
> +            (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit/"
> +                           "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
> +           (file-name "mediastreamer-msfactory.patch")

I'm not sure what the outcome of the latest discussion on carrying patches was.
Should we carry patches in Guix now or fetch them from external source?

> +        "-DENABLE_GSM=NO"              ; Need recompilation with -fPIC

Uhhhhhhhhh if that's a library, it should have been compiled with "-fPIC", no?

Which library would need recompilation with "-fPIC"?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 11-add-mediastreamer-v2

[Raghav Gururajan]

Hi Danny!

>> + (list
>> 
>> + ;; For fixing definitions.
> 
> Yes, but why? What would happen if we didn't do it?

Otherwise, we get `-Werror` flag related compilation errors.

>> + (origin
>> + (method url-fetch)
>> + (uri
>> + (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit"
>> + "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
>> + (file-name "mediastreamer-msfactory.patch")
> 
> I'm not sure what the outcome of the latest discussion on carrying patches was.
> Should we carry patches in Guix now or fetch them from external source?

I think it's good as long as we use hash to verify. :-)

>> + "-DENABLE_GSM=NO" ; Need recompilation with -fPIC
> 
> Uhhhhhhhhh if that's a library, it should have been compiled with "-fPIC", no?
> 
> Which library would need recompilation with "-fPIC"?

I am not sure about this one. Since it is a feature, I was planning on to deal this later and disable gsm for now. I hope it is okay.

Regards,
RG.

[bug#40264] Linphone: 11-add-mediastreamer-v2

[maxim.cournoyer]

Hello Raghav,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> Hi Danny!
>
>>> + (list
>>>
>>> + ;; For fixing definitions.
>>
>> Yes, but why? What would happen if we didn't do it?
>
> Otherwise, we get `-Werror` flag related compilation errors.

Could you please clarify that in a comment above the patch?

>>> + (origin
>>> + (method url-fetch)
>>> + (uri
>>> + (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit"
>>> + "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
>>> + (file-name "mediastreamer-msfactory.patch")
>>
>> I'm not sure what the outcome of the latest discussion on carrying patches was.
>> Should we carry patches in Guix now or fetch them from external source?
>
> I think it's good as long as we use hash to verify. :-)

The problem is that metadata or format of auto-generated patches may
change on a whim.  In past discussions it was decided best to not use
them (that is, it's best to embed a copy of it in Guix sources) [0].

[0]  https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00554.html

I'll post more comments in your original message.

Maxim

[bug#40264] Linphone: 11-add-mediastreamer-v2

[maxim.cournoyer]

Hi Raghav!

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> From 3cf73361203f7833c61a24f69b9ab4bb4da358ce Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Wed, 1 Apr 2020 20:18:20 -0400
> Subject: [PATCH 9/9] gnu: Add mediastreamer
>
> * gnu/packages/linphone.scm (mediastreamer): New variable.
> ---
>  gnu/packages/linphone.scm | 83 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 83 insertions(+)
>
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 3be35bdb74..ce3ffa763b 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -19,12 +19,24 @@
>  
>  (define-module (gnu packages linphone)
>    #:use-module (gnu packages)
> +  #:use-module (gnu packages admin)
> +  #:use-module (gnu packages audio)
>    #:use-module (gnu packages base)
>    #:use-module (gnu packages documentation)
> +  #:use-module (gnu packages gl)
> +  #:use-module (gnu packages gnome)
>    #:use-module (gnu packages graphviz)
> +  #:use-module (gnu packages image)
> +  #:use-module (gnu packages linux)
> +  #:use-module (gnu packages pulseaudio)
> +  #:use-module (gnu packages python)
>    #:use-module (gnu packages sqlite)
> +  #:use-module (gnu packages telephony)
>    #:use-module (gnu packages tls)
> +  #:use-module (gnu packages video)
> +  #:use-module (gnu packages xiph)
>    #:use-module (gnu packages xml)
> +  #:use-module (gnu packages xorg)
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
>    #:use-module (guix download)
> @@ -252,3 +264,74 @@ protocol, written in C.  It is fully portable and can be executed on many
>  platforms including both ARM and x86.")
>      (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
>      (license license:gpl2+)))
> +
> +(define-public mediastreamer
> +  (package
> +    (name "mediastreamer")

The variable name and package name should be "mediastreamer2", as per
upstream.

> +    (version "2.16.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri
> +        (string-append "https://www.linphone.org/releases/sources/" name
> +                       "/" name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
> +       (patches
> +        (list
> +         ;; For fixing definitions.
> +         (origin
> +           (method url-fetch)
> +           (uri
> +            (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit/"
> +                           "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
> +           (file-name "mediastreamer-msfactory.patch")
> +           (sha256
> +            (base32 "18lsn9fc9di8bzr12ck3h9k9h8xvvhjzgkimbj9p4vmxxwhjaxn2")))))))

You can just use the "ENABLE_STRICT=NO", which will disable -Werror and
make the package more resilient in the face of future compiler upgrades
in Guix.  No more need for that patch :-).

> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f                      ; No test target
> +       #:configure-flags
> +       (list
> +        "-DENABLE_SRTP=NO"             ; Using ZRTP instead

Usually we try to offer the most features possible.  I don't see why we
shouldn't add SRTP support since we should already have the required
dependencies.

Also, I see there's a ENABLE_UNIT_TESTS=YES option for unit tests, which
we should enable and try to run.

> +        "-DENABLE_STATIC=NO"           ; Not required
> +        "-DENABLE_GSM=NO"              ; Need recompilation with -fPIC

Not a merge breaker, but it'd make sense to have GSM for telephony
focused software :-).

> +        "-DENABLE_BV16=NO")))          ; Not available
> +    (native-inputs
> +     `(("dot" ,graphviz)
> +       ("doxygen" ,doxygen)
> +       ("python" ,python)))
> +    (inputs
> +     `(("alsa" ,alsa-lib)
> +       ("bcg729" ,bcg729)
> +       ("bcmatroska2" ,bcmatroska2)
> +       ("bctoolbox" ,bctoolbox)
> +       ("ffmpeg" ,ffmpeg)
> +       ("glew" ,glew)
> +       ("glu" ,glu)
> +       ("glx" ,mesa-utils)
> +       ("gsm" ,gsm)
> +       ("opengl" ,mesa)
> +       ("opus" ,opus)
> +       ("ortp" ,ortp)
> +       ("pcap" ,libpcap)
> +       ("portaudio" ,portaudio)
> +       ("pulseaudio" ,pulseaudio)
> +       ("spandsp" ,spandsp)
> +       ("speex" ,speex)
> +       ("speexdsp" ,speexdsp)
> +       ("srtp" ,libsrtp)
> +       ("theora" ,libtheora)
> +       ("turbojpeg" ,libjpeg-turbo)
> +       ("v4l" ,v4l-utils)
> +       ("vpx" ,libvpx)
> +       ("x11" ,libx11)
> +       ("xv" ,libxv)
> +       ("zrtp", bzrtp)))
> +    (synopsis "Belledonne Communications Streaming Engine")
> +    (description "Mediastreamer is a powerful and
> lightweight streaming

There are some strange characters in there (around 'powerful').  Please
edit them out.

Maxim

[bug#40264] Linphone: 11-add-mediastreamer-v2

[Raghav Gururajan]

Hi Maxim!

>> From 3cf73361203f7833c61a24f69b9ab4bb4da358ce Mon Sep 17 00:00:00 2001
>> From: Raghav Gururajan <raghavgururajan@disroot.org>
>> Date: Wed, 1 Apr 2020 20:18:20 -0400
>> Subject: [PATCH 9/9] gnu: Add mediastreamer
>> 
>> * gnu/packages/linphone.scm (mediastreamer): New variable.
>> ---
>> gnu/packages/linphone.scm | 83 +++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 83 insertions(+)
>> 
>> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
>> index 3be35bdb74..ce3ffa763b 100644
>> --- a/gnu/packages/linphone.scm
>> +++ b/gnu/packages/linphone.scm
>> @@ -19,12 +19,24 @@
>> 
>> (define-module (gnu packages linphone)
>> #:use-module (gnu packages)
>> + #:use-module (gnu packages admin)
>> + #:use-module (gnu packages audio)
>> #:use-module (gnu packages base)
>> #:use-module (gnu packages documentation)
>> + #:use-module (gnu packages gl)
>> + #:use-module (gnu packages gnome)
>> #:use-module (gnu packages graphviz)
>> + #:use-module (gnu packages image)
>> + #:use-module (gnu packages linux)
>> + #:use-module (gnu packages pulseaudio)
>> + #:use-module (gnu packages python)
>> #:use-module (gnu packages sqlite)
>> + #:use-module (gnu packages telephony)
>> #:use-module (gnu packages tls)
>> + #:use-module (gnu packages video)
>> + #:use-module (gnu packages xiph)
>> #:use-module (gnu packages xml)
>> + #:use-module (gnu packages xorg)
>> #:use-module ((guix licenses) #:prefix license:)
>> #:use-module (guix packages)
>> #:use-module (guix download)
>> @@ -252,3 +264,74 @@ protocol, written in C. It is fully portable and can be executed on many
>> platforms including both ARM and x86.")
>> (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
>> (license license:gpl2+)))
>> +
>> +(define-public mediastreamer
>> + (package
>> + (name "mediastreamer")
> 
> The variable name and package name should be "mediastreamer2", as per
> upstream.
> 
>> + (version "2.16.1")
>> + (source
>> + (origin
>> + (method url-fetch)
>> + (uri
>> + (string-append "https://www.linphone.org/releases/sources" name
>> + "/" name "-" version ".tar.gz"))
>> + (sha256
>> + (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
>> + (patches
>> + (list
>> + ;; For fixing definitions.
>> + (origin
>> + (method url-fetch)
>> + (uri
>> + (string-append "https://gitlab.linphone.org/BC/public/mediastreamer2/commit"
>> + "de3a24b795d7a78e78eab6b974e7ec5abf2259ac.diff"))
>> + (file-name "mediastreamer-msfactory.patch")
>> + (sha256
>> + (base32 "18lsn9fc9di8bzr12ck3h9k9h8xvvhjzgkimbj9p4vmxxwhjaxn2")))))))
> 
> You can just use the "ENABLE_STRICT=NO", which will disable -Werror and
> make the package more resilient in the face of future compiler upgrades
> in Guix. No more need for that patch :-).
> 
>> + (build-system cmake-build-system)
>> + (arguments
>> + `(#:tests? #f ; No test target
>> + #:configure-flags
>> + (list
>> + "-DENABLE_SRTP=NO" ; Using ZRTP instead
> 
> Usually we try to offer the most features possible. I don't see why we
> shouldn't add SRTP support since we should already have the required
> dependencies.
> 
> Also, I see there's a ENABLE_UNIT_TESTS=YES option for unit tests, which
> we should enable and try to run.
> 
>> + "-DENABLE_STATIC=NO" ; Not required
>> + "-DENABLE_GSM=NO" ; Need recompilation with -fPIC
> 
> Not a merge breaker, but it'd make sense to have GSM for telephony
> focused software :-).
> 
>> + "-DENABLE_BV16=NO"))) ; Not available
>> + (native-inputs
>> + `(("dot" ,graphviz)
>> + ("doxygen" ,doxygen)
>> + ("python" ,python)))
>> + (inputs
>> + `(("alsa" ,alsa-lib)
>> + ("bcg729" ,bcg729)
>> + ("bcmatroska2" ,bcmatroska2)
>> + ("bctoolbox" ,bctoolbox)
>> + ("ffmpeg" ,ffmpeg)
>> + ("glew" ,glew)
>> + ("glu" ,glu)
>> + ("glx" ,mesa-utils)
>> + ("gsm" ,gsm)
>> + ("opengl" ,mesa)
>> + ("opus" ,opus)
>> + ("ortp" ,ortp)
>> + ("pcap" ,libpcap)
>> + ("portaudio" ,portaudio)
>> + ("pulseaudio" ,pulseaudio)
>> + ("spandsp" ,spandsp)
>> + ("speex" ,speex)
>> + ("speexdsp" ,speexdsp)
>> + ("srtp" ,libsrtp)
>> + ("theora" ,libtheora)
>> + ("turbojpeg" ,libjpeg-turbo)
>> + ("v4l" ,v4l-utils)
>> + ("vpx" ,libvpx)
>> + ("x11" ,libx11)
>> + ("xv" ,libxv)
>> + ("zrtp", bzrtp)))
>> + (synopsis "Belledonne Communications Streaming Engine")
>> + (description "Mediastreamer is apowerfuland
>> lightweight streaming
> 
> There are some strange characters in there (around 'powerful'). Please
> edit them out.

I fixed everything in 11-add-mediastreamer-v3. :-)

Regards,
RG.

[bug#40264] Linphone: 12-add-belle-sip-v2

[Raghav Gururajan]

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



[-- Attachment #2: 12-add-belle-sip-v2.patch --]
[-- Type: application/octet-stream, Size: 2439 bytes --]

From f0dd558fe520530f4d2950250d9f2081dd232ae7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 20:42:33 -0400
Subject: [PATCH 10/10] gnu: Add belle-sip

* gnu/packages/linphone.scm (belle-sip): New variable.
---
 gnu/packages/linphone.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index ce3ffa763b..71f23794e2 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -22,11 +22,13 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -335,3 +337,34 @@ is responsible for receiving and sending all multimedia streams in Linphone,
 including media capture, encoding and decoding, and rendering.")
     (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
     (license license:gpl2+)))
+
+(define-public belle-sip
+  (package
+    (name "belle-sip")
+    (version "1.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; Requires network access
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))
+    (inputs
+     `(("antlr3" ,antlr3-3.3)
+       ("antlr3c" ,libantlr3c)
+       ("bctoolbox" ,bctoolbox)
+       ("java" ,icedtea)
+       ("zlib" ,zlib)))
+    (synopsis "Belledonne Communications SIP Library")
+    (description "Belle-sip is a modern library implementing SIP transport,
+transaction and dialog layers.  It is written in C, with an object-oriented
+API.  It also comprises a simple HTTP/HTTPS client implementation.")
+    (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 12-add-belle-sip-v2

[Danny Milosavljevic]

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

Hi Raghav,

belle-sip is not reproducible.

$ guix build --rounds=2 belle-sip
[...]
phase `compress-documentation' succeeded after 0.0 seconds
output ‘/gnu/store/rykd8wp9ibjf3ad4nlg15vmyzgq9izsp-belle-sip-1.6.3’ of ‘/gnu/store/lqdmaxvlhxk25jr7whk5bvi0y1zbzp5a-belle-sip-1.6.3.drv’ differs from ‘/gnu/store/rykd8wp9ibjf3ad4nlg15vmyzgq9izsp-belle-sip-1.6.3-check’ from previous round
build of /gnu/store/lqdmaxvlhxk25jr7whk5bvi0y1zbzp5a-belle-sip-1.6.3.drv failed

$ diffoscope --exclude-directory-metadata /gnu/store/rykd8wp9ibjf3ad4nlg15vmyzgq9izsp-belle-sip-1.6.3 /gnu/store/rykd8wp9ibjf3ad4nlg15vmyzgq9izsp-belle-sip-1.6.3-check
[...]

I'm not saying that this is a blocker for merging, but basically libbellesip.so (and libbellesip.so.0) doesn't always come out the same.  Spooky.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 12-add-belle-sip-v2

[Raghav Gururajan]

Hi Danny!

> belle-sip is not reproducible.

Nice catch!

> I'm not saying that this is a blocker for merging, but basically libbellesip.so (and
> libbellesip.so.0) doesn't always come out the same. Spooky.

Yeah, that is really is spooky. I even disabled the tests as it required network access. Is it possible that there are multiple values set for any environment variable, and it uses different values randomly during each build?

Regards,
RG.

[bug#40264] Linphone: 12-add-belle-sip-v2

[Raghav Gururajan]

Hi Danny!

>> belle-sip is not reproducible.
> 
> Nice catch!
> 
>> I'm not saying that this is a blocker for merging, but basically libbellesip.so (and
>> libbellesip.so.0) doesn't always come out the same. Spooky.
> 
> Yeah, that is really is spooky. I even disabled the tests as it required network access. Is it
> possible that there are multiple values set for any environment variable, and it uses different
> values randomly during each build?

I suspect it could be due to having two different definitions for bctoolbox and ortp. Could you try belle-sip after applying the patch http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40326

Regards,
RG.

[bug#40264] Linphone: 12-add-belle-sip-v2

[Danny Milosavljevic]

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

Hi Raghav,

On Thu, 02 Apr 2020 17:19:29 +0000
"Raghav Gururajan" <raghavgururajan@disroot.org> wrote:

> I suspect it could be due to having two different definitions for bctoolbox and ortp. Could you try belle-sip after applying the patch http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40326

I tried and it didn't help.

However, I found and fixed the problem:

From 1f847861de4ab73011d6243fb652f098e16106cb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 20:42:33 -0400
Subject: [FIXME 2/2] gnu: Add belle-sip.
Tags: patch

* gnu/packages/linphone.scm (belle-sip): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/linphone.scm | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 18a11776e8..9cbbd5e7d6 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -22,11 +22,13 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -335,3 +337,43 @@ is responsible for receiving and sending all multimedia streams in Linphone,
 including media capture, encoding and decoding, and rendering.")
     (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
     (license license:gpl2+)))
+
+(define-public belle-sip
+  (package
+    (name "belle-sip")
+    (version "1.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; Requires network access
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/CMakeLists.txt"
+              ;; ANTLR would use multithreaded DFA generation
+              ;; otherwise--which would not be reproducible.
+              (("-Xmultithreaded ") ""))
+             #t)))))
+    (inputs
+     `(("antlr3" ,antlr3-3.3)
+       ("antlr3c" ,libantlr3c)
+       ("bctoolbox" ,bctoolbox)
+       ("java" ,icedtea)
+       ("zlib" ,zlib)))
+    (synopsis "Belledonne Communications SIP Library")
+    (description "Belle-sip is a modern library implementing SIP transport,
+transaction and dialog layers.  It is written in C, with an object-oriented
+API.  It also comprises a simple HTTP/HTTPS client implementation.")
+    (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
+    (license license:gpl2+)))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 12-add-belle-sip-v2

[Maxim Cournoyer]

Hello Danny and Raghav,

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Raghav,
>
> On Thu, 02 Apr 2020 17:19:29 +0000
> "Raghav Gururajan" <raghavgururajan@disroot.org> wrote:
>
>> I suspect it could be due to having two different definitions for bctoolbox and ortp. Could you try belle-sip after applying the patch http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40326
>
> I tried and it didn't help.
>
> However, I found and fixed the problem:
>
> From 1f847861de4ab73011d6243fb652f098e16106cb Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Wed, 1 Apr 2020 20:42:33 -0400
> Subject: [FIXME 2/2] gnu: Add belle-sip.
> Tags: patch
>
> * gnu/packages/linphone.scm (belle-sip): New variable.
>
> Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
> ---
>  gnu/packages/linphone.scm | 42 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
>
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 18a11776e8..9cbbd5e7d6 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -22,11 +22,13 @@
>    #:use-module (gnu packages admin)
>    #:use-module (gnu packages audio)
>    #:use-module (gnu packages base)
> +  #:use-module (gnu packages compression)
>    #:use-module (gnu packages documentation)
>    #:use-module (gnu packages gl)
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages graphviz)
>    #:use-module (gnu packages image)
> +  #:use-module (gnu packages java)
>    #:use-module (gnu packages linux)
>    #:use-module (gnu packages pulseaudio)
>    #:use-module (gnu packages python)
> @@ -335,3 +337,43 @@ is responsible for receiving and sending all multimedia streams in Linphone,
>  including media capture, encoding and decoding, and rendering.")
>      (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
>      (license license:gpl2+)))
> +
> +(define-public belle-sip
> +  (package
> +    (name "belle-sip")
> +    (version "1.6.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri
> +        (string-append "https://www.linphone.org/releases/sources/" name
> +                       "/" name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f                      ; Requires network access
> +       #:configure-flags
> +       (list
> +        "-DENABLE_STATIC=NO")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch
> +           (lambda _
> +             (substitute* "src/CMakeLists.txt"
> +              ;; ANTLR would use multithreaded DFA generation
> +              ;; otherwise--which would not be reproducible.
> +              (("-Xmultithreaded ") ""))
> +             #t)))))

Nice find!  Although note that this doesn't exist in the latest code,
and that the latest release is nearly 3 years old (2017-07-21).  Perhaps
we should just try to package the latest master?  Their git history
suggests many bug fixes, including a memory leak.

Maxim

[bug#40264] Linphone: 12-add-belle-sip-v2

[Raghav Gururajan]

> Nice find! Although note that this doesn't exist in the latest code,
> and that the latest release is nearly 3 years old (2017-07-21). Perhaps
> we should just try to package the latest master? Their git history
> suggests many bug fixes, including a memory leak.

In their mail list, one of the dev mentioned that there is going to be a release this year. Also, for consistency, I think it is better that we stick to release tarballs and apply critical patches from master. :-)

Regards,
RG.

[bug#40264] Linphone: 12-add-belle-sip-v2

[maxim.cournoyer]

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

>> Nice find! Although note that this doesn't exist in the latest code,
>> and that the latest release is nearly 3 years old (2017-07-21). Perhaps
>> we should just try to package the latest master? Their git history
>> suggests many bug fixes, including a memory leak.
>
> In their mail list, one of the dev mentioned that there is going to be a release this year. Also, for consistency, I think it is better that we stick to release tarballs and apply critical patches from master. :-)
>
> Regards,
> RG.

Sounds reasonable!  Thanks for the information.

Maxim

[bug#40264] Linphone: 12-add-belle-sip-v2

[Danny Milosavljevic]

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

Pushed this patch to guix master as commit e7859da11371e9bd0fffc5235b9e980cccf4b239.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 13-add-linphone-v2

[Raghav Gururajan]

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



[-- Attachment #2: 13-add-linphone-v2.patch --]
[-- Type: application/octet-stream, Size: 3105 bytes --]

From 2bc6755be0c3d1e64e1ec8a8f3a7c9e7f8c0030d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 21:18:04 -0400
Subject: [PATCH 11/11] gnu: Add liblinphone

* gnu/packages/linphone.scm (liblinphone): New variable.
---
 gnu/packages/linphone.scm | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 71f23794e2..6c161c444c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,7 +24,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
+  ;;#:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
@@ -32,6 +34,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -368,3 +371,49 @@ transaction and dialog layers.  It is written in C, with an object-oriented
 API.  It also comprises a simple HTTP/HTTPS client implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
     (license license:gpl2+)))
+
+(define-public liblinphone
+  (package
+    (name "linphone")
+    (version "3.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)
+       ("gettext" ,gettext-minimal)
+       ("iconv" ,libiconv)
+       ("python" ,python)
+       ("xml2" ,libxml2)
+       ("zlib" ,zlib)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("bzrtp", bzrtp)
+       ("mediastreamer2" ,mediastreamer)
+       ("ortp" ,ortp)
+       ("pystache" ,python-pystache)
+       ("six" ,python-six)
+       ("sqlite" ,sqlite)
+       ("udev" ,eudev)))
+    (synopsis "Belledonne Communications Softphone Library")
+    (description "Liblinphone is a high-level SIP library integrating
+all calling and instant messaging features into an unified
+easy-to-use API.  It is the cross-platform VoIP library on which the
+Linphone application is based on, and that anyone can use to add audio
+and video calls or instant messaging capabilities to an application.")
+    (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 13-add-linphone-v2

[Danny Milosavljevic]

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

How come that https://github.com/BelledonneCommunications/liblinphone/releases has 4.3.1 and we have 3.12.0 ?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 13-add-linphone-v2

[Danny Milosavljevic]

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

Renamed package to liblinphone and pushed this patch to guix master as
commit 9732910dd336e9bca56991a0630619bc1578d2af.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 13-add-linphone-v2

[Raghav Gururajan]

Hi Danny!

> How come that https://github.com/BelledonneCommunications/liblinphone/releases has 4.3.1 and we
> have 3.12.0 ?

Releases tag in gitlab.linphone.org are for internal purposes. Official releases are done at linphone.org/releases/sources.

[bug#40264] Linphone: 13-add-linphone-v2

[Raghav Gururajan]

Hi Danny!

> Renamed package to liblinphone and pushed this patch to guix master as
> commit 9732910dd336e9bca56991a0630619bc1578d2af.

Thanks for the push :-)

Shall we please keep the name "linphone" for package and "liblinphone" for variable? The release tarballs have not been renamed (linphone.org/releases/sources). We'll change the package name when it is changed in releases by upstream. This will consistent with other packages in linphone.scm.

Regards,
RG.

[bug#40264] Linphone: 14-add-linphoneqt-v2

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v2.patch --]
[-- Type: application/octet-stream, Size: 3153 bytes --]

From 496e5998ee1e853cb8c8170a001d40de80a609ba Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 21:45:32 -0400
Subject: [PATCH 12/12] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm | 48 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 6c161c444c..5d92b47598 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,9 +24,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
-  ;;#:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
@@ -35,6 +35,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -417,3 +418,48 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)))                 ; Required for libstd.h
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("mediastreamer2" ,mediastreamer)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
+       ("qttools" ,qttools)))
+    (propagated-inputs
+     `(("linphone" ,liblinphone)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linohone: 15-add-msamr-v2

[Raghav Gururajan]

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



[-- Attachment #2: 15-add-msamr-v2.patch --]
[-- Type: application/octet-stream, Size: 1797 bytes --]

From 2cffe0a1b1ee6cf908b9e4637b1b7c01b198fa61 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 22:04:16 -0400
Subject: [PATCH 13/13] gnu: Add msamr

* gnu/packages/linphone (msamr): New variable.
---
 gnu/packages/linphone.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 5d92b47598..b4bd95f178 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -463,3 +463,33 @@ and instant messaging.  It is fully SIP-based, for all calling, presence
 and IM features.")
     (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
     (license license:gpl2+)))
+
+(define-public msamr
+  (package
+    (name "msamr")
+    (version "1.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/plugins/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO"            ; Not required
+        "-DENABLE_WIDEBAND=YES")))
+    (inputs
+     `(("mediastreamer2" ,mediastreamer)
+       ("opencoreamr" ,opencore-amr)
+       ("ortp" ,ortp)
+       ("voamrwbenc" ,vo-amrwbenc)))
+    (synopsis "Media Streamer AMR Codec")
+    (description "MSAMR is a plugin of MediaStreamer, adding support for
+AMR codec.  It is based on the opencore-amr implementation.")
+    (home-page "https://gitlab.linphone.org/BC/public/msamr")
+    (license license:gpl3+)))
-- 
2.26.0

[bug#40264] Linohone: 15-add-msamr-v2

[Danny Milosavljevic]

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

Hi Raghav,

thanks for the patch!

Pushed to guix master as commit b89201695582351fa5fa183c7a1aa26162ca271e.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 16-add-msopenh264-v2

[Raghav Gururajan]

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



[-- Attachment #2: 16-add-msopenh264-v2.patch --]
[-- Type: application/octet-stream, Size: 2186 bytes --]

From fca6a8fbb84f59135167e2830e227793b97dbf40 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 22:53:05 -0400
Subject: [PATCH 14/14] gnu: Add msopenh264

* gnu/packages/linphone.scm (msopenh264): New variable.
---
 gnu/packages/linphone.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index b4bd95f178..86123035c4 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -493,3 +493,42 @@ and IM features.")
 AMR codec.  It is based on the opencore-amr implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/msamr")
     (license license:gpl3+)))
+
+(define-public msopenh264
+  (package
+    (name "msopenh264")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/plugins/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
+       (patches
+        (list
+         ;; For support for OpenH264 version >= 2.
+         (origin
+           (method url-fetch)
+           (uri
+            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
+                           "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
+           (file-name "msopenh264-openh264.patch")
+           (sha256
+            (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (inputs
+     `(("mediastreamer2" ,mediastreamer)
+       ("openh264" ,openh264)
+       ("ortp" ,ortp)))
+    (synopsis "Media Streamer H.264 Codec")
+    (description "MsOpenH264 is an  H.264 encoder/decoder plugin for
+mediastreamer2 based on the openh264 library.")
+    (home-page "https://gitlab.linphone.org/BC/public/msopenh264")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 16-add-msopenh264-v2

[Danny Milosavljevic]

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

Thanks for the patch!

Pushed to guix master as commit 376fc95e29b24609f3cb7fca024e93a37c0adbfe.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 17-add-mssilk-v2

[Raghav Gururajan]

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



[-- Attachment #2: 17-add-mssilk-v2.patch --]
[-- Type: application/octet-stream, Size: 1707 bytes --]

From 59e121ba5e1160379e3391dad3bf3ab936dc3601 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 22:58:32 -0400
Subject: [PATCH 15/15] gnu: Add mssilk

* gnu/packages/linphone.scm (mssilk): New variable.
---
 gnu/packages/linphone.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 86123035c4..40719839ef 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -532,3 +532,30 @@ AMR codec.  It is based on the opencore-amr implementation.")
 mediastreamer2 based on the openh264 library.")
     (home-page "https://gitlab.linphone.org/BC/public/msopenh264")
     (license license:gpl2+)))
+
+(define-public mssilk
+  (package
+    (name "mssilk")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/plugins/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))         ; Not required
+    (inputs
+     `(("mediastreamer2" ,mediastreamer)
+       ("ortp" ,ortp)))
+    (synopsis "Media Streamer SILK Codec")
+    (description "MSSILK is a plugin of MediaStreamer, adding support for
+AMR codec.  It is based on the Skype's SILK implementation.")
+    (home-page "https://gitlab.linphone.org/BC/public/mssilk")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 17-add-mssilk-v2

[Danny Milosavljevic]

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

Thanks for the patch!

Pushed to guix master as commit f689d3d7d9ba3fa25b4839bdd1e4b98905f4869c.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 18-add-mswebrtc-v2

[Raghav Gururajan]

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



[-- Attachment #2: 18-add-mswebrtc-v2.patch --]
[-- Type: application/octet-stream, Size: 1741 bytes --]

From 8ae89dd5770387616aa12949c90dc50d4f2b5b26 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 1 Apr 2020 23:04:34 -0400
Subject: [PATCH 16/16] gnu: Add mswebrtc

* gnu/packages/linphone.scm (mswebrtc): New variable.
---
 gnu/packages/linphone.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 40719839ef..4f7c94a522 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -559,3 +559,31 @@ mediastreamer2 based on the openh264 library.")
 AMR codec.  It is based on the Skype's SILK implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/mssilk")
     (license license:gpl2+)))
+
+(define-public mswebrtc
+  (package
+    (name "mswebrtc")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/plugins/"
+                       name "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO")))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("mediastreamer2" ,mediastreamer)
+       ("ortp" ,ortp)))
+    (synopsis "Media Streamer WebRTC Codec")
+    (description "MSWebRTC is a plugin of MediaStreamer, adding support for
+WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
+    (home-page "https://gitlab.linphone.org/BC/public/mswebrtc")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 18-add-mswebrtc-v2

[Danny Milosavljevic]

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

Thanks for the patch!

Pushed to guix master as commit fe8f1c0b194de2fa7aa5265a4a0424e82bd11af1.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 14-add-linphoneqt-v3

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v3.patch --]
[-- Type: application/octet-stream, Size: 3155 bytes --]

From 55a515655cf977ca23b1ff13ebd423efb7bb577e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 04:53:22 -0400
Subject: [PATCH 12/20] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm | 48 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 6c161c444c..a87d722ac1 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,9 +24,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
-  ;;#:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
@@ -35,6 +35,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -417,3 +418,48 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)                   ; Required for libstd.h
+       ("qttools" ,qttools)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)))
+    (propagated-inputs
+     `(("qtquickcontrols2" ,qtquickcontrols2)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt-v3

[Raghav Gururajan]

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

Hello Maxim and Danny!

At this point for linphoneqt a.k.a linphone-desktop, I am facing following issues.


When I build *without* `-DENABLE_DBUS=YES`and run the program, I get:

QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread
QMutex: destroying locked mutex


When I build *with* `-DENABLE_DBUS=YES` and run the program, I get:

Segmentation Fault (Core Dumped)


I think the following patch is relevant, but when I use it, doesn't get successfully patched during the build.

https://gitlab.linphone.org/BC/public/linphone-desktop/commit/9cf08623e3092fa19366e5c07fbe06898a59f039.diff


Any ideas on how to fix this situation?

Thank you!

Regards,
RG.

[-- Attachment #2: 14-add-linphoneqt-v3.patch --]
[-- Type: application/octet-stream, Size: 3155 bytes --]

From 55a515655cf977ca23b1ff13ebd423efb7bb577e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 04:53:22 -0400
Subject: [PATCH 12/20] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm | 48 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 6c161c444c..a87d722ac1 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,9 +24,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
-  ;;#:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
@@ -35,6 +35,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -417,3 +418,48 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)                   ; Required for libstd.h
+       ("qttools" ,qttools)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)))
+    (propagated-inputs
+     `(("qtquickcontrols2" ,qtquickcontrols2)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt-v3

[Raghav Gururajan]

Hello Maxim and Danny!

> At this point for linphoneqt a.k.a linphone-desktop, I am facing following issues.
> 
> When I build *without* `-DENABLE_DBUS=YES`and run the program, I get:
> 
> QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread
> QMutex: destroying locked mutex
> 
> When I build *with* `-DENABLE_DBUS=YES` and run the program, I get:
> 
> Segmentation Fault (Core Dumped)
> 
> I think the following patch is relevant, but when I use it, doesn't get successfully patched during
> the build.
> 
> https://gitlab.linphone.org/BC/public/linphone-desktop/commit/9cf08623e3092fa19366e5c07fbe06898a59f0
> 9.diff
> 
> Any ideas on how to fix this situation?

So I fixed "QSocketNotifier" error in version 4 patch (14-add-linphoneqt-v4). I still don't know how to fix "QMutex" error.

Regards,
RG.

[bug#40264] Linphone: 14-add-linphoneqt-v3

[Raghav Gururajan]

Hello Maxim and Danny!

>> At this point for linphoneqt a.k.a linphone-desktop, I am facing following issues.
>> 
>> When I build *without* `-DENABLE_DBUS=YES`and run the program, I get:
>> 
>> QSocketNotifier: Socket notifiers cannot be enabled or disabled from another thread
>> QMutex: destroying locked mutex
>> 
>> When I build *with* `-DENABLE_DBUS=YES` and run the program, I get:
>> 
>> Segmentation Fault (Core Dumped)
>> 
>> I think the following patch is relevant, but when I use it, doesn't get successfully patched during
>> the build.
>> 
>> https://gitlab.linphone.org/BC/public/linphone-desktop/commit/9cf08623e3092fa19366e5c07fbe06898a59f0
>> 9.diff
>> 
>> Any ideas on how to fix this situation?
> 
> So I fixed "QSocketNotifier" error in version 4 patch (14-add-linphoneqt-v4). I still don't know
> how to fix "QMutex" error.

I have now fixed the "Qmutex error" in version 6 patch (14-add-linphoneqt-v6).

Regards,
RG.

[bug#40264] Linphone: 14-add-linphoneqt-v4

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v4.patch --]
[-- Type: application/octet-stream, Size: 3623 bytes --]

From 42fc25b8b978d76abe8534175c404fa44c2430f9 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 16:48:44 -0400
Subject: [PATCH 12/21] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm | 59 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 6c161c444c..345b9f5afe 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,9 +24,9 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
-  ;;#:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
@@ -35,6 +35,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -417,3 +418,59 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))
+       (patches
+        (list
+         ;; For proper signal handling.
+         (origin
+           (method url-fetch)
+           (uri
+            (string-append "https://gitlab.linphone.org/BC/public/linphone-desktop/commit/"
+                           "9cf08623e3092fa19366e5c07fbe06898a59f039.diff"))
+           (file-name "linphone-desktop-sockets.patch")
+           (sha256
+            (base32 "0cnn63n3rs5m0dbi1yzn33zpp38llh5lz286f2nraadnh7kddfm5")))))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)                   ; Required for libstd.h
+       ("qttools" ,qttools)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)))
+    (propagated-inputs
+     `(("qtquickcontrols2" ,qtquickcontrols2)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 13-add-linphone-v3

[Raghav Gururajan]

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



[-- Attachment #2: 13-add-linphone-v3.patch --]
[-- Type: application/octet-stream, Size: 4065 bytes --]

From 63fc284f69fa407506c3796b689a6045c0d37c65 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 19:06:01 -0400
Subject: [PATCH 11/16] gnu: Add liblinphone

* gnu/packages/linphone.scm (liblinphone): New variable.
---
 gnu/packages/linphone.scm | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 71f23794e2..b881a820ae 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,14 +24,19 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gnome-xyz)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -368,3 +373,69 @@ transaction and dialog layers.  It is written in C, with an object-oriented
 API.  It also comprises a simple HTTP/HTTPS client implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/belle-sip")
     (license license:gpl2+)))
+
+(define-public liblinphone
+  (package
+    (name "linphone")
+    (version "3.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR="
+                       (string-append (assoc-ref %build-inputs "gtk2")
+                                      "/lib/gtk-2.0/include"))
+        (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR="
+                       (string-append (assoc-ref %build-inputs "glib")
+                                      "/lib/glib-2.0/include"))
+        "-DENABLE_STATIC=NO"            ; Not required
+        "-DENABLE_GTK_UI=YES")          ; For Legacy UI
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "gtk/main.c"
+               (("#include \"liblinphone_gitversion.h\"")
+                ""))
+             #t)))))
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)
+       ("gettext" ,gettext-minimal)
+       ("iconv" ,libiconv)
+       ("python" ,python)
+       ("xml2" ,libxml2)
+       ("zlib" ,zlib)))
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("bzrtp", bzrtp)
+       ("glib" ,glib)
+       ("gtk2" ,gtk+-2)
+       ("mediastreamer2" ,mediastreamer)
+       ("notify" ,libnotify)
+       ("ortp" ,ortp)
+       ("pystache" ,python-pystache)
+       ("six" ,python-six)
+       ("sqlite" ,sqlite)
+       ("udev" ,eudev)))
+    (propagated-inputs
+     `(("murrine" ,murrine)))           ; Required for GTK UI
+    (synopsis "Belledonne Communications Softphone Library")
+    (description "Liblinphone is a high-level SIP library integrating
+all calling and instant messaging features into an unified
+easy-to-use API.  It is the cross-platform VoIP library on which the
+Linphone application is based on, and that anyone can use to add audio
+and video calls or instant messaging capabilities to an application.")
+    (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 13-add-linphone-v3

[Danny Milosavljevic]

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

Pushed to guix master as commit 02b32cdda68495344d8e5521db5aeaf5add03797.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 14-add-linphoneqt-v5

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v5.patch --]
[-- Type: application/octet-stream, Size: 3490 bytes --]

From d97a0c1318addd128f094db92702de1536ef0309 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 20:19:20 -0400
Subject: [PATCH 17/17] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm | 58 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index b881a820ae..df0859a2e7 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -37,6 +38,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
@@ -439,3 +441,59 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))
+       (patches
+        (list
+         ;; For proper signal handling.
+         (origin
+           (method url-fetch)
+           (uri
+            (string-append "https://gitlab.linphone.org/BC/public/linphone-desktop/commit/"
+                           "9cf08623e3092fa19366e5c07fbe06898a59f039.diff"))
+           (file-name "linphone-desktop-sockets.patch")
+           (sha256
+            (base32 "0cnn63n3rs5m0dbi1yzn33zpp38llh5lz286f2nraadnh7kddfm5")))))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)))                 ; Required for libstd.h
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer)))
+    (propagated-inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
+       ("qttools" ,qttools)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt-v6

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v6.patch --]
[-- Type: application/octet-stream, Size: 9012 bytes --]

From 08461b68154402e9fd26cc5e13b9b7b24c35a812 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 3 Apr 2020 19:42:33 -0400
Subject: [PATCH 17/17] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
* gnu/packages/patches/linphone-desktop-mutex.patch: New patch file.
---
 gnu/packages/linphone.scm                     |  60 +++++++++
 .../patches/linphone-desktop-mutex.patch      | 127 ++++++++++++++++++
 2 files changed, 187 insertions(+)
 create mode 100644 gnu/packages/patches/linphone-desktop-mutex.patch

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index b881a820ae..65ae41d361 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -34,6 +35,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
@@ -439,3 +441,61 @@ Linphone application is based on, and that anyone can use to add audio
 and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
+
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))
+       (patches
+        (list
+         ;; For fixing errors with signal handling.
+         (origin
+           (method url-fetch)
+           (uri
+            (string-append "https://gitlab.linphone.org/BC/public/linphone-desktop/commit/"
+                           "9cf08623e3092fa19366e5c07fbe06898a59f039.diff"))
+           (file-name "linphone-desktop-socket.patch")
+           (sha256
+            (base32 "0cnn63n3rs5m0dbi1yzn33zpp38llh5lz286f2nraadnh7kddfm5")))
+         ;; For fixing errors with crash handling.
+         (search-patch "linphone-desktop-mutex.patch")))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)))                 ; Required for libstd.h
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer)))
+    (propagated-inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
+       ("qttools" ,qttools)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
diff --git a/gnu/packages/patches/linphone-desktop-mutex.patch b/gnu/packages/patches/linphone-desktop-mutex.patch
new file mode 100644
index 0000000000..29aef4b713
--- /dev/null
+++ b/gnu/packages/patches/linphone-desktop-mutex.patch
@@ -0,0 +1,127 @@
+From 03bed40d638d09f36deb9e0ec3ad1fe1d10e139f Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@disroot.org>
+Date: Fri, 3 Apr 2020 17:13:20 -0400
+Subject: [PATCH] test 2
+
+---
+ .../single-application/SingleApplication.cpp  | 63 ++-----------------
+ .../SingleApplicationPrivate.hpp              |  3 -
+ 2 files changed, 5 insertions(+), 61 deletions(-)
+
+diff --git a/src/app/single-application/SingleApplication.cpp b/src/app/single-application/SingleApplication.cpp
+index 29538ae3..1e6ab396 100644
+--- a/src/app/single-application/SingleApplication.cpp
++++ b/src/app/single-application/SingleApplication.cpp
+@@ -35,7 +35,6 @@
+ 
+ #ifdef Q_OS_UNIX
+   #include <signal.h>
+-  #include <unistd.h>
+ #endif // ifdef Q_OS_UNIX
+ 
+ #ifdef Q_OS_WIN
+@@ -135,10 +134,9 @@ void SingleApplicationPrivate::genBlockServerName (int timeout) {
+ 
+ void SingleApplicationPrivate::startPrimary (bool resetMemory) {
+   #ifdef Q_OS_UNIX
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    crashHandler();
++    signal(SIGINT, SingleApplicationPrivate::terminate);
+   #endif // ifdef Q_OS_UNIX
++
+   // Successful creation means that no main process exists
+   // So we start a QLocalServer to listen for connections
+   QLocalServer::removeServer(blockServerName);
+@@ -178,9 +176,7 @@ void SingleApplicationPrivate::startPrimary (bool resetMemory) {
+ 
+ void SingleApplicationPrivate::startSecondary () {
+   #ifdef Q_OS_UNIX
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    crashHandler();
++    signal(SIGINT, SingleApplicationPrivate::terminate);
+   #endif // ifdef Q_OS_UNIX
+ }
+ 
+@@ -222,60 +218,11 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
+ }
+ 
+ #ifdef Q_OS_UNIX
+-  void SingleApplicationPrivate::crashHandler () {
+-    // This guarantees the program will work even with multiple
+-    // instances of SingleApplication in different threads.
+-    // Which in my opinion is idiotic, but lets handle that too.
+-    {
+-      sharedMemMutex.lock();
+-      sharedMem.append(this);
+-      sharedMemMutex.unlock();
+-    }
+-
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    signal(SIGHUP, SingleApplicationPrivate::terminate);        // 1
+-    signal(SIGINT, SingleApplicationPrivate::terminate);        // 2
+-    signal(SIGQUIT, SingleApplicationPrivate::terminate);       // 3
+-    signal(SIGILL, SingleApplicationPrivate::terminate);        // 4
+-    signal(SIGABRT, SingleApplicationPrivate::terminate);       // 6
+-    signal(SIGFPE, SingleApplicationPrivate::terminate);        // 8
+-    signal(SIGBUS, SingleApplicationPrivate::terminate);        // 10
+-    signal(SIGSEGV, SingleApplicationPrivate::terminate);       // 11
+-    signal(SIGSYS, SingleApplicationPrivate::terminate);        // 12
+-    signal(SIGPIPE, SingleApplicationPrivate::terminate);       // 13
+-    signal(SIGALRM, SingleApplicationPrivate::terminate);       // 14
+-    signal(SIGTERM, SingleApplicationPrivate::terminate);       // 15
+-    signal(SIGXCPU, SingleApplicationPrivate::terminate);       // 24
+-    signal(SIGXFSZ, SingleApplicationPrivate::terminate);       // 25
+-  }
+ 
+   void SingleApplicationPrivate::terminate (int signum) {
+-    if (signum == SIGINT) {
+-      SingleApplication::instance()->quit();
+-      return;
+-    }
+-
+-    // Dangerous signals. Exit directly after shared memory destruction.
+-    // Don't touch sockets => avoid dead locks.
+-    for (int crashSig : { SIGABRT, SIGBUS, SIGSEGV })
+-      if (signum == crashSig) {
+-        for (SingleApplicationPrivate *d : sharedMem)
+-          delete d->memory;
+-        goto forceExit;
+-      }
+-
+-    while (!sharedMem.empty()) {
+-      delete sharedMem.back();
+-      sharedMem.pop_back();
+-    }
+-
+-  forceExit:
+-    ::exit(128 + signum);
++    Q_UNUSED(signum);
++    SingleApplication::instance()->quit();
+   }
+-
+-  QList<SingleApplicationPrivate *> SingleApplicationPrivate::sharedMem;
+-  QMutex SingleApplicationPrivate::sharedMemMutex;
+ #endif // ifdef Q_OS_UNIX
+ 
+ /**
+diff --git a/src/app/single-application/SingleApplicationPrivate.hpp b/src/app/single-application/SingleApplicationPrivate.hpp
+index d0dfc10e..db2d8cf5 100644
+--- a/src/app/single-application/SingleApplicationPrivate.hpp
++++ b/src/app/single-application/SingleApplicationPrivate.hpp
+@@ -59,10 +59,7 @@ public:
+   void connectToPrimary (int msecs, char connectionType);
+ 
+   #ifdef Q_OS_UNIX
+-    void crashHandler ();
+     static void terminate (int signum);
+-    static QList<SingleApplicationPrivate *> sharedMem;
+-    static QMutex sharedMemMutex;
+   #endif // ifdef Q_OS_UNIX
+ 
+   QSharedMemory *memory;
+-- 
+2.17.1
+
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt-v6

[Danny Milosavljevic]

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

This package is not reproducible.  Probably something simple amiss.

diffoscope --exclude-directory-metadata /gnu/store/p9186fvq27dawzmij3q2ibllhdd07c6a-linphoneqt-4.1.1 /gnu/store/p9186fvq27dawzmij3q2ibllhdd07c6a-linphoneqt-4.1.1-check
--- /gnu/store/p9186fvq27dawzmij3q2ibllhdd07c6a-linphoneqt-4.1.1
+++ /gnu/store/p9186fvq27dawzmij3q2ibllhdd07c6a-linphoneqt-4.1.1-check
├── bin
│ ├── linphone
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190213,17 +190213,17 @@
│ │ │    0x00801020 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x00801030 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x00801040 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x00801050 00000000 00000000 00000000 00000000 ................
│ │ │    0x00801060 00000000 00020000 00010000 00010000 ................
│ │ │    0x00801070 00000000 00000000 00000002 00000002 ................
│ │ │    0x00801080 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x00801090 00010000 00010000 00000000 01714bf9 .............qK.
│ │ │ -  0x008010a0 65980000 00220001 00000001 0000280f e...."........(.
│ │ │ -  0x008010b0 00000171 4bf96598 00000000 00000000 ...qK.e.........
│ │ │ +  0x00801090 00010000 00010000 00000000 01714bf7 .............qK.
│ │ │ +  0x008010a0 f3330000 00220001 00000001 0000280f .3..."........(.
│ │ │ +  0x008010b0 00000171 4bf7f333 00000000 00000000 ...qK..3........
│ │ │    0x008010c0 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x008010d0 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x008010e0 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x008010f0 00000000 00000000 00000000 00000000 ................
│ │ │    0x00801100 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x00801110 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x00801120 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c
│ ├── linphone-tester
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190443,17 +190443,17 @@
│ │ │    0x0080be80 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x0080be90 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x0080bea0 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x0080beb0 00000000 00000000 00000000 00000000 ................
│ │ │    0x0080bec0 00000000 00020000 00010000 00010000 ................
│ │ │    0x0080bed0 00000000 00000000 00000002 00000002 ................
│ │ │    0x0080bee0 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x0080bef0 00010000 00010000 00000000 01714bf9 .............qK.
│ │ │ -  0x0080bf00 65980000 00220001 00000001 0000280f e...."........(.
│ │ │ -  0x0080bf10 00000171 4bf96598 00000000 00000000 ...qK.e.........
│ │ │ +  0x0080bef0 00010000 00010000 00000000 01714bf7 .............qK.
│ │ │ +  0x0080bf00 f3330000 00220001 00000001 0000280f .3..."........(.
│ │ │ +  0x0080bf10 00000171 4bf7f333 00000000 00000000 ...qK..3........
│ │ │    0x0080bf20 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x0080bf30 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x0080bf40 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x0080bf50 00000000 00000000 00000000 00000000 ................
│ │ │    0x0080bf60 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x0080bf70 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x0080bf80 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 14-add-linphoneqt-v6

[Raghav Gururajan]

Hi Danny!

> This package is not reproducible. Probably something simple amiss.

Nice catch! Let me try to see what causes it.

Btw, is there everything else good with the package?

Regards,
RG.

[bug#40264] Linphone: 14-add-linphoneqt-v6

[Raghav Gururajan]

Hi Danny!

>> This package is not reproducible. Probably something simple amiss.
> 
> Nice catch! Let me try to see what causes it.
> 
> Btw, is there everything else good with the package?

Hmm, I think it is something to with computing QML files.

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Raghav Gururajan]

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



[-- Attachment #2: 11-add-mediastreamer-v3.patch --]
[-- Type: application/octet-stream, Size: 10378 bytes --]

From c9f9ecc04aaff5c48490e3fc88b0b2b4ef79eafb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 5 Apr 2020 03:25:10 -0400
Subject: [PATCH 3/3] gnu: Add mediastreamer2

* gnu/packages/linphone.scm (mediastreamer2): New variable.
---
 gnu/packages/linphone.scm                     |  78 +++++++++
 .../patches/mediastreamer-msfactory.patch     |  31 ++++
 .../patches/mediastreamer-srtp2.patch         | 155 ++++++++++++++++++
 3 files changed, 264 insertions(+)
 create mode 100644 gnu/packages/patches/mediastreamer-msfactory.patch
 create mode 100644 gnu/packages/patches/mediastreamer-srtp2.patch

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 0e32500b07..a3ec664a40 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -19,12 +19,24 @@
 
 (define-module (gnu packages linphone)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages telephony)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -252,3 +264,69 @@ protocol, written in C.  It is fully portable and can be executed on many
 platforms including both ARM and x86.")
     (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
     (license license:gpl2+)))
+
+(define-public mediastreamer2
+  (package
+    (name "mediastreamer")
+    (version "2.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
+       (patches
+        (list
+         ;; For updating definitions.
+         ;; Fixes "-Werror" flag related errors and MS2_GIT_VERSION error.
+         (search-patch "mediastreamer-msfactory.patch")
+         ;; For srtp2 compatibility.
+         ;; Fixes locating srtp2 files.
+         (search-patch "mediastreamer-srtp2.patch")))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:configure-flags
+       (list
+        "-DENABLE_STATIC=NO"            ; Not required
+        "-DENABLE_BV16=NO")))           ; Not available
+    (native-inputs
+     `(("dot" ,graphviz)
+       ("doxygen" ,doxygen)
+       ("python" ,python)))
+    (inputs
+     `(("alsa" ,alsa-lib)
+       ("bcg729" ,bcg729)
+       ("bcmatroska2" ,bcmatroska2)
+       ("bctoolbox" ,bctoolbox)
+       ("ffmpeg" ,ffmpeg)
+       ("glew" ,glew)
+       ("glu" ,glu)
+       ("glx" ,mesa-utils)
+       ("gsm" ,gsm)
+       ("opengl" ,mesa)
+       ("opus" ,opus)
+       ("ortp" ,ortp)
+       ("pcap" ,libpcap)
+       ("portaudio" ,portaudio)
+       ("pulseaudio" ,pulseaudio)
+       ("spandsp" ,spandsp)
+       ("speex" ,speex)
+       ("speexdsp" ,speexdsp)
+       ("srtp" ,libsrtp)
+       ("theora" ,libtheora)
+       ("turbojpeg" ,libjpeg-turbo)
+       ("v4l" ,v4l-utils)
+       ("vpx" ,libvpx)
+       ("x11" ,libx11)
+       ("xv" ,libxv)
+       ("zrtp", bzrtp)))
+    (synopsis "Belledonne Communications Streaming Engine")
+    (description "Mediastreamer is a powerful and lightweight streaming
+engine for telephony applications.  This media processing and streaming toolkit
+is responsible for receiving and sending all multimedia streams in Linphone,
+including media capture, encoding and decoding, and rendering.")
+    (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
+    (license license:gpl2+)))
diff --git a/gnu/packages/patches/mediastreamer-msfactory.patch b/gnu/packages/patches/mediastreamer-msfactory.patch
new file mode 100644
index 0000000000..debc74e01c
--- /dev/null
+++ b/gnu/packages/patches/mediastreamer-msfactory.patch
@@ -0,0 +1,31 @@
+From de3a24b795d7a78e78eab6b974e7ec5abf2259ac Mon Sep 17 00:00:00 2001
+From: Simon Morlat <simon.morlat@linphone.org>
+Date: Mon, 14 Aug 2017 11:18:16 +0200
+Subject: [PATCH] allow MS2_GIT_VERSION to be undefined, as it will be the case
+ when building rpms.
+
+---
+ src/base/msfactory.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/base/msfactory.c b/src/base/msfactory.c
+index 6562d86c..f61c68a8 100644
+--- a/src/base/msfactory.c
++++ b/src/base/msfactory.c
+@@ -24,9 +24,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #   ifndef MEDIASTREAMER_VERSION
+ #   define MEDIASTREAMER_VERSION "unknown"
+ #   endif
+-#	ifndef MS2_GIT_VERSION
+-#	define MS2_GIT_VERSION "unknown"
+-#	endif
++#endif
++
++#ifndef MS2_GIT_VERSION
++#define MS2_GIT_VERSION "unknown"
+ #endif
+ 
+ #include "mediastreamer2/msfilter.h"
+-- 
+2.21.0
+
diff --git a/gnu/packages/patches/mediastreamer-srtp2.patch b/gnu/packages/patches/mediastreamer-srtp2.patch
new file mode 100644
index 0000000000..f6d494facb
--- /dev/null
+++ b/gnu/packages/patches/mediastreamer-srtp2.patch
@@ -0,0 +1,155 @@
+From 97903498364ae2596e790cb2c2ce9ac76c04d64a Mon Sep 17 00:00:00 2001
+From: Danmei Chen <danmei.chen@belledonne-communications.com>
+Date: Fri, 19 Jan 2018 10:04:07 +0100
+Subject: [PATCH] add compability with srtp2
+
+---
+ cmake/FindSRTP.cmake    | 24 ++++++++++++++++++++----
+ src/CMakeLists.txt      |  1 +
+ src/crypto/ms_srtp.c    | 10 ++--------
+ src/utils/srtp_prefix.h | 41 +++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 64 insertions(+), 12 deletions(-)
+ create mode 100644 src/utils/srtp_prefix.h
+
+diff --git a/cmake/FindSRTP.cmake b/cmake/FindSRTP.cmake
+index 988b846a..f720ce7e 100644
+--- a/cmake/FindSRTP.cmake
++++ b/cmake/FindSRTP.cmake
+@@ -31,20 +31,36 @@ set(_SRTP_ROOT_PATHS
+ )
+ 
+ find_path(SRTP_INCLUDE_DIRS
+-	NAMES srtp/srtp.h
++	NAMES srtp2/srtp.h
+ 	HINTS _SRTP_ROOT_PATHS
+ 	PATH_SUFFIXES include
+ )
+ 
+ if(SRTP_INCLUDE_DIRS)
+ 	set(HAVE_SRTP_SRTP_H 1)
+-endif()
+-
+-find_library(SRTP_LIBRARIES
++	set(SRTP_VERSION 2)
++	find_library(SRTP_LIBRARIES
++		NAMES srtp2
++		HINTS ${_SRTP_ROOT_PATHS}
++		PATH_SUFFIXES bin lib
++	)
++else()
++	find_path(SRTP_INCLUDE_DIRS
++		NAMES srtp/srtp.h
++		HINTS _SRTP_ROOT_PATHS
++		PATH_SUFFIXES include
++	)
++	if(SRTP_INCLUDE_DIRS)
++		set(HAVE_SRTP_SRTP_H 1)
++		set(SRTP_VERSION 1)
++	endif()
++	find_library(SRTP_LIBRARIES
+ 	NAMES srtp
+ 	HINTS ${_SRTP_ROOT_PATHS}
+ 	PATH_SUFFIXES bin lib
+ )
++endif()
++
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(SRTP
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index da429764..c46faa62 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -183,6 +183,7 @@ set(VOIP_SOURCE_FILES_C
+ 	utils/pcap_sender.c
+ 	utils/pcap_sender.h
+ 	utils/stream_regulator.c
++	utils/srtp_prefix.h
+ 	voip/audioconference.c
+ 	voip/audiostream.c
+ 	voip/bandwidthcontroller.c
+diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c
+index 5a510c99..67810316 100644
+--- a/src/crypto/ms_srtp.c
++++ b/src/crypto/ms_srtp.c
+@@ -25,6 +25,7 @@
+ #include "mediastreamer2/ms_srtp.h"
+ #include "mediastreamer2/mediastream.h"
+ 
++
+ #ifdef HAVE_SRTP
+ 
+ /*srtp defines all this stuff*/
+@@ -34,13 +35,7 @@
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ 
+-#if defined(MS2_WINDOWS_PHONE)
+-// Windows phone doesn't use make install
+-#include <srtp.h>
+-#else
+-#include <srtp/srtp.h>
+-#endif
+-
++#include "srtp_prefix.h"
+ 
+ #include "ortp/b64.h"
+ 
+@@ -352,7 +347,6 @@ int ms_srtp_init(void)
+ 			srtp_init_done++;
+ 		}else{
+ 			ms_fatal("Couldn't initialize SRTP library: %d.", st);
+-			err_reporting_init("mediastreamer2");
+ 		}
+ 	}else srtp_init_done++;
+ 	return (int)st;
+diff --git a/src/utils/srtp_prefix.h b/src/utils/srtp_prefix.h
+new file mode 100644
+index 00000000..68bde496
+--- /dev/null
++++ b/src/utils/srtp_prefix.h
+@@ -0,0 +1,41 @@
++/*
++  mediastreamer2 library - modular sound and video processing and streaming
++  Copyright (C) 2006-2014 Belledonne Communications, Grenoble
++
++  This library is free software; you can redistribute it and/or
++  modify it under the terms of the GNU Lesser General Public
++  License as published by the Free Software Foundation; either
++  version 2.1 of the License, or (at your option) any later version.
++
++  This library 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
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public
++  License along with this library; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++*/
++#ifndef __SRTP2_H__
++#define __SRTP2_H__
++
++#if defined(MS2_WINDOWS_PHONE)
++// Windows phone doesn't use make install
++#include <srtp.h>
++#elif SRTP_VERSION==1
++#include <srtp/srtp.h>
++#else
++#include <srtp2/srtp.h>
++#define err_status_t srtp_err_status_t
++#define err_status_ok srtp_err_status_ok
++#define crypto_policy_t srtp_crypto_policy_t
++#define crypto_policy_set_aes_cm_256_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80
++#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32
++#define crypto_policy_set_aes_cm_128_null_auth srtp_crypto_policy_set_aes_cm_128_null_auth
++#define crypto_policy_set_null_cipher_hmac_sha1_80 srtp_crypto_policy_set_null_cipher_hmac_sha1_80
++#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80
++#define crypto_policy_set_aes_cm_256_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_32
++#define ssrc_t srtp_ssrc_t
++#endif
++
++#endif
+-- 
+2.21.0
+
-- 
2.26.0

[bug#40264] Linphone: 11-add-mediastreamer-v3

[maxim.cournoyer]

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> From c9f9ecc04aaff5c48490e3fc88b0b2b4ef79eafb Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sun, 5 Apr 2020 03:25:10 -0400
> Subject: [PATCH 3/3] gnu: Add mediastreamer2
>
> * gnu/packages/linphone.scm (mediastreamer2): New variable.
> ---
>  gnu/packages/linphone.scm                     |  78 +++++++++
>  .../patches/mediastreamer-msfactory.patch     |  31 ++++
>  .../patches/mediastreamer-srtp2.patch         | 155 ++++++++++++++++++
>  3 files changed, 264 insertions(+)
>  create mode 100644 gnu/packages/patches/mediastreamer-msfactory.patch
>  create mode 100644 gnu/packages/patches/mediastreamer-srtp2.patch

Is the mediastreamer-srtp2 patch really required?  I could build the
package successfully (with libsrtp) without it.  Please rename the
patches mediastream2 to reflect the updated package name (the '2'
suffix).

Also, patches must be registered in gnu/local.mk (in the dist_patch_DATA
variable), otherwise they won't be included in the sources of Guix.

> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 0e32500b07..a3ec664a40 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -19,12 +19,24 @@
>  
>  (define-module (gnu packages linphone)
>    #:use-module (gnu packages)
> +  #:use-module (gnu packages admin)
> +  #:use-module (gnu packages audio)
>    #:use-module (gnu packages base)
>    #:use-module (gnu packages documentation)
> +  #:use-module (gnu packages gl)
> +  #:use-module (gnu packages gnome)
>    #:use-module (gnu packages graphviz)
> +  #:use-module (gnu packages image)
> +  #:use-module (gnu packages linux)
> +  #:use-module (gnu packages pulseaudio)
> +  #:use-module (gnu packages python)
>    #:use-module (gnu packages sqlite)
> +  #:use-module (gnu packages telephony)
>    #:use-module (gnu packages tls)
> +  #:use-module (gnu packages video)
> +  #:use-module (gnu packages xiph)
>    #:use-module (gnu packages xml)
> +  #:use-module (gnu packages xorg)
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
>    #:use-module (guix download)
> @@ -252,3 +264,69 @@ protocol, written in C.  It is fully portable and can be executed on many
>  platforms including both ARM and x86.")
>      (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
>      (license license:gpl2+)))
> +
> +(define-public mediastreamer2
> +  (package
> +    (name "mediastreamer")
> +    (version "2.16.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri
> +        (string-append "https://www.linphone.org/releases/sources/" name
> +                       "/" name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
> +       (patches
> +        (list
> +         ;; For updating definitions.
> +         ;; Fixes "-Werror" flag related errors and MS2_GIT_VERSION error.
> +         (search-patch "mediastreamer-msfactory.patch")
> +         ;; For srtp2 compatibility.
> +         ;; Fixes locating srtp2 files.
> +         (search-patch "mediastreamer-srtp2.patch")))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f                      ; No test target
> +       #:configure-flags
> +       (list
> +        "-DENABLE_STATIC=NO"            ; Not required
> +        "-DENABLE_BV16=NO")))           ; Not available

Could you investigate the ENABLE_UNIT_TESTS=yes option?

> +    (native-inputs
> +     `(("dot" ,graphviz)
> +       ("doxygen" ,doxygen)
> +       ("python" ,python)))
> +    (inputs
> +     `(("alsa" ,alsa-lib)
> +       ("bcg729" ,bcg729)
> +       ("bcmatroska2" ,bcmatroska2)
> +       ("bctoolbox" ,bctoolbox)
> +       ("ffmpeg" ,ffmpeg)
> +       ("glew" ,glew)
> +       ("glu" ,glu)
> +       ("glx" ,mesa-utils)
> +       ("gsm" ,gsm)
> +       ("opengl" ,mesa)
> +       ("opus" ,opus)
> +       ("ortp" ,ortp)
> +       ("pcap" ,libpcap)
> +       ("portaudio" ,portaudio)
> +       ("pulseaudio" ,pulseaudio)
> +       ("spandsp" ,spandsp)
> +       ("speex" ,speex)
> +       ("speexdsp" ,speexdsp)
> +       ("srtp" ,libsrtp)
> +       ("theora" ,libtheora)
> +       ("turbojpeg" ,libjpeg-turbo)
> +       ("v4l" ,v4l-utils)
> +       ("vpx" ,libvpx)
> +       ("x11" ,libx11)
> +       ("xv" ,libxv)
> +       ("zrtp", bzrtp)))
> +    (synopsis "Belledonne Communications Streaming Engine")
> +    (description "Mediastreamer is a powerful and lightweight streaming

I still see strange characters here:   ^               ^

Otherwise, LGTM.

Maxim

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Danny Milosavljevic]

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

Does 

  ENABLE_STRICT=NO

instead of mediastreamer-msfactory.patch work or not?


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Danny Milosavljevic]

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

Hi,

On Sun, 5 Apr 2020 20:29:40 +0200
Danny Milosavljevic <dannym@scratchpost.org> wrote:

> Does 
> 
>   ENABLE_STRICT=NO
> 
> instead of mediastreamer-msfactory.patch work or not?

Yes.

So added mediastreamer2 without any patches to guix master as
commit b6b3a6a6c4f00815da576912907c7bdbf02ca11a.

If the patches are required after all (for example the srtp2 one--is it
correct that this one updates the dependency from srtp1 to srtp2?), we
can still add them.

I've also renamed the package to mediastreamer2 like upstream does
(I don't like the name so much--but upstream chose it, so be it).

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Raghav Gururajan]

Hi Danny!

> So added mediastreamer2 without any patches to guix master as
> commit b6b3a6a6c4f00815da576912907c7bdbf02ca11a.

Thanks for the push.

> If the patches are required after all (for example the srtp2 one--is it
> correct that this one updates the dependency from srtp1 to srtp2?), we
> can still add them.

Oh no, that patch is required. MS won't build with srtp enabled, without it. You can see "MediaStreamer will be built without SRTP support". That patch fixes search and locate of srtp2 version of include and lib files.

> I've also renamed the package to mediastreamer2 like upstream does
> (I don't like the name so much--but upstream chose it, so be it).

Shall we please keep the name "mediastreamer" for package and "mediastreamer2" for variable? The release tarballs have not been renamed. We'll change the package name when it is changed in releases by upstream. This will consistent with other packages in linphone.scm.

Regards,
RG.

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Danny Milosavljevic]

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

Hi Raghav,

On Sun, 05 Apr 2020 22:52:25 +0000
"Raghav Gururajan" <raghavgururajan@disroot.org> wrote:

> Oh no, that patch is required. MS won't build with srtp enabled, without it.

Okay--added in commit 2c56aeaea94d3914acf79f9bbabeef1b3ec8aa07.

> Shall we please keep the name "mediastreamer" for package and "mediastreamer2" for variable? The release tarballs have not been renamed. We'll change the package name when it is changed in releases by upstream. This will consistent with other packages in linphone.scm.

I'll see what the others say--but I'm not opposed to use the other name.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 11-add-mediastreamer-v3

[Raghav Gururajan]

Hi Danny!

>> Oh no, that patch is required. MS won't build with srtp enabled, without it.
> 
> Okay--added in commit 2c56aeaea94d3914acf79f9bbabeef1b3ec8aa07.

Thanks so much :-)

>> Shall we please keep the name "mediastreamer" for package and "mediastreamer2" for variable? The
>> release tarballs have not been renamed. We'll change the package name when it is changed in
>> releases by upstream. This will consistent with other packages in linphone.scm.
> 
> I'll see what the others say--but I'm not opposed to use the other name.

Cool!

Regards,
RG.

[bug#40264] Linphone: 11-add-mediastreamer-v3

[maxim.cournoyer]

Hello,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> Hi Danny!
>
>>> Oh no, that patch is required. MS won't build with srtp enabled, without it.
>>
>> Okay--added in commit 2c56aeaea94d3914acf79f9bbabeef1b3ec8aa07.
>
> Thanks so much :-)
>
>>> Shall we please keep the name "mediastreamer" for package and "mediastreamer2" for variable? The
>>> release tarballs have not been renamed. We'll change the package name when it is changed in
>>> releases by upstream. This will consistent with other packages in linphone.scm.
>>
>> I'll see what the others say--but I'm not opposed to use the other name.

mediastreamer2 is better.  Otherwise we get a confused mix of
mediastreamer-2.16.1 / mediastreamer2-2.16.1 under share/, for example.
The name really is mediastreamer2 in the code/doc, everywhere except in
for the tarball file name.

I'll push some refinements I made today in a moment, mostly adding the
tester binary and data to a 'tester' output (it comes with about 20 MiB
of data files).

Great work!

Maxim

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Raghav Gururajan]

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



[-- Attachment #2: 14-add-linphoneqt-v7.patch --]
[-- Type: application/octet-stream, Size: 10246 bytes --]

From 57d4613ad8888ca70765ee2e439782b00a864673 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Mon, 6 Apr 2020 00:02:20 -0400
Subject: [PATCH] gnu: Add linphone-desktop

* gnu/packages/linphone.scm (linphone-desktop): New variable.
---
 gnu/packages/linphone.scm                    |  53 ++++++++
 gnu/packages/patches/linphoneqt-mutex.patch  | 127 +++++++++++++++++++
 gnu/packages/patches/linphoneqt-socket.patch |  39 ++++++
 3 files changed, 219 insertions(+)
 create mode 100644 gnu/packages/patches/linphoneqt-mutex.patch
 create mode 100644 gnu/packages/patches/linphoneqt-socket.patch

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index ab223700d5..5b1a3778d6 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -36,6 +37,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages java)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
@@ -441,6 +443,57 @@ and video calls or instant messaging capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
 
+(define-public linphone-desktop
+  (package
+    (name "linphoneqt")
+    (version "4.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.linphone.org/releases/sources/" name
+                       "/" name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a"))
+       (patches
+        (list
+         ;; For fixing run-time errors with signal handling.
+         (search-patch "linphoneqt-socket.patch")
+         ;; For fixing run-time errors with crash handling.
+         (search-patch "linphoneqt-mutex.patch")))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; No test target
+       #:phases
+       ;; For replacing undeclared variable.
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/app/AppController.cpp"
+               (("LINPHONE_QT_GIT_VERSION")
+                "\"4.1.1\""))
+             #t)))))
+    (native-inputs
+     `(("gcc" ,gcc-5)))                 ; Required for libstd.h
+    (inputs
+     `(("bctoolbox" ,bctoolbox)
+       ("belcard" ,belcard)
+       ("bellesip" ,belle-sip)
+       ("linphone" ,liblinphone)
+       ("mediastreamer2" ,mediastreamer2)))
+    (propagated-inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtsvg" ,qtsvg)
+       ("qttools" ,qttools)))
+    (synopsis "Belledonne Communications Softphone Application")
+    (description "Linphone is a softphone for voice and video over IP calling
+and instant messaging.  It is fully SIP-based, for all calling, presence
+and IM features.")
+    (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop")
+    (license license:gpl2+)))
+
 (define-public msopenh264
   (package
     (name "msopenh264")
diff --git a/gnu/packages/patches/linphoneqt-mutex.patch b/gnu/packages/patches/linphoneqt-mutex.patch
new file mode 100644
index 0000000000..29aef4b713
--- /dev/null
+++ b/gnu/packages/patches/linphoneqt-mutex.patch
@@ -0,0 +1,127 @@
+From 03bed40d638d09f36deb9e0ec3ad1fe1d10e139f Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@disroot.org>
+Date: Fri, 3 Apr 2020 17:13:20 -0400
+Subject: [PATCH] test 2
+
+---
+ .../single-application/SingleApplication.cpp  | 63 ++-----------------
+ .../SingleApplicationPrivate.hpp              |  3 -
+ 2 files changed, 5 insertions(+), 61 deletions(-)
+
+diff --git a/src/app/single-application/SingleApplication.cpp b/src/app/single-application/SingleApplication.cpp
+index 29538ae3..1e6ab396 100644
+--- a/src/app/single-application/SingleApplication.cpp
++++ b/src/app/single-application/SingleApplication.cpp
+@@ -35,7 +35,6 @@
+ 
+ #ifdef Q_OS_UNIX
+   #include <signal.h>
+-  #include <unistd.h>
+ #endif // ifdef Q_OS_UNIX
+ 
+ #ifdef Q_OS_WIN
+@@ -135,10 +134,9 @@ void SingleApplicationPrivate::genBlockServerName (int timeout) {
+ 
+ void SingleApplicationPrivate::startPrimary (bool resetMemory) {
+   #ifdef Q_OS_UNIX
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    crashHandler();
++    signal(SIGINT, SingleApplicationPrivate::terminate);
+   #endif // ifdef Q_OS_UNIX
++
+   // Successful creation means that no main process exists
+   // So we start a QLocalServer to listen for connections
+   QLocalServer::removeServer(blockServerName);
+@@ -178,9 +176,7 @@ void SingleApplicationPrivate::startPrimary (bool resetMemory) {
+ 
+ void SingleApplicationPrivate::startSecondary () {
+   #ifdef Q_OS_UNIX
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    crashHandler();
++    signal(SIGINT, SingleApplicationPrivate::terminate);
+   #endif // ifdef Q_OS_UNIX
+ }
+ 
+@@ -222,60 +218,11 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
+ }
+ 
+ #ifdef Q_OS_UNIX
+-  void SingleApplicationPrivate::crashHandler () {
+-    // This guarantees the program will work even with multiple
+-    // instances of SingleApplication in different threads.
+-    // Which in my opinion is idiotic, but lets handle that too.
+-    {
+-      sharedMemMutex.lock();
+-      sharedMem.append(this);
+-      sharedMemMutex.unlock();
+-    }
+-
+-    // Handle any further termination signals to ensure the
+-    // QSharedMemory block is deleted even if the process crashes
+-    signal(SIGHUP, SingleApplicationPrivate::terminate);        // 1
+-    signal(SIGINT, SingleApplicationPrivate::terminate);        // 2
+-    signal(SIGQUIT, SingleApplicationPrivate::terminate);       // 3
+-    signal(SIGILL, SingleApplicationPrivate::terminate);        // 4
+-    signal(SIGABRT, SingleApplicationPrivate::terminate);       // 6
+-    signal(SIGFPE, SingleApplicationPrivate::terminate);        // 8
+-    signal(SIGBUS, SingleApplicationPrivate::terminate);        // 10
+-    signal(SIGSEGV, SingleApplicationPrivate::terminate);       // 11
+-    signal(SIGSYS, SingleApplicationPrivate::terminate);        // 12
+-    signal(SIGPIPE, SingleApplicationPrivate::terminate);       // 13
+-    signal(SIGALRM, SingleApplicationPrivate::terminate);       // 14
+-    signal(SIGTERM, SingleApplicationPrivate::terminate);       // 15
+-    signal(SIGXCPU, SingleApplicationPrivate::terminate);       // 24
+-    signal(SIGXFSZ, SingleApplicationPrivate::terminate);       // 25
+-  }
+ 
+   void SingleApplicationPrivate::terminate (int signum) {
+-    if (signum == SIGINT) {
+-      SingleApplication::instance()->quit();
+-      return;
+-    }
+-
+-    // Dangerous signals. Exit directly after shared memory destruction.
+-    // Don't touch sockets => avoid dead locks.
+-    for (int crashSig : { SIGABRT, SIGBUS, SIGSEGV })
+-      if (signum == crashSig) {
+-        for (SingleApplicationPrivate *d : sharedMem)
+-          delete d->memory;
+-        goto forceExit;
+-      }
+-
+-    while (!sharedMem.empty()) {
+-      delete sharedMem.back();
+-      sharedMem.pop_back();
+-    }
+-
+-  forceExit:
+-    ::exit(128 + signum);
++    Q_UNUSED(signum);
++    SingleApplication::instance()->quit();
+   }
+-
+-  QList<SingleApplicationPrivate *> SingleApplicationPrivate::sharedMem;
+-  QMutex SingleApplicationPrivate::sharedMemMutex;
+ #endif // ifdef Q_OS_UNIX
+ 
+ /**
+diff --git a/src/app/single-application/SingleApplicationPrivate.hpp b/src/app/single-application/SingleApplicationPrivate.hpp
+index d0dfc10e..db2d8cf5 100644
+--- a/src/app/single-application/SingleApplicationPrivate.hpp
++++ b/src/app/single-application/SingleApplicationPrivate.hpp
+@@ -59,10 +59,7 @@ public:
+   void connectToPrimary (int msecs, char connectionType);
+ 
+   #ifdef Q_OS_UNIX
+-    void crashHandler ();
+     static void terminate (int signum);
+-    static QList<SingleApplicationPrivate *> sharedMem;
+-    static QMutex sharedMemMutex;
+   #endif // ifdef Q_OS_UNIX
+ 
+   QSharedMemory *memory;
+-- 
+2.17.1
+
diff --git a/gnu/packages/patches/linphoneqt-socket.patch b/gnu/packages/patches/linphoneqt-socket.patch
new file mode 100644
index 0000000000..ca9b5a04d2
--- /dev/null
+++ b/gnu/packages/patches/linphoneqt-socket.patch
@@ -0,0 +1,39 @@
+From 9cf08623e3092fa19366e5c07fbe06898a59f039 Mon Sep 17 00:00:00 2001
+From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
+Date: Fri, 26 Jan 2018 11:45:53 +0100
+Subject: [PATCH] feat(SingleApplication): don't touch sockets when SIGABRT,
+ SIGBUS or SIGSEGV is handled
+
+---
+ src/app/single-application/SingleApplication.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/app/single-application/SingleApplication.cpp b/src/app/single-application/SingleApplication.cpp
+index d64903ba..b42285b5 100644
+--- a/src/app/single-application/SingleApplication.cpp
++++ b/src/app/single-application/SingleApplication.cpp
+@@ -256,11 +256,21 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
+       return;
+     }
+ 
++    // Dangerous signals. Exit directly after shared memory destruction.
++    // Don't touch sockets => avoid dead locks.
++    for (int crashSig : { SIGABRT, SIGBUS, SIGSEGV })
++      if (signum == crashSig) {
++        for (SingleApplicationPrivate *d : sharedMem)
++          delete d->memory;
++        goto forceExit;
++      }
++
+     while (!sharedMem.empty()) {
+       delete sharedMem.back();
+       sharedMem.pop_back();
+     }
+ 
++  forceExit:
+     ::exit(128 + signum);
+   }
+ 
+-- 
+2.21.0
+
-- 
2.26.0

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Danny Milosavljevic]

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

Hi Raghav,

if we add gcc 5 here, do we need to do something similar to
https://lists.gnu.org/archive/html/guix-commits/2020-04/msg00774.html too or
not?

Why is only gcc 5 working and not gcc 7?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Danny Milosavljevic]

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

Hi Raghav,

pushed to guix core-updates (with changes below) because, there, it works
without weird special gcc versions.

Commit is c0cce2055757c18619ef1826c54ed3d5b9ec7eb0.

Moved all propagated-inputs to regular inputs--except qttools which I moved to
native-inputs.

Added qtgraphicaleffects to inputs.

Switched to qt build system so the programs actually start up successfully.

There is still the same reproducibility problems in bin/linphone and
bin/linphone-tester:

--- /gnu/store/7g8kdcwzvybx7a8w87pnbypy7x0rf9wg-linphoneqt-4.1.1
+++ /gnu/store/7g8kdcwzvybx7a8w87pnbypy7x0rf9wg-linphoneqt-4.1.1-check
├── bin
│ ├── linphone
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190223,17 +190223,17 @@
│ │ │    0x008080c0 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x008080d0 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x008080e0 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x008080f0 00000000 00000000 00000000 00000000 ................
│ │ │    0x00808100 00000000 00020000 00010000 00010000 ................
│ │ │    0x00808110 00000000 00000000 00000002 00000002 ................
│ │ │    0x00808120 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x00808130 00010000 00010000 00000000 0171666d .............qfm
│ │ │ -  0x00808140 dfb80000 00220001 00000001 0000280f ....."........(.
│ │ │ -  0x00808150 00000171 666ddfb8 00000000 00000000 ...qfm..........
│ │ │ +  0x00808130 00010000 00010000 00000000 0171666c .............qfl
│ │ │ +  0x00808140 71bb0000 00220001 00000001 0000280f q...."........(.
│ │ │ +  0x00808150 00000171 666c71bb 00000000 00000000 ...qflq.........
│ │ │    0x00808160 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x00808170 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x00808180 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x00808190 00000000 00000000 00000000 00000000 ................
│ │ │    0x008081a0 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x008081b0 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x008081c0 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c
│ ├── linphone-tester
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190455,17 +190455,17 @@
│ │ │    0x00811f40 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x00811f50 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x00811f60 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x00811f70 00000000 00000000 00000000 00000000 ................
│ │ │    0x00811f80 00000000 00020000 00010000 00010000 ................
│ │ │    0x00811f90 00000000 00000000 00000002 00000002 ................
│ │ │    0x00811fa0 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x00811fb0 00010000 00010000 00000000 0171666d .............qfm
│ │ │ -  0x00811fc0 dfb80000 00220001 00000001 0000280f ....."........(.
│ │ │ -  0x00811fd0 00000171 666ddfb8 00000000 00000000 ...qfm..........
│ │ │ +  0x00811fb0 00010000 00010000 00000000 0171666c .............qfl
│ │ │ +  0x00811fc0 71bb0000 00220001 00000001 0000280f q...."........(.
│ │ │ +  0x00811fd0 00000171 666c71bb 00000000 00000000 ...qflq.........
│ │ │ +  0x00811fb0 00010000 00010000 00000000 0171666c .............qfl
│ │ │ +  0x00811fc0 71bb0000 00220001 00000001 0000280f q...."........(.
│ │ │ +  0x00811fd0 00000171 666c71bb 00000000 00000000 ...qflq.........
│ │ │    0x00811fe0 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x00811ff0 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x00812000 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x00812010 00000000 00000000 00000000 00000000 ................
│ │ │    0x00812020 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x00812030 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x00812040 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Maxim Cournoyer]

Hello Danny,

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Raghav,
>
> pushed to guix core-updates (with changes below) because, there, it works
> without weird special gcc versions.
>
> Commit is c0cce2055757c18619ef1826c54ed3d5b9ec7eb0.
>
> Moved all propagated-inputs to regular inputs--except qttools which I moved to
> native-inputs.
>
> Added qtgraphicaleffects to inputs.
>
> Switched to qt build system so the programs actually start up successfully.
>
> There is still the same reproducibility problems in bin/linphone and
> bin/linphone-tester:
>
> --- /gnu/store/7g8kdcwzvybx7a8w87pnbypy7x0rf9wg-linphoneqt-4.1.1
> +++ /gnu/store/7g8kdcwzvybx7a8w87pnbypy7x0rf9wg-linphoneqt-4.1.1-check
> ├── bin
> │ ├── linphone
> │ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
> │ │ │ @@ -190223,17 +190223,17 @@
> │ │ │    0x008080c0 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
> │ │ │    0x008080d0 3e000100 02010c05 56000200 0c000300 >.......V.......
> │ │ │    0x008080e0 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
> │ │ │    0x008080f0 00000000 00000000 00000000 00000000 ................
> │ │ │    0x00808100 00000000 00020000 00010000 00010000 ................
> │ │ │    0x00808110 00000000 00000000 00000002 00000002 ................
> │ │ │    0x00808120 00000002 00000000 00000000 00000018 ................
> │ │ │ -  0x00808130 00010000 00010000 00000000 0171666d .............qfm
> │ │ │ -  0x00808140 dfb80000 00220001 00000001 0000280f ....."........(.
> │ │ │ -  0x00808150 00000171 666ddfb8 00000000 00000000 ...qfm..........
> │ │ │ +  0x00808130 00010000 00010000 00000000 0171666c .............qfl
> │ │ │ +  0x00808140 71bb0000 00220001 00000001 0000280f q...."........(.
> │ │ │ +  0x00808150 00000171 666c71bb 00000000 00000000 ...qflq.........
> │ │ │    0x00808160 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
> │ │ │    0x00808170 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
> │ │ │    0x00808180 006e0002 000006d2 00660072 00000000 .n.......f.r....
> │ │ │    0x00808190 00000000 00000000 00000000 00000000 ................
> │ │ │    0x008081a0 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
> │ │ │    0x008081b0 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
> │ │ │    0x008081c0 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c
> │ ├── linphone-tester
> │ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
> │ │ │ @@ -190455,17 +190455,17 @@
> │ │ │    0x00811f40 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
> │ │ │    0x00811f50 3e000100 02010c05 56000200 0c000300 >.......V.......
> │ │ │    0x00811f60 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
> │ │ │    0x00811f70 00000000 00000000 00000000 00000000 ................
> │ │ │    0x00811f80 00000000 00020000 00010000 00010000 ................
> │ │ │    0x00811f90 00000000 00000000 00000002 00000002 ................
> │ │ │    0x00811fa0 00000002 00000000 00000000 00000018 ................
> │ │ │ -  0x00811fb0 00010000 00010000 00000000 0171666d .............qfm
> │ │ │ -  0x00811fc0 dfb80000 00220001 00000001 0000280f ....."........(.
> │ │ │ -  0x00811fd0 00000171 666ddfb8 00000000 00000000 ...qfm..........
> │ │ │ +  0x00811fb0 00010000 00010000 00000000 0171666c .............qfl
> │ │ │ +  0x00811fc0 71bb0000 00220001 00000001 0000280f q...."........(.
> │ │ │ +  0x00811fd0 00000171 666c71bb 00000000 00000000 ...qflq.........
> │ │ │ +  0x00811fb0 00010000 00010000 00000000 0171666c .............qfl
> │ │ │ +  0x00811fc0 71bb0000 00220001 00000001 0000280f q...."........(.
> │ │ │ +  0x00811fd0 00000171 666c71bb 00000000 00000000 ...qflq.........
> │ │ │    0x00811fe0 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
> │ │ │    0x00811ff0 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
> │ │ │    0x00812000 006e0002 000006d2 00660072 00000000 .n.......f.r....
> │ │ │    0x00812010 00000000 00000000 00000000 00000000 ................
> │ │ │    0x00812020 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
> │ │ │    0x00812030 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
> │ │ │    0x00812040 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c

In my case I'm seeing slightly different outputs:

diffoscope --exclude-command stat /gnu/store/i3pqi987rdm3x023ya4zd2k3jxhaiqqy-linphoneqt-4.1.1{,-check}
--- /gnu/store/i3pqi987rdm3x023ya4zd2k3jxhaiqqy-linphoneqt-4.1.1
+++ /gnu/store/i3pqi987rdm3x023ya4zd2k3jxhaiqqy-linphoneqt-4.1.1-check
├── bin
│ ├── .linphone-real
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190223,17 +190223,17 @@
│ │ │    0x008080c0 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x008080d0 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x008080e0 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x008080f0 00000000 00000000 00000000 00000000 ................
│ │ │    0x00808100 00000000 00020000 00010000 00010000 ................
│ │ │    0x00808110 00000000 00000000 00000002 00000002 ................
│ │ │    0x00808120 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x00808130 00010000 00010000 00000000 01717ba8 .............q{.
│ │ │ -  0x00808140 1fbe0000 00220001 00000001 0000280f ....."........(.
│ │ │ -  0x00808150 00000171 7ba81fba 00000000 00000000 ...q{...........
│ │ │ +  0x00808130 00010000 00010000 00000000 01717ba6 .............q{.
│ │ │ +  0x00808140 59760000 00220001 00000001 0000280f Yv..."........(.
│ │ │ +  0x00808150 00000171 7ba65972 00000000 00000000 ...q{.Yr........
│ │ │    0x00808160 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x00808170 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x00808180 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x00808190 00000000 00000000 00000000 00000000 ................
│ │ │    0x008081a0 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x008081b0 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x008081c0 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c
│ ├── .linphone-tester-real
│ │ ├── /gnu/store/mx2bgrpxkbdjsmhlxp9a30hbzcilk4cn-binutils-2.32/bin/readelf --wide --decompress --hex-dump=.rodata {}
│ │ │ @@ -190455,17 +190455,17 @@
│ │ │    0x00811f40 02000a00 12000309 3b093c09 3d000109 ........;.<.=...
│ │ │    0x00811f50 3e000100 02010c05 56000200 0c000300 >.......V.......
│ │ │    0x00811f60 f3023706 03000100 03004c00 4d045700 ..7.......L.M.W.
│ │ │    0x00811f70 00000000 00000000 00000000 00000000 ................
│ │ │    0x00811f80 00000000 00020000 00010000 00010000 ................
│ │ │    0x00811f90 00000000 00000000 00000002 00000002 ................
│ │ │    0x00811fa0 00000002 00000000 00000000 00000018 ................
│ │ │ -  0x00811fb0 00010000 00010000 00000000 01717ba8 .............q{.
│ │ │ -  0x00811fc0 1fbe0000 00220001 00000001 0000280f ....."........(.
│ │ │ -  0x00811fd0 00000171 7ba81fba 00000000 00000000 ...q{...........
│ │ │ +  0x00811fb0 00010000 00010000 00000000 01717ba6 .............q{.
│ │ │ +  0x00811fc0 59760000 00220001 00000001 0000280f Yv..."........(.
│ │ │ +  0x00811fd0 00000171 7ba65972 00000000 00000000 ...q{.Yr........
│ │ │    0x00811fe0 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│ │ │    0x00811ff0 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│ │ │    0x00812000 006e0002 000006d2 00660072 00000000 .n.......f.r....
│ │ │    0x00812010 00000000 00000000 00000000 00000000 ................
│ │ │    0x00812020 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│ │ │    0x00812030 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│ │ │    0x00812040 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c

Adding more data points so that hopefully we can find out the cause of
the non-reproducibility issue.

Maxim

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Maxim Cournoyer]

Hello again,

I've isolated the culprit: it's the translation auto-generated files
qrc_i18n.cpp.  I've run a couple builds locally, then diffed the build
files, and found this suspicious:

diff -I build2 -I build3 -r build2/qrc_i18n.cpp build3/qrc_i18n.cpp
1352c1352
< 0x0,0x0,0x1,0x71,0x7b,0xea,0x68,0x8a,
---
> 0x0,0x0,0x1,0x71,0x7b,0xec,0x98,0x61,
1355c1355
< 0x0,0x0,0x1,0x71,0x7b,0xea,0x68,0x86,
---
> 0x0,0x0,0x1,0x71,0x7b,0xec,0x98,0x61,

I then compared the object files for this source, e.g.: diffoscope
--exclude-command stat
build{2,3}/CMakeFiles/app-library.dir/qrc_i18n.cpp.o

  Hex dump of section '.rodata':
│    0x00000000 00000000 00020000 00010000 00010000 ................
│    0x00000010 00000000 00000000 00000002 00000002 ................
│    0x00000020 00000002 00000000 00000000 00000018 ................
│ -  0x00000030 00010000 00010000 00000000 01717bea .............q{.
│ -  0x00000040 688a0000 00220001 00000001 0000280f h...."........(.
│ -  0x00000050 00000171 7bea6886 00000000 00000000 ...q{.h.........
│ +  0x00000030 00010000 00010000 00000000 01717bec .............q{.
│ +  0x00000040 98610000 00220001 00000001 0000280f .a..."........(.
│ +  0x00000050 00000171 7bec9861 00000000 00000000 ...q{..a........
│    0x00000060 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
│    0x00000070 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
│    0x00000080 006e0002 000006d2 00660072 00000000 .n.......f.r....
│    0x00000090 00000000 00000000 00000000 00000000 ................
│    0x000000a0 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
│    0x000000b0 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
│    0x000000c0 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c

This matches the .rodata diff found in the main binary :-).

Maxim

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Maxim Cournoyer]

Hi!

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hello again,
>
> I've isolated the culprit: it's the translation auto-generated files
> qrc_i18n.cpp.  I've run a couple builds locally, then diffed the build
> files, and found this suspicious:
>
> diff -I build2 -I build3 -r build2/qrc_i18n.cpp build3/qrc_i18n.cpp
> 1352c1352
> < 0x0,0x0,0x1,0x71,0x7b,0xea,0x68,0x8a,
> ---
>> 0x0,0x0,0x1,0x71,0x7b,0xec,0x98,0x61,
> 1355c1355
> < 0x0,0x0,0x1,0x71,0x7b,0xea,0x68,0x86,
> ---
>> 0x0,0x0,0x1,0x71,0x7b,0xec,0x98,0x61,
>
> I then compared the object files for this source, e.g.: diffoscope
> --exclude-command stat
> build{2,3}/CMakeFiles/app-library.dir/qrc_i18n.cpp.o
>
>   Hex dump of section '.rodata':
> │    0x00000000 00000000 00020000 00010000 00010000 ................
> │    0x00000010 00000000 00000000 00000002 00000002 ................
> │    0x00000020 00000002 00000000 00000000 00000018 ................
> │ -  0x00000030 00010000 00010000 00000000 01717bea .............q{.
> │ -  0x00000040 688a0000 00220001 00000001 0000280f h...."........(.
> │ -  0x00000050 00000171 7bea6886 00000000 00000000 ...q{.h.........
> │ +  0x00000030 00010000 00010000 00000000 01717bec .............q{.
> │ +  0x00000040 98610000 00220001 00000001 0000280f .a..."........(.
> │ +  0x00000050 00000171 7bec9861 00000000 00000000 ...q{..a........
> │    0x00000060 000904eb 98c3006c 0061006e 00670075 .......l.a.n.g.u
> │    0x00000070 00610067 00650073 00020000 06be0065 .a.g.e.s.......e
> │    0x00000080 006e0002 000006d2 00660072 00000000 .n.......f.r....
> │    0x00000090 00000000 00000000 00000000 00000000 ................
> │    0x000000a0 0000280b 00008688 789ce57d 0b741cc5 ..(.....x..}.t..
> │    0x000000b0 9568c992 a5d16834 92654996 8531c236 .h....h4.eI..1.6
> │    0x000000c0 c626c618 639b9f31 8cf58905 922ceb63 .&..c..1.....,.c
>
> This matches the .rodata diff found in the main binary :-).
>
> Maxim

Fixed in commit a4f1a7e2db, on core-updates :-)

Maxim

[bug#40264] Linphone: 14-add-linphoneqt-v7

[Raghav Gururajan]

Hi Danny!

> if we add gcc 5 here, do we need to do something similar to
> https://lists.gnu.org/archive/html/guix-commits/2020-04/msg00774.html too or
> not?
> 
> Why is only gcc 5 working and not gcc 7?

The requirement for gcc 5 is related to Qt. It has something to do with C++ standard. The Qt package in qt.scm uses gcc 5 instead of gcc 7.

The reason for gcc 7 working for linphoneqt on core-updates, could also be due to updates in qt.

Regards,
RG.

[bug#40264] Replace source URI with mirror.

[Raghav Gururajan]

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



[-- Attachment #2: 0001-download-Add-linphone.patch --]
[-- Type: application/octet-stream, Size: 1231 bytes --]

From 090bb3e3f05fc678217903c07a7f723bdfde9240 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:51:26 -0400
Subject: [PATCH 1/2] download: Add linphone.

* guix/download.scm (%mirrors): Add linphone.
---
 guix/download.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/guix/download.scm b/guix/download.scm
index 91a2b4ce5f..afc81868da 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -361,6 +362,10 @@
        "https://ftp4.usa.openbsd.org/pub/OpenBSD/"
        "https://ftp5.usa.openbsd.org/pub/OpenBSD/"
        "https://mirror.esc7.net/pub/OpenBSD/")
+      (linphone
+       "https://linphone.org/releases/"
+       "https://linphone.org/releases/sources/"
+       "https://linphone.org/releases/sources/plugins/")
       (mate
        "https://pub.mate-desktop.org/releases/"
        "http://pub.mate-desktop.org/releases/"))))
-- 
2.26.0


[-- Attachment #3: 0002-gnu-linphone-Replace-source-URI-with-mirror.patch --]
[-- Type: application/octet-stream, Size: 7480 bytes --]

From a2a4099994e21087cca9149a70d18186bfba7411 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:53:06 -0400
Subject: [PATCH 2/2] gnu: linphone: Replace source URI with mirror.

* gnu/packages/linphone.scm: Replace source URI with mirror.
---
 gnu/packages/linphone.scm | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 50d75a4a95..39109ff877 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -59,7 +59,7 @@
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
@@ -84,7 +84,7 @@ framework for writing, administering, and running unit tests in C.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
@@ -111,7 +111,7 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
@@ -138,7 +138,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
@@ -164,7 +164,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
@@ -196,7 +196,7 @@ picture, or subtitle tracks in one file. ")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
@@ -223,7 +223,7 @@ such as conferencing.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
@@ -252,7 +252,7 @@ implements the RFC 3550 standard.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
@@ -281,7 +281,7 @@ platforms including both ARM and x86.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
@@ -315,14 +315,14 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
 
 (define-public mediastreamer2
   (package
-    (name "mediastreamer2")
+    (name "mediastreamer")
     (version "2.16.1")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/"
-                       "mediastreamer/mediastreamer-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
        (patches (search-patches "mediastreamer2-srtp2.patch"))))
@@ -405,14 +405,14 @@ decoding, and rendering.")
 
 (define-public liblinphone
   (package
-    (name "liblinphone")
+    (name "linphone")
     (version "3.12.0")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/linphone"
-                       "/linphone-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
     (build-system cmake-build-system)
@@ -477,8 +477,8 @@ and video calls or instant messaging capabilities to an application.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
        (patches
@@ -516,8 +516,8 @@ mediastreamer2 based on the openh264 library.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
     (build-system cmake-build-system)
@@ -543,8 +543,8 @@ AMR codec.  It is based on the Skype's SILK implementation.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
     (build-system cmake-build-system)
@@ -571,8 +571,8 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
     (build-system cmake-build-system)
-- 
2.26.0

[bug#40264] Mirror and Formatting

[Raghav Gururajan]

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



[-- Attachment #2: 0001-download-Add-linphone.patch --]
[-- Type: application/octet-stream, Size: 1231 bytes --]

From 090bb3e3f05fc678217903c07a7f723bdfde9240 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:51:26 -0400
Subject: [PATCH 1/3] download: Add linphone.

* guix/download.scm (%mirrors): Add linphone.
---
 guix/download.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/guix/download.scm b/guix/download.scm
index 91a2b4ce5f..afc81868da 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -361,6 +362,10 @@
        "https://ftp4.usa.openbsd.org/pub/OpenBSD/"
        "https://ftp5.usa.openbsd.org/pub/OpenBSD/"
        "https://mirror.esc7.net/pub/OpenBSD/")
+      (linphone
+       "https://linphone.org/releases/"
+       "https://linphone.org/releases/sources/"
+       "https://linphone.org/releases/sources/plugins/")
       (mate
        "https://pub.mate-desktop.org/releases/"
        "http://pub.mate-desktop.org/releases/"))))
-- 
2.26.0


[-- Attachment #3: 0002-gnu-linphone-Replace-source-URI-with-mirror.patch --]
[-- Type: application/octet-stream, Size: 7480 bytes --]

From a2a4099994e21087cca9149a70d18186bfba7411 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 02:53:06 -0400
Subject: [PATCH 2/3] gnu: linphone: Replace source URI with mirror.

* gnu/packages/linphone.scm: Replace source URI with mirror.
---
 gnu/packages/linphone.scm | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 50d75a4a95..39109ff877 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -59,7 +59,7 @@
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk"))))
@@ -84,7 +84,7 @@ framework for writing, administering, and running unit tests in C.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6"))))
@@ -111,7 +111,7 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1"))))
@@ -138,7 +138,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k"))))
@@ -164,7 +164,7 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15"))))
@@ -196,7 +196,7 @@ picture, or subtitle tracks in one file. ")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "01y34ky7ykjgfnf8a9f59hg61fqfjiprfrzshdz06w0lz4gvy3qs"))))
@@ -223,7 +223,7 @@ such as conferencing.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5"))))
@@ -252,7 +252,7 @@ implements the RFC 3550 standard.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z"))))
@@ -281,7 +281,7 @@ platforms including both ARM and x86.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/" name
+        (string-append "mirror://linphone/" name
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z"))))
@@ -315,14 +315,14 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
 
 (define-public mediastreamer2
   (package
-    (name "mediastreamer2")
+    (name "mediastreamer")
     (version "2.16.1")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/"
-                       "mediastreamer/mediastreamer-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
        (patches (search-patches "mediastreamer2-srtp2.patch"))))
@@ -405,14 +405,14 @@ decoding, and rendering.")
 
 (define-public liblinphone
   (package
-    (name "liblinphone")
+    (name "linphone")
     (version "3.12.0")
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/linphone"
-                       "/linphone-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
     (build-system cmake-build-system)
@@ -477,8 +477,8 @@ and video calls or instant messaging capabilities to an application.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"))
        (patches
@@ -516,8 +516,8 @@ mediastreamer2 based on the openh264 library.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj"))))
     (build-system cmake-build-system)
@@ -543,8 +543,8 @@ AMR codec.  It is based on the Skype's SILK implementation.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr"))))
     (build-system cmake-build-system)
@@ -571,8 +571,8 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
      (origin
        (method url-fetch)
        (uri
-        (string-append "https://www.linphone.org/releases/sources/plugins/"
-                       name "/" name "-" version ".tar.gz"))
+        (string-append "mirror://linphone/" name
+                       "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5"))))
     (build-system cmake-build-system)
-- 
2.26.0


[-- Attachment #4: 0003-gnu-linphone-Fix-formatting.patch --]
[-- Type: application/octet-stream, Size: 9962 bytes --]

From 5b3dc89e93749fb4ff1e2d246db20e61a54e6232 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 8 Apr 2020 03:28:07 -0400
Subject: [PATCH 3/3] gnu: linphone: Fix formatting.

* gnu/packages/linphone.scm: Fix formatting.
---
 gnu/packages/linphone.scm | 84 ++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 39109ff877..0e3281de4b 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -70,9 +70,9 @@
        (list
         "-DENABLE_STATIC=NO")))         ; Not required
     (synopsis "Belledonne Communications Unit Testing Framework")
-    (description "BCUnit is a fork of the defunct project CUnit,
-with several fixes and patches applied.  It is an unit testing
-framework for writing, administering, and running unit tests in C.")
+    (description "BCUnit is a fork of the defunct project CUnit, with several
+fixes and patches applied.  It is an unit testing framework for writing,
+administering, and running unit tests in C.")
     (home-page "https://gitlab.linphone.org/BC/public/bcunit")
     (license license:lgpl2.0+)))
 
@@ -124,9 +124,10 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
     (inputs
      `(("bctoolbox" ,bctoolbox)))
     (synopsis "Belledonne Communications Language Recognition Library")
-    (description "Belr is Belledonne Communications' language recognition library,
-written in C++11.  It parses text inputs formatted according to a language
-defined by an ABNF grammar, such as the protocols standardized at IETF.")
+    (description "Belr is Belledonne Communications' language recognition
+library, written in C++11.  It parses text inputs formatted according to a
+language defined by an ABNF grammar, such as the protocols standardized at
+IETF.")
     (home-page "https://gitlab.linphone.org/BC/public/belr")
     (license license:gpl3+)))
 
@@ -152,7 +153,8 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
      `(("bctoolbox" ,bctoolbox)
        ("belr" ,belr)))
     (synopsis "Belledonne Communications VCard Library")
-    (description "Belcard is a C++ library to manipulate VCard standard format.")
+    (description "Belcard is a C++ library to manipulate VCard standard
+format.")
     (home-page "https://gitlab.linphone.org/BC/public/belcard")
     (license license:gpl3+)))
 
@@ -175,16 +177,16 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
        (list
         "-DENABLE_STATIC=NO")))         ; Not required
     (synopsis "Belledonne Communications Media Container")
-    (description "BcMatroska is a free and open standard multi-media
-container format.  It can hold an unlimited number of video, audio,
-picture, or subtitle tracks in one file. ")
+    (description "BcMatroska is a free and open standard multi-media container
+format.  It can hold an unlimited number of video, audio, picture, or subtitle
+tracks in one file. ")
     (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
     (license
      (list
-      ;; That license applies for Core C and LibEBML2.
+      ;; For Core C and LibEBML2.
       ;; https://www.matroska.org/node/47
       license:bsd-4
-      ;; That license applies for LibMatroska2.
+      ;; For LibMatroska2.
       ;; https://www.matroska.org/node/47
       license:lgpl2.1+))))
 
@@ -261,15 +263,15 @@ implements the RFC 3550 standard.")
      `(#:tests? #f                      ; No test target
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")))
+        "-DENABLE_STATIC=NO")))         ; Not required
     (inputs
      `(("bctoolbox" ,bctoolbox)
        ("sqlite3" ,sqlite)
        ("xml2" ,libxml2)))
     (synopsis "Belledonne Communications ZRTP Library")
-    (description "BZRTP is an implementation of ZRTP keys exchange
-protocol, written in C.  It is fully portable and can be executed on many
-platforms including both ARM and x86.")
+    (description "BZRTP is an implementation of ZRTP keys exchange protocol,
+written in C.  It is fully portable and can be executed on many platforms
+including both ARM and x86.")
     (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
     (license license:gpl2+)))
 
@@ -290,15 +292,15 @@ platforms including both ARM and x86.")
      `(#:tests? #f                      ; Requires network access
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")
+        "-DENABLE_STATIC=NO")           ; Not required
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch
            (lambda _
              (substitute* "src/CMakeLists.txt"
-              ;; ANTLR would use multithreaded DFA generation
-              ;; otherwise--which would not be reproducible.
-              (("-Xmultithreaded ") ""))
+               ;; ANTLR would use multithreaded DFA generation otherwise,
+               ;; which would not be reproducible.
+               (("-Xmultithreaded ") ""))
              #t)))))
     (inputs
      `(("antlr3" ,antlr3-3.3)
@@ -325,7 +327,8 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
                        "/" name "-" version ".tar.gz"))
        (sha256
         (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
-       (patches (search-patches "mediastreamer2-srtp2.patch"))))
+       (patches
+        (search-patches "mediastreamer2-srtp2.patch"))))
     (outputs '("out" "doc" "tester"))
     (build-system cmake-build-system)
     (arguments
@@ -393,13 +396,12 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
        ("vpx" ,libvpx)
        ("x11" ,libx11)
        ("xv" ,libxv)
-       ("zrtp", bzrtp)))
+       ("zrtp" ,bzrtp)))
     (synopsis "Belledonne Communications Streaming Engine")
-    (description "Mediastreamer2 is a powerful and lightweight
-streaming engine for telephony applications.  This media processing
-and streaming toolkit is responsible for receiving and sending all
-multimedia streams in Linphone, including media capture, encoding and
-decoding, and rendering.")
+    (description "Mediastreamer2 is a powerful and lightweight streaming engine
+for telephony applications.  This media processing and streaming toolkit is
+responsible for receiving and sending all multimedia streams in Linphone,
+including media capture, encoding and decoding, and rendering.")
     (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
     (license license:gpl2+)))
 
@@ -461,11 +463,11 @@ decoding, and rendering.")
     (propagated-inputs
      `(("murrine" ,murrine)))           ; Required for GTK UI
     (synopsis "Belledonne Communications Softphone Library")
-    (description "Liblinphone is a high-level SIP library integrating
-all calling and instant messaging features into an unified
-easy-to-use API.  It is the cross-platform VoIP library on which the
-Linphone application is based on, and that anyone can use to add audio
-and video calls or instant messaging capabilities to an application.")
+    (description "Liblinphone is a high-level SIP library integrating all
+calling and instant messaging features into an unified easy-to-use API.  It is
+the cross-platform VoIP library on which the Linphone application is based on,
+and that anyone can use to add audio and video calls or instant messaging
+capabilities to an application.")
     (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
     (license license:gpl2+)))
 
@@ -487,11 +489,13 @@ and video calls or instant messaging capabilities to an application.")
          (origin
            (method url-fetch)
            (uri
-            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
-                           "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
+            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/"
+                           "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326"
+                           ".diff"))
            (file-name "msopenh264-openh264.patch")
            (sha256
-            (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
+            (base32
+             "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; No test target
@@ -530,8 +534,8 @@ mediastreamer2 based on the openh264 library.")
      `(("mediastreamer2" ,mediastreamer2)
        ("ortp" ,ortp)))
     (synopsis "Media Streamer SILK Codec")
-    (description "MSSILK is a plugin of MediaStreamer, adding support for
-AMR codec.  It is based on the Skype's SILK implementation.")
+    (description "MSSILK is a plugin of MediaStreamer, adding support for AMR
+codec.  It is based on the Skype's SILK implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/mssilk")
     (license license:gpl2+)))
 
@@ -552,7 +556,7 @@ AMR codec.  It is based on the Skype's SILK implementation.")
      `(#:tests? #f                      ; No test target
        #:configure-flags
        (list
-        "-DENABLE_STATIC=NO")))
+        "-DENABLE_STATIC=NO")))         ; Not required
     (inputs
      `(("bctoolbox" ,bctoolbox)
        ("mediastreamer2" ,mediastreamer2)
@@ -588,7 +592,7 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
        ("ortp" ,ortp)
        ("voamrwbenc" ,vo-amrwbenc)))
     (synopsis "Media Streamer AMR Codec")
-    (description "MSAMR is a plugin of MediaStreamer, adding support for
-AMR codec.  It is based on the opencore-amr implementation.")
+    (description "MSAMR is a plugin of MediaStreamer, adding support for AMR
+codec.  It is based on the opencore-amr implementation.")
     (home-page "https://gitlab.linphone.org/BC/public/msamr")
     (license license:gpl3+)))
-- 
2.26.0

bug#40264: Mirror and Formatting

[maxim.cournoyer]

Hello Raghav,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> From 5b3dc89e93749fb4ff1e2d246db20e61a54e6232 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Wed, 8 Apr 2020 03:28:07 -0400
> Subject: [PATCH 3/3] gnu: linphone: Fix formatting.
>
> * gnu/packages/linphone.scm: Fix formatting.
> ---
>  gnu/packages/linphone.scm | 84 ++++++++++++++++++++-------------------
>  1 file changed, 44 insertions(+), 40 deletions(-)
>
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 39109ff877..0e3281de4b 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -70,9 +70,9 @@
>         (list
>          "-DENABLE_STATIC=NO")))         ; Not required
>      (synopsis "Belledonne Communications Unit Testing Framework")
> -    (description "BCUnit is a fork of the defunct project CUnit,
> -with several fixes and patches applied.  It is an unit testing
> -framework for writing, administering, and running unit tests in C.")
> +    (description "BCUnit is a fork of the defunct project CUnit, with several
> +fixes and patches applied.  It is an unit testing framework for writing,
> +administering, and running unit tests in C.")
>      (home-page "https://gitlab.linphone.org/BC/public/bcunit")
>      (license license:lgpl2.0+)))
>  
> @@ -124,9 +124,10 @@ Communications softwares like belle-sip, mediastreamer2 and linphone.")
>      (inputs
>       `(("bctoolbox" ,bctoolbox)))
>      (synopsis "Belledonne Communications Language Recognition Library")
> -    (description "Belr is Belledonne Communications' language recognition library,
> -written in C++11.  It parses text inputs formatted according to a language
> -defined by an ABNF grammar, such as the protocols standardized at IETF.")
> +    (description "Belr is Belledonne Communications' language recognition
> +library, written in C++11.  It parses text inputs formatted according to a
> +language defined by an ABNF grammar, such as the protocols standardized at
> +IETF.")
>      (home-page "https://gitlab.linphone.org/BC/public/belr")
>      (license license:gpl3+)))
>  
> @@ -152,7 +153,8 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
>       `(("bctoolbox" ,bctoolbox)
>         ("belr" ,belr)))
>      (synopsis "Belledonne Communications VCard Library")
> -    (description "Belcard is a C++ library to manipulate VCard standard format.")
> +    (description "Belcard is a C++ library to manipulate VCard standard
> +format.")
>      (home-page "https://gitlab.linphone.org/BC/public/belcard")
>      (license license:gpl3+)))
>  
> @@ -175,16 +177,16 @@ defined by an ABNF grammar, such as the protocols standardized at IETF.")
>         (list
>          "-DENABLE_STATIC=NO")))         ; Not required
>      (synopsis "Belledonne Communications Media Container")
> -    (description "BcMatroska is a free and open standard multi-media
> -container format.  It can hold an unlimited number of video, audio,
> -picture, or subtitle tracks in one file. ")
> +    (description "BcMatroska is a free and open standard multi-media container
> +format.  It can hold an unlimited number of video, audio, picture, or subtitle
> +tracks in one file. ")
>      (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2")
>      (license
>       (list
> -      ;; That license applies for Core C and LibEBML2.
> +      ;; For Core C and LibEBML2.
>        ;; https://www.matroska.org/node/47
>        license:bsd-4
> -      ;; That license applies for LibMatroska2.
> +      ;; For LibMatroska2.
>        ;; https://www.matroska.org/node/47
>        license:lgpl2.1+))))
>  
> @@ -261,15 +263,15 @@ implements the RFC 3550 standard.")
>       `(#:tests? #f                      ; No test target
>         #:configure-flags
>         (list
> -        "-DENABLE_STATIC=NO")))
> +        "-DENABLE_STATIC=NO")))         ; Not required
>      (inputs
>       `(("bctoolbox" ,bctoolbox)
>         ("sqlite3" ,sqlite)
>         ("xml2" ,libxml2)))
>      (synopsis "Belledonne Communications ZRTP Library")
> -    (description "BZRTP is an implementation of ZRTP keys exchange
> -protocol, written in C.  It is fully portable and can be executed on many
> -platforms including both ARM and x86.")
> +    (description "BZRTP is an implementation of ZRTP keys exchange protocol,
> +written in C.  It is fully portable and can be executed on many platforms
> +including both ARM and x86.")
>      (home-page "https://gitlab.linphone.org/BC/public/bzrtp")
>      (license license:gpl2+)))
>  
> @@ -290,15 +292,15 @@ platforms including both ARM and x86.")
>       `(#:tests? #f                      ; Requires network access
>         #:configure-flags
>         (list
> -        "-DENABLE_STATIC=NO")
> +        "-DENABLE_STATIC=NO")           ; Not required
>         #:phases
>         (modify-phases %standard-phases
>           (add-after 'unpack 'patch
>             (lambda _
>               (substitute* "src/CMakeLists.txt"
> -              ;; ANTLR would use multithreaded DFA generation
> -              ;; otherwise--which would not be reproducible.
> -              (("-Xmultithreaded ") ""))
> +               ;; ANTLR would use multithreaded DFA generation otherwise,
> +               ;; which would not be reproducible.
> +               (("-Xmultithreaded ") ""))
>               #t)))))
>      (inputs
>       `(("antlr3" ,antlr3-3.3)
> @@ -325,7 +327,8 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
>                         "/" name "-" version ".tar.gz"))
>         (sha256
>          (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))
> -       (patches (search-patches "mediastreamer2-srtp2.patch"))))
> +       (patches
> +        (search-patches "mediastreamer2-srtp2.patch"))))
>      (outputs '("out" "doc" "tester"))
>      (build-system cmake-build-system)
>      (arguments
> @@ -393,13 +396,12 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
>         ("vpx" ,libvpx)
>         ("x11" ,libx11)
>         ("xv" ,libxv)
> -       ("zrtp", bzrtp)))
> +       ("zrtp" ,bzrtp)))
>      (synopsis "Belledonne Communications Streaming Engine")
> -    (description "Mediastreamer2 is a powerful and lightweight
> -streaming engine for telephony applications.  This media processing
> -and streaming toolkit is responsible for receiving and sending all
> -multimedia streams in Linphone, including media capture, encoding and
> -decoding, and rendering.")
> +    (description "Mediastreamer2 is a powerful and lightweight streaming engine
> +for telephony applications.  This media processing and streaming toolkit is
> +responsible for receiving and sending all multimedia streams in Linphone,
> +including media capture, encoding and decoding, and rendering.")
>      (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2")
>      (license license:gpl2+)))
>  
> @@ -461,11 +463,11 @@ decoding, and rendering.")
>      (propagated-inputs
>       `(("murrine" ,murrine)))           ; Required for GTK UI
>      (synopsis "Belledonne Communications Softphone Library")
> -    (description "Liblinphone is a high-level SIP library integrating
> -all calling and instant messaging features into an unified
> -easy-to-use API.  It is the cross-platform VoIP library on which the
> -Linphone application is based on, and that anyone can use to add audio
> -and video calls or instant messaging capabilities to an application.")
> +    (description "Liblinphone is a high-level SIP library integrating all
> +calling and instant messaging features into an unified easy-to-use API.  It is
> +the cross-platform VoIP library on which the Linphone application is based on,
> +and that anyone can use to add audio and video calls or instant messaging
> +capabilities to an application.")
>      (home-page "https://gitlab.linphone.org/BC/public/liblinphone")
>      (license license:gpl2+)))
>  
> @@ -487,11 +489,13 @@ and video calls or instant messaging capabilities to an application.")
>           (origin
>             (method url-fetch)
>             (uri
> -            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/commit/"
> -                           "493d147d28c9a0f788ba4e50b47a1ce7b18bf326.diff"))
> +            (string-append "https://gitlab.linphone.org/BC/public/msopenh264/"
> +                           "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326"
> +                           ".diff"))
>             (file-name "msopenh264-openh264.patch")
>             (sha256
> -            (base32 "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
> +            (base32
> +             "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb")))))))
>      (build-system cmake-build-system)
>      (arguments
>       `(#:tests? #f                      ; No test target
> @@ -530,8 +534,8 @@ mediastreamer2 based on the openh264 library.")
>       `(("mediastreamer2" ,mediastreamer2)
>         ("ortp" ,ortp)))
>      (synopsis "Media Streamer SILK Codec")
> -    (description "MSSILK is a plugin of MediaStreamer, adding support for
> -AMR codec.  It is based on the Skype's SILK implementation.")
> +    (description "MSSILK is a plugin of MediaStreamer, adding support for AMR
> +codec.  It is based on the Skype's SILK implementation.")
>      (home-page "https://gitlab.linphone.org/BC/public/mssilk")
>      (license license:gpl2+)))
>  
> @@ -552,7 +556,7 @@ AMR codec.  It is based on the Skype's SILK implementation.")
>       `(#:tests? #f                      ; No test target
>         #:configure-flags
>         (list
> -        "-DENABLE_STATIC=NO")))
> +        "-DENABLE_STATIC=NO")))         ; Not required
>      (inputs
>       `(("bctoolbox" ,bctoolbox)
>         ("mediastreamer2" ,mediastreamer2)
> @@ -588,7 +592,7 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
>         ("ortp" ,ortp)
>         ("voamrwbenc" ,vo-amrwbenc)))
>      (synopsis "Media Streamer AMR Codec")
> -    (description "MSAMR is a plugin of MediaStreamer, adding support for
> -AMR codec.  It is based on the opencore-amr implementation.")
> +    (description "MSAMR is a plugin of MediaStreamer, adding support for AMR
> +codec.  It is based on the opencore-amr implementation.")
>      (home-page "https://gitlab.linphone.org/BC/public/msamr")
>      (license license:gpl3+)))

Please not that we usually submit changes *per-package*, that is, one
commit per package.  It's a convention we use.  I'm making an exception
here because the changes are cosmetic only, but keep this in mind for
your next changes.

I've pushed a slightly modified version of the above changes in commit
1988ef21f82430d4b380dd4887160a902d8796fd (on the core-updates branch).

Thank you for your contributions and your patience in the lengthy review
process.

Maxim

[bug#40264] Replace source URI with mirror.

[Maxim Cournoyer]

Hello Raghav!

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> From a2a4099994e21087cca9149a70d18186bfba7411 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Wed, 8 Apr 2020 02:53:06 -0400
> Subject: [PATCH 2/2] gnu: linphone: Replace source URI with mirror.
>
> * gnu/packages/linphone.scm: Replace source URI with mirror.

To have a mirror makes sense when many locations provide the same
content.  Here there's only https://www.linphone.org/ so I don't think
adding a mirror for it is necessary.

Thank you,

Maxim