Merge svn changes up to r28461

4 files changed, 56 insertions, 158 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 785c4f8cf8..384445b3c1 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -9100,6 +9100,10 @@ Currently it only works if scene change detection is disabled
 (sc_threshold=1000000000).
 .
 .TP
+.B "gmc\ \ \ \ "
+Enable Global Motion Compensation.
+.
+.TP
 .B (no)lowdelay
 Sets the low delay flag for MPEG-1/2 (disables B-frames).
 .
diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index a18f1f1ba0..a18f1f1ba0 100644
--- a/DOCS/man/zh/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index fae3bd8618..257ca635c3 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -26,13 +26,21 @@ answers.
 
 <itemizedlist>
 <listitem><para>
-  <emphasis role="bold">binutils</emphasis> - recommended version is
-  <emphasis role="bold">2.11.x</emphasis>.
+  <emphasis role="bold">POSIX system</emphasis> - You need a POSIX-compatible
+  shell and POSIX-compatible system tools like grep, sed, awk, etc. in your
+  path.
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">gcc</emphasis> - recommended versions are 2.95
-  and 3.4+. 2.96 and 3.0.x are known to generate faulty code, 3.1 and
-  3.2 also had problems, 3.3 some minor ones. On PowerPC, use 4.x.
+  <emphasis role="bold">GNU make</emphasis> 3.81 or later
+</para></listitem>
+<listitem><para>
+  <emphasis role="bold">binutils</emphasis> - GNU binutils 2.11 or later
+  is known to work.
+</para></listitem>
+<listitem><para>
+  <emphasis role="bold">compiler</emphasis> - We mostly use gcc, the
+  recommended versions on x86 are 2.95 and 3.4+. On PowerPC, use 4.x+.
+  icc 10.1+ is also known to work.
 </para></listitem>
 <listitem><para>
   <emphasis role="bold">Xorg/XFree86</emphasis> - recommended version is
@@ -42,9 +50,6 @@ answers.
   You don't absolutely need X, some video output drivers work without it.
 </para></listitem>
 <listitem><para>
-  <emphasis role="bold">GNU make</emphasis> 3.81
-</para></listitem>
-<listitem><para>
   <emphasis role="bold">FreeType</emphasis> - 2.0.9 or later is required
   for the OSD and subtitles
 </para></listitem>
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index 29ed6bd422..abf5c17f72 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -3,18 +3,18 @@
 <chapter id="ports" xreflabel="Ports">
 <title>Ports</title>
 
-<sect1 id="linux">
-<title>Linux</title>
-
 <para>
-The main development platform is Linux on x86, although
-<application>MPlayer</application> works on many other Linux ports.
 Binary packages of <application>MPlayer</application> are available from several
-sources.
+sources. We have a list of places to get
+<ulink url="http://www.mplayerhq.hu/design7/projects.html#unofficial_packages">unofficial packages</ulink>
+for various systems on our homepage.
 However, <emphasis role="bold">none of these packages are supported</emphasis>.
 Report problems to the authors, not to us.
 </para>
 
+<sect1 id="linux">
+<title>Linux</title>
+
 <!-- ********** -->
 
 <sect2 id="debian">
@@ -45,13 +45,6 @@ As root you can then install the <filename>.deb</filename> package as usual:
 
 <screen>dpkg -i ../mplayer_<replaceable>version</replaceable>.deb</screen>
 </para>
-
-<para>
-Christian Marillat has been making unofficial Debian packages of
-<application>MPlayer</application>, <application>MEncoder</application> and
-our binary codec packages for a while, you can (apt-)get them from
-<ulink url="http://www.debian-multimedia.org/">his homepage</ulink>.
-</para>
 </sect2>
 
 <!-- ********** -->
@@ -60,25 +53,17 @@ our binary codec packages for a while, you can (apt-)get them from
 <title>RPM packaging</title>
 
 <para>
