Merge.

4 files changed, 73 insertions, 38 deletions

diff --git a/.hgignore b/.hgignore
index 186211ae5..260a4a086 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,12 +2,17 @@ syntax: glob
 *~
 *.orig
 
+xine-lib-*.tar.gz
+xine-lib-*.tar.bz2
+
 *.o
 *.a
 *.lo
 *.la
-.libs/*
+*.so
+.libs
 .deps/*
+.depend
 Makefile
 Makefile.in
 
@@ -45,6 +50,9 @@ debian/*.substvars
 contrib/ffmpeg/*.pc
 contrib/ffmpeg/config.err
 contrib/ffmpeg/config.mak
+contrib/ffmpeg/doc/*.1
+contrib/ffmpeg/doc/*.html
+contrib/ffmpeg/version.h
 
 doc/faq/faq.html
 doc/faq/faq.txt
diff --git a/autogen.sh b/autogen.sh
index 580ed39de..e228f051b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -51,6 +51,17 @@ detect_configure_ac() {
   }
 }
 
+parse_version_no() {
+  # version no. is extended/truncated to three parts; only digits are handled
+  perl -e 'my $v = <>;
+	   chomp $v;
+	   my @v = split (" ", $v);
+	   $v = $v[$#v];
+	   $v =~ s/[^0-9.].*$//;
+	   @v = split (/\./, $v);
+	   push @v, 0 while $#v < 2;
+	   print $v[0] * 10000 + $v[1] * 100 + $v[2], "\n"'
+}
 
 #--------------------
 # AUTOCONF
@@ -61,12 +72,8 @@ detect_autoconf() {
   NUM_RESULT=$#
   RESULT_FILE=$3
   if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
-    AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    AUTOCONF_MIN="`echo $AUTOCONF_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    if test $AC -lt 100 ; then
-      AC=`expr $AC \* 10`
-    fi
-    if [ `expr $AC` -ge $AUTOCONF_MIN ]; then
+    AC="`autoconf --version | parse_version_no`"
+    if [ `expr $AC` -ge "`echo $AUTOCONF_MIN | parse_version_no`" ]; then
       autoconf_ok=yes
     fi
   else
@@ -114,12 +121,8 @@ try_libtool_executable() {
   NUM_RESULT=$#
   RESULT_FILE=$3
   if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
-    LT="`$libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-\;]//g'`"
-    LIBTOOL_MIN="`echo $LIBTOOL_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    if test $LT -lt 100 ; then
-      LT=`expr $LT \* 10`
-    fi
-    if [ `expr $LT` -ge $LIBTOOL_MIN ]; then
+    LT="`$libtool --version | awk '{ print $4 }' | parse_version_no`"
+    if [ `expr $LT` -ge "`echo $LIBTOOL_MIN | parse_version_no`" ]; then
       libtool_ok=yes
     fi
   fi
@@ -166,12 +169,8 @@ detect_automake() {
   NUM_RESULT=$#
   RESULT_FILE=$3
   if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
-    AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    AUTOMAKE_MIN="`echo $AUTOMAKE_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    if test $AM -lt 100 ; then
-      AM=`expr $AM \* 10`
-    fi
-    if [ `expr $AM` -ge $AUTOMAKE_MIN ]; then
+    AM="`automake --version | parse_version_no`"
+    if [ `expr $AM` -ge "`echo $AUTOMAKE_MIN | parse_version_no`" ]; then
       automake_ok=yes
     fi
   else
@@ -208,17 +207,13 @@ detect_aclocal() {
   NUM_RESULT=$#
   RESULT_FILE=$3
   if [ $RETVAL -eq 0 -a $NUM_RESULT -eq 3 -a -f "$RESULT_FILE" ]; then
-    AC="`aclocal --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    ACLOCAL_MIN="`echo $AUTOMAKE_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
-    if test $AC -lt 100 ; then
-      AC=`expr $AC \* 10`
-    fi
-    if [ `expr $AC` -ge $ACLOCAL_MIN ]; then
+    AC="`aclocal --version | parse_version_no`"
+    if [ `expr $AC` -ge "`echo $AUTOMAKE_MIN | parse_version_no`" ]; then
       aclocal_ok=yes
     fi
   else
     echo
-    echo "**Error**: You must have \`automake' >= $AUTOMAKE_MIN installed to" 
+    echo "**Error**: You must have \`aclocal' >= $AUTOMAKE_MIN installed to" 
     echo "           compile $PROG. Download the appropriate package"
     echo "           for your distribution or source from ftp.gnu.org."
     exit 1
diff --git a/configure.ac b/configure.ac
index 1ccd1005b..a20f64a21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2047,10 +2047,14 @@ dnl ---------------------------------------------
 dnl ASM ALIGN is power of two ?
 dnl Used by internal FFmpeg and Planar postprocess
 dnl ---------------------------------------------
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ asm (".align 3"); ]])],[
-  AC_DEFINE([ASMALIGN(ZEROBITS)], [".align " #ZEROBITS "\n\t"], "asmalign power of two")
-],[
-  AC_DEFINE([ASMALIGN(ZEROBITS)], [".align 1<<" #ZEROBITS "\n\t"], "asmalign power of two")
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ asm (".align 3"); ]])],
+  AC_DEFINE([ASMALIGN_1SLN], [1], [define if '.align n' means alignment to (1<<n)-byte boundaries]),
+  :)
+AH_BOTTOM([#ifdef ASMALIGN_1SLN
+# define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t"
+#else
+# define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"
+#endif
 ])
 
 dnl ---------------------------------------------
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 6abc6a9ab..9743cf361 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -128,14 +128,6 @@
      <para>
       Currently, only xine-lib and gxine are present here.
      </para>
-     <para>
-      If you have patches for a module which is maintained using mercurial,
-      you can make them available as diffs - use <command>hg
-      export</command> for this - or via HTTP by using <command>hg
-      serve</command>. In the latter case, you'll need to post a URL from
-      which a developer can pull the changes. We prefer these methods since
-      we get proper attribution this way.
-     </para>
     </sect3>
     <sect3>
      <title>Checking out xine modules from CVS</title>
@@ -150,10 +142,46 @@
      </para>
      <para>
       If you want xine-lib or gxine, you should use Mercurial instead.
+      The CVS repositories for these are not maintained.
      </para>
     </sect3>
    </sect2>
 
+   <sect2 id="patch">
+    <title>How do I submit patches?</title>
+    <para>
+     First, make sure that you're using a current development version
+     (see above) or at least the current release version. Then, once you're
+     ready to send the patch...
+    </para>
+    <para>
+     Generate your patch using either <command>cvs diff -u &gt;
+     my.patch</command> or <command>hg diff &gt; my.patch</command> (as
+     appropriate). Make sure that your message subject briefly describes the
+     patch; your message body should contain a longer description of the
+     patch. Your patch should be applicable using <command>patch -p0 -i
+     my.patch</command> or, preferably, <command>patch -p1 -i
+     my.patch</command> from the top-level directory in the source tree
+     (i.e. where configure.ac is) - this is fairly important for our
+     Mercurial-based repositories since it makes importing your patch that
+     much easier (hg import defaults to -p1).
+    </para>
+    <para>
+     Alternatively, if you've been hacking away at a module which is
+     maintained using mercurial, you can make them available as diffs - use
+     <command>hg export</command> or, if you have several patches, you could
+     use <command>hg bundle</command> instead (both require extra
+     parameters; <command>hg help export</command> and <command>hg help
+     bundle</command> for more details) - or via HTTP by using <command>hg
+     serve</command>. In the latter case, you'll need to post a URL from
+     which a developer can pull the changes.
+    </para>
+    <para>
+     Patches should normally be sent to the xine-devel mailing list,
+     <email>xine-devel@lists.sourceforge.net</email>.
+    </para>
+   </sect2>
+
    <sect2 id="gnome-xine">
     <title>Why is gxine's CVS module named &quot;gnome-xine&quot;?</title>
     <para>