From 40f6f76ed1eb29673f1da5eb9f976c566104abe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 7 Apr 2015 14:49:05 +0800
Subject: [PATCH] gnu: gst-plugins-good: Add more inputs and remove unneeded
 ones.

* gnu/packages/gstreamer.scm (gst-plugins-good): Move gst-plugins-base
  from 'native-inputs' to 'inputs'.
  [inputs]: Add aalib, jack, libavc1394, libcaca, libdv, libiec61833,
  libshout, libsoup, libvpx, orc, taglib and wavpack.  Remove glib,
  gstreamer, libogg, libx11, libxext, libxv, and zlib.
  [arguments]: Remove.
---
 gnu/packages/gstreamer.scm | 41 ++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 977ca14e3a..b882208d76 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -25,14 +25,17 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages video)
@@ -217,30 +220,30 @@ for the GStreamer multimedia library.")
         "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"))))
     (build-system gnu-build-system)
     (inputs
-     `(("glib" ,glib)
+     `(("aalib" ,aalib)
        ("cairo" ,cairo)
-       ("gdk-pixbuf" ,gdk-pixbuf)
        ("flac" ,flac)
-       ("speex" ,speex)
-       ("libogg" ,libogg) ;; should be a propagated input of the above
-       ("libx11" ,libx11)
-       ("zlib" ,zlib)
-       ("libpng" ,libpng)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("jack" ,jack-2)
+       ("libavc1394" ,libavc1394)
+       ("libcaca" ,libcaca)
+       ("libdv" ,libdv)
+       ("libiec61883" ,libiec61883)
        ("libjpeg" ,libjpeg)
-       ("libXext" ,libxext)
-       ("libxv" ,libxv)
+       ("libpng" ,libpng)
+       ("libshout" ,libshout)
+       ("libsoup" ,libsoup)
+       ("libvpx" ,libvpx)
+       ("orc" ,orc)
        ("pulseaudio" ,pulseaudio)
-       ("gstreamer" ,gstreamer)))
+       ("speex" ,speex)
+       ("taglib" ,taglib)
+       ("wavpack" ,wavpack)))
     (native-inputs
-      `(("pkg-config" ,pkg-config)
-        ("glib" ,glib "bin")
-        ("gst-plugins-base" ,gst-plugins-base)
-        ("python-wrapper" ,python-wrapper)))
-   (arguments
-    `(#:configure-flags (list "--disable-osx_audio" 
-                              "--disable-osx_video"
-                              "--disable-directsound"
-                              "--disable-waveform")))
+     `(("glib:bin" ,glib "bin")
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
     (home-page "http://gstreamer.freedesktop.org/")
     (synopsis
      "Plugins for the GStreamer multimedia library")