From 146a9403b3f9bda114e4e3a63ad1ad1aaac82d12 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 15:51:11 -0400 Subject: gnu: mediastreamer2: Update to 4.4.34. * gnu/packages/linphone.scm (mediastreamer2)[source]: Switch to git repository. [version]: Update to 4.4.34. [patches]: Remove field. [configure-flags]: Remove the ENABLE_STRICT, ENABLE_BV16, CMAKE_C_FLAGS and CMAKE_CXX_FLAGS flags. [phases]{fix-version}: New phase. {separate-outputs}: Modify. [native-inputs]: Replace python with python-wrapper. [home-page]: Update. [license]: Upgrade to GPLv3+. * gnu/packages/patches/mediastreamer2-srtp2.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 61 ++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) (limited to 'gnu/packages/linphone.scm') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 370748220a..129b6764e5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -417,9 +417,10 @@ (define-public ortp #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version-strings + ;; See: https://gitlab.linphone.org/BC/public/ortp/-/issues/5. (lambda _ (substitute* "CMakeLists.txt" - (("VERSION 4.4.0") + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version)) (("\\$\\{ORTP_DOC_VERSION\\}") ,version)))) @@ -518,56 +519,52 @@ (define-public belle-sip (define-public mediastreamer2 (package (name "mediastreamer2") - (version "2.16.1") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" - "mediastreamer/mediastreamer-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mediastreamer2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k")) - (patches (search-patches "mediastreamer2-srtp2.patch")))) + (base32 "0989h3d0h7qrx4kjx8gg09j8c5hvvi3h8qi1iq1dqbppwbaxbz8c")))) (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err - "-DENABLE_BV16=NO" ; Not available - "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" - "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") + #:configure-flags (list "-DENABLE_STATIC=NO") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") + (string-append "VERSION " ,version))))) (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"))) + (tester-name (string-append ,name "_tester")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-" ,version))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share") + (string-append doc "/share/doc"))) ;; 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. - (copy-recursively (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)) - (delete-file-recursively (string-append out "/share/" - tester-name)) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)) ;; Copy the HTML documentation. - (copy-recursively (string-append out "/share/doc/" - ,name "-" ,version "/html") - (string-append doc "/share/doc/" - ,name "-" ,version "/html")) - (delete-file-recursively (string-append out "/share/doc/" - ,name "-" ,version - "/html")) - #t)))))) + (rename-file (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name)))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python))) + ("python" ,python-wrapper))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) @@ -600,8 +597,8 @@ (define-public mediastreamer2 for telephony applications. This media processing and streaming toolkit is responsible for receiving and sending all multimedia streams in Linphone, including media capture, encoding and decoding, and rendering.") - (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/mediastreamer2") + (license license:gpl3+))) (define-public liblinphone (package -- cgit v1.2.3