[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
300/416: gnu: farstream: Use gexps.
From: |
guix-commits |
Subject: |
300/416: gnu: farstream: Use gexps. |
Date: |
Fri, 14 Apr 2023 15:26:07 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit c1eb1342aaf6e67da3e41e2734ea8587fdb96790
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Apr 1 21:21:02 2023 -0400
gnu: farstream: Use gexps.
* 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.
---
gnu/packages/freedesktop.scm | 123 ++++++++++++++++++++++---------------------
1 file changed, 63 insertions(+), 60 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index bbac2ea064..a0ce0c2b25 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -225,72 +225,75 @@ application-centers for distributions.")
(sha256
(base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk"))
(patches
- (search-patches
- "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
- "farstream-make.patch"))))
+ (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
+ "farstream-make.patch"))))
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (list
- "--enable-gtk-doc"
- "--enable-glib-asserts"
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'copy-common
- (lambda _
- (delete-file "autogen.sh")
- (copy-recursively
- (assoc-ref %build-inputs "common")
- "common")))
- (add-after 'unpack 'disable-problematic-tests
- (lambda _
- (substitute* "tests/check/Makefile.am"
- ;; This test fails since updating gstreamer to version 1.22.1
- ;; (see:
- ;;
https://gitlab.freedesktop.org/farstream/farstream/-/issues/25).
- (("^\trtp/recvcodecs.*") "")
- ;; This test timeouts despite changing the value of
- ;; 'CK_DEFAULT_TIMEOUT' to 600 (see:
- ;;
https://gitlab.freedesktop.org/farstream/farstream/-/issues/20).
- (("^\ttransmitter/nice.*") ""))))
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key 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/")
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/")))))))))
+ (list
+ #:configure-flags
+ #~(list "--enable-gtk-doc"
+ "--enable-glib-asserts"
+ (string-append "--with-html-dir=" #$output
+ "/share/gtk-doc/html"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-common
+ (lambda _
+ (delete-file "autogen.sh")
+ (copy-recursively
+ #$(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url
"https://gitlab.freedesktop.org/gstreamer/common.git")
+ (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e")))
+ (file-name (git-file-name "common" "latest.52adcdb"))
+ (sha256
+ (base32
+ "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))
+ "common")))
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (substitute* "tests/check/Makefile.am"
+ ;; This test fails since updating gstreamer to version 1.22.1
+ ;; (see:
+ ;;
https://gitlab.freedesktop.org/farstream/farstream/-/issues/25).
+ (("^\trtp/recvcodecs.*") "")
+ ;; This test timeouts despite changing the value of
+ ;; 'CK_DEFAULT_TIMEOUT' to 600 (see:
+ ;;
https://gitlab.freedesktop.org/farstream/farstream/-/issues/20).
+ (("^\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
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("common"
- ,(origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://gitlab.freedesktop.org/gstreamer/common.git")
- (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e")))
- (file-name (git-file-name "common" "latest.52adcdb"))
- (sha256
- (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)))
+ (list autoconf
+ automake
+ docbook-xml-4.1.2
+ docbook-xsl
+ gobject-introspection
+ gtk-doc/stable
+ libtool
+ libxslt
+ perl
+ pkg-config
+ python-wrapper))
(inputs
- (list glib gtk+ gupnp-igd libnice))
+ (list glib
+ gtk+
+ gupnp-igd
+ libnice))
(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")
(description "Farstream is a collection of GStreamer modules and libraries
for videoconferencing.")
- 234/416: gnu: qtdeclarative-5: Update to 5.15.8., (continued)
- 234/416: gnu: qtdeclarative-5: Update to 5.15.8., guix-commits, 2023/04/14
- 245/416: gnu: qtlocation: Update to 5.15.5., guix-commits, 2023/04/14
- 248/416: gnu: qtquickcontrols-5: Update to 5.15.8., guix-commits, 2023/04/14
- 249/416: gnu: qtquickcontrols2-5: Update to 5.15.8., guix-commits, 2023/04/14
- 266/416: gnu: ruby-puma: Disable a flaky test., guix-commits, 2023/04/14
- 278/416: gnu: python-coverage: Update to 5.5., guix-commits, 2023/04/14
- 289/416: gnu: Add orangeduck-mpc., guix-commits, 2023/04/14
- 293/416: gnu: utf8-h: Install header under include/utf8 prefix., guix-commits, 2023/04/14
- 294/416: gnu: imgui: Use gexp output variables., guix-commits, 2023/04/14
- 295/416: gnu: Add imgui-1.87., guix-commits, 2023/04/14
- 300/416: gnu: farstream: Use gexps.,
guix-commits <=
- 299/416: gnu: farstream: Disable a failing test., guix-commits, 2023/04/14
- 213/416: gnu: gst-plugins-good: Update to 1.22.1., guix-commits, 2023/04/14
- 302/416: gnu: python-exceptiongroup: Update to 1.1.1., guix-commits, 2023/04/14
- 309/416: gnu: python-h5py: Update to 3.8.0., guix-commits, 2023/04/14
- 312/416: gnu: rust-pyo3-0.15: Update to 0.15.2., guix-commits, 2023/04/14
- 317/416: gnu: rust-core-foundation-sys-0.8: Update to 0.8.3., guix-commits, 2023/04/14
- 326/416: gnu: rust-cc-1: Update to 1.0.79., guix-commits, 2023/04/14
- 330/416: gnu: Add rust-prettyplease-0.1., guix-commits, 2023/04/14
- 334/416: gnu: rust-slab-0.4: Update to 0.4.8., guix-commits, 2023/04/14
- 339/416: gnu: rust-futures-io-0.3: Update to 0.3.26., guix-commits, 2023/04/14