From 762e46f650e71c662a1d90fb2740c6400538417f Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 10 Aug 2010 22:00:31 +0200 Subject: [PATCH] GStreamer is now a required dependency --- docs/changes.rst | 1 + docs/installation/gstreamer.rst | 26 +++++++++++++++++--------- docs/installation/index.rst | 17 +++++++++-------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 8c034f51..c8e4c912 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -12,6 +12,7 @@ Another great release. **Changes** +- GStreamer is now a required dependency. - Exit early if not Python >= 2.6, < 3. - Include Sphinx scripts for building docs, pylintrc, tests and test data in the packages created by ``setup.py`` for i.e. PyPI. diff --git a/docs/installation/gstreamer.rst b/docs/installation/gstreamer.rst index dd038ba0..ef66c673 100644 --- a/docs/installation/gstreamer.rst +++ b/docs/installation/gstreamer.rst @@ -1,29 +1,37 @@ ********************** -Gstreamer installation +GStreamer installation ********************** -To use the `Gstreamer `_ backend, you first -need to install Gstreamer and its Python bindings. +To use the Mopidy, you first need to install GStreamer and its Python bindings. -Installing Gstreamer on Linux +Installing GStreamer on Linux ============================= -Gstreamer is packaged for most popular Linux distributions. If you use -Debian/Ubuntu you can install Gstreamer with Aptitude:: +GStreamer is packaged for most popular Linux distributions. If you use +Debian/Ubuntu you can install GStreamer with Aptitude:: sudo aptitude install python-gst0.10 gstreamer0.10-plugins-good \ gstreamer0.10-plugins-ugly -Installing Gstreamer on OS X +Installing GStreamer on OS X ============================ -To install Gstreamer on OS X using Homebrew:: +.. note:: + + We have created GStreamer formulas for Homebrew to make the GStreamer + installation easy for you, but our formulas has not been merged into + Homebrew's master branch yet. You should either fetch the formula files + from `Homebrew's issue #1612 + `_ yourself, or fall + back to using MacPorts. + +To install GStreamer on OS X using Homebrew:: brew install gst-python gst-plugins-good gst-plugins-ugly -To install Gstreamer on OS X using MacPorts:: +To install GStreamer on OS X using MacPorts:: sudo port install py26-gst-python gstreamer-plugins-good \ gstreamer-plugins-ugly diff --git a/docs/installation/index.rst b/docs/installation/index.rst index d70d7392..bc5cc7a8 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -3,11 +3,11 @@ Installation ************ Mopidy itself is a breeze to install, as it just requires a standard Python -2.6 or newer installation. The libraries we depend on to connect to the Spotify -service is far more tricky to get working for the time being. Until -installation of these libraries are either well documented by their developers, -or the libraries are packaged for various Linux distributions, we will supply -our own installation guides, as linked to below. +installation and the GStreamer library. The libraries we depend on to connect +to the Spotify service is far more tricky to get working for the time being. +Until installation of these libraries are either well documented by their +developers, or the libraries are packaged for various Linux distributions, we +will supply our own installation guides, as linked to below. Install dependencies @@ -16,13 +16,14 @@ Install dependencies .. toctree:: :hidden: - despotify - libspotify gstreamer + libspotify + despotify Make sure you got the required dependencies installed. - Python >= 2.6, < 3 +- :doc:`GStreamer ` (>= 0.10 ?) with Python bindings - Dependencies for at least one Mopidy mixer: - AlsaMixer (Linux only) @@ -45,7 +46,7 @@ Make sure you got the required dependencies installed. - LocalBackend (Linux, OS X, and Windows) - - :doc:`GStreamer ` + - No additional dependencies. Install latest release