From a412459054b7ad00738dc66cb2035638f9c11b3c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Jun 2020 19:11:28 -0400 Subject: [PATCH 58/58] gnu: gst-libav: Update package definition. * gnu/packages/gstreamer.scm (gst-libav): Update package definition. [arguments]<#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, perl and ruby. [inputs]: Remove gst-plugins-base, orc and zlib. [propagated-inputs]: Add gstreamer and gst-plugins-base. [synopsis]: Modify. [description]: Modify. [license]: Change from gpl2+ to lgpl2.0+. --- gnu/packages/gstreamer.scm | 66 +++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index fab789d571..a166c90f10 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -85,6 +85,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) #:use-module (gnu packages speech) #:use-module (gnu packages python) #:use-module (gnu packages ssh) @@ -902,7 +903,6 @@ they'll probably land in an unmarked grave at the final showdown.") ("libcdio" ,libcdio) ("libdvdread" ,libdvdread) ("libmpeg2" ,libmpeg2) - ("libdvdread" ,libdvdread) ("libx264" ,libx264) ("opencore-amr" ,opencore-amr) ("orc" ,orc))) @@ -920,35 +920,49 @@ think twice about shipping them.") (package (name "gst-libav") (version "1.16.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://gstreamer.freedesktop.org/src/" name "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop bundled ffmpeg. - (delete-file-recursively "gst-libs/ext/libav") - #t)))) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://gstreamer.freedesktop.org/src/" name "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled ffmpeg. + (delete-file-recursively "gst-libs/ext/libav") + #t)))) (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "plugins/gst-libav-plugins-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python))) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby))) (inputs - `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) - ("orc" ,orc) - ("zlib" ,zlib))) + `(("ffmpeg" ,ffmpeg))) + (propagated-inputs + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) + (synopsis "GStreamer plugins and helper libraries") + (description "Gst-Libav contains a GStreamer plugin for using the encoders, +decoders, muxers, and demuxers provided by FFmpeg.") (home-page "https://gstreamer.freedesktop.org/") - (synopsis "Plugins for the GStreamer multimedia library") - (description - "This GStreamer plugin supports a large number of audio and video -compression formats through the use of the libav library.") - (license license:gpl2+))) + (license license:lgpl2.0+))) (define-public gst-editing-services (package -- 2.26.2