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

[maxim . cournoyer]

"Raghav Gururajan" <address@hidden> writes:

> From c9f9ecc04aaff5c48490e3fc88b0b2b4ef79eafb Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <address@hidden>
> 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