[Lunar-commits] <moonbase> MPlayer: fix compilation with x264 and live555

[Paul Bredbury]

commit b6953a6dc21f6b42079035dcc789e5f787c1888c
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Wed Sep 2 01:21:34 2009 +0700

    MPlayer: fix compilation with x264 and live555
    
    x264 needs to be compiled into ffmpeg, then compile MPlayer with ffmpeg. Compilation fails if MPlayer tries to use x264 directly.
    
    The --enable and --disable options for MPlayer are a minefield of crazy compilation errors - use them sparingly, favouring MPlayer's autodetect, which does a much better job.
---
 video/MPlayer/BUILD   |    4 +---
 video/MPlayer/DEPENDS |   18 ++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/video/MPlayer/BUILD b/video/MPlayer/BUILD
index 63b3bbc..40f6262 100644
--- a/video/MPlayer/BUILD
+++ b/video/MPlayer/BUILD
@@ -1,6 +1,6 @@
 (
 
-  # using CFLAGS other than MPlayers autodetected will break
+  # using CFLAGS other than MPlayer's auto-detected will break
   bad_flags compiler  &&
 
   cd $SOURCE_DIRECTORY  &&
@@ -9,8 +9,6 @@
               --confdir=/etc                \
               --mandir=/usr/share/man       \
               --codecsdir=/usr/lib/win32    \
-              --enable-linux-devfs          \
-              --enable-largefiles           \
               --confdir=/etc/mplayer        \
               --datadir=/usr/share/mplayer  \
               $OPTS  &&
diff --git a/video/MPlayer/DEPENDS b/video/MPlayer/DEPENDS
index e2a0b37..b8eb7cc 100644
--- a/video/MPlayer/DEPENDS
+++ b/video/MPlayer/DEPENDS
@@ -1,25 +1,23 @@
+# Using minimal --enables, because MPlayer's build system is FLAKY.
 depends freetype2
-depends unzip
 depends MPlayer-essentials
 
 optional_depends DirectFB    ""                 "" "to use DirectFB support"
-optional_depends SDL         "--enable-sdl"     "" "to use SDL to output video signal"
+optional_depends SDL         ""                 "" "to use SDL to output video signal"
 optional_depends libdvdread  ""                 "" "To read DVDs"
 optional_depends alsa-utils  ""                 "" "for ALSA sound support"
 optional_depends libvorbis   ""                 "" "to use ogg audio format"
 optional_depends libmatroska ""                 "" "for matroska audio/video container format support"
 optional_depends faad        ""                 "" "for external FAAD2 (MPA/AAC) support"
-
-optional_depends libtheora   "--enable-theora"  "--disable-theora"    "for OGG/Theora Video Playback"
-optional_depends libXvMC     "--enable-xvmc --with-xvmclib=XvMCW" \
-                             "" "for hardware XvMC acceleration"
-
+optional_depends libtheora   ""                 "--disable-theora"    "for OGG/Theora Video Playback"
+optional_depends libXvMC     "--enable-xvmc"    "" "for hardware XvMC acceleration"
 optional_depends gtk+-2      "--enable-gui"     "--disable-gui"       "for MPlayer GTK gui support"
 optional_depends MPlayer-all ""                 ""                    "to install more foreign codecs"
-optional_depends libggi      "--enable-ggi"     "--disable-ggi"       "General Graphics Interface support"
-optional_depends libggiwmh   "--enable-ggiwmh"  "--disable-ggiwmh"    "GGI extension support"
+optional_depends libggi      ""                 "--disable-ggi"       "General Graphics Interface support"
+optional_depends libggiwmh   ""                 "--disable-ggiwmh"    "GGI extension support"
 optional_depends amrnb       ""                 "--disable-libopencore_amrnb" "AMR narrowband support"
 optional_depends amrwb       ""                 "--disable-libopencore_amrwb" "AMR wideband support"
 optional_depends mpeg2dec    ""                 ""                    "for mpeg-1 and mpeg-2 support"
 optional_depends live555     ""                 "--disable-live"      "for RTP/RTCP, RTSP, SIP support"
-optional_depends x264-snapshot  "--enable-x264" "--disable-x264"      "for H264/AVC video stream support"
+# MPlayer needs to use x264 *via* ffmpeg
+optional_depends ffmpeg      ""                 "--disable-x264"      "use ffmpeg (with e.g. x264-snapshot)"