me/guix
Archived
1
0
Fork 0
Code Activity

gnu: farstream: Use gexps.

Browse source 
* gnu/packages/freedesktop.scm (farstream)
[arguments]: Use gexps.  Ungexp 'common' origin in-place.  Use
search-input-directory in patch-docbook-xml phase.
[native-inputs]: Remove labels.
[inputs, propagated-inputs]: Re-indent.
This commit is contained in:
Maxim Cournoyer 2023-04-01 21:21:02 -04:00
parent b876c5b8e4
commit f11c6f66bf
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 63 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
gnu/packages/freedesktop.scm
View file

@ -225,72 +225,75 @@ application-centers for distributions.")
(sha256 (sha256
(base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk")) (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk"))
(patches (patches
(search-patches (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
"farstream-gupnp.patch" ;for test 'transmitter/rawudp' "farstream-make.patch"))))
"farstream-make.patch"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags (list
(list #:configure-flags
"--enable-gtk-doc" #~(list "--enable-gtk-doc"
"--enable-glib-asserts" "--enable-glib-asserts"
(string-append "--with-html-dir=" (string-append "--with-html-dir=" #$output
(assoc-ref %outputs "doc") "/share/gtk-doc/html"))
"/share/gtk-doc/html")) #:phases
#:phases #~(modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'copy-common
(add-after 'unpack 'copy-common (lambda _
(lambda _ (delete-file "autogen.sh")
(delete-file "autogen.sh") (copy-recursively
(copy-recursively #$(origin
(assoc-ref %build-inputs "common") (method git-fetch)
"common"))) (uri
(add-after 'unpack 'disable-problematic-tests (git-reference
(lambda _ (url "https://gitlab.freedesktop.org/gstreamer/common.git")
(substitute* "tests/check/Makefile.am" (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e")))
;; This test fails since updating gstreamer to version 1.22.1 (file-name (git-file-name "common" "latest.52adcdb"))
;; (see: (sha256
;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). (base32
(("^\trtp/recvcodecs.*") "") "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))
;; This test timeouts despite changing the value of "common")))
;; 'CK_DEFAULT_TIMEOUT' to 600 (see: (add-after 'unpack 'disable-problematic-tests
;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). (lambda _
(("^\ttransmitter/nice.*") "")))) (substitute* "tests/check/Makefile.am"
(add-after 'unpack 'patch-docbook-xml ;; This test fails since updating gstreamer to version 1.22.1
(lambda* (#:key inputs #:allow-other-keys) ;; (see:
(with-directory-excursion "docs" ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25).
(substitute* '("libs/farstream-libs-docs.sgml" (("^\trtp/recvcodecs.*") "")
"plugins/farstream-plugins-docs.sgml") ;; This test timeouts despite changing the value of
(("http://www.oasis-open.org/docbook/xml/4.1.2/") ;; 'CK_DEFAULT_TIMEOUT' to 600 (see:
(string-append (assoc-ref inputs "docbook-xml") ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20).
"/xml/dtd/docbook/"))))))))) (("^\ttransmitter/nice.*") ""))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "docs"
(substitute* '("libs/farstream-libs-docs.sgml"
"plugins/farstream-plugins-docs.sgml")
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(search-input-directory (or native-inputs inputs)
"xml/dtd/docbook/")))))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("common" docbook-xml-4.1.2
,(origin docbook-xsl
(method git-fetch) gobject-introspection
(uri gtk-doc/stable
(git-reference libtool
(url "https://gitlab.freedesktop.org/gstreamer/common.git") libxslt
(commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) perl
(file-name (git-file-name "common" "latest.52adcdb")) pkg-config
(sha256 python-wrapper))
(base32 "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r"))))
("docbook-xml" ,docbook-xml-4.1.2)
("docbook-xsl" ,docbook-xsl)
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc/stable)
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("xsltproc" ,libxslt)))
(inputs (inputs
(list glib gtk+ gupnp-igd libnice)) (list glib
gtk+
gupnp-igd
libnice))
(propagated-inputs (propagated-inputs
(list gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good)) (list gstreamer
gst-plugins-bad
gst-plugins-base
gst-plugins-good))
(synopsis "The Farstream VVoIP framework") (synopsis "The Farstream VVoIP framework")
(description "Farstream is a collection of GStreamer modules and libraries (description "Farstream is a collection of GStreamer modules and libraries
for videoconferencing.") for videoconferencing.")