From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jL6of-00046y-Bw for guix-patches@gnu.org; Sun, 05 Apr 2020 11:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jL6od-0006Ww-1B for guix-patches@gnu.org; Sun, 05 Apr 2020 11:04:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34938) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jL6oc-0006Wn-UB for guix-patches@gnu.org; Sun, 05 Apr 2020 11:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jL6oc-0003HV-Le for guix-patches@gnu.org; Sun, 05 Apr 2020 11:04:02 -0400 Subject: [bug#40264] Linphone: 11-add-mediastreamer-v3 Resent-Message-ID: From: maxim.cournoyer@gmail.com References: <8d37c9308eddb3c687689ed614c86386@disroot.org> Date: Sun, 05 Apr 2020 11:02:47 -0400 In-Reply-To: <8d37c9308eddb3c687689ed614c86386@disroot.org> (Raghav Gururajan's message of "Sun, 05 Apr 2020 07:28:06 +0000") Message-ID: <87eet22cx4.fsf@hurd.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Raghav Gururajan Cc: 40264@debbugs.gnu.org "Raghav Gururajan" writes: > From c9f9ecc04aaff5c48490e3fc88b0b2b4ef79eafb Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > 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