X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=README;h=beb6867633f60434f807057b362eb17022367128;hb=e4a7200c63c82ccdeb23915c3f4949c784063052;hp=bf1416df1a663a783760a9529ff2100febf0d870;hpb=0c943d40ddfe32e9478e08b829915de7662fd4b8;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/README b/README
index bf1416d..beb6867 100644
--- a/README
+++ b/README
@@ -1,12 +1,10 @@
+GStreamer 1.11.x development series
+
 WHAT IT IS
 ----------
 
 This is GStreamer, a framework for streaming media.
 
-This package is in the 0.9.x series.  This means that this is a
-development series leading up to a stable 0.10.x series.
-You have been warned.
-
 WHERE TO START
 --------------
 
@@ -25,8 +23,8 @@ We track bugs in GNOME's bugzilla; see the website for details.
 
 You can join us on IRC - #gstreamer on irc.freenode.org
 
-GStreamer 0.9 development series - Hung by a Thread
----------------------------------------------------
+GStreamer 1.0 series
+--------------------
 
 Starring
 
@@ -139,13 +137,14 @@ PLATFORMS
 ---------
 
 - Linux is of course fully supported
-- FreeBSD is reported to work; other BSD's should work too
+- FreeBSD is reported to work; other BSDs should work too
 - Solaris is reported to work; a specific sunaudiosink plugin has been written
-- MacOSX is reported to work; specific audio and video sinks have been written
-- Windows support is experimental but improving.  Output sinks have been
-  written but are not yet included in the code. We support
-  - MSys/MingW builds
-  - Microsoft Visual Studio 6 builds (see win32/README.txt)
+- MacOSX works, binary 1.x packages can be built using the cerbero build tool
+- Windows works; binary 1.x packages can be built using the cerbero build tool
+  - MSys/MinGW builds
+  - Microsoft Visual Studio builds are not yet available or supported
+- Android works, binary 1.x packages can be built using the cerbero build tool
+- iOS works
 
 INSTALLING FROM PACKAGES
 ------------------------
@@ -158,7 +157,7 @@ Only in cases where you:
 - want to hack on GStreamer
 - want to verify that a bug has been fixed
 - do not have a sane distribution
-should you choose to build from source tarballs or CVS.
+should you choose to build from source tarballs or git.
 
 Find more information about the various packages at
 http://gstreamer.freedesktop.org/download/
@@ -176,35 +175,31 @@ COMPILING FROM SOURCE TARBALLS
   make
 
   to build GStreamer.
-- if you want to install it (not required), run
+- if you want to install it (not required, but what you usually want to do), run
   make install
-- You should create a registry for things to work.
-  If you ran make install in the previous step, run
-  gst-register
-  as root.
-
-  If you didn't install, run
-  tools/gst-register
-  as a normal user.
 
 - try out a simple test:
-  gst-launch fakesrc num_buffers=5 ! fakesink
-  (If you didn't install GStreamer, again prefix gst-launch with tools/)
+  gst-launch -v fakesrc num_buffers=5 ! fakesink
+  (If you didn't install GStreamer, prefix gst-launch with tools/)
 
   If it outputs a bunch of messages from fakesrc and fakesink, everything is
   ok.
 
+  If it did not work, keep in mind that you might need to adjust the
+  PATH and/or LD_LIBRARY_PATH environment variables to make the system
+  find GStreamer in the prefix where you installed (by default that is /usr/local).
+
 - After this, you're ready to install gst-plugins, which will provide the
   functionality you're probably looking for by now, so go on and read
   that README.
 
-COMPILING FROM CVS
+COMPILING FROM GIT
 ------------------
 
-When building from CVS sources, you will need to run autogen.sh to generate 
+When building from git sources, you will need to run autogen.sh to generate
 the build system files.
 
-You will need a set of additional tools typical for building from CVS,
+You will need a set of additional tools typical for building from git,
 including:
 - autoconf
 - automake
@@ -216,10 +211,7 @@ them.  You can also specify specific versions of automake and autoconf with
 
 Check autogen.sh options by running autogen.sh --help
 
-autogen.sh can pass on arguments to configure - you just need to separate them
-from autogen.sh with -- between the two.
-prefix has been added to autogen.sh but will be passed on to configure because
-some build scripts like that.
+autogen.sh can pass on arguments to configure
 
 When you have done this once, you can use autoregen.sh to re-autogen with
 the last passed options as a handy shortcut.  Use it.
@@ -227,9 +219,17 @@ the last passed options as a handy shortcut.  Use it.
 After the autogen.sh stage, you can follow the directions listed in
 "COMPILING FROM SOURCE"
 
-You can also run your whole cvs stack uninstalled.  The script in
-the gstreamer module /docs/faq/gst-uninstalled) is helpful in setting
-up your environment for this.
+You can also run your whole git stack uninstalled in your home directory,
+so that you can quickly test changes without affecting your system setup or
+interfering with GStreamer installed from packages.  Many GStreamer developers
+use an uninstalled setup for their work.
+
+There is a 'create-uninstalled-setup.sh' script in
+
+  http://cgit.freedesktop.org/gstreamer/gstreamer/tree/scripts/
+
+to easily create an uninstalled setup from scratch.
+
 
 PLUG-IN DEPENDENCIES AND LICENSES
 ---------------------------------