aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2015-02-18 15:22:52 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2015-02-18 15:22:52 -0600
commitdbc383d4834daea1de2c59aa95c06198a3941d6e (patch)
tree548186c18dbfa426a5c0a21fb70e57ca165da1c5 /docs/source
parent941b9abbb03dbc6fb91975a5f4bf5ea6b4997d17 (diff)
parenteade529e189ee688ba125c7a7e26e8cb8ed6aedd (diff)
downloadmediagoblin-dbc383d4834daea1de2c59aa95c06198a3941d6e.tar.lz
mediagoblin-dbc383d4834daea1de2c59aa95c06198a3941d6e.tar.xz
mediagoblin-dbc383d4834daea1de2c59aa95c06198a3941d6e.zip
Merge remote-tracking branch 'refs/remotes/breton/new_gst10'
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/siteadmin/media-types.rst19
1 files changed, 11 insertions, 8 deletions
diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst
index f8030081..7d9f72b0 100644
--- a/docs/source/siteadmin/media-types.rst
+++ b/docs/source/siteadmin/media-types.rst
@@ -79,12 +79,15 @@ good/bad/ugly). On Debianoid systems
.. code-block:: bash
- sudo apt-get install python-gst0.10 \
- gstreamer0.10-plugins-base \
- gstreamer0.10-plugins-bad \
- gstreamer0.10-plugins-good \
- gstreamer0.10-plugins-ugly \
- gstreamer0.10-ffmpeg
+ sudo apt-get install python-gi python3-gi \
+ gstreamer1.0-tools \
+ gir1.2-gstreamer-1.0 \
+ gir1.2-gst-plugins-base-1.0 \
+ gstreamer1.0-plugins-good \
+ gstreamer1.0-plugins-ugly \
+ gstreamer1.0-plugins-bad \
+ gstreamer1.0-libav \
+ python-gst-1.0
Add ``[[mediagoblin.media_types.video]]`` under the ``[plugins]`` section in
@@ -206,7 +209,7 @@ It may work on some earlier versions, but that is not guaranteed (and
is surely not to work prior to Blender 2.5X).
Add ``[[mediagoblin.media_types.stl]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin.
+``mediagoblin_local.ini`` and restart MediaGoblin.
Run
@@ -255,7 +258,7 @@ This feature has been tested on Fedora with:
It may work on some earlier versions, but that is not guaranteed.
Add ``[[mediagoblin.media_types.pdf]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin.
+``mediagoblin_local.ini`` and restart MediaGoblin.
Run