From 60de07aa98dbe450d5f4cc9873e04fbe52b8c05a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 17 Mar 2021 23:36:02 -0400 Subject: [PATCH 43/53] 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 "doc" and rename "tester" to "test". [arguments]<#:imported-modules>: Remove argument. <#:modules>: Remove argument. <#:configure-flags>[-DGTK2_GDKCONFIG_INCLUDE_DIR]: Remove flag. [-DGTK2_GLIBCONFIG_INCLUDE_DIR]: Remove flag. [-DENABLE_STRICT]: Remove flag. [-DENABLE_GTK_UI]: Remove flag. <#:phases>['patch]: Remove phase. ['install-man-pages]: Remove phase. ['separate-outputs]: Modify. ['glib-or-gtk-compile-schemas]: Remove phase. ['glib-or-gtk-wrap]: Remove phase. [native-inputs]: Add perl. Replace python with python-wrapper. [inputs]: Add belr, lime, soci and xsd. Remove glib and gtk+-2. --- gnu/packages/linphone.scm | 100 +++++++++++++------------------------- 1 file changed, 34 insertions(+), 66 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 80349ac426..7158c093b3 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 codesynthesis) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -745,95 +746,62 @@ It supports multiple devices per user and multiple users per 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") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x")))) - (outputs '("out" "doc" "tester")) + (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9")))) + (outputs '("out" "test")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target + `(#:tests? #f ; Tests require networking #: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)) + (list + "-DENABLE_STATIC=NO") #: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")) - (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 "/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))))) + (test (assoc-ref outputs "test")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + `(,(string-append test "/bin") + ,(string-append test "/share"))) + (rename-file + (string-append out "/bin/" test-name) + (string-append test "/bin/" test-name)) + (rename-file + (string-append out "/share/" test-name) + (string-append test "/share/" test-name))) + #t))))) (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))) -- 2.31.0