diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
| commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
| tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /gnu/packages/gstreamer.scm | |
| parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
| parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e3019f630c..977ca14e3a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages video) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) #:use-module (gnu packages pkg-config) @@ -262,7 +263,8 @@ developers consider to have good quality code and correct functionality.") "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:configure-flags '("--with-system-libav") + #:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh (lambda _ @@ -271,10 +273,10 @@ developers consider to have good quality code and correct functionality.") (string-append "#! "(which "sh"))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python) - ("yasm" ,yasm))) + ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) + ("ffmpeg" ,ffmpeg) ("orc" ,orc) ("zlib" ,zlib))) (home-page "http://gstreamer.freedesktop.org/") |