From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54362) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKzjI-0001VY-Ho for guix-patches@gnu.org; Sun, 05 Apr 2020 03:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKzjG-0003jd-7m for guix-patches@gnu.org; Sun, 05 Apr 2020 03:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKzjG-0003jZ-3M for guix-patches@gnu.org; Sun, 05 Apr 2020 03:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jKzjG-0005V6-Lq for guix-patches@gnu.org; Sun, 05 Apr 2020 03:30:02 -0400 Subject: [bug#40264] Linphone: 11-add-mediastreamer-v2 Resent-Message-ID: Mime-Version: 1.0 Date: Sun, 05 Apr 2020 07:29:05 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Raghav Gururajan" Message-ID: In-Reply-To: <87k12u36ua.fsf@hurd.i-did-not-set--mail-host-address--so-tickle-me> References: <87k12u36ua.fsf@hurd.i-did-not-set--mail-host-address--so-tickle-me> <981ea9c838575bacfe934a652ceeca62@disroot.org> 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: maxim.cournoyer@gmail.com Cc: 40264@debbugs.gnu.org Hi Maxim!=0A=0A>> From 3cf73361203f7833c61a24f69b9ab4bb4da358ce Mon Sep 1= 7 00:00:00 2001=0A>> From: Raghav Gururajan = =0A>> Date: Wed, 1 Apr 2020 20:18:20 -0400=0A>> Subject: [PATCH 9/9] gnu:= Add mediastreamer=0A>> =0A>> * gnu/packages/linphone.scm (mediastreamer)= : New variable.=0A>> ---=0A>> gnu/packages/linphone.scm | 83 ++++++++++++= +++++++++++++++++++++++++++=0A>> 1 file changed, 83 insertions(+)=0A>> = =0A>> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm= =0A>> index 3be35bdb74..ce3ffa763b 100644=0A>> --- a/gnu/packages/linphon= e.scm=0A>> +++ b/gnu/packages/linphone.scm=0A>> @@ -19,12 +19,24 @@=0A>> = =0A>> (define-module (gnu packages linphone)=0A>> #:use-module (gnu packa= ges)=0A>> + #:use-module (gnu packages admin)=0A>> + #:use-module (gnu pa= ckages audio)=0A>> #:use-module (gnu packages base)=0A>> #:use-module (gn= u packages documentation)=0A>> + #:use-module (gnu packages gl)=0A>> + #:= use-module (gnu packages gnome)=0A>> #:use-module (gnu packages graphviz)= =0A>> + #:use-module (gnu packages image)=0A>> + #:use-module (gnu packag= es linux)=0A>> + #:use-module (gnu packages pulseaudio)=0A>> + #:use-modu= le (gnu packages python)=0A>> #:use-module (gnu packages sqlite)=0A>> + #= :use-module (gnu packages telephony)=0A>> #:use-module (gnu packages tls)= =0A>> + #:use-module (gnu packages video)=0A>> + #:use-module (gnu packag= es xiph)=0A>> #:use-module (gnu packages xml)=0A>> + #:use-module (gnu pa= ckages xorg)=0A>> #:use-module ((guix licenses) #:prefix license:)=0A>> #= :use-module (guix packages)=0A>> #:use-module (guix download)=0A>> @@ -25= 2,3 +264,74 @@ protocol, written in C. It is fully portable and can be ex= ecuted on many=0A>> platforms including both ARM and x86.")=0A>> (home-pa= ge "https://gitlab.linphone.org/BC/public/bzrtp")=0A>> (license license:g= pl2+)))=0A>> +=0A>> +(define-public mediastreamer=0A>> + (package=0A>> + = (name "mediastreamer")=0A> =0A> The variable name and package name should= be "mediastreamer2", as per=0A> upstream.=0A> =0A>> + (version "2.16.1")= =0A>> + (source=0A>> + (origin=0A>> + (method url-fetch)=0A>> + (uri=0A>>= + (string-append "https://www.linphone.org/releases/sources" name=0A>> += "/" name "-" version ".tar.gz"))=0A>> + (sha256=0A>> + (base32 "0whpqr69= wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k"))=0A>> + (patches=0A>> + (l= ist=0A>> + ;; For fixing definitions.=0A>> + (origin=0A>> + (method url-f= etch)=0A>> + (uri=0A>> + (string-append "https://gitlab.linphone.org/BC/p= ublic/mediastreamer2/commit"=0A>> + "de3a24b795d7a78e78eab6b974e7ec5abf22= 59ac.diff"))=0A>> + (file-name "mediastreamer-msfactory.patch")=0A>> + (s= ha256=0A>> + (base32 "18lsn9fc9di8bzr12ck3h9k9h8xvvhjzgkimbj9p4vmxxwhjaxn= 2")))))))=0A> =0A> You can just use the "ENABLE_STRICT=3DNO", which will = disable -Werror and=0A> make the package more resilient in the face of fu= ture compiler upgrades=0A> in Guix. No more need for that patch :-).=0A> = =0A>> + (build-system cmake-build-system)=0A>> + (arguments=0A>> + `(#:te= sts? #f ; No test target=0A>> + #:configure-flags=0A>> + (list=0A>> + "-D= ENABLE_SRTP=3DNO" ; Using ZRTP instead=0A> =0A> Usually we try to offer t= he most features possible. I don't see why we=0A> shouldn't add SRTP supp= ort since we should already have the required=0A> dependencies.=0A> =0A> = Also, I see there's a ENABLE_UNIT_TESTS=3DYES option for unit tests, whic= h=0A> we should enable and try to run.=0A> =0A>> + "-DENABLE_STATIC=3DNO"= ; Not required=0A>> + "-DENABLE_GSM=3DNO" ; Need recompilation with -fPI= C=0A> =0A> Not a merge breaker, but it'd make sense to have GSM for telep= hony=0A> focused software :-).=0A> =0A>> + "-DENABLE_BV16=3DNO"))) ; Not = available=0A>> + (native-inputs=0A>> + `(("dot" ,graphviz)=0A>> + ("doxyg= en" ,doxygen)=0A>> + ("python" ,python)))=0A>> + (inputs=0A>> + `(("alsa"= ,alsa-lib)=0A>> + ("bcg729" ,bcg729)=0A>> + ("bcmatroska2" ,bcmatroska2)= =0A>> + ("bctoolbox" ,bctoolbox)=0A>> + ("ffmpeg" ,ffmpeg)=0A>> + ("glew"= ,glew)=0A>> + ("glu" ,glu)=0A>> + ("glx" ,mesa-utils)=0A>> + ("gsm" ,gsm= )=0A>> + ("opengl" ,mesa)=0A>> + ("opus" ,opus)=0A>> + ("ortp" ,ortp)=0A>= > + ("pcap" ,libpcap)=0A>> + ("portaudio" ,portaudio)=0A>> + ("pulseaudio= " ,pulseaudio)=0A>> + ("spandsp" ,spandsp)=0A>> + ("speex" ,speex)=0A>> += ("speexdsp" ,speexdsp)=0A>> + ("srtp" ,libsrtp)=0A>> + ("theora" ,libthe= ora)=0A>> + ("turbojpeg" ,libjpeg-turbo)=0A>> + ("v4l" ,v4l-utils)=0A>> += ("vpx" ,libvpx)=0A>> + ("x11" ,libx11)=0A>> + ("xv" ,libxv)=0A>> + ("zrt= p", bzrtp)))=0A>> + (synopsis "Belledonne Communications Streaming Engine= ")=0A>> + (description "Mediastreamer is apowerfuland=0A>> lightweight st= reaming=0A> =0A> There are some strange characters in there (around 'powe= rful'). Please=0A> edit them out.=0A=0AI fixed everything in 11-add-media= streamer-v3. :-)=0A=0ARegards,=0ARG.