[SCM] mplayer/master: Cherry pick r37549 to allow building the documentation without FFmpeg.

[micove-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit db7736098fe68c20f3a4b66336b940407f002781
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Nov 2 03:28:57 2015 -0500

    Cherry pick r37549 to allow building the documentation without FFmpeg.

diff --git a/debian/patches/0102_svn37549.patch b/debian/patches/0102_svn37549.patch
new file mode 100644
index 0000000..f91b912
--- /dev/null
+++ b/debian/patches/0102_svn37549.patch
@@ -0,0 +1,24 @@
+Description: Add revision 37549 from trunk.
+ Drop the requirement for FFmpeg when just building the docs
+Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
+Forwarded: not-needed
+
+Index: configure
+===================================================================
+--- mplayer/configure	(revision 37548)
++++ mplayer/configure	(revision 37549)
+@@ -7142,9 +7142,11 @@
+   def_ffmpeg_a='#undef CONFIG_FFMPEG_A'
+   def_ffmpeg_so='#undef CONFIG_FFMPEG_SO'
+   nocodecmodules="ffmpeg $nocodecmodules"
+-  echo "Compiling without FFmpeg is currently not supported/working."
+-  echo "Please contact us if that is an issue for you."
+-  die "both internal and external FFmpeg missing"
++  if test "$_mplayer" = yes || test "$_mencoder" = yes ; then
++    echo "Compiling without FFmpeg is currently not supported/working."
++    echo "Please contact us if that is an issue for you."
++    die "both internal and external FFmpeg missing"
++  fi
+ fi
+ test "$_vf_lavfi" = yes && def_vf_lavfi='#define CONFIG_VF_LAVFI 1'|| libavfilters=''
+ test "$_libavcodec_mpegaudio_hp" = yes &&
diff --git a/debian/patches/series b/debian/patches/series
index 06c73b9..0e7fb1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
 0002_mplayer_debug_printf.patch
 0100_svn37545.patch
 0101_svn37548.patch
+0102_svn37549.patch
 0200_Hurd_PATH_MAX.patch
 0201_PATH_MAX_HURD.patch

-- 
mplayer packaging