diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
| commit | f7175626ffce578be1bc6df4916a129f86557872 (patch) | |
| tree | 2eb0040522f2883764b3e09dc36595d68eeb14c1 /gnu/packages/gstreamer.scm | |
| parent | 2b6ecdf41a09ab9ecae06d7c537583a2f0f28efc (diff) | |
| parent | e8c5533d26b4441c96e9ae92350efcb24d787c4b (diff) | |
| download | guix-f7175626ffce578be1bc6df4916a129f86557872.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 12b37ffe12..01474e29a7 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -723,6 +723,8 @@ model to base your own plug-in on, here it is.") ;("qtdeclarative" ,qtdeclarative) ;("qtx11extras" ,qtx11extras) ("soundtouch" ,soundtouch) + ;; GStreamer is not yet compatible with srt > 1.4.1. + ("srt" ,srt-1.4.1) ("x265" ,x265) ("wayland" ,wayland))) (home-page "https://gstreamer.freedesktop.org/") @@ -919,18 +921,7 @@ non-linear editors.") (description "This package contains GObject Introspection overrides for Python that can be used by Python applications using GStreamer.") - (license license:lgpl2.1+) - (properties `((python2-variant . ,(delay python2-gst)))))) - -(define-public python2-gst - (package (inherit python-gst) - (name "python2-gst") - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-2))) - (propagated-inputs - `(("gst-plugins-base" ,gst-plugins-base) - ("python-pygobject" ,python2-pygobject))))) + (license license:lgpl2.1+))) (define-public gst123 (package |