me
/
guix
Archived
1
0
Fork 0
Code

gnu: pjproject: Update to 2.11. 

* gnu/packages/telephony.scm (pjproject): Update to 2.11.  Remove trailing #t.
[patches]: Delete field.  The patches are preserved because pjproject-jami
still needs them.
master
Maxim Cournoyer 2021-03-30 13:08:10 -04:00
parent 67a5e112b1
commit 45136b3673
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/telephony.scm
View File

@ -17,7 +17,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; ;;;
@ -723,7 +723,7 @@ your calls and messages.")
(define-public pjproject (define-public pjproject
(package (package
(name "pjproject") (name "pjproject")
(version "2.10") (version "2.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -733,12 +733,8 @@ your calls and messages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) "1kn9g1x1vmh4130ghph8mldz5m89gsjs4vpdzlzm98m3808gk5an"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; The patches upstream status can be tracked at:
;; https://github.com/pjsip/pjproject/pull/2501.
(patches (search-patches "pjproject-correct-the-cflags-field.patch"
"pjproject-fix-pkg-config-ldflags.patch"))
(snippet (snippet
'(begin '(begin
;; Remove bundled libraries. ;; Remove bundled libraries.
@ -746,8 +742,7 @@ your calls and messages.")
(substitute* "aconfigure.ac" (substitute* "aconfigure.ac"
(("third_party/build/os-auto.mak") "")) (("third_party/build/os-auto.mak") ""))
(substitute* "Makefile" (substitute* "Makefile"
(("third_party/build") "")) (("third_party/build") ""))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "debug" "static")) (outputs '("out" "debug" "static"))
(arguments (arguments
@ -785,8 +780,7 @@ your calls and messages.")
;; Make all the files writable to prevent the following error: ;; Make all the files writable to prevent the following error:
;; "autom4te: cannot open aconfigure: Permission denied". ;; "autom4te: cannot open aconfigure: Permission denied".
(lambda _ (lambda _
(for-each make-file-writable (find-files ".")) (for-each make-file-writable (find-files "."))))
#t))
(add-before 'build 'build-dep (add-before 'build 'build-dep
(lambda _ (invoke "make" "dep"))) (lambda _ (invoke "make" "dep")))
;; The check phases is moved after the install phase so to ;; The check phases is moved after the install phase so to
@ -800,8 +794,7 @@ your calls and messages.")
(with-directory-excursion out (with-directory-excursion out
(for-each (lambda (f) (for-each (lambda (f)
(rename-file f (string-append s "/" (basename f)))) (rename-file f (string-append s "/" (basename f))))
(find-files "." "\\.a$"))) (find-files "." "\\.a$"))))))
#t)))
(add-after 'install 'check (add-after 'install 'check
(assoc-ref %standard-phases 'check)) (assoc-ref %standard-phases 'check))
(add-before 'patch-source-shebangs 'autoconf (add-before 'patch-source-shebangs 'autoconf
@ -844,8 +837,7 @@ your calls and messages.")
;; Disable the pjnath and pjsua tests, which require an actual ;; Disable the pjnath and pjsua tests, which require an actual
;; network and an actual sound card, respectively. ;; network and an actual sound card, respectively.
(("pjnath-test pjmedia-test pjsip-test pjsua-test") (("pjnath-test pjmedia-test pjsip-test pjsua-test")
"pjmedia-test pjsip-test")) "pjmedia-test pjsip-test")))))))
#t)))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)