-Dominik Mierzejewski maintains the official RPM packages of
-<application>MPlayer</application> for Fedora and CentOS/RHEL. They are available
-from <ulink url="http://rpmfusion.org/">RPMFusion repository</ulink>.
-</para>
+To build an RPM package, run the following command in the
+<application>MPlayer</application> source directory:
 
-<para>
-Mandrake/Mandriva RPM packages are available from the
-<ulink url="http://plf.zarb.org/">P.L.F.</ulink>.
-SUSE used to include a crippled version of <application>MPlayer</application>
-in their distribution. They have removed it in their latest releases. You can
-get working RPMs from
-<ulink url="http://packman.links2linux.de/?action=128">links2linux.de</ulink>.
+<screen>FIXME: insert proper commands here</screen>
 </para>
 </sect2>
 
 <!-- ********** -->
 
-<sect2 id="arm">
-<title>ARM</title>
+<sect2 id="arm_linux">
+<title>ARM Linux</title>
 
 <para>
 <application>MPlayer</application> works on Linux PDAs with ARM CPU e.g. Sharp
@@ -110,11 +95,6 @@ available that are probably easier to use than our raw sources.
 </para>
 
 <para>
-To build <application>MPlayer</application> you will need GNU make
-(gmake - native BSD make will not work) and a recent version of binutils.
-</para>
-
-<para>
 If <application>MPlayer</application> complains about not finding
 <filename>/dev/cdrom</filename> or <filename>/dev/dvd</filename>,
 create an appropriate symbolic link:
@@ -188,6 +168,13 @@ adjustments to make the build work.
 <title>Solaris</title>
 
 <para>
+Solaris still has broken, POSIX-incompatible system tools and shell in default
+locations. Until a bold step out of the computing stone age is made, you will
+have to add <filename>/usr/xpg4/bin</filename> to your
+<systemitem>PATH</systemitem>.
+</para>
+
+<para>
 <application>MPlayer</application> should work on Solaris 2.6 or newer.
 Use the SUN audio driver with the <option>-ao sun</option> option for sound.
 </para>
@@ -223,17 +210,6 @@ installed.
 </itemizedlist>
 
 <para>
-To build the package you will need GNU <application>make</application>
-(<filename>gmake</filename>, <filename>/opt/sfw/gmake</filename>), native
-Solaris make will not work. Typical error you get when building with
-Solaris' make instead of GNU make:
-<screen>
-% /usr/ccs/bin/make
-make: Fatal error in reader: Makefile, line 25: Unexpected end of line seen
-</screen>
-</para>
-
-<para>
 On Solaris SPARC, you need the GNU C/C++ Compiler; it does not matter if
 GNU C/C++ compiler is configured with or without the GNU assembler.
 </para>
@@ -339,34 +315,6 @@ you may not be able to play DVD discs larger than 4 GB:
 
 <!-- ********** -->
 
-<sect2 id="irix">
-<title>IRIX</title>
-
-<para>
-You can either try to install the GNU install program, and (if you did
-not put it in your global path) then point to the location with:
-<screen>
-./configure --with-install=<replaceable>/path/and/name/of/install</replaceable>
-</screen>
-</para>
-
-<para>
-Or you can use the default install delivered with IRIX 6.5 in which case
-you will have to edit the <filename>Makefile</filename> by hand a little bit.
-Change the line:
-<programlisting>
-$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
-</programlisting>
-to:
-<programlisting>
-$(INSTALL) -m 644 mplayer.1 $(MANDIR)/man1/
-</programlisting>
-and then go on with building and installing.
-</para>
-</sect2>
-
-<!-- ********** -->
-
 <sect2 id="hp-ux">
 <title>HP-UX</title>
 
@@ -378,7 +326,7 @@ work out of the box. The following information is taken from this HOWTO.
 </para>
 
 <para>
-You need GCC 3.4.0 or later, GNU make 3.80 or later and SDL 1.2.7 or later.
+You need GCC 3.4.0 or later and SDL 1.2.7 or later.
 HP cc will not produce a working program, prior GCC versions are buggy.
 For OpenGL functionality you need to install Mesa and the gl and gl2 video
 output drivers should work, speed may be very bad, depending on the CPU speed,
@@ -490,13 +438,6 @@ or if you are building on POWER5, GCC 4.0 is required.
 </para>
 
 <para>
-Ensure that you are using GNU make
-(<filename>/opt/freeware/bin/gmake</filename>) to build
-<application>MPlayer</application>, as you will encounter problems if
-you use <filename>/usr/ccs/bin/make</filename>.
-</para>
-
-<para>
 CPU detection is still a work in progress.
 The following architectures have been tested:
 </para>
@@ -549,6 +490,23 @@ Messages in the GTK-2 interface will be broken then.<!--
 </listitem>
 </itemizedlist>
 </sect2>
+
+<!-- ********** -->
+
+<sect2 id="qnx">
+<title>QNX</title>
+
+<para>
+You'll need to download and install SDL for QNX. Then run
+<application>MPlayer</application> with <option>-vo sdl:driver=photon</option>
+and <option>-ao sdl:nto</option> options, it should be fast.
+</para>
+
+<para>
+The <option>-vo x11</option> output will be even slower than on Linux,
+since QNX has only X <emphasis>emulation</emphasis> which is very slow.
+</para>
+</sect2>
 </sect1>
 
 
@@ -695,11 +653,9 @@ Instructions and files for making SDL run under
 <title><application>MinGW</application></title>
 
 <para>
-Installing a version of <application>MinGW</application> that could
-compile <application>MPlayer</application> used to be quite tricky, but it
-works out of the box now. Just install <application>MinGW</application>
-3.1.0 or later and MSYS 1.0.9 or later and tell the MSYS postinstall that
-<application>MinGW</application> is installed.
+You need <application>MinGW</application> 3.1.0 or later and MSYS 1.0.9 or
+later. Tell the MSYS postinstall that <application>MinGW</application> is
+installed.
 </para>
 
 <para>
@@ -882,71 +838,4 @@ not work anymore.
 </sect2>
 </sect1>
 
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<sect1 id="exotic_platforms">
-<title>Exotic Platforms</title>
-
-<para>
-<application>MPlayer</application> runs on a number of exotic platforms,
-but most of the platform-specific changes from those systems have not been
-merged back into the main source tree.
-For build instructions you should refer to the system-specific documentation.
-</para>
-
-<!-- ********** -->
-
-<sect2 id="qnx">
-<title>QNX</title>
-
-<para>
-You'll need to download and install SDL for QNX. Then run
-<application>MPlayer</application> with <option>-vo sdl:driver=photon</option>
-and <option>-ao sdl:nto</option> options, it should be fast.
-</para>
-
-<para>
-The <option>-vo x11</option> output will be even slower than on Linux,
-since QNX has only X <emphasis>emulation</emphasis> which is very slow.
-</para>
-</sect2>
-
-<!-- ********** -->
-
-<sect2 id="amiga">
-<title>Amiga/MorphOS (GeekGadgets)</title>
-<para>
-The people over at
-<ulink url="http://www.amigasoft.net">www.amigasoft.net</ulink>
-make current <application>MPlayer</application> and
-<application>MEncoder</application> packages.
-</para>
-
-<para>
-Nicholas Det at Genesi has done a big and powerful port of <application>MPlayer
-</application> for MorphOS. Sadly it's based on the 0.90 series.
-</para>
-
-<para>
-Get if from <ulink url="http://www.morphzone.org/">MorphZone</ulink>:
-<itemizedlist>
-<listitem><para>
-  <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=90">
-  <application>MPlayer</application> 0.91 binary</ulink>
-</para></listitem>
-<listitem><para>
-  <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=91">
-  <application>MPlayer</application> 0.91 source</ulink>
-</para></listitem>
-<listitem><para>
-  <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=92">
-  <application>MEncoder</application> 1.0pre3 binary</ulink>
-</para></listitem>
-</itemizedlist>
-</para>
-</sect2>
-</sect1>
-
 </chapter>