[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/19: gnu: liblinphone: Update to 4.4.34.
From: |
guix-commits |
Subject: |
13/19: gnu: liblinphone: Update to 4.4.34. |
Date: |
Mon, 29 Mar 2021 01:44:06 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit acf4c0cd7c41e2c4643ebb6820cbcd86f0bf3b48
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Wed Mar 17 23:36:02 2021 -0400
gnu: liblinphone: Update to 4.4.34.
* gnu/packages/linphone.scm (liblinphone) [source]: Switch to git
repository.
[version]: Update to 4.4.34.
[outputs]: Remove the "doc" output.
[imported-modules, modules]: Remove arguments.
[configure-flags]<GTK2_GDKCONFIG_INCLUDE_DIR>: Remove flag.
<GTK2_GLIBCONFIG_INCLUDE_DIR, ENABLE_STRICT, ENABLE_GTK_UI>: Likewise.
[phases]<patch, install-man-pages, glib-or-gtk-compile-schemas>
<glib-or-gtk-wrap>: Remove phases.
<separate-outputs>: Modify.
[native-inputs]: Add perl. Replace python with python-wrapper.
[inputs]: Add belr, lime, soci and xsd. Remove glib and gtk+-2.
[home-page]: Update.
[license]: Upgrade to GPLv3+.
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
gnu/packages/linphone.scm | 95 ++++++++++++++++-------------------------------
1 file changed, 31 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 1c94d49..cc1308b 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -25,6 +25,7 @@
#:use-module (gnu packages audio)
#:use-module (gnu packages avahi)
#:use-module (gnu packages base)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
@@ -732,95 +733,61 @@ device.")
(define-public liblinphone
(package
(name "liblinphone")
- (version "3.12.0")
+ (version "4.4.34")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://www.linphone.org/releases/sources/linphone"
- "/linphone-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.linphone.org/BC/public/liblinphone.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x"))))
- (outputs '("out" "doc" "tester"))
+ (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9"))))
+ (outputs '("out" "tester"))
(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_STRICT=NO"
- "-DENABLE_GTK_UI=YES") ; for legacy UI
- #:imported-modules (,@%cmake-build-system-modules
- (guix build glib-or-gtk-build-system))
- #:modules ((guix build cmake-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
- (guix build utils))
+ `(#:tests? #f ; Tests require networking
+ #:configure-flags (list "-DENABLE_STATIC=NO"
+ "-DENABLE_DOC=NO" ;requires unpackaged
javasphinx
+ "-DENABLE_LDAP=YES")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda _
- (substitute* "gtk/main.c"
- (("#include \"liblinphone_gitversion.h\"")
- ""))
- #t))
(add-after 'install 'separate-outputs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc"))
(tester (assoc-ref outputs "tester"))
(tester-name (string-append ,name "_tester")))
- ;; Copy the tester executable.
- (mkdir-p (string-append tester "/bin"))
+ (for-each mkdir-p
+ (list (string-append tester "/bin")
+ (string-append tester "/share")))
(rename-file (string-append out "/bin/" tester-name)
(string-append tester "/bin/" tester-name))
- ;; Copy the tester data files.
- (mkdir-p (string-append tester "/share/"))
+ (rename-file (string-append out "/bin/groupchat_benchmark")
+ (string-append tester "/bin/groupchat_benchmark"))
(rename-file (string-append out "/share/" tester-name)
- (string-append tester "/share/" tester-name))
- ;; Copy the HTML and XML documentation.
- (copy-recursively
- (string-append out "/share/doc/linphone-" ,version)
- (string-append doc "/share/doc/" ,name "-" ,version))
- (delete-file-recursively
- (string-append out "/share/doc/linphone-" ,version))
- #t)))
- (add-after 'install 'install-man-pages
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (man (string-append out "/share/man/man1")))
- (for-each (lambda (file)
- (install-file file man))
- (find-files ".." ".*.1$"))
- #t)))
- (add-after 'separate-outputs 'glib-or-gtk-compile-schemas
- (assoc-ref glib-or-gtk:%standard-phases
'glib-or-gtk-compile-schemas))
- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (string-append tester "/share/" tester-name))))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("udev" ,eudev) ;for libudev.h
- ;; For generating the C++ wrappers.
- ("dot" ,graphviz)
+ `(("dot" ,graphviz)
("doxygen" ,doxygen)
- ("python" ,python)
+ ("gettext" ,gettext-minimal)
+ ("perl" ,perl)
+ ("python" ,python-wrapper)
("pystache" ,python-pystache)
- ("six" ,python-six)))
+ ("six" ,python-six)
+ ("udev" ,eudev)))
(inputs
`(("bctoolbox" ,bctoolbox)
("belcard" ,belcard)
("bellesip" ,belle-sip)
+ ("belr" ,belr)
("bzrtp" ,bzrtp)
("iconv" ,libiconv)
- ("glib" ,glib)
- ("gtk2" ,gtk+-2)
+ ("libxsd" ,xsd)
+ ("lime" ,lime)
("mediastreamer2" ,mediastreamer2)
("notify" ,libnotify)
("ortp" ,ortp)
+ ("soci" ,soci)
("sqlite" ,sqlite)
("xml2" ,libxml2)
("zlib" ,zlib)))
@@ -830,8 +797,8 @@ 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+)))
+ (home-page "https://linphone.org/technical-corner/liblinphone")
+ (license license:gpl3+)))
(define-public linphoneqt
(package
- branch master updated (414fc58 -> a999325), guix-commits, 2021/03/29
- 19/19: gnu: msamr: Update to 1.1.3-11., guix-commits, 2021/03/29
- 06/19: gnu: mediastreamer2: Update to 4.4.34., guix-commits, 2021/03/29
- 01/19: gnu: bctoolbox: Update to 4.4.34 and enable libdecaf, tests., guix-commits, 2021/03/29
- 11/19: gnu: belle-sip: Enable mDNS support., guix-commits, 2021/03/29
- 16/19: gnu: msopenh264: Update to 1.2.1-21., guix-commits, 2021/03/29
- 04/19: gnu: bzrtp: Update to 4.4.34 and enable tests., guix-commits, 2021/03/29
- 07/19: gnu: mediastreamer2: Enable tests., guix-commits, 2021/03/29
- 18/19: gnu: mswebrtc: Update to 1.1.1-23., guix-commits, 2021/03/29
- 13/19: gnu: liblinphone: Update to 4.4.34.,
guix-commits <=
- 03/19: gnu: belcard: Update to 4.4.34 and enable tests., guix-commits, 2021/03/29
- 12/19: gnu: Add lime., guix-commits, 2021/03/29
- 02/19: gnu: belr: Update to 4.4.34 and enable tests., guix-commits, 2021/03/29
- 14/19: gnu: liblinphone: Enable LDAP support., guix-commits, 2021/03/29
- 10/19: gnu: belle-sip: Enable tests., guix-commits, 2021/03/29
- 15/19: gnu: linphoneqt: Update to 4.2.5 and rename to linphone-desktop., guix-commits, 2021/03/29
- 08/19: gnu: mediastreamer2: Enable PCAP, port-audio and G729B support., guix-commits, 2021/03/29
- 09/19: gnu: belle-sip: Update to 4.4.34., guix-commits, 2021/03/29
- 05/19: gnu: ortp: Update to 4.4.34., guix-commits, 2021/03/29
- 17/19: gnu: mssilk: Update to 1.1.1-8., guix-commits, 2021/03/